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

Fix Dockerfiles, create-dev-data #4353

Merged
merged 1 commit into from
Apr 18, 2019

Conversation

rmol
Copy link
Contributor

@rmol rmol commented Apr 17, 2019

Status

Ready for review

Description of Changes

In the Dockerfiles, running apt-install in a separate RUN after apt-update could fail if the output of the apt-update's RUN were cached; apt-install could be looking for outdated versions of packages.

In create-dev-data.py, fix a misplaced print/format parenthesis.

Testing

Run make -C securedrop dev to build and run the Python 2 container.

Run PYTHON_VERSION=3 make -C securedrop dev to build and run the Python 3 container.

Both should get through image building/updating and end up running the SD services.

If you made changes to the server application code:

  • Linting (make ci-lint) and tests (make -C securedrop test) pass in the development container

If you made non-trivial code changes:

  • I have written a test plan and validated it for this PR

In the Dockerfiles, running apt-install in a separate RUN after
apt-update could fail if the output of the apt-update's RUN were
cached; apt-install could be looking for outdated versions of
packages.

In create-dev-data, fix a misplaced print/format parenthesis.
@sssoleileraaa
Copy link
Contributor

I was seeing this error before and no longer see it.

Copy link
Contributor

@redshiftzero redshiftzero left a comment

Choose a reason for hiding this comment

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

lgtm thanks @rmol!

@redshiftzero redshiftzero merged commit 9bdf727 into freedomofpress:develop Apr 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants