diff --git a/.env b/.env index e23bc7a..157f07f 100644 --- a/.env +++ b/.env @@ -1,3 +1,4 @@ +DATABASE_HOST=mysql DATABASE_NAME=magento2dockerized DATABASE_USER=magento DATABASE_PASSWORD=enAVINa2 diff --git a/README.md b/README.md index f4d5cfb..bed2985 100644 --- a/README.md +++ b/README.md @@ -68,6 +68,7 @@ For more information on how to use docker-compose visit: https://docs.docker.com The `install` action depends on some parameters such as usernames and passwords. We have put in some default values for you that will work for a quick test: ``` +DATABASE_HOST="mysql" DATABASE_NAME="magento2dockerized" DATABASE_USER="magento" DATABASE_PASSWORD="enAVINa2" diff --git a/bin/console b/bin/console index c9d24d6..4afa9cf 100755 --- a/bin/console +++ b/bin/console @@ -40,6 +40,11 @@ fi . $ENVIRONMENTVARIABLESFILE # check the environment variables +if [ -z "$DATABASE_HOST" ]; then + echo >&2 "The DATABASE_HOST variable is not set" + exit 1 +fi + if [ -z "$DATABASE_NAME" ]; then echo >&2 "The DATABASE_NAME variable is not set" exit 1 @@ -193,6 +198,7 @@ generateSSLCertificate() { ####################################### # Install Magento # Globals: +# DATABASE_HOST # DATABASE_NAME # DATABASE_USER # DATABASE_PASSWORD @@ -246,7 +252,7 @@ installMagento() { backendURL="https://${hostname}/${BACKEND_FRONTNAME}" executeInDocker setup:install --base-url=$baseURLInsecure --base-url-secure=$baseURLSecure --backend-frontname=${BACKEND_FRONTNAME} \ --language=${DEFAULT_LANGUAGE} --currency=${DEFAULT_CURRENCY} --timezone=${DEFAULT_TIMEZONE} \ - --db-host=mysql --db-name=${DATABASE_NAME} --db-user=${DATABASE_USER} --db-password=${DATABASE_PASSWORD} \ + --db-host=${DATABASE_HOST} --db-name=${DATABASE_NAME} --db-user=${DATABASE_USER} --db-password=${DATABASE_PASSWORD} \ --admin-firstname=${ADMIN_FIRSTNAME} --admin-lastname=${ADMIN_LASTNAME} --admin-email=${ADMIN_EMAIL} --admin-user=${ADMIN_USERNAME} --admin-password=${ADMIN_PASSWORD} \ --cleanup-database --session-save=db diff --git a/docker-compose.yml b/docker-compose.yml index 9530164..fca1ffc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -69,7 +69,7 @@ services: ports: - "8080:80" environment: - PMA_HOST: "mysql" + PMA_HOST: ${DATABASE_HOST} PMA_PORT: 3306 networks: - front