Make more Gally env vars configurable via .env.gally

Author: shochdoerfer

docker-compose.gally.yaml

@@ -2,7 +2,7 @@
 services:
   web:
     external_links:
-      - "ddev-router:${GALLY_URL}"
+      - "ddev-router:${GALLY_HOSTNAME}"
 
   gally:
     container_name: ddev-${DDEV_SITENAME}-gally
@@ -14,10 +14,10 @@ services:
       args:
         - GALLY_VERSION=${GALLY_VERSION}
         - POSTGRES_VERSION=${POSTGRES_VERSION}
-        - NEXT_PUBLIC_ENTRYPOINT=${GALLY_URL}
-        - NEXT_PUBLIC_API_URL=https://${GALLY_URL}/${GALLY_API_ROUTE_PREFIX}
+        - NEXT_PUBLIC_ENTRYPOINT=${GALLY_HOSTNAME}
+        - NEXT_PUBLIC_API_URL=https://${GALLY_HOSTNAME}/${GALLY_API_ROUTE_PREFIX}
         - NEXT_PUBLIC_API_ROUTE_PREFIX=${GALLY_API_ROUTE_PREFIX}
-        - REACT_APP_API_URL=https://${GALLY_URL}/${GALLY_API_ROUTE_PREFIX}
+        - REACT_APP_API_URL=https://${GALLY_HOSTNAME}/${GALLY_API_ROUTE_PREFIX}
     networks:
       ddev_default: null
       default: null
@@ -26,15 +26,15 @@ services:
       - "127.0.0.1:$DDEV_HOST_HTTPS_PORT:443"
     environment:
       - SERVER_NAME=:80
-      - APP_ENV=prod
-      - APP_DEBUG=0
-      - APP_SECRET=${APP_SECRET}
+      - APP_ENV=${GALLY_APP_ENV}
+      - APP_DEBUG=${GALLY_APP_DEBUG}
+      - APP_SECRET=${GALLY_APP_SECRET}
       - API_ROUTE_PREFIX=${GALLY_API_ROUTE_PREFIX}
       - TRUSTED_PROXIES=127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
-      - TRUSTED_HOSTS=${GALLY_URL}|localhost|php
-      - CORS_ALLOW_ORIGIN=https://${GALLY_URL}
-      - GALLY_CATALOG_MEDIA_URL=https://${GALLY_URL}/${GALLY_API_ROUTE_PREFIX}/media/catalog/product/
-      - GALLY_FRONT_URL=https://${GALLY_URL}
+      - TRUSTED_HOSTS=${GALLY_HOSTNAME}|localhost|php
+      - CORS_ALLOW_ORIGIN=https://${GALLY_HOSTNAME}
+      - GALLY_CATALOG_MEDIA_URL=${GALLY_CATALOG_MEDIA_URL}
+      - GALLY_FRONT_URL=https://${GALLY_HOSTNAME}
       - GALLY_DEFAULT_SENDER_NAME=Gally
       - [email protected]
       - DATABASE_HOST=${GALLY_DB_HOST}
@@ -44,14 +44,14 @@ services:
       - DATABASE_PASSWORD=${GALLY_DB_PASSWORD}
       - DATABASE_URL=postgresql://${GALLY_DB_USER}:${GALLY_DB_PASSWORD}@${GALLY_DB_HOST}:${GALLY_DB_PORT}/${GALLY_DB_NAME}?serverVersion=${POSTGRES_VERSION}
       - VARNISH_URL=http://gally-varnish
-      - REDIS_SERVER=redis://redis/0
-      - ELASTICSEARCH_URL=http://opensearch:9200/
+      - REDIS_SERVER=redis://${REDIS_HOST}/${REDIS_DB}
+      - ELASTICSEARCH_URL=http://${OPENSEARCH_HOST}:${OPENSEARCH_PORT}/
       - ELASTICSEARCH_SSL_VERIFICATION=false
       - MAILER_DSN=smtp://web:1025
-      - NEXT_PUBLIC_ENTRYPOINT=${GALLY_URL}
-      - NEXT_PUBLIC_API_URL=https://${GALLY_URL}/${GALLY_API_ROUTE_PREFIX}
+      - NEXT_PUBLIC_ENTRYPOINT=${GALLY_HOSTNAME}
+      - NEXT_PUBLIC_API_URL=https://${GALLY_HOSTNAME}/${GALLY_API_ROUTE_PREFIX}
       - NEXT_PUBLIC_API_ROUTE_PREFIX=${GALLY_API_ROUTE_PREFIX}
-      - REACT_APP_API_URL=https://${GALLY_URL}/${GALLY_API_ROUTE_PREFIX}
+      - REACT_APP_API_URL=https://${GALLY_HOSTNAME}/${GALLY_API_ROUTE_PREFIX}
     volumes:
       - ".:/mnt/ddev_config"
       - "ddev-global-cache:/mnt/ddev-global-cache"

gally/scripts/setup/env.php

@@ -7,16 +7,23 @@
 $content = <<<EOT
 #ddev-generated
 GALLY_VERSION=2.2.0
-GALLY_URL=$projectName-gally.ddev.site
+GALLY_HOSTNAME=$projectName-gally.ddev.site
+GALLY_CATALOG_MEDIA_URL=https://$projectName.ddev.site/media/catalog/product/
 GALLY_API_ROUTE_PREFIX=api
+GALLY_APP_ENV=prod
+GALLY_APP_DEBUG=0
+GALLY_APP_SECRET=Bh9Phhoceiyasa7iebf22hah6OdfN8oh
 GALLY_DB_HOST=gally-db
 GALLY_DB_PORT=5432
 GALLY_DB_NAME=gally
 GALLY_DB_USER=gally
 GALLY_DB_PASSWORD=gally
 POSTGRES_VERSION=16
 VARNISH_VERSION=8.0
-APP_SECRET=Bh9Phhoceiyasa7iebf22hah6OdfN8oh
+REDIS_HOST=redis
+REDIS_DB=0
+OPENSEARCH_HOST=opensearch
+OPENSEARCH_PORT=9200
 EOT;
 
 file_put_contents('.env.gally', $content);