IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-16 18:25:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

1) Fixed an issue where PG 16 binaries not getting copied into the docker container.

Browse Source 
2) Remove support for PostgreSQL 11.
This commit is contained in:
Akshay Joshi 2023-09-26 13:45:08 +05:30
parent 5a26cad588
commit 5736e173ea
6 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -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:11-alpine AS pg11-builder
FROM postgres:12-alpine AS pg12-builder
FROM postgres:13-alpine AS pg13-builder
FROM postgres:14-alpine AS pg14-builder
@ -124,11 +123,6 @@ FROM postgres:16-alpine AS pg16-builder
FROM alpine:latest AS tool-builder
# Copy the PG binaries
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/
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/

4
docs/en_US/container_deployment.rst
View File

@ -53,11 +53,11 @@ The default binary paths set in the container are as follows:
.. code-block:: bash
DEFAULT_BINARY_PATHS = {
'pg-16': '/usr/local/pgsql-16',
'pg-15': '/usr/local/pgsql-15',
'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-12': '/usr/local/pgsql-12'
}
this may be changed in the :ref:`preferences`.

4
docs/en_US/release_notes_7_8.rst
View File

@ -8,9 +8,9 @@ This release contains a number of bug fixes and new features since the release o
Supported Database Servers
**************************
**PostgreSQL**: 11, 12, 13, 14, 15, and 16
**PostgreSQL**: 12, 13, 14, 15, and 16
**EDB Advanced Server**: 11, 12, 13, 14 and 15
**EDB Advanced Server**: 12, 13, 14 and 15
Bundled PostgreSQL Utilities
****************************

7
pkg/docker/entrypoint.sh
View File

@ -19,13 +19,12 @@ CA_FILE = '/etc/ssl/certs/ca-certificates.crt'
LOG_FILE = '/dev/null'
HELP_PATH = '../../docs'
DEFAULT_BINARY_PATHS = {
'pg': '/usr/local/pgsql-15',
'pg': '/usr/local/pgsql-16',
'pg-16': '/usr/local/pgsql-16',
'pg-15': '/usr/local/pgsql-15',
'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-12': '/usr/local/pgsql-12'
}
EOF

2
web/config.py
View File

@ -477,14 +477,12 @@ STORAGE_DIR = os.path.join(DATA_DIR, 'storage')
##########################################################################
DEFAULT_BINARY_PATHS = {
"pg": "",
"pg-11": "",
"pg-12": "",
"pg-13": "",
"pg-14": "",
"pg-15": "",
"pg-16": "",
"ppas": "",
"ppas-11": "",
"ppas-12": "",
"ppas-13": "",
"ppas-14": "",

6
web/pgadmin/utils/constants.py
View File

@ -71,9 +71,6 @@ SUPPORTED_AUTH_SOURCES = [INTERNAL,
BINARY_PATHS = {
"as_bin_paths": [
{"version": "110000", "next_major_version": "120000",
"serverType": gettext("EDB Advanced Server 11"), "binaryPath": None,
"isDefault": False},
{"version": "120000", "next_major_version": "130000",
"serverType": gettext("EDB Advanced Server 12"), "binaryPath": None,
"isDefault": False},
@ -91,9 +88,6 @@ BINARY_PATHS = {
"isDefault": False}
],
"pg_bin_paths": [
{"version": "110000", "next_major_version": "120000",
"serverType": gettext("PostgreSQL 11"), "binaryPath": None,
"isDefault": False},
{"version": "120000", "next_major_version": "130000",
"serverType": gettext("PostgreSQL 12"), "binaryPath": None,
"isDefault": False},