Skip to content
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

Improve cacheability of Docker layers and add ca-certs to scratch image #2842

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

marcofranssen
Copy link

No description provided.

@marcofranssen marcofranssen requested a review from a team as a code owner October 29, 2024 08:13
@maintainer-s-little-helper
Copy link

Commit 7f3f19e does not match "Signed-off-by".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

@maintainer-s-little-helper
Copy link

Commit 7f3f19e does not match "Signed-off-by".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

@maintainer-s-little-helper
Copy link

Commit 018b43f does not match "Signed-off-by".

Please follow instructions provided in https://docs.cilium.io/en/stable/contributing/development/contributing_guide/#developer-s-certificate-of-origin

@@ -25,8 +25,10 @@ jobs:
strategy:
matrix:
include:
- name: cilium-cli
- name: cilium-cli-ci
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This way we can leverage the target in docker build. as well don't need to append -ci in various places.

Comment on lines -43 to -44
LABEL maintainer="[email protected]"
WORKDIR /root/app
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moving this into the 2 target images cilium-cli and cilium-cli-ci makes it possible to cache these layers more efficiently meaning those layers will never have to be redownloaded as it is only the layers with binaries at the end that change.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like this change is partially reverting #2817, but it's not obvious to me why that PR introduced this FINAL_CONTAINER approach. Seems like we don't need this logic though, the developer could just run docker build --target cilium-cli .. This change looks good to me.

/cc @michi-covalent @leppeK

Copy link
Member

@joestringer joestringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM thanks!

Comment on lines -43 to -44
LABEL maintainer="[email protected]"
WORKDIR /root/app
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems like this change is partially reverting #2817, but it's not obvious to me why that PR introduced this FINAL_CONTAINER approach. Seems like we don't need this logic though, the developer could just run docker build --target cilium-cli .. This change looks good to me.

/cc @michi-covalent @leppeK

Dockerfile Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants