From 2e744cdbd178334ba11f122efea703fe876b11f9 Mon Sep 17 00:00:00 2001 From: MrAnyx Date: Sat, 4 Jan 2025 15:59:23 +0000 Subject: [PATCH] fix: Update environment variable handling in Supervisor configuration scripts --- .docker/entrypoint.dev.sh | 5 ++--- .docker/entrypoint.prod.sh | 7 ++++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.docker/entrypoint.dev.sh b/.docker/entrypoint.dev.sh index a1e026a..8a69b6b 100644 --- a/.docker/entrypoint.dev.sh +++ b/.docker/entrypoint.dev.sh @@ -3,14 +3,13 @@ set -e echo "Generating Supervisor configuration..." SUPERVISORD_CONF="/etc/supervisor/conf.d/supervisord.conf" -ENV_VARS=$(printenv | awk -F= '{print $1"=\""$2"\""}' | tr '\n' ',' | sed 's/,$//') -ESCAPED_ENV_VARS=$(echo "$ENV_VARS" | sed 's/"/\\"/g') +ENV_VARS=$(printenv | awk -F= '{print $1"=\""$2"\","}' | tr -d '\n' | sed 's/,$//') echo "" >> $SUPERVISORD_CONF echo "[supervisord]" >> $SUPERVISORD_CONF echo "nodaemon=true" >> $SUPERVISORD_CONF echo "logfile=/dev/null" >> $SUPERVISORD_CONF echo "logfile_maxbytes=0" >> $SUPERVISORD_CONF -echo "environment=${ESCAPED_ENV_VARS}" >> $SUPERVISORD_CONF +echo "environment=${ENV_VARS}" >> $SUPERVISORD_CONF # Update and start supervisor service echo "Starting supervisor..." diff --git a/.docker/entrypoint.prod.sh b/.docker/entrypoint.prod.sh index 81929cb..4918b6a 100644 --- a/.docker/entrypoint.prod.sh +++ b/.docker/entrypoint.prod.sh @@ -6,16 +6,17 @@ echo "Running database migrations..." php bin/console doctrine:migrations:migrate --no-interaction --allow-no-migration # Generate Supervisor configuration + + echo "Generating Supervisor configuration..." SUPERVISORD_CONF="/etc/supervisor/conf.d/supervisord.conf" -ENV_VARS=$(printenv | awk -F= '{print $1"=\""$2"\""}' | tr '\n' ',' | sed 's/,$//') -ESCAPED_ENV_VARS=$(echo "$ENV_VARS" | sed 's/"/\\"/g') +ENV_VARS=$(printenv | awk -F= '{print $1"=\""$2"\","}' | tr -d '\n' | sed 's/,$//') echo "" >> $SUPERVISORD_CONF echo "[supervisord]" >> $SUPERVISORD_CONF echo "nodaemon=true" >> $SUPERVISORD_CONF echo "logfile=/dev/null" >> $SUPERVISORD_CONF echo "logfile_maxbytes=0" >> $SUPERVISORD_CONF -echo "environment=${ESCAPED_ENV_VARS}" >> $SUPERVISORD_CONF +echo "environment=${ENV_VARS}" >> $SUPERVISORD_CONF # Update and start supervisor service echo "Starting supervisor..."