pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Include PostgreSQL 12 binaries in the container. Fixes #4823

pull/26/head
Dave Page 2019-10-11 11:13:06 +01:00
parent c3e11bd390
commit 9bdb5ea5e0
4 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -98,6 +98,7 @@ FROM postgres:9.5-alpine as pg95-builder
FROM postgres:9.6-alpine as pg96-builder FROM postgres:9.6-alpine as pg96-builder
FROM postgres:10-alpine as pg10-builder FROM postgres:10-alpine as pg10-builder
FROM postgres:11-alpine as pg11-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.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/pg_restore /usr/local/pgsql/pgsql-11/
COPY --from=pg11-builder /usr/local/bin/psql /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. # Assemble everything into the final container.
######################################################################### #########################################################################

1
docs/en_US/container_deployment.rst
View File

@ -22,6 +22,7 @@ server:
* PostgreSQL 9.6: */usr/local/pgsql-9.6* * PostgreSQL 9.6: */usr/local/pgsql-9.6*
* PostgreSQL 10: */usr/local/pgsql-10* * PostgreSQL 10: */usr/local/pgsql-10*
* PostgreSQL 11: */usr/local/pgsql-11* * 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 The most recent version of the utilities is used by default; this may be
changed in the :ref:`preferences`. changed in the :ref:`preferences`.

1
docs/en_US/release_notes_4_14.rst
View File

@ -11,6 +11,7 @@ New features
| `Issue #3009 <https://redmine.postgresql.org/issues/3009>`_ - Added Copy with headers functionality when copy data from Query Tool/View Data. | `Issue #3009 <https://redmine.postgresql.org/issues/3009>`_ - Added Copy with headers functionality when copy data from Query Tool/View Data.
| `Issue #4778 <https://redmine.postgresql.org/issues/4778>`_ - Implemeted the Query Plan Analyser. | `Issue #4778 <https://redmine.postgresql.org/issues/4778>`_ - Implemeted the Query Plan Analyser.
| `Issue #4823 <https://redmine.postgresql.org/issues/4823>`_ - Include PostgreSQL 12 binaries in the container.
Housekeeping Housekeeping
************ ************

2
pkg/docker/entrypoint.sh
View File

@ -7,7 +7,7 @@ if [ ! -f /pgadmin4/config_distro.py ]; then
cat << EOF > /pgadmin4/config_distro.py cat << EOF > /pgadmin4/config_distro.py
HELP_PATH = '../../docs' HELP_PATH = '../../docs'
DEFAULT_BINARY_PATHS = { DEFAULT_BINARY_PATHS = {
'pg': '/usr/local/pgsql-11' 'pg': '/usr/local/pgsql-12'
} }
EOF EOF