Skip to content
This repository has been archived by the owner on Jul 25, 2023. It is now read-only.

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

Merged
merged 1 commit into from
Feb 15, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions 7.0-cli/bin/magento-installer
Original file line number Diff line number Diff line change
Expand Up @@ -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 [ -z "$M2SETUP_BACKEND_FRONTNAME" ]; then
INSTALL_COMMAND="$INSTALL_COMMAND --backend-frontname=$M2SETUP_BACKEND_FRONTNAME"
Expand Down
1 change: 1 addition & 0 deletions docker-compose-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down