images: use buildkit again #1615
Merged
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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #1615 +/- ##
=======================================
Coverage 51.79% 51.79%
=======================================
Files 42 42
Lines 4873 4873
=======================================
Hits 2524 2524
Misses 2204 2204
Partials 145 145 ☔ View full report in Codecov by Sentry. |
The Toybox images had two issues: 1. Distroless does not support /bin -> /usr/bin so we needed to create it manually to get /bin/bash for Toybox. However, with this Openshift image validation complains that we are touching the "base" image. 2. We could not use buildkit since it fails with /bin symlink copied over /bin directory from Distroless. The simple fix is just to move away from all /bin/sh and /bin/bash and use "/usr/bin/env bash" to resolve the path instead. This allows to keep /bin untouched. Signed-off-by: Mikko Ylinen <[email protected]>
tkatila
approved these changes
Dec 8, 2023
|
What's the point of adding (GPL v3) Bash when using Toybox (which is non-GPL remake of Busybox)? On quick look at the scripts, there's nothing in them needing Bash, plain POSIX shell should be fine... |
It's the symlink toybox provides: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The Toybox images had two issues:
Distroless does not support /bin -> /usr/bin so we needed to create it manually to get /bin/bash for Toybox. However, with this Openshift image validation complains that we are touching the "base" image.
We could not use buildkit since it fails with /bin symlink copied over /bin directory from Distroless.
The simple fix is just to move away from all /bin/sh and /bin/bash and use "/usr/bin/env bash" to resolve the path instead. This allows to keep /bin untouched.