Docker on 3.x (ezsystems#455)

* [Docker] Fixed problem with DATABASE_URL in install_dependencies * [Docker] Added default composer project name
alongosz · Oct 3, 2019 · b09f1dc · b09f1dc
1 parent 2c7d70e
commit b09f1dc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/.env b/.env
@@ -6,6 +6,9 @@ COMPOSE_DIR=.
 COMPOSER_HOME=~/.composer
 COMPOSER_MEMORY_LIMIT=4G
 
+# Feel free to change project name to something meaningful (preferably unique per project)
+COMPOSE_PROJECT_NAME=ezplatform
+
 ## Docker images (name and version)
 PHP_IMAGE=ezsystems/php:7.3-v1
 PHP_IMAGE_DEV=ezsystems/php:7.3-v1-dev

diff --git a/doc/docker/install-dependencies.yml b/doc/docker/install-dependencies.yml
@@ -16,4 +16,6 @@ services:
      - DATABASE_PASSWORD
      - DATABASE_NAME
      - COMPOSER_AUTH
+     - DATABASE_PLATFORM
+     - DATABASE_PORT
     command: ./doc/docker/install_script.sh
diff --git a/doc/docker/install_script.sh b/doc/docker/install_script.sh
@@ -13,6 +13,8 @@ fi
 mkdir -p public/var
 
 if [ "${INSTALL_DATABASE}" == "1" ]; then 
+    export DATABASE_URL=${DATABASE_PLATFORM}://${DATABASE_USER}:${DATABASE_PASSWORD}@${DATABASE_HOST}:${DATABASE_PORT}/${DATABASE_NAME}
+
     php /scripts/wait_for_db.php
     composer ezplatform-install
     if [ "$APP_CMD" != '' ]; then