Pass BUILDSYS_NAME to rpm2img so we use requested image name prefix #1312
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
samuelkarp
approved these changes
Feb 9, 2021
bcressey
approved these changes
Feb 9, 2021
webern
approved these changes
Feb 9, 2021
diranged
reviewed
Feb 9, 2021
| @@ -24,7 +24,7 @@ esac | |||
|
|
|||
| mkdir -p "${OUTPUT_DIR}" | |||
|
|
|||
| FILENAME_PREFIX="bottlerocket-${VARIANT}-${ARCH}-${VERSION_ID}-${BUILD_ID}" | |||
| FILENAME_PREFIX="${IMAGE_NAME}-${VARIANT}-${ARCH}-${VERSION_ID}-${BUILD_ID}" | |||
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.
Issue number:
Fixes #1311 - thanks @diranged!
Description of changes:
We had forgotten to pass BUILDSYS_NAME through rpm2img, so while we were able to build images, they weren't named properly, and the symlinks were broken.
Testing done:
After a
cargo make -e BUILDSYS_NAME=nd-bottlerocket, the images are named appropriately:...and linked properly in
latest:cargo make ami -e BUILDSYS_NAME=nd-bottlerocketsucceeded with the new images (Icleaned out any others) and I was able to launch a healthy instance and run a pod OK.Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.