-
Notifications
You must be signed in to change notification settings - Fork 102
feat(docker): Switch to a distroless base image #4940
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Dav1dde
wants to merge
2
commits into
master
Choose a base branch
from
dav1d/distroless
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,31 +1,21 @@ | ||
FROM debian:bookworm-slim | ||
FROM gcr.io/distroless/cc-debian12:debug AS builder | ||
|
||
ARG TARGETPLATFORM | ||
|
||
RUN apt-get update \ | ||
&& apt-get install -y ca-certificates gosu curl --no-install-recommends \ | ||
&& apt-get clean \ | ||
&& rm -rf /var/lib/apt/lists/* | ||
RUN ["/busybox/busybox", "mkdir", "/work", "/etc/relay"] | ||
|
||
ENV \ | ||
RELAY_UID=10001 \ | ||
RELAY_GID=10001 | ||
|
||
# Create a new user and group with fixed uid/gid | ||
RUN groupadd --system relay --gid $RELAY_GID \ | ||
&& useradd --system --gid relay --uid $RELAY_UID relay | ||
FROM gcr.io/distroless/cc-debian12:nonroot | ||
|
||
RUN mkdir /work /etc/relay \ | ||
&& chown relay:relay /work /etc/relay | ||
VOLUME ["/work", "/etc/relay"] | ||
WORKDIR /work | ||
ARG TARGETPLATFORM | ||
|
||
EXPOSE 3000 | ||
|
||
COPY $TARGETPLATFORM/relay /bin/relay | ||
RUN chmod +x /bin/relay | ||
COPY --from=builder --chown=nonroot:noonroot /etc/relay /etc/relay | ||
COPY --from=builder --chown=nonroot:noonroot /work /work | ||
|
||
COPY ./docker-entrypoint.sh / | ||
ENTRYPOINT ["/bin/bash", "/docker-entrypoint.sh"] | ||
CMD ["run"] | ||
VOLUME ["/etc/relay", "/work"] | ||
WORKDIR /work | ||
|
||
COPY --chmod=755 $TARGETPLATFORM/relay /bin/relay | ||
|
||
ENTRYPOINT ["/bin/relay"] | ||
CMD ["run"] |
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you're going to want to keep these. It looks like the k8s manifest depends on the specific UID/GID values.
https://github.com/getsentry/ops/blob/af385f13a141f608487665407e34f180ecb10919/k8s/services/relay-pop/deployment.yaml#L166-L167
I'm not sure what
nonroot:nonroot
is going to map to in distroless. Either way, I would assume it is not guaranteed to match 10001.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Afaik
nonroot
is65532
, but it doesn't matter, this is just the default. The runtime can freely override this, kubernetes can choose the user, the only issue then will be possibly file permissions, but that just needs to configured correctly on the k8s side.Since we mount the only necessary write directory with read all and write all permissions this should all work fine.