From ed247f5a636f6169da9e19034bfebf5e598bf1ac Mon Sep 17 00:00:00 2001 From: Jef van der Avoirt Date: Fri, 10 Nov 2023 16:07:21 +0100 Subject: [PATCH] fix: added missing environment variable to symfony docker-compose.yml (#51190) * fix: added missing environment variable to symfony docker-compose.yml refs: #48437 Signed-off-by: JefvdA * Revert "fix: added missing environment variable to symfony docker-compose.yml" This reverts commit b7f386d69ed64338b4a7fb47a8ec3e11a63c3ecf. Signed-off-by: JefvdA * fix: hard coded SYMFONY_SKELETON variable in symfony-env.sh refs: #48437 Signed-off-by: JefvdA * Combine two approaches Signed-off-by: Jose Antonio Carmona --------- Signed-off-by: JefvdA Signed-off-by: Jose Antonio Carmona Co-authored-by: Jose Antonio Carmona --- bitnami/symfony/5.4/debian-11/docker-compose.yml | 1 + .../5.4/debian-11/rootfs/opt/bitnami/scripts/symfony-env.sh | 1 + bitnami/symfony/6.3/debian-11/docker-compose.yml | 1 + .../6.3/debian-11/rootfs/opt/bitnami/scripts/symfony-env.sh | 1 + bitnami/symfony/docker-compose.yml | 1 + 5 files changed, 5 insertions(+) diff --git a/bitnami/symfony/5.4/debian-11/docker-compose.yml b/bitnami/symfony/5.4/debian-11/docker-compose.yml index 6a7065926f0e..85804475b82e 100644 --- a/bitnami/symfony/5.4/debian-11/docker-compose.yml +++ b/bitnami/symfony/5.4/debian-11/docker-compose.yml @@ -22,6 +22,7 @@ services: - SYMFONY_DATABASE_PORT_NUMBER=3306 - SYMFONY_DATABASE_USER=bn_myapp - SYMFONY_DATABASE_NAME=bitnami_myapp + - SYMFONY_PROJECT_SKELETON=symfony/skeleton volumes: - './my-project:/app' depends_on: diff --git a/bitnami/symfony/5.4/debian-11/rootfs/opt/bitnami/scripts/symfony-env.sh b/bitnami/symfony/5.4/debian-11/rootfs/opt/bitnami/scripts/symfony-env.sh index 680f6f9aaec9..c2949d3fab0b 100644 --- a/bitnami/symfony/5.4/debian-11/rootfs/opt/bitnami/scripts/symfony-env.sh +++ b/bitnami/symfony/5.4/debian-11/rootfs/opt/bitnami/scripts/symfony-env.sh @@ -57,6 +57,7 @@ export SYMFONY_SKELETON_DIR="${SYMFONY_BASE_DIR}/skeleton" # Symfony configuration export SYMFONY_PORT_NUMBER="${SYMFONY_PORT_NUMBER:-8000}" export SYMFONY_SKIP_DATABASE="${SYMFONY_SKIP_DATABASE:-no}" # only used during the first initialization +export SYMFONY_PROJECT_SKELETON="${SYMFONY_PROJECT_SKELETON:-}" # Database configuration SYMFONY_DATABASE_HOST="${SYMFONY_DATABASE_HOST:-"${MARIADB_HOST:-}"}" diff --git a/bitnami/symfony/6.3/debian-11/docker-compose.yml b/bitnami/symfony/6.3/debian-11/docker-compose.yml index bd1214307d82..bf23dfa79bd9 100644 --- a/bitnami/symfony/6.3/debian-11/docker-compose.yml +++ b/bitnami/symfony/6.3/debian-11/docker-compose.yml @@ -22,6 +22,7 @@ services: - SYMFONY_DATABASE_PORT_NUMBER=3306 - SYMFONY_DATABASE_USER=bn_myapp - SYMFONY_DATABASE_NAME=bitnami_myapp + - SYMFONY_PROJECT_SKELETON=symfony/skeleton volumes: - './my-project:/app' depends_on: diff --git a/bitnami/symfony/6.3/debian-11/rootfs/opt/bitnami/scripts/symfony-env.sh b/bitnami/symfony/6.3/debian-11/rootfs/opt/bitnami/scripts/symfony-env.sh index 680f6f9aaec9..c2949d3fab0b 100644 --- a/bitnami/symfony/6.3/debian-11/rootfs/opt/bitnami/scripts/symfony-env.sh +++ b/bitnami/symfony/6.3/debian-11/rootfs/opt/bitnami/scripts/symfony-env.sh @@ -57,6 +57,7 @@ export SYMFONY_SKELETON_DIR="${SYMFONY_BASE_DIR}/skeleton" # Symfony configuration export SYMFONY_PORT_NUMBER="${SYMFONY_PORT_NUMBER:-8000}" export SYMFONY_SKIP_DATABASE="${SYMFONY_SKIP_DATABASE:-no}" # only used during the first initialization +export SYMFONY_PROJECT_SKELETON="${SYMFONY_PROJECT_SKELETON:-}" # Database configuration SYMFONY_DATABASE_HOST="${SYMFONY_DATABASE_HOST:-"${MARIADB_HOST:-}"}" diff --git a/bitnami/symfony/docker-compose.yml b/bitnami/symfony/docker-compose.yml index bd1214307d82..bf23dfa79bd9 100644 --- a/bitnami/symfony/docker-compose.yml +++ b/bitnami/symfony/docker-compose.yml @@ -22,6 +22,7 @@ services: - SYMFONY_DATABASE_PORT_NUMBER=3306 - SYMFONY_DATABASE_USER=bn_myapp - SYMFONY_DATABASE_NAME=bitnami_myapp + - SYMFONY_PROJECT_SKELETON=symfony/skeleton volumes: - './my-project:/app' depends_on: