diff --git a/Dockerfile b/Dockerfile index 46fc483f4..50ffb7d5a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ # and clean up the web/ source code ######################################################################### -FROM node:10-alpine AS app-builder +FROM node:12-alpine3.11 AS app-builder RUN apk add --no-cache \ autoconf \ @@ -66,7 +66,7 @@ RUN npm install && \ # Now, create a documentation build container for the Sphinx docs ######################################################################### -FROM python:3.7-alpine3.10 as docs-builder +FROM python:3.8-alpine3.11 as docs-builder # Install only dependencies absolutely required for documentation building RUN apk add --no-cache \ @@ -98,21 +98,15 @@ RUN LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 make -C /pgadmin4/docs/en_US -f Makefile # Create additional builders to get all of the PostgreSQL utilities ######################################################################### -FROM postgres:9.4-alpine as pg94-builder FROM postgres:9.5-alpine as pg95-builder FROM postgres:9.6-alpine as pg96-builder FROM postgres:10-alpine as pg10-builder FROM postgres:11-alpine as pg11-builder FROM postgres:12-alpine as pg12-builder -FROM alpine:3.10 as tool-builder +FROM alpine:3.11 as tool-builder # Copy the PG binaries -COPY --from=pg94-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-9.4/ -COPY --from=pg94-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-9.4/ -COPY --from=pg94-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-9.4/ -COPY --from=pg94-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-9.4/ - COPY --from=pg95-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-9.5/ COPY --from=pg95-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-9.5/ COPY --from=pg95-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-9.5/ @@ -142,7 +136,7 @@ COPY --from=pg12-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-12/ # Assemble everything into the final container. ######################################################################### -FROM python:3.7-alpine3.10 +FROM python:3.8-alpine3.11 COPY --from=tool-builder /usr/local/pgsql /usr/local/ @@ -194,7 +188,7 @@ RUN groupadd -g 5050 pgadmin && \ chown pgadmin:pgadmin /var/log/pgadmin && \ touch /pgadmin4/config_distro.py && \ chown pgadmin:pgadmin /pgadmin4/config_distro.py && \ - setcap CAP_NET_BIND_SERVICE=+eip /usr/local/bin/python3.7 + setcap CAP_NET_BIND_SERVICE=+eip /usr/local/bin/python3.8 USER pgadmin # Finish up diff --git a/docs/en_US/container_deployment.rst b/docs/en_US/container_deployment.rst index ad73f324c..d1ad19e33 100644 --- a/docs/en_US/container_deployment.rst +++ b/docs/en_US/container_deployment.rst @@ -17,7 +17,6 @@ maintenance functions to be executed. Multiple versions are included in the following directories to allow use with different versions of the database server: -* PostgreSQL 9.4: */usr/local/pgsql-9.4* * PostgreSQL 9.5: */usr/local/pgsql-9.5* * PostgreSQL 9.6: */usr/local/pgsql-9.6* * PostgreSQL 10: */usr/local/pgsql-10* diff --git a/docs/en_US/release_notes_4_22.rst b/docs/en_US/release_notes_4_22.rst index 0305aca11..22e43c233 100644 --- a/docs/en_US/release_notes_4_22.rst +++ b/docs/en_US/release_notes_4_22.rst @@ -23,6 +23,8 @@ Housekeeping | `Issue #5455 `_ - Refactor pgAdmin4.py so it can be imported and is a lot more readable. | `Issue #5493 `_ - Search object UI improvements. | `Issue #5525 `_ - Cleanup and refactor the macOS build scripts. +| `Issue #5552 `_ - Update dependencies in the Docker container. +| `Issue #5553 `_ - Remove PG 9.4 utilities from the Docker container as it's now out of support. Bug fixes *********