From aaea068cceb4063ab89313d9785f2b40f35b0d63 Mon Sep 17 00:00:00 2001
From: Yang Jiao <72076317+YangJiao0817@users.noreply.github.com>
Date: Fri, 5 May 2023 10:32:39 +0800
Subject: [PATCH] Upgrade the internal PostgreSQL to 14 in 2.9.0 (#18612)

Fix #18338

Signed-off-by: Yang Jiao <jiaoya@vmware.com>
Co-authored-by: Wang Yan <wangyan@vmware.com>
---
 make/photon/db/Dockerfile           | 4 ++--
 make/photon/db/Dockerfile.base      | 6 +++---
 make/photon/db/docker-entrypoint.sh | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/make/photon/db/Dockerfile b/make/photon/db/Dockerfile
index a7b2298e4..3171f0cf8 100644
--- a/make/photon/db/Dockerfile
+++ b/make/photon/db/Dockerfile
@@ -14,7 +14,7 @@ COPY ./make/photon/db/initial-registry.sql /docker-entrypoint-initdb.d/
 RUN chown -R postgres:postgres /docker-entrypoint.sh /docker-healthcheck.sh /docker-entrypoint-initdb.d \
     && chmod u+x /docker-entrypoint.sh /docker-healthcheck.sh
 
-ENTRYPOINT ["/docker-entrypoint.sh", "", "13"]
+ENTRYPOINT ["/docker-entrypoint.sh", "13", "14"]
 HEALTHCHECK CMD ["/docker-healthcheck.sh"]
 
-USER postgres
\ No newline at end of file
+USER postgres
diff --git a/make/photon/db/Dockerfile.base b/make/photon/db/Dockerfile.base
index 27dd7bd7d..9414deefe 100644
--- a/make/photon/db/Dockerfile.base
+++ b/make/photon/db/Dockerfile.base
@@ -2,7 +2,7 @@ FROM photon:4.0
 
 ENV PGDATA /var/lib/postgresql/data
 
-RUN tdnf install -y shadow gzip postgresql13 findutils bc >> /dev/null \
+RUN tdnf install -y shadow gzip postgresql13 postgresql findutils bc >> /dev/null \
     && groupadd -r postgres --gid=999 \
     && useradd -m -r -g postgres --uid=999 postgres \
     && mkdir -p /docker-entrypoint-initdb.d \
@@ -10,8 +10,8 @@ RUN tdnf install -y shadow gzip postgresql13 findutils bc >> /dev/null \
     && chown -R postgres:postgres /run/postgresql \
     && chmod 2777 /run/postgresql \
     && mkdir -p "$PGDATA" && chown -R postgres:postgres "$PGDATA" && chmod 777 "$PGDATA" \
-    && sed -i "s|#listen_addresses = 'localhost'.*|listen_addresses = '*'|g" /usr/pgsql/13/share/postgresql/postgresql.conf.sample \
-    && sed -i "s|#unix_socket_directories = '/tmp'.*|unix_socket_directories = '/run/postgresql'|g" /usr/pgsql/13/share/postgresql/postgresql.conf.sample \
+    && sed -i "s|#listen_addresses = 'localhost'.*|listen_addresses = '*'|g" /usr/share/postgresql/postgresql.conf.sample \
+    && sed -i "s|#unix_socket_directories = '/tmp'.*|unix_socket_directories = '/run/postgresql'|g" /usr/share/postgresql/postgresql.conf.sample \
     && tdnf clean all
 
 RUN tdnf erase -y toybox && tdnf install -y util-linux net-tools
diff --git a/make/photon/db/docker-entrypoint.sh b/make/photon/db/docker-entrypoint.sh
index 57b047787..e6a363fe4 100644
--- a/make/photon/db/docker-entrypoint.sh
+++ b/make/photon/db/docker-entrypoint.sh
@@ -14,7 +14,7 @@ PGDATANEW=${PGDATA}/pg${PG_VERSION_NEW}
 
 # We should block the upgrade path from 9.6 directly.
 if [ -s $PGDATA/PG_VERSION ]; then
-        echo "Upgrading from PostgreSQL 9.6 to PostgreSQL $PG_VERSION_NEW is not supported in the current Harbor release."             
+        echo "Upgrading from PostgreSQL 9.6 to PostgreSQL $PG_VERSION_NEW is not supported in the current Harbor release."
         echo "You should upgrade to previous Harbor firstly, then upgrade to current release."
         exit 1
 fi
@@ -56,7 +56,7 @@ if [ ! -s $PGDATANEW/PG_VERSION ]; then
                 rm -rf $PGDATAOLD
         else
                 echo "init DB, DB version:$PG_VERSION_NEW"
-                initPG $PGDATANEW true 
+                initPG $PGDATANEW true
         fi
 fi