Add support for --base-url-secure when installing (#58)

fixes #48
meanbee · Feb 15, 2017 · 5991db3 · 5991db3
1 parent cd789b6
commit 5991db3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/7.0-cli/bin/magento-installer b/7.0-cli/bin/magento-installer
@@ -43,6 +43,11 @@ if [ ! "$M2SETUP_INSTALL_DB" = "false" ]; then
         --admin-user=$M2SETUP_ADMIN_USER \
         --admin-password=$M2SETUP_ADMIN_PASSWORD"
 
+    # Use a separate value for secure base URL, if the variable is set
+    if [ -n "$M2SETUP_SECURE_BASE_URL" ]; then
+        INSTALL_COMMAND="$INSTALL_COMMAND --base-url-secure=$M2SETUP_SECURE_BASE_URL"
+    fi
+
     # Only define a backend-frontname if the variable is set, or not empty.
     if [ -n "$M2SETUP_BACKEND_FRONTNAME" ]; then
         INSTALL_COMMAND="$INSTALL_COMMAND --backend-frontname=$M2SETUP_BACKEND_FRONTNAME"

diff --git a/docker-compose-build.yml b/docker-compose-build.yml
@@ -74,6 +74,7 @@ services:
       - M2SETUP_DB_USER=magento2
       - M2SETUP_DB_PASSWORD=magento2
       - M2SETUP_BASE_URL=http://magento2.docker/
+      # - M2SETUP_SECURE_BASE_URL=https://magento2.docker/
       - M2SETUP_BACKEND_FRONTNAME=admin
       - M2SETUP_ADMIN_FIRSTNAME=Admin
       - M2SETUP_ADMIN_LASTNAME=User

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -71,6 +71,7 @@ services:
       - M2SETUP_DB_USER=magento2
       - M2SETUP_DB_PASSWORD=magento2
       - M2SETUP_BASE_URL=http://magento2.docker/
+      # - M2SETUP_SECURE_BASE_URL=https://magento2.docker/
       - M2SETUP_BACKEND_FRONTNAME=admin
       - M2SETUP_ADMIN_FIRSTNAME=Admin
       - M2SETUP_ADMIN_LASTNAME=User