Skip to content

Commit d710e77

Browse files
committed
ROX-19980 fix
1 parent 7e434d1 commit d710e77

File tree

2 files changed

+24
-15
lines changed

2 files changed

+24
-15
lines changed

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

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,25 @@ set -e
88

99
if [ ! -d "/var/lib/postgresql/data/pgdata" ]; then
1010

11-
echo "Creating /var/lib/postgresql/data/pgdata..."
12-
mkdir -p /var/lib/postgresql/data/pgdata
13-
14-
echo "Moving archive to target directory..."
15-
mv /tmp/data.tar.gz /var/lib/postgresql/data/pgdata/data.tar.gz
11+
# This uses the "archival" methoc
12+
# echo "Creating /var/lib/postgresql/data/pgdata..."
13+
# mkdir -p /var/lib/postgresql/data/pgdata
14+
#
15+
# echo "Moving archive to target directory..."
16+
# mv /tmp/data.tar.gz /var/lib/postgresql/data/pgdata/data.tar.gz
17+
#
18+
# echo "Uncompressing into /var/lib/pgsql/data/pgdata..."
19+
# tar -xzf /var/lib/postgresql/data/pgdata/data.tar.gz -C /var/lib/postgresql/data/pgdata
20+
#
21+
# echo "Removing archive..."
22+
# rm /var/lib/postgresql/data/pgdata/data.tar.gz
1623

17-
echo "Uncompressing into /var/lib/pgsql/data/pgdata..."
18-
tar -xzf /var/lib/postgresql/data/pgdata/data.tar.gz -C /var/lib/postgresql/data/pgdata
24+
# SYMLINK METHOD
25+
echo "Creating /var/lib/postgresql/data/pgdata..."
26+
mkdir -p /var/lib/postgresql/data
1927

20-
echo "Removing archive..."
21-
rm /var/lib/postgresql/data/pgdata/data.tar.gz
28+
echo "Create a symbolic link from /var/lib/postgresql/data/pgdata to /tmp/data"
29+
ln -s /tmp/data /var/lib/postgresql/data/pgdata
2230

2331
echo "Starting database..."
2432
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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,15 @@ echo "Starting database..."
1515
PGDATA=/tmp/data POSTGRES_PASSWORD=postgres /usr/local/bin/docker-entrypoint.sh postgres -c config_file=/tmp/postgres.conf
1616

1717
echo "Waiting for database to stop..."
18-
while [ -f /tmp/data/pgdata/postmaster.pid ]; do
18+
while [ -f /tmp/data/postmaster.pid ]; do
1919
sleep 1
2020
done
2121

2222
rm /tmp/postgres.conf
2323

24-
echo "Compressing database data folder..."
25-
tar -czf /tmp/data.tar.gz -C /tmp/data .
26-
27-
echo "Removing temporary PGDATA directory..."
28-
rm -rf /tmp/data
24+
# ARCHIVE METHOD
25+
# echo "Compressing database data folder..."
26+
# tar -czf /tmp/data.tar.gz -C /tmp/data .
27+
#
28+
# echo "Removing temporary PGDATA directory..."
29+
# rm -rf /tmp/data

0 commit comments

Comments
 (0)