Restore installation of supervisor in Dockerfiles#4583
Merged
redshiftzero merged 1 commit intofreedomofpress:developfrom Jul 3, 2019
Merged
Restore installation of supervisor in Dockerfiles#4583redshiftzero merged 1 commit intofreedomofpress:developfrom
redshiftzero merged 1 commit intofreedomofpress:developfrom
Conversation
In commit ec2549 I broke the installation of supervisor in the dev Dockerfiles. This corrects that mistake.
redshiftzero
reviewed
Jul 2, 2019
redshiftzero
approved these changes
Jul 3, 2019
This file contains hidden or 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
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
In commit ec2549 I broke the installation of supervisor in the dev Dockerfiles. This corrects that mistake.
Testing
developand runmake dev. Right after the image is built and tagged, you should see this error:setsid: failed to execute supervisord: No such file or directory.make devagain. The error should no longer appear.Deployment
This only affects the development containers.
Checklist
If you made changes to the server application code:
make lint) and tests (make -C securedrop test) pass in the development containerIf you made non-trivial code changes: