update

[noissue]
pulp · Aug 21, 2024 · 1553350 · 1553350
1 parent 457699e
commit 1553350
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -113,8 +113,8 @@ jobs:
           podman ps -a
           podman images -a
           podman logs pulp
-          echo "plottin'"
-          cat /var/lib/pgsql/data/log/*.log
+          echo "plottin"
+          podman exec pulp sh -c "cat /var/lib/pgsql/data/log/*.log"
           cd images/compose
           podman-compose logs
           podman logs --tail=10000 compose_pulp_api_1

diff --git a/images/s6_assets/init/postgres-init b/images/s6_assets/init/postgres-init
@@ -43,10 +43,6 @@ if [ -d "${PGDATA}/base" -a -f "${PGDATA}/PG_VERSION" ]; then
     su postgres -c "PGSETUP_INITDB_OPTIONS=\"-E ${ENCODING} --locale=${LOCALE} --auth=trust\" postgresql-upgrade ${PGDATA}" || { echo -e "${PREFIX} ${RED} Failed to upgrade the postgresql database${ENDCOLOR}" ; exit 1; }
   fi
 else
-  if [ ! -d "/var/run/postgresql" ]; then
-    mkdir -p /var/run/postgresql
-    chown postgres:postgres /var/run/postgresql
-  fi
   echo -e "${PREFIX} ${GREEN}initdb -E UTF8 --locale=C.UTF-8 --pgdata ${PGDATA}${ENDCOLOR}"
   su postgres -c "initdb -E UTF8 --locale=C.UTF-8 --pgdata=${PGDATA}"
   STATUS=$?

diff --git a/images/s6_assets/init/postgres-prepare b/images/s6_assets/init/postgres-prepare
@@ -13,6 +13,11 @@ export C035="\e[35m"
 export C036="\e[36m"
 export C037="\e[37m"
 
+if [ ! -d "/var/run/postgresql" ]; then
+  mkdir -p /var/run/postgresql
+  chown postgres:postgres /var/run/postgresql
+fi
+
 PG_ISREADY=1
 while [ "$PG_ISREADY" != "0"  ]; do
   sleep 1