diff --git a/Dockerfile b/Dockerfile index 816f0a1bb..24fe20822 100644 --- a/Dockerfile +++ b/Dockerfile @@ -114,7 +114,6 @@ RUN rm -rf /pgadmin4/docs/en_US/_build/html/_static/*.png # Create additional builders to get all of the PostgreSQL utilities ######################################################################### -FROM postgres:10-alpine AS pg10-builder FROM postgres:11-alpine AS pg11-builder FROM postgres:12-alpine AS pg12-builder FROM postgres:13-alpine AS pg13-builder @@ -124,11 +123,6 @@ FROM postgres:15-alpine AS pg15-builder FROM alpine:latest AS tool-builder # Copy the PG binaries -COPY --from=pg10-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-10/ -COPY --from=pg10-builder /usr/local/bin/pg_dumpall /usr/local/pgsql/pgsql-10/ -COPY --from=pg10-builder /usr/local/bin/pg_restore /usr/local/pgsql/pgsql-10/ -COPY --from=pg10-builder /usr/local/bin/psql /usr/local/pgsql/pgsql-10/ - COPY --from=pg11-builder /usr/local/bin/pg_dump /usr/local/pgsql/pgsql-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/ diff --git a/docs/en_US/container_deployment.rst b/docs/en_US/container_deployment.rst index d5ceb305f..7f01c5513 100644 --- a/docs/en_US/container_deployment.rst +++ b/docs/en_US/container_deployment.rst @@ -26,9 +26,9 @@ where ** is one of the following: +==========+===============================================================================+ | latest | The most recent release. | +----------+-------------------------------------------------------------------------------+ - | 6.14 | A specific version (6.14 in this case). | + | 7.4 | A specific version (7.4 in this case). | +----------+-------------------------------------------------------------------------------+ - | 6 | the latest release of a specific major version (major version 6 in this case).| + | 7 | the latest release of a specific major version (major version 7 in this case).| +----------+-------------------------------------------------------------------------------+ | snapshot | The latest nightly test build. | +----------+-------------------------------------------------------------------------------+ @@ -42,11 +42,11 @@ maintenance functions to be executed. Multiple versions are included in the following directories to allow use with different versions of the database server: -* PostgreSQL 10: */usr/local/pgsql-10* * PostgreSQL 11: */usr/local/pgsql-11* * PostgreSQL 12: */usr/local/pgsql-12* * PostgreSQL 13: */usr/local/pgsql-13* * PostgreSQL 14: */usr/local/pgsql-14* +* PostgreSQL 15: */usr/local/pgsql-15* The default binary paths set in the container are as follows: @@ -57,8 +57,7 @@ The default binary paths set in the container are as follows: 'pg-14': '/usr/local/pgsql-14', 'pg-13': '/usr/local/pgsql-13', 'pg-12': '/usr/local/pgsql-12', - 'pg-11': '/usr/local/pgsql-11', - 'pg-10': '/usr/local/pgsql-10' + 'pg-11': '/usr/local/pgsql-11' } this may be changed in the :ref:`preferences`. diff --git a/docs/en_US/release_notes_7_5.rst b/docs/en_US/release_notes_7_5.rst index e90435d5a..67fccd7cc 100644 --- a/docs/en_US/release_notes_7_5.rst +++ b/docs/en_US/release_notes_7_5.rst @@ -27,6 +27,7 @@ Housekeeping | `Issue #6295 `_ - Remove Bootstrap and jQuery from authentication pages and rewrite them in ReactJS. | `Issue #6423 `_ - Clarify the LICENSE file to indicate that it is the PostgreSQL Licence. + | `Issue #6532 `_ - Remove unsupported PostgreSQL versions from the container. Bug fixes *********