diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-06-25 05:20:53 +0100 |
|---|---|---|
| committer | Amber Brown <hawkowl@atleastfornow.net> | 2019-06-25 14:20:53 +1000 |
| commit | f817fc9ad51eb8b409894136d7eab2b7448a7f09 (patch) | |
| tree | ae757fb865db44a7207cf2798904598f88a82bab | |
| parent | Add info about black to code_style.rst (#5537) (diff) | |
| download | synapse-f817fc9ad51eb8b409894136d7eab2b7448a7f09.tar.xz | |
Update docker image to use Python 3.7. (#5546)
Python 3.7 is apparently faster than 3.6, and should be mature enough.
| -rw-r--r-- | .circleci/config.yml | 4 | ||||
| -rw-r--r-- | changelog.d/5546.feature | 1 | ||||
| -rw-r--r-- | docker/Dockerfile | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index e4fd5ffa6b..98c217dd1d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,7 +4,7 @@ jobs: machine: true steps: - checkout - - run: docker build -f docker/Dockerfile --label gitsha1=${CIRCLE_SHA1} -t matrixdotorg/synapse:${CIRCLE_TAG} -t matrixdotorg/synapse:${CIRCLE_TAG}-py3 --build-arg PYTHON_VERSION=3.6 . + - run: docker build -f docker/Dockerfile --label gitsha1=${CIRCLE_SHA1} -t matrixdotorg/synapse:${CIRCLE_TAG} -t matrixdotorg/synapse:${CIRCLE_TAG}-py3 . - run: docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD - run: docker push matrixdotorg/synapse:${CIRCLE_TAG} - run: docker push matrixdotorg/synapse:${CIRCLE_TAG}-py3 @@ -12,7 +12,7 @@ jobs: machine: true steps: - checkout - - run: docker build -f docker/Dockerfile --label gitsha1=${CIRCLE_SHA1} -t matrixdotorg/synapse:latest -t matrixdotorg/synapse:latest-py3 --build-arg PYTHON_VERSION=3.6 . + - run: docker build -f docker/Dockerfile --label gitsha1=${CIRCLE_SHA1} -t matrixdotorg/synapse:latest -t matrixdotorg/synapse:latest-py3 . - run: docker login --username $DOCKER_HUB_USERNAME --password $DOCKER_HUB_PASSWORD - run: docker push matrixdotorg/synapse:latest - run: docker push matrixdotorg/synapse:latest-py3 diff --git a/changelog.d/5546.feature b/changelog.d/5546.feature new file mode 100644 index 0000000000..16952b62fc --- /dev/null +++ b/changelog.d/5546.feature @@ -0,0 +1 @@ +Update docker image to use Python 3.7. diff --git a/docker/Dockerfile b/docker/Dockerfile index 24921eb098..0939cadf39 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -11,7 +11,7 @@ # docker build -f docker/Dockerfile --build-arg PYTHON_VERSION=3.6 . # -ARG PYTHON_VERSION=2 +ARG PYTHON_VERSION=3.7 ### ### Stage 0: builder |