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.

Sign up for GitHub

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
Merged

Fix Dockerfiles, create-dev-data #4353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions securedrop/create-dev-data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ def create_source_and_submissions(num_submissions=2, num_replies=2):
db.session.commit()

print("Test source (codename: '{}', journalist designation '{}') "
"added with {} submissions and {} replies").format(
codename, journalist_designation, num_submissions, num_replies)
"added with {} submissions and {} replies".format(
codename, journalist_designation, num_submissions, num_replies))


if __name__ == "__main__": # pragma: no cover
Expand Down
5 changes: 2 additions & 3 deletions securedrop/dockerfiles/xenial/python2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ ENV USER_ID ${USER_ID:-0}
RUN apt-get update && \
apt-get install -y paxctl && \
{ apt-get install -y libgtk2.0 || echo 'libgtk2.0 was not installed'; } && \
paxctl -cm /usr/bin/mono-sgen && dpkg-reconfigure mono-runtime-sgen

RUN apt-get install -y devscripts vim \
paxctl -cm /usr/bin/mono-sgen && dpkg-reconfigure mono-runtime-sgen && \
apt-get install -y devscripts vim \
python-pip libpython2.7-dev libssl-dev secure-delete \
gnupg2 ruby redis-server firefox git xvfb haveged curl \
gettext paxctl x11vnc enchant libffi-dev sqlite3 gettext sudo
Expand Down
5 changes: 2 additions & 3 deletions securedrop/dockerfiles/xenial/python3/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ ENV USER_ID ${USER_ID:-0}
# If running grsecurity kernel on the host, Memprotect must be disabled on mono-sgen in the container
RUN apt-get update && apt-get install -y paxctl && \
{ apt-get install -y libgtk2.0 || echo 'libgtk2.0 was not installed'; } && \
paxctl -cm /usr/bin/mono-sgen && dpkg-reconfigure mono-runtime-sgen

RUN apt-get install -y devscripts \
paxctl -cm /usr/bin/mono-sgen && dpkg-reconfigure mono-runtime-sgen && \
apt-get install -y devscripts \
python3-pip libpython3.5-dev libssl-dev secure-delete \
gnupg2 ruby redis-server firefox git xvfb haveged curl \
gettext paxctl x11vnc enchant libffi-dev sqlite3 gettext sudo \
Expand Down