diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2019-06-18 00:59:00 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-18 00:59:00 +1000 |
| commit | eba7caf09fe9bb5f5a0d4b17c5dde1413343cadc (patch) | |
| tree | c1c6772ccd74da04a5e68d76340f5ab938fffe3b /docker | |
| parent | Merge pull request #5385 from matrix-org/erikj/reduce_http_exceptions (diff) | |
| download | synapse-eba7caf09fe9bb5f5a0d4b17c5dde1413343cadc.tar.xz | |
Remove Postgres 9.4 support (#5448)
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile-pgtests | 4 | ||||
| -rwxr-xr-x | docker/run_pg_tests.sh | 2 |
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 |