From 5736e173ea5ff6be772fa3fe60fa5919fb33b77a Mon Sep 17 00:00:00 2001
From: Akshay Joshi <akshay.joshi@enterprisedb.com>
Date: Tue, 26 Sep 2023 13:45:08 +0530
Subject: [PATCH] 1) Fixed an issue where PG 16 binaries not getting copied
 into the docker container. 2) Remove support for PostgreSQL 11.

---
 Dockerfile                          | 6 ------
 docs/en_US/container_deployment.rst | 4 ++--
 docs/en_US/release_notes_7_8.rst    | 4 ++--
 pkg/docker/entrypoint.sh            | 7 +++----
 web/config.py                       | 2 --
 web/pgadmin/utils/constants.py      | 6 ------
 6 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8a8c226ce..4cd965760 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: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/
diff --git a/docs/en_US/container_deployment.rst b/docs/en_US/container_deployment.rst
index 73ef9801f..cb0dbc93d 100644
--- a/docs/en_US/container_deployment.rst
+++ b/docs/en_US/container_deployment.rst
@@ -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`.
diff --git a/docs/en_US/release_notes_7_8.rst b/docs/en_US/release_notes_7_8.rst
index d648a7a94..45c38be54 100644
--- a/docs/en_US/release_notes_7_8.rst
+++ b/docs/en_US/release_notes_7_8.rst
@@ -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
 ****************************
diff --git a/pkg/docker/entrypoint.sh b/pkg/docker/entrypoint.sh
index ed5a41d56..cb22c555f 100755
--- a/pkg/docker/entrypoint.sh
+++ b/pkg/docker/entrypoint.sh
@@ -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
 
diff --git a/web/config.py b/web/config.py
index e1a125437..5ca8b1f35 100644
--- a/web/config.py
+++ b/web/config.py
@@ -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": "",
diff --git a/web/pgadmin/utils/constants.py b/web/pgadmin/utils/constants.py
index 341c26fa8..cd3ff8d0f 100644
--- a/web/pgadmin/utils/constants.py
+++ b/web/pgadmin/utils/constants.py
@@ -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},