diff --git a/.chloggen/update_user_gid.yaml b/.chloggen/update_user_gid.yaml new file mode 100644 index 000000000..09934bd06 --- /dev/null +++ b/.chloggen/update_user_gid.yaml @@ -0,0 +1,26 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: 'enhancement' + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: images + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: set USER_GID alongside USER_UID + +# One or more tracking issues or pull requests related to the change +issues: [662] + +# (Optional) One or more lines of additional information to render under the primary note. +# These lines will be padded with 2 spaces and then inserted directly into the document. +# Use pipe (|) for multiline entries. +subtext: + +# Optional: The change log or logs in which this entry should be included. +# e.g. '[user]' or '[user, api]' +# Include 'user' if the change is relevant to end users. +# Include 'api' if there is a change to a library API. +# Default: '[user]' +change_logs: [] + diff --git a/distributions/otelcol-contrib/Dockerfile b/distributions/otelcol-contrib/Dockerfile index d053e9f28..b55277c90 100644 --- a/distributions/otelcol-contrib/Dockerfile +++ b/distributions/otelcol-contrib/Dockerfile @@ -4,7 +4,8 @@ RUN apk --update add ca-certificates FROM scratch ARG USER_UID=10001 -USER ${USER_UID} +ARG USER_GID=10001 +USER ${USER_UID}:${USER_GID} COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY --chmod=755 otelcol-contrib /otelcol-contrib diff --git a/distributions/otelcol-k8s/Dockerfile b/distributions/otelcol-k8s/Dockerfile index 5bfe2d692..5f7defffa 100644 --- a/distributions/otelcol-k8s/Dockerfile +++ b/distributions/otelcol-k8s/Dockerfile @@ -4,7 +4,8 @@ RUN apk --update add ca-certificates FROM scratch ARG USER_UID=10001 -USER ${USER_UID} +ARG USER_GID=10001 +USER ${USER_UID}:${USER_GID} COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY --chmod=755 otelcol-k8s /otelcol-k8s diff --git a/distributions/otelcol-otlp/Dockerfile b/distributions/otelcol-otlp/Dockerfile index 79e886781..ef5516b63 100644 --- a/distributions/otelcol-otlp/Dockerfile +++ b/distributions/otelcol-otlp/Dockerfile @@ -4,7 +4,8 @@ RUN apk --update add ca-certificates FROM scratch ARG USER_UID=10001 -USER ${USER_UID} +ARG USER_GID=10001 +USER ${USER_UID}:${USER_GID} COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY --chmod=755 otelcol-otlp /otelcol-otlp diff --git a/distributions/otelcol/Dockerfile b/distributions/otelcol/Dockerfile index 252ae6b2d..c3cd35efb 100644 --- a/distributions/otelcol/Dockerfile +++ b/distributions/otelcol/Dockerfile @@ -4,7 +4,8 @@ RUN apk --update add ca-certificates FROM scratch ARG USER_UID=10001 -USER ${USER_UID} +ARG USER_GID=10001 +USER ${USER_UID}:${USER_GID} COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY --chmod=755 otelcol /otelcol