-
Notifications
You must be signed in to change notification settings - Fork 117
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
ci: Refactor Dockerfile & entrypoint #8923
Open
upbqdn
wants to merge
88
commits into
main
Choose a base branch
from
docker-refactor
base: main
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
+688
−647
Conversation
This file contains 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
7 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
A-devops
Area: Pipelines, CI/CD and Dockerfiles
C-bug
Category: This is a bug
C-trivial
Category: A trivial change that is not worth mentioning in the CHANGELOG
P-Medium ⚡
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.
Motivation
CI contains a bunch of nits:
root
inside Docker, which is a security risk.runtime
Docker stage for production images contains unneeded packages, making the images larger than necessary and increasing the surface for security vulnerabilities.deps
Docker stage for tests contains unneeded packages, which slows CI down.EXPOSE
instruction contains two ports, but Zebra uses only one of them at a time, and it doesn't contain some other ports Zebra uses.FEATURES
(which comes fromRUST_PROD_FEATURES
in CI)TEST_FEATURES
(which comes fromRUST_TEST_FEATURES
in CI)EXPERIMENTAL_FEATURES
(which should probably come fromRUST_EXPERIMENTAL_FEATURES
in CI, containing"shielded-scan"
, but it doesn't, so the Dockerfile uses the default value"journald prometheus filter-reload"
)ENTRYPOINT_FEATURES = "$FEATURES $TEST_FEATURES"
ENTRYPOINT_FEATURES_EXPERIMENTAL = $ENTRYPOINT_FEATURES $EXPERIMENTAL_FEATURES
Close #9210.
Solution
runtime
Docker stage and switch to it.gosu
.runtime
stage.deps
stageEXPOSE
instruction in Docker./etc/zebrad
to/usr/local/bin
.ZEBRA_CACHED_STATE_DIR
env var toZEBRA_CACHE_DIR
since that dir no longer contains only the state but also the network cache and the cookie file.Tests
Manually test that
zebrad
runs under the newzebra
user:Running
displays
PR Checklist