Support multiple Magento instances simultaneously #52

Author: paliarush

.travis.yml

@@ -13,7 +13,7 @@ jobs:
       script:
         - cd tests && sudo bash ./NoCustomConfigBasicTest.sh
     - script: cd tests && sudo bash ./Ce23WithSampleDataMysqlSearchNoNfsTest.sh
-    - script: cd tests && sudo bash ./CeFromComposerNoNfsTest.sh
+    - script: cd tests && sudo bash ./MultiInstanceWithCeFromComposerNoNfsTest.sh
     - script: cd tests && sudo bash ./EeLinkingTest.sh
 
 env:

README.md

@@ -145,8 +145,8 @@ You can create multiple copies of [etc/instance/config.yaml.dist](etc/instance/c
 Upon a successful installation, you'll see the location and URL of the newly-installed Magento 2 application in console.
 
 **Web access**:
-- Access storefront at `http://<instance_name>.magento` (can be found in `etc/instance/<instance_name>.yaml`)
-- Access admin panel at `http://<instance_name>.magento/admin/`
+- Access storefront at `http://magento.<instance_name>` (can be found in `etc/instance/<instance_name>.yaml`)
+- Access admin panel at `http://magento.<instance_name>/admin/`
 - Magento admin user/password: `admin/123123q`
 - Rabbit MQ control panel: run `bash k-open-rabbitmq`, credentials `admin`/`123123q`
 

etc/guest/.gitignore

@@ -0,0 +1 @@
+/_nginx-servers.tpl

etc/helm/templates/.gitignore

@@ -74,10 +74,6 @@ if [[ ${force_project_cleaning} -eq 1 ]]; then
         }
     fi
 
-    mv "${devbox_dir}/etc/guest/.gitignore" "${devbox_dir}/etc/.gitignore.back"
-    rm -rf "${devbox_dir}/.devbox" "${devbox_dir}/etc/guest"
-    mkdir "${devbox_dir}/etc/guest"
-    mv "${devbox_dir}/etc/.gitignore.back" "${devbox_dir}/etc/guest/.gitignore"
     cd "${devbox_dir}/log" && mv email/.gitignore email_gitignore.back && rm -rf email && mkdir email && mv email_gitignore.back email/.gitignore
 fi
 

etc/helm/templates/_nginx-server.tpl.dist

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+set -e
+
+cd "$(dirname "${BASH_SOURCE[0]}")" && devbox_dir=$PWD
+
+source "${devbox_dir}/scripts/functions.sh"
+resetNestingLevel
+current_script_name=`basename "$0"`
+initLogFile ${current_script_name}
+
+debug_devbox_project="$(bash "${devbox_dir}/scripts/get_env_config_value.sh" "debug_devbox_project")"
+if [[ ${debug_devbox_project} -eq 1 ]]; then
+    set -x
+fi
+
+context=$(getContext)
+
+if [[ -z ${context} ]]; then
+    echo "Context is not set. Use 'k-set-context <context-name>' to set it."
+    exit 1
+fi
+
+echo ${context}

etc/magento2_default_varnish.vcl.dist

@@ -300,7 +300,6 @@ function loginToPodContainer()
 
 function getContext()
 {
-    # TODO: Add safety checks
     cat "${context_file}"
 }
 

etc/magento2_virtual_host.conf.dist

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+set -e
+
+cd "$(dirname "${BASH_SOURCE[0]}")/../.." && devbox_dir=$PWD
+
+source "${devbox_dir}/scripts/functions.sh"
+resetNestingLevel
+current_script_name=`basename "$0"`
+initLogFile ${current_script_name}
+
+debug_devbox_project="$(bash "${devbox_dir}/scripts/get_env_config_value.sh" "debug_devbox_project")"
+if [[ ${debug_devbox_project} -eq 1 ]]; then
+    set -x
+fi
+
+nginx_servers_config_file="${devbox_dir}/etc/helm/templates/_nginx-servers.tpl"
+
+status "Regenerating '${nginx_servers_config_file}'"
+
+rm -f "${nginx_servers_config_file}"
+
+echo '{{- define "common.nginx.servers.config" -}}' >> "${nginx_servers_config_file}"
+echo '{{/* WARNING: Do not modify this file directly, it is auto-generated and any changes will be overwritten. */}}' >> "${nginx_servers_config_file}"
+
+for instance_name in $(getInstanceList); do
+    cat >> "${nginx_servers_config_file}" <<- LITERAL
+server {
+  listen "{{ .Values.global.monolith.service.nginxPort }}";
+  server_name $(getInstanceDomainName ${instance_name});
+  set \$MAGE_ROOT {{.Values.global.monolith.volumeHostPath}}/${instance_name};
+  {{- include "common.nginx.config" . | nindent 2 }}
+}
+LITERAL
+done
+echo '{{- end -}}' >> "${nginx_servers_config_file}"
+
+info "$(regular)See details in $(bold)${devbox_dir}/log/${current_script_name}.log$(regular). For debug output set $(bold)debug:devbox_project$(regular) to $(bold)1$(regular) in $(bold)etc/config.yaml$(regular)"

init_project.sh

@@ -184,9 +184,6 @@ fi
 cd "${devbox_dir}"
 
 status "Configuring kubernetes cluster on the minikube"
-# TODO: Optimize. Helm tiller must be initialized and started before environment configuration can begin
-helm init --wait
-#waitForKubernetesPodToRun 'tiller-deploy'
 
 # TODO: Check if environment upgrade can be safely removed
 bash "${devbox_dir}/scripts/host/k_upgrade_environment.sh"

k-get-context

@@ -15,6 +15,8 @@ nfs_server_ip="$(bash "${devbox_dir}/scripts/get_env_config_value.sh" "guest_nfs
 use_varnish="$(bash "${devbox_dir}/scripts/get_env_config_value.sh" "environment_use_varnish")"
 use_nfs="$(bash "${devbox_dir}/scripts/get_env_config_value.sh" "guest_use_nfs")"
 
+bash "${devbox_dir}/scripts/host/configure_nginx_servers.sh"
+
 status "Deploying cluster, it may take several minutes"
 
 cd "${devbox_dir}/etc/helm"

scripts/functions.sh

@@ -15,6 +15,8 @@ nfs_server_ip="$(bash "${devbox_dir}/scripts/get_env_config_value.sh" "guest_nfs
 use_varnish="$(bash "${devbox_dir}/scripts/get_env_config_value.sh" "environment_use_varnish")"
 use_nfs="$(bash "${devbox_dir}/scripts/get_env_config_value.sh" "guest_use_nfs")"
 
+bash "${devbox_dir}/scripts/host/configure_nginx_servers.sh"
+
 status "Upgrading cluster, it may take several minutes"
 
 # TODO: Eliminate code duplication with k_install_environment

scripts/host/configure_nginx_servers.sh

@@ -26,7 +26,6 @@ function oneTimeSetUp
 function setUp()
 {
     debug_devbox_project=0
-    skip_codebase_stash=0
 }
 
 function tearDown()
@@ -35,7 +34,6 @@ function tearDown()
 
     if [[ ${delete_test_project_on_tear_down} -eq 1 ]]; then
         stashLogs
-        stashMagentoCodebase
         clearTestTmp
     fi
 
@@ -54,7 +52,6 @@ See logs in ${logs_dir}"
 function testCe23WithSampleDataMysqlSearchNoNfs()
 {
     current_config_name="ce23_with_sample_data_mysql_search_no_nfs"
-    current_codebase="ce23_with_sample_data"
 
     installEnvironment
 

scripts/host/init_instance.sh

@@ -26,7 +26,6 @@ function oneTimeSetUp
 function setUp()
 {
     debug_devbox_project=0
-    skip_codebase_stash=0
 }
 
 function tearDown()
@@ -35,7 +34,6 @@ function tearDown()
 
     if [[ ${delete_test_project_on_tear_down} -eq 1 ]]; then
         stashLogs
-        stashMagentoCodebase
         clearTestTmp
     fi
 
@@ -54,7 +52,6 @@ See logs in ${logs_dir}"
 function testEeLinking()
 {
     current_config_name="ce_shallow_clone_no_nfs"
-    current_codebase="ee"
     installEnvironment
 #    assertVarnishDisabled
     executeBasicCommonAssertions