summary refs log tree commit diff
path: root/docker
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-02-10 17:52:09 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-02-10 17:52:09 +0000
commit1114a42739e16b26ff7809e9c7ce54ea6b1ebf40 (patch)
tree0dacd36054bb5a1b60b5a2f39c2b5dbadedb43f0 /docker
parentMerge pull request #5385 from matrix-org/erikj/reduce_http_exceptions (diff)
parentRemove Postgres 9.4 support (#5448) (diff)
downloadsynapse-1114a42739e16b26ff7809e9c7ce54ea6b1ebf40.tar.xz
Remove Postgres 9.4 support (#5448)
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile-pgtests4
-rwxr-xr-xdocker/run_pg_tests.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/docker/Dockerfile-pgtests b/docker/Dockerfile-pgtests

index 7da8eeb9eb..3bfee845c6 100644 --- a/docker/Dockerfile-pgtests +++ b/docker/Dockerfile-pgtests
@@ -3,10 +3,10 @@ FROM matrixdotorg/sytest:latest # The Sytest image doesn't come with python, so install that -RUN apt-get -qq install -y python python-dev python-pip +RUN apt-get update && apt-get -qq install -y python3 python3-dev python3-pip # We need tox to run the tests in run_pg_tests.sh -RUN pip install tox +RUN python3 -m pip install tox ADD run_pg_tests.sh /pg_tests.sh ENTRYPOINT /pg_tests.sh diff --git a/docker/run_pg_tests.sh b/docker/run_pg_tests.sh
index e77424c41a..d18d1e4c8e 100755 --- a/docker/run_pg_tests.sh +++ b/docker/run_pg_tests.sh
@@ -17,4 +17,4 @@ su -c '/usr/lib/postgresql/9.6/bin/pg_ctl -w -D /var/lib/postgresql/data start' # Run the tests cd /src export TRIAL_FLAGS="-j 4" -tox --workdir=/tmp -e py27-postgres +tox --workdir=/tmp -e py35-postgres