-
Notifications
You must be signed in to change notification settings - Fork 524
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
Migrations build fix #906
Merged
etungsten
merged 2 commits into
bottlerocket-os:develop
from
etungsten:migrations-build-fix
Apr 15, 2020
Merged
Migrations build fix #906
etungsten
merged 2 commits into
bottlerocket-os:develop
from
etungsten:migrations-build-fix
Apr 15, 2020
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
This reverts commit 3980e54. Using a struct caused from_map to insert the struct name as a prefix of the key, which is invalid.
tjkirch
reviewed
Apr 15, 2020
41a369b
to
3693fc4
Compare
Addresses @tjkirch 's comments. |
3693fc4
to
796396e
Compare
Oops. Forgot to remove my previous changes. |
Updates the Dockerfile to limit the file being added for 'rpm2migration' to only the migrations rpm. This is to prevent the migrations-debuginfo rpm from being installed.
796396e
to
1c65b7d
Compare
Instead of directly globbing, use |
tjkirch
approved these changes
Apr 15, 2020
zmrow
approved these changes
Apr 15, 2020
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.
🌃
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:
N/A
Description of changes:
Updates the Dockerfile to limit the file being added for 'rpm2migration' to only the migrations rpm. This is to prevent the migrations-debuginfo rpm from being installed.
Reverts 3980e54 which broke
ReplaceTemplateMigration
migration helper.Testing done:
Built migration from #903 fine, end up with correct migrations archive.
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.