-
Notifications
You must be signed in to change notification settings - Fork 696
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
Adds initial builder-focal molecule scenario #5444
Conversation
This will enable creating the builder image sd-builder-focal from the Dockerfile in this commit. We can then update the next image_hash in the next commit.
30bf0bf
to
0ea9942
Compare
The dh-virtualenv package from sid works well enough. Hopefully upstream will provide a focal package, but in the meantime, let's install from sid. Updated the install logic to verify keys via apt, since the previous iteration was only appropriate for a research spike.
Based on the build logic scenario for Focal, pushing a newly created image to quay.io/freedomofpress/sd-docker-builder-focal Also updates a few lingering "xenial" references in the build scenario for focal.
Back from the Trusty -> Xenial migration, we still had a var "securedrop_build_xenial_support" that wasn't actually used anywhere. Removing it to eliminate confusion prior to the Xenial -> Focal migration.
@kushaldas All set! I've pushed the new focal image based on the logic you've added here. I also took the liberty of appending a few commits. On my machine, I was able to pull the image, confirm it was really Focal, and even build most of the packages—the failing ones are already tracked for follow-up in #5449. Before you mark as ready-for-review, please review the additional commits to make sure you agree with them, then add some steps to the test plan for the next reviewer! |
This adds a new build target to build the Debian packages on Focal. It also includes two variables to be used as ansible override during future build steps in Ansible.
28ec7ef
to
b761fc6
Compare
Ran the new makefile target, and i'm getting new Focal packages!
As expected, there are still a few failing packages for focal (viz. |
Status
Ready for review
Description of Changes
Fixes #5446
This will enable creating the builder image sd-builder-focal
from the Dockerfile in this commit. We can then update the next
image_hash in the next commit.
Testing
make build-debs-focal
command should start building packages using the Focal container image. But, the actual debian package builds will fail. The fixes for the actual packages will come in future PRs.Deployment
Any special considerations for deployment? Consider both:
Checklist
If you made changes to the server application code:
make lint
) and tests (make test
) pass in the development containerIf you made changes to
securedrop-admin
:make -C admin test
) pass in the admin development containerIf you made changes to the system configuration:
If you made non-trivial code changes:
If you made changes to documentation:
make docs-lint
) passed locallyIf you added or updated a code dependency:
Choose one of the following: