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

install 'root.json' during image build #239

Merged
merged 3 commits into from
May 24, 2024

Conversation

jpculp
Copy link
Member

@jpculp jpculp commented May 24, 2024

Description of changes:

Testing done:

  • Built bottlerocket with a modified 'os' package and verified /usr/share/updog/root.json.
  • Repacked an upstream image of bottlerocket with my own 'root.json' and verified /usr/share/updog/root.json.

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.

jpculp added 2 commits May 24, 2024 19:38
Rather than a direct copy from `roles/` and installed via the 'os'
package, we install the `root.json` directly with help from `imghelper`.

Signed-off-by: Patrick J.P. Culp <[email protected]>
@jpculp jpculp requested review from bcressey and rpkelly May 24, 2024 19:55
@jpculp jpculp force-pushed the install-rootjson branch from 2567725 to deab2b0 Compare May 24, 2024 22:45
@jpculp
Copy link
Member Author

jpculp commented May 24, 2024

Removed unnecessary prune on find.

@jpculp jpculp merged commit 5b5405a into bottlerocket-os:develop May 24, 2024
1 check passed
@jpculp jpculp deleted the install-rootjson branch May 24, 2024 23:03
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