From 438116c57478f6523e7cb4da9a8c528fc538804c Mon Sep 17 00:00:00 2001 From: Dave Page Date: Wed, 13 Feb 2019 17:18:14 +0000 Subject: [PATCH] Update Alpine Linux version in the docker container. This also updates the PG utilities to v11. Fixes #3991 --- docs/en_US/release_notes_4_3.rst | 1 + pkg/docker/Dockerfile | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/en_US/release_notes_4_3.rst b/docs/en_US/release_notes_4_3.rst index 3de6c0a34..258a98f4e 100644 --- a/docs/en_US/release_notes_4_3.rst +++ b/docs/en_US/release_notes_4_3.rst @@ -11,6 +11,7 @@ Features | `Feature #1825 `_ - Install a script to start pgAdmin (pgadmin4) from the command line when installed from the Python wheel. | `Feature #3439 `_ - Allow X-FRAME-OPTIONS to be set for security. Default to SAMEORIGIN. +| `Feature #3991 `_ - Update Alpine Linux version in the docker container. This also updates the PG utilities to v11. Bug fixes ********* diff --git a/pkg/docker/Dockerfile b/pkg/docker/Dockerfile index 1198e609e..6fd2fccb3 100644 --- a/pkg/docker/Dockerfile +++ b/pkg/docker/Dockerfile @@ -19,7 +19,7 @@ RUN yarn install --cache-folder ./ycache --verbose && \ rm -rf ./ycache ./pgadmin/static/js/generated/.cache # Build Sphinx documentation in separate container -FROM python:3.6-alpine3.7 as docs-builder +FROM python:3.7-alpine3.9 as docs-builder # Install only dependencies absolutely required for documentation building RUN apk add --no-cache make @@ -32,8 +32,7 @@ COPY ./pgadmin4/ /pgadmin4 RUN LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 make -C /pgadmin4/docs/en_US -f Makefile.sphinx html # Then install backend, copy static files and set up entrypoint -# Need alpine3.7 to get pg_dump and friends in postgresql-client package -FROM python:3.6-alpine3.7 +FROM python:3.7-alpine3.9 RUN pip --no-cache-dir install gunicorn RUN apk add --no-cache postfix postgresql-client postgresql-libs