ROX-19980 fix

stackrox · Oct 27, 2023 · 97cd483 · 97cd483
1 parent eee741a
commit 97cd483
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/image/db/rhel/Dockerfile.slim b/image/db/rhel/Dockerfile.slim
@@ -59,7 +59,16 @@ USER 70:70
 
 ENV ROX_SLIM_MODE="true"
 
-ENTRYPOINT ["docker-entrypoint.sh"]
+COPY scripts/custom-entrypoint.sh /usr/local/bin/
+COPY scripts/start-db.sh /usr/local/bin/
+
+RUN /usr/local/bin/start-db.sh
+USER root
+RUN rm -rf /usr/local/bin/start-db.sh && \
+    rm -rf /docker-entrypoint-initdb.d/*
+USER 70:70
+ENV DATABASE_ALREADY_EXISTS=true
+ENTRYPOINT ["custom-entrypoint.sh"]
 
 EXPOSE 5432
 CMD ["postgres", "-c", "config_file=/etc/postgresql.conf"]
diff --git a/image/db/rhel/scripts/custom-entrypoint.sh b/image/db/rhel/scripts/custom-entrypoint.sh
@@ -32,7 +32,7 @@ if [ ! -d "/var/lib/postgresql/data/pgdata" ]; then
   if [ -n "$POSTGRES_PASSWORD" ]; then
     PGPASSWORD=postgres psql -c "ALTER USER postgres WITH PASSWORD '$POSTGRES_PASSWORD';"
   elif [ -n "$POSTGRES_PASSWORD_FILE" ]; then
-    PGPASSWORD=$(cat "$POSTGRES_PASSWORD_FILE") psql -c "ALTER USER postgres WITH PASSWORD '$POSTGRES_PASSWORD';"
+    PGPASSWORD=postgres psql -c "ALTER USER postgres WITH PASSWORD '$(cat "$POSTGRES_PASSWORD_FILE")';"
   fi
 
   echo "Renaming postgres user if necessary..."