Revert "ROX-19980 fix"

This reverts commit d710e77.

Author: ludydoo

image/db/rhel/scripts/custom-entrypoint.sh

@@ -8,25 +8,17 @@ set -e
 
 if [ ! -d "/var/lib/postgresql/data/pgdata" ]; then
 
-  #  This uses the "archival" methoc
-  #  echo "Creating /var/lib/postgresql/data/pgdata..."
-  #  mkdir -p /var/lib/postgresql/data/pgdata
-  #
-  #  echo "Moving archive to target directory..."
-  #  mv /tmp/data.tar.gz /var/lib/postgresql/data/pgdata/data.tar.gz
-  #
-  #  echo "Uncompressing into /var/lib/pgsql/data/pgdata..."
-  #  tar -xzf /var/lib/postgresql/data/pgdata/data.tar.gz -C /var/lib/postgresql/data/pgdata
-  #
-  #  echo "Removing archive..."
-  #  rm /var/lib/postgresql/data/pgdata/data.tar.gz
-
-  # SYMLINK METHOD
   echo "Creating /var/lib/postgresql/data/pgdata..."
-  mkdir -p /var/lib/postgresql/data
+  mkdir -p /var/lib/postgresql/data/pgdata
+
+  echo "Moving archive to target directory..."
+  mv /tmp/data.tar.gz /var/lib/postgresql/data/pgdata/data.tar.gz
+
+  echo "Uncompressing into /var/lib/pgsql/data/pgdata..."
+  tar -xzf /var/lib/postgresql/data/pgdata/data.tar.gz -C /var/lib/postgresql/data/pgdata
 
-  echo "Create a symbolic link from /var/lib/postgresql/data/pgdata to /tmp/data"
-  ln -s /tmp/data /var/lib/postgresql/data/pgdata
+  echo "Removing archive..."
+  rm /var/lib/postgresql/data/pgdata/data.tar.gz
 
   echo "Starting database..."
   POSTGRES_PASSWORD_FILE="" POSTGRES_PASSWORD=postgres /usr/local/bin/docker-entrypoint.sh postgres -c config_file=/etc/postgresql.conf &

image/db/rhel/scripts/start-db.sh

@@ -15,15 +15,14 @@ echo "Starting database..."
 PGDATA=/tmp/data POSTGRES_PASSWORD=postgres /usr/local/bin/docker-entrypoint.sh postgres -c config_file=/tmp/postgres.conf
 
 echo "Waiting for database to stop..."
-while [ -f /tmp/data/postmaster.pid ]; do
+while [ -f /tmp/data/pgdata/postmaster.pid ]; do
   sleep 1
 done
 
 rm /tmp/postgres.conf
 
-# ARCHIVE METHOD
-# echo "Compressing database data folder..."
-# tar -czf /tmp/data.tar.gz -C /tmp/data .
-#
-# echo "Removing temporary PGDATA directory..."
-# rm -rf /tmp/data
+echo "Compressing database data folder..."
+tar -czf /tmp/data.tar.gz -C /tmp/data .
+
+echo "Removing temporary PGDATA directory..."
+rm -rf /tmp/data