Skip to content

Commit

Permalink
chore(Dockerfile): set USER_GID alongside USER_UID (#738)
Browse files Browse the repository at this point in the history
* chore(Dockerfile): set USER_GID alongside USER_UID

* chore: add changelog file

* fix: changelog note

---------

Co-authored-by: Antoine Toulme <[email protected]>
  • Loading branch information
rogercoll and atoulme authored Feb 20, 2025
1 parent c5c9e63 commit fd75933
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 4 deletions.
26 changes: 26 additions & 0 deletions .chloggen/update_user_gid.yaml
Original file line number Diff line number Diff line change
@@ -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: []

3 changes: 2 additions & 1 deletion distributions/otelcol-contrib/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion distributions/otelcol-k8s/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion distributions/otelcol-otlp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion distributions/otelcol/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit fd75933

Please sign in to comment.