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

Migrations build fix #906

Merged
merged 2 commits into from
Apr 15, 2020

Conversation

etungsten
Copy link
Contributor

@etungsten etungsten commented Apr 15, 2020

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.

This reverts commit 3980e54.

Using a struct caused from_map to insert the struct name as a prefix of the key, which is invalid.
@etungsten etungsten requested review from tjkirch and zmrow April 15, 2020 18:09
Dockerfile Outdated Show resolved Hide resolved
@etungsten etungsten force-pushed the migrations-build-fix branch from 41a369b to 3693fc4 Compare April 15, 2020 19:05
@etungsten
Copy link
Contributor Author

etungsten commented Apr 15, 2020

Addresses @tjkirch 's comments.
Use GLOBIGNORE to prevent the migrations debuginfo package from being copied.

@etungsten etungsten force-pushed the migrations-build-fix branch from 3693fc4 to 796396e Compare April 15, 2020 19:14
@etungsten
Copy link
Contributor Author

Oops. Forgot to remove my previous changes.

@etungsten etungsten requested a review from tjkirch April 15, 2020 19:15
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.
@etungsten etungsten force-pushed the migrations-build-fix branch from 796396e to 1c65b7d Compare April 15, 2020 19:54
@etungsten
Copy link
Contributor Author

etungsten commented Apr 15, 2020

Instead of directly globbing, use find to filter for the migrations rpm then exec cp.

Copy link
Contributor

@zmrow zmrow left a comment

Choose a reason for hiding this comment

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

🌃

@etungsten etungsten merged commit 05bb2eb into bottlerocket-os:develop Apr 15, 2020
@etungsten etungsten deleted the migrations-build-fix branch April 15, 2020 21:14
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.

3 participants