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

Use system provided pip/setuptools #5110

Closed
wants to merge 6 commits into from
Closed

Use system provided pip/setuptools #5110

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7cb0594
Fixes #5109 uses system provided pip/setuptools
kushaldas Jan 29, 2020
d562439
Update builder image
emkll Jan 29, 2020
9ceeaf5
Adds --no-deps for pip
kushaldas Jan 29, 2020
6476ebb
Skipping test_apache_logging_journalist_interface temporarily while d…
zenmonkeykstop Jan 30, 2020
2ebdb80
Adds pyvenv.cfg to apparmor rules
kushaldas Jan 31, 2020
88352d2
unskipping JI logging test, as it's working after apparmor fix
zenmonkeykstop Feb 4, 2020
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
2 changes: 2 additions & 0 deletions install_files/securedrop-app-code/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,11 @@ override_dh_virtualenv:
dh_virtualenv \
--python=/usr/bin/python3.5 \
--setuptools \
--builtin-venv \
zenmonkeykstop marked this conversation as resolved.
Show resolved Hide resolved
--extra-pip-arg "--verbose" \
--extra-pip-arg "--ignore-installed" \
--extra-pip-arg "--no-binary=:all:" \
--extra-pip-arg "--no-deps" \
--extra-pip-arg "--no-cache-dir"

#
Expand Down
1 change: 1 addition & 0 deletions molecule/builder-xenial/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ RUN apt-get -y update && apt-get upgrade -y && apt-get install -y \
paxctl \
python3-all \
python3-pip \
python3-venv \
python3-setuptools \
rsync \
ruby \
Expand Down
4 changes: 2 additions & 2 deletions molecule/builder-xenial/image_hash
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# sha256 digest quay.io/freedomofpress/sd-docker-builder-xenial:2019_12_03
1e61e825bd7bc221eacb071ae200924f99fb1728e736d9a707fd183d22f0dfcb
# sha256 digest quay.io/freedomofpress/sd-docker-builder-xenial:2020_01_29
697a3f1a4b67a30670b44fc02eada36689b09c6b3da1e99e42d60907a81e916e
1 change: 1 addition & 0 deletions molecule/testinfra/staging/app/apache/test_apache_journalist_interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ def test_apache_journalist_interface_vhost(host):
assert common_apache2_directory_declarations in f.content_string


@pytest.mark.skip(reason="Blocking #5110")
Copy link
Contributor

Choose a reason for hiding this comment

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

Had to add this to stop testinfra test from bombing out. It would be worth investigating why this test is failing rather than leaving the skip in place

def test_apache_logging_journalist_interface(host):
"""
Check that logging is configured correctly for the Journalist Interface.
Expand Down