Skip to content

Commit 3fcb00a

Browse files
committed
Try echo -e when initially writing server.key/server.crt files
this is for environments which don't support multi-line ENV variables and we must convert newlines to \n
1 parent c0242fa commit 3fcb00a

2 files changed

Lines changed: 26 additions & 4 deletions

File tree

17/docker-entrypoint-initdb.d/00_enable_ssl.sh

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,25 @@ set -eu
1616
# WARNING: chown postgres:postgres
1717
# WARNING: chmod 0600
1818
echo " **** Configure SSL certificate and key"
19-
echo "$POSTGRES_SSL_CERT" > "$PGDATA/server.crt"
19+
echo -e "$POSTGRES_SSL_CERT" > "$PGDATA/server.crt"
2020
chown postgres:postgres "$PGDATA/server.crt"
2121
chmod 0600 "$PGDATA/server.crt"
2222

23-
echo "$POSTGRES_SSL_KEY" > "$PGDATA/server.key"
23+
echo "DEBUG: BEGIN $PGDATA/server.crt"
24+
ls -l "$PGDATA/server.crt"
25+
cat "$PGDATA/server.crt"
26+
echo "DEBUG: END $PGDATA/server.crt"
27+
28+
29+
echo -e "$POSTGRES_SSL_KEY" > "$PGDATA/server.key"
2430
chown postgres:postgres "$PGDATA/server.key"
2531
chmod 0600 "$PGDATA/server.key"
2632

33+
echo "DEBUG: BEGIN $PGDATA/server.key"
34+
ls -l "$PGDATA/server.key"
35+
echo "DEBUG: END $PGDATA/server.key"
36+
37+
2738
echo " **** Turn SSL mode ON"
2839
psql --set ON_ERROR_STOP=1 \
2940
--username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL

18/docker-entrypoint-initdb.d/00_enable_ssl.sh

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,25 @@ set -eu
1616
# WARNING: chown postgres:postgres
1717
# WARNING: chmod 0600
1818
echo " **** Configure SSL certificate and key"
19-
echo "$POSTGRES_SSL_CERT" > "$PGDATA/server.crt"
19+
echo -e "$POSTGRES_SSL_CERT" > "$PGDATA/server.crt"
2020
chown postgres:postgres "$PGDATA/server.crt"
2121
chmod 0600 "$PGDATA/server.crt"
2222

23-
echo "$POSTGRES_SSL_KEY" > "$PGDATA/server.key"
23+
echo "DEBUG: BEGIN $PGDATA/server.crt"
24+
ls -l "$PGDATA/server.crt"
25+
cat "$PGDATA/server.crt"
26+
echo "DEBUG: END $PGDATA/server.crt"
27+
28+
29+
echo -e "$POSTGRES_SSL_KEY" > "$PGDATA/server.key"
2430
chown postgres:postgres "$PGDATA/server.key"
2531
chmod 0600 "$PGDATA/server.key"
2632

33+
echo "DEBUG: BEGIN $PGDATA/server.key"
34+
ls -l "$PGDATA/server.key"
35+
echo "DEBUG: END $PGDATA/server.key"
36+
37+
2738
echo " **** Turn SSL mode ON"
2839
psql --set ON_ERROR_STOP=1 \
2940
--username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL

0 commit comments

Comments
 (0)