diff --git a/Dockerfile b/Dockerfile index d0d35b45c..d56f8d556 100644 --- a/Dockerfile +++ b/Dockerfile @@ -98,6 +98,7 @@ 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 @@ -127,6 +128,11 @@ COPY --from=pg11-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-11/ COPY --from=pg11-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-11/ COPY --from=pg11-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-11/ +COPY --from=pg12-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-12/ +COPY --from=pg12-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-12/ +COPY --from=pg12-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-12/ +COPY --from=pg12-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-12/ + ######################################################################### # Assemble everything into the final container. ######################################################################### diff --git a/docs/en_US/container_deployment.rst b/docs/en_US/container_deployment.rst index 1a8c66524..726915fc5 100644 --- a/docs/en_US/container_deployment.rst +++ b/docs/en_US/container_deployment.rst @@ -22,6 +22,7 @@ server: * PostgreSQL 9.6: */usr/local/pgsql-9.6* * PostgreSQL 10: */usr/local/pgsql-10* * PostgreSQL 11: */usr/local/pgsql-11* +* PostgreSQL 12: */usr/local/pgsql-12* The most recent version of the utilities is used by default; this may be changed in the :ref:`preferences`. diff --git a/docs/en_US/release_notes_4_14.rst b/docs/en_US/release_notes_4_14.rst index 5293ab3ee..f3b49817d 100644 --- a/docs/en_US/release_notes_4_14.rst +++ b/docs/en_US/release_notes_4_14.rst @@ -11,6 +11,7 @@ New features | `Issue #3009 `_ - Added Copy with headers functionality when copy data from Query Tool/View Data. | `Issue #4778 `_ - Implemeted the Query Plan Analyser. +| `Issue #4823 `_ - Include PostgreSQL 12 binaries in the container. Housekeeping ************ diff --git a/pkg/docker/entrypoint.sh b/pkg/docker/entrypoint.sh index 46f5bdce9..af02fd6d3 100755 --- a/pkg/docker/entrypoint.sh +++ b/pkg/docker/entrypoint.sh @@ -7,7 +7,7 @@ if [ ! -f /pgadmin4/config_distro.py ]; then cat << EOF > /pgadmin4/config_distro.py HELP_PATH = '../../docs' DEFAULT_BINARY_PATHS = { - 'pg': '/usr/local/pgsql-11' + 'pg': '/usr/local/pgsql-12' } EOF