diff options
| author | Slavi Pantaleev <slavi@devture.com> | 2019-07-12 13:38:25 +0300 |
|---|---|---|
| committer | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-07-12 11:38:25 +0100 |
| commit | f36916476151309c7e1c00ae35fd3bf551f61d42 (patch) | |
| tree | 013ee0d75d00e0dd6cbf7597e9efc8641168a26b | |
| parent | Add a mechanism for per-test configs (#5657) (diff) | |
| download | synapse-f36916476151309c7e1c00ae35fd3bf551f61d42.tar.xz | |
Upgrade Alpine Linux used in the Docker image (3.8 -> 3.10) (#5619)
Alpine Linux 3.8 is still supported, but it seems like it's quite outdated now. While Python should be the same on both, all other libraries, etc., are much newer in Alpine 3.9 and 3.10. Signed-off-by: Slavi Pantaleev <slavi@devture.com>
| -rw-r--r-- | changelog.d/5619.misc | 1 | ||||
| -rw-r--r-- | docker/Dockerfile | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/changelog.d/5619.misc b/changelog.d/5619.misc new file mode 100644 index 0000000000..c5e22d2051 --- /dev/null +++ b/changelog.d/5619.misc @@ -0,0 +1 @@ +Base Docker image on a newer Alpine Linux version (3.8 -> 3.10) diff --git a/docker/Dockerfile b/docker/Dockerfile index 79276209f6..e5a0d6d5f6 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -16,7 +16,7 @@ ARG PYTHON_VERSION=3.7 ### ### Stage 0: builder ### -FROM docker.io/python:${PYTHON_VERSION}-alpine3.8 as builder +FROM docker.io/python:${PYTHON_VERSION}-alpine3.10 as builder # install the OS build deps @@ -55,7 +55,7 @@ RUN pip install --prefix="/install" --no-warn-script-location \ ### Stage 1: runtime ### -FROM docker.io/python:${PYTHON_VERSION}-alpine3.8 +FROM docker.io/python:${PYTHON_VERSION}-alpine3.10 # xmlsec is required for saml support RUN apk add --no-cache --virtual .runtime_deps \ |