Updates admin Dockerfile Debian Buster as a base image, fixes requirements build #5437
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
zenmonkeykstop
requested review from
emkll,
kushaldas and
redshiftzero
as code owners
zenmonkeykstop
force-pushed
the
5436-fix-admin-docker
branch
from
35c513f to
ff4d2f9
Compare
zenmonkeykstop
force-pushed
the
5436-fix-admin-docker
branch
2 times, most recently
from
8d4b61e to
6a1db0c
Compare
zenmonkeykstop
force-pushed
the
5436-fix-admin-docker
branch
from
6a1db0c to
8d5559c
Compare
zenmonkeykstop
changed the title
zenmonkeykstop
changed the title
rmol
approved these changes
Aug 24, 2020
There was a problem hiding this comment.
- The digest value for the base image in
admin/Dockerfilematches the digest found for the latest Buster version via the command:docker pull debian:buster - The command
make update-admin-pip-requirementscompletes without error - Update a dependency in
admin/requirements.inand runmake update-pip-requirements:- The file
admin/requirements.txtincludes the updated dependency.
- The file
- hash for six verson 1.15.0 matches the hash in https://github.com/freedomofpress/securedrop-debian-packaging/wiki/six-1.11.0-to-1.15.0
| @@ -23,7 +26,18 @@ function docker_image() { | |||
| } | |||
|
|
|||
| function docker_run() { | |||
| docker run --rm -ti ${DOCKER_RUN_ARGUMENTS:-} securedrop-admin "$@" | |||
| if [ -z "${CIRCLECI-}" ] | |||
There was a problem hiding this comment.
Had never seen that form of expansion! "When not performing substring expansion, using the forms documented below (e.g., :-), bash tests for a parameter that is unset or null. Omitting the colon results in a test only for a parameter that is unset." Nice.
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.
Status
Ready for review
Description of Changes
Fixes #5436
admin/bin/dev-shellwrapper for admin Docker container to mount a shared volume with the Docker host, allowing requirements files to be updated on the host.sixmodule to 1.15.0 to work around multiple declarations in requirements filesTesting
admin/Dockerfilematches the digest found for the latest Buster version via the command:docker pull debian:bustermake update-admin-pip-requirementscompletes without erroradmin/requirements.inand runmake update-pip-requirements:admin/requirements.txtincludes the updated dependency.Checklist
If you made non-trivial code changes:
If you added or updated a code dependency:
Choose one of the following: