Merge pull request #279 from jburel/pg_default_rocky

recommend psql 14
ome · Nov 15, 2023 · 399c8c3 · 399c8c3
2 parents d1930ff + 9e0a9c7
commit 399c8c3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/linux/step01_rocky9_deps.sh b/linux/step01_rocky9_deps.sh
@@ -63,6 +63,7 @@ if [ "$PGVER" = "pg13" ]; then
   sed -i 's/ ident/ trust/g' /var/lib/pgsql/data/pg_hba.conf
 
 elif [ "$PGVER" = "pg14" ]; then
+  #start-recommended-postgres
   dnf -y install postgresql14-server postgresql14
   if [ -f /.dockerenv ]; then
     su - postgres -c "/usr/pgsql-14/bin/initdb -D /var/lib/pgsql/14/data --encoding=UTF8"
@@ -72,11 +73,10 @@ elif [ "$PGVER" = "pg14" ]; then
   else
     PGSETUP_INITDB_OPTIONS=--encoding=UTF8  /usr/pgsql-14/bin/postgresql-14-setup initdb
   fi
-
   sed -i.bak -re 's/^(host.*)ident/\1md5/' /var/lib/pgsql/14/data/pg_hba.conf
   sed -i 's/ ident/ trust/g' /var/lib/pgsql/14/data/pg_hba.conf
+  #end-recommended-postgres
 elif [ "$PGVER" = "pg15" ]; then
-  #start-recommended-postgres
   dnf -y install postgresql15-server postgresql15
   if [ -f /.dockerenv ]; then
     su - postgres -c "/usr/pgsql-15/bin/initdb -D /var/lib/pgsql/15/data --encoding=UTF8"
@@ -88,7 +88,6 @@ elif [ "$PGVER" = "pg15" ]; then
   fi
   sed -i.bak -re 's/^(host.*)ident/\1md5/' /var/lib/pgsql/15/data/pg_hba.conf
   sed -i 's/ ident/ trust/g' /var/lib/pgsql/15/data/pg_hba.conf
-  #end-recommended-postgres
 elif [ "$PGVER" = "pg16" ]; then
   dnf -y install postgresql16-server postgresql16
     if [ -f /.dockerenv ]; then

diff --git a/linux/test/rockylinux9/Dockerfile b/linux/test/rockylinux9/Dockerfile
@@ -6,7 +6,7 @@ MAINTAINER [email protected]
 ARG OMEROVER=latest
 ARG JAVAVER=openjdk11
 ARG ICEVER=ice36
-ARG PGVER=pg15
+ARG PGVER=pg14
 
 RUN touch /.dockerenv
 ADD omero-install-test.zip /