Merge pull request #13 from magento/develop

valdislav · web-flow · commit a8d953664122 · 2019-02-07T12:08:16.000-05:00
Develop
diff --git a/README.md b/README.md
@@ -303,8 +303,13 @@ Sometimes it is necessary to test upgrade flow. This can be easily done as follo
  - Use commands described in [Switch between CE and EE](#switch-between-ce-and-ee) section with `-u` flag
 
 ### Multiple Magento instances
+Edit etc/config.yaml.
+Change ce branch and add checkout repository and branch.
+Follow [Installation steps](#installation-steps), when running init-magento use -e argument
 
-Not available yet.
+```bash
+helm init-magento -e
+```
 <!--To install several Magento instances based on different code bases, just follow [Installation steps](#installation-steps) to initialize project in another directory on the host.
 Unique IP address, SSH port and domain name will be generated for each new instance if not specified manually in `etc/config.yaml`
 -->
diff --git a/etc/config.yaml.dist b/etc/config.yaml.dist
@@ -16,6 +16,7 @@ repository_url:
   # [To apply changes: init_project.sh -fc]
   # git@github.com:magento/magento2ce.git OR custom one. Use '::' to specify a specific branch, e.g: git@github.com:magento/magento2.git::2.1
   ce: "git@github.com:magento/magento2.git"
+  checkout: "git@github.com:magento/magento2.git"
   # git@github.com:magento/magento2ee.git OR custom one
   ee: ""
   # can be replaced with custom repository. Use '::' to specify a specific branch, e.g: git@github.com:magento/magento2-sample-data.git::2.1-develop
diff --git a/etc/helm/charts/checkout/templates/checkout-deployment.yaml b/etc/helm/charts/checkout/templates/checkout-deployment.yaml
@@ -21,10 +21,23 @@ spec:
     spec:
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: magento2-monolith:dev
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - containerPort: 80
+          env:
+            - name: VAGRANT_ROOT
+              value: {{.Values.global.checkout.volumeHostPath}}
+            - name: COMPOSER_HOME
+              value: {{.Values.global.checkout.volumeHostPath}}/.composer
+            - name: MAGENTO_ROOT
+              value: {{.Values.global.checkout.volumeHostPath}}/checkout
+            - name: MAGENTO_ROOT_HOST
+              value: {{.Values.global.checkout.volumeHostPath}}/checkout
+            - name: VAGRANT_ROOT_HOST
+              value: {{.Values.global.checkout.volumeHostPath}}
+            - name: IS_WINDOWS_HOST
+              value: "0"
           volumeMounts:
             - name: {{ .Chart.Name }}-code
               mountPath: {{.Values.global.checkout.volumeHostPath}}
diff --git a/etc/helm/charts/checkout/templates/configmap.yaml b/etc/helm/charts/checkout/templates/configmap.yaml
@@ -33,6 +33,8 @@ data:
 
       server {
         listen 8001;
+        listen 30102;
+        listen 80;
 
         server_name _;
         set $MAGE_ROOT {{.Values.global.checkout.volumeHostPath}}/checkout;
diff --git a/etc/helm/charts/checkout/values.yaml b/etc/helm/charts/checkout/values.yaml
@@ -25,8 +25,8 @@ checkout:
     port: 80
   deployment:
     nginxImage: nginx:1.9
-    codeImage: shiftedreality/magento-kubernetes-components-php
-    imageTag: 7.1-fpm
+    codeImage: magento2-monolith
+    imageTag: dev
     imagePullPolicy: Always
 
 resources: {}
diff --git a/etc/helm/templates/configmap.yaml b/etc/helm/templates/configmap.yaml
@@ -32,6 +32,7 @@ data:
 
       server {
         listen 8001;
+        listen 30301;
 
         server_name _;
         set $MAGE_ROOT {{.Values.global.monolith.volumeHostPath}}/magento;
diff --git a/init_project.sh b/init_project.sh
@@ -22,20 +22,22 @@ if [[ ! -f "${config_path}" ]]; then
 fi
 
 magento_ce_dir="${vagrant_dir}/magento"
+magento_checkout_dir="${vagrant_dir}/checkout"
 magento_ce_sample_data_dir="${magento_ce_dir}/magento2ce-sample-data"
 magento_ee_dir="${magento_ce_dir}/magento2ee"
 magento_ee_sample_data_dir="${magento_ce_dir}/magento2ee-sample-data"
 host_os="$(bash "${vagrant_dir}/scripts/host/get_host_os.sh")"
 use_nfs="$(bash "${vagrant_dir}/scripts/get_config_value.sh" "guest_use_nfs")"
 repository_url_ce="$(bash "${vagrant_dir}/scripts/get_config_value.sh" "repository_url_ce")"
-#repository_url_checkout="$(bash "${vagrant_dir}/scripts/get_config_value.sh" "repository_url_checkout")"
+repository_url_checkout="$(bash "${vagrant_dir}/scripts/get_config_value.sh" "repository_url_checkout")"
 repository_url_ee="$(bash "${vagrant_dir}/scripts/get_config_value.sh" "repository_url_ee")"
 composer_project_name="$(bash "${vagrant_dir}/scripts/get_config_value.sh" "composer_project_name")"
 composer_project_url="$(bash "${vagrant_dir}/scripts/get_config_value.sh" "composer_project_url")"
 checkout_source_from="$(bash "${vagrant_dir}/scripts/get_config_value.sh" "checkout_source_from")"
 
 function checkoutSourceCodeFromGit()
 {
+    local checkout_enabled=${1}
     if [[ ! -d ${magento_ce_dir} ]]; then
         if [[ ${host_os} == "Windows" ]]; then
             status "Configuring git for Windows host"
@@ -45,6 +47,9 @@ function checkoutSourceCodeFromGit()
         fi
 
         initMagentoCeGit
+        if [[ ${checkout_enabled} -eq 1 ]]; then
+            initMagentoCheckoutGit
+        fi
         initMagentoCeSampleGit
 
         # By default EE repository is not specified and EE project is not checked out
@@ -64,6 +69,11 @@ function initMagentoCeGit()
     initGitRepository ${repository_url_ce} "CE" "${magento_ce_dir}"
 }
 
+function initMagentoCheckoutGit()
+{
+    initGitRepository ${repository_url_checkout} "checkout" "${magento_checkout_dir}"
+}
+
 function initMagentoEeGit()
 {
     initGitRepository ${repository_url_ee} "EE" "${magento_ee_dir}"
@@ -208,7 +218,7 @@ if [[ ! -d ${magento_ce_dir} ]]; then
     if [[ "${checkout_source_from}" == "composer" ]]; then
         composerCreateProject
     elif [[ "${checkout_source_from}" == "git" ]]; then
-        checkoutSourceCodeFromGit
+        checkoutSourceCodeFromGit ${enable_checkout}
     else
         error "Value specified for 'checkout_source_from' is invalid. Supported options: composer OR git"
         exit 1
@@ -265,7 +275,12 @@ fi
 minikube_ip="$(minikube service magento2-monolith --url | grep -oE '[0-9][^:]+' | head -1)"
 status "Saving minikube IP to etc/config.yaml (${minikube_ip})"
 sed -i.back "s|ip_address: \".*\"|ip_address: \"${minikube_ip}\"|g" "${config_path}"
-sed -i.back "s|host_name: \".*\"|host_name: \"${minikube_ip}\"|g" "${config_path}"
+if [[ "${enable_checkout}" == 1 ]]; then
+    sed -i.back "s|host_name: \".*\"|host_name: \"${minikube_ip}\"|g" "${config_path}"
+else
+    sed -i.back "s|host_name: \".*\"|host_name: \"${minikube_ip}\"|g" "${config_path}"
+fi
+
 rm -f "${config_path}.back"
 
 bash "${vagrant_dir}/scripts/host/check_mounted_directories.sh"
@@ -289,6 +304,9 @@ else
     else
         bash "${vagrant_dir}/scripts/host/m_switch_to_ce.sh" -f 2> >(logError)
     fi
+    if [[ "${enable_checkout}" == 1 ]]; then
+        bash "${vagrant_dir}/scripts/host/m_switch_to_ce.sh" -p=checkout -f 2> >(logError)
+    fi
 fi
 
 success "Project initialization succesfully completed (make sure there are no errors in the log above)"
diff --git a/scripts/guest/composer_checkout.sh b/scripts/guest/composer_checkout.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+# This script allows to use credentials specified in etc/composer/auth.json without declaring them globally
+
+cd "$(dirname "${BASH_SOURCE[0]}")/../.." && vagrant_dir=$PWD
+
+source "${vagrant_dir}/scripts/functions.sh"
+
+status "Executing composer command"
+incrementNestingLevel
+
+composer_auth_json="${vagrant_dir}/etc/composer/auth.json"
+
+# commented out due to composer conflicts
+# ${php_executable} "${composer_phar}" global require "hirak/prestissimo:^0.3"
+
+cd "${VAGRANT_ROOT}/checkout"
+if [[ -f ${composer_auth_json} ]]; then
+    status "Exporting etc/auth.json to environment variable"
+    export COMPOSER_AUTH="$(cat "${composer_auth_json}")"
+fi
+
+status "composer --no-interaction "$@""
+composer --no-interaction "$@" 2> >(log) > >(log)
+
+decrementNestingLevel
diff --git a/scripts/guest/m-checkout-postinstall b/scripts/guest/m-checkout-postinstall
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+vagrant_dir="${VAGRANT_ROOT}"
+
+source "${vagrant_dir}/scripts/functions.sh"
+
+magento_host_name="$(bash ${get_config_value} "magento_host_name")"
+magento_host_name="http://${magento_host_name}:30102/"
+php "${MAGENTO_ROOT}/bin/magento" module:disable Magento_CustomerProxy Magento_CatalogProxy 2> >(logError)
+php "${MAGENTO_ROOT}/bin/magento" config:set service/host/address "${magento_host_name}" 2> >(logError)
diff --git a/scripts/guest/m-checkout-reinstall b/scripts/guest/m-checkout-reinstall
@@ -0,0 +1,139 @@
+#!/usr/bin/env bash
+
+vagrant_dir="${VAGRANT_ROOT}"
+
+source "${vagrant_dir}/scripts/functions.sh"
+
+PORT=30102
+get_config_value="${vagrant_dir}/scripts/get_config_value.sh"
+magento_host_name="$(bash ${get_config_value} "magento_host_name")"
+magento_host_name="${magento_host_name}:30102"
+magento_db_name="checkout"
+
+status ${magento_host_name}
+use_nfs="$(bash "${vagrant_dir}/scripts/get_config_value.sh" "guest_use_nfs")"
+is_windows_host=${IS_WINDOWS_HOST}
+generate_basic_data="$(bash ${get_config_value} "magento_generate_basic_data")"
+
+declare -A setupOptions
+setupOptions[admin_frontname]="$(bash ${get_config_value} "magento_admin_frontname")"
+setupOptions[language]="$(bash ${get_config_value} "magento_language")"
+setupOptions[timezone]="$(bash ${get_config_value} "magento_timezone")"
+setupOptions[currency]="$(bash ${get_config_value} "magento_currency")"
+setupOptions[admin_user]="$(bash ${get_config_value} "magento_admin_user")"
+setupOptions[admin_password]="$(bash ${get_config_value} "magento_admin_password")"
+setupOptions[db_host]='magento2-mysql'
+setupOptions[db_name]="${magento_db_name}"
+setupOptions[db_user]='root'
+setupOptions[db_password]='123123q'
+setupOptions[base_url]="http://${magento_host_name}/"
+setupOptions[admin_lastname]='Admin'
+setupOptions[admin_firstname]='Admin'
+setupOptions[admin_email]='admin@example.com'
+setupOptions[amqp_host]='magento2-rabbitmq'
+setupOptions[amqp_port]='5672'
+setupOptions[amqp_user]='admin'
+setupOptions[amqp_password]='123123q'
+setupOptions[amqp_virtualhost]='/'
+
+#if [[ ${is_windows_host} == 1 ]] || [[ ${use_nfs} == 0 ]]; then
+#    sudo chown -R vagrant:vagrant ${MAGENTO_ROOT}
+#fi
+#
+#status "Killing MQ processes"
+#pkill -f queue
+
+status "Installing/re-installing Magento"
+incrementNestingLevel
+
+cd ${MAGENTO_ROOT}
+
+status "Removing Magento configuration files (env.php and config.php)"
+rm -f "${MAGENTO_ROOT}/app/etc/config.php"
+rm -f "${MAGENTO_ROOT}/app/etc/env.php"
+
+status "Restoring stored in git config.php (if applicable)"
+git checkout "${MAGENTO_ROOT}/app/etc/config.php" &>/dev/null
+
+bash "${VAGRANT_ROOT}/scripts/guest/m-clear-cache"
+# Cache cleaning takes 5-10 seconds and should be avoided until the end of installation to speed up the process
+export SKIP_CACHE_CLEAN=1
+
+db_names=("${setupOptions[db_name]}" "magento_integration_tests" )
+for db_name in "${db_names[@]}"; do
+    status "Dropping and creating '${db_name}' DB"
+    mysql -u"${setupOptions[db_user]}" -p"${setupOptions[db_password]}" -h"${setupOptions[db_host]}" -e"drop database if exists ${db_name}; create database ${db_name};"
+done
+
+# Install Magento application
+cd ${MAGENTO_ROOT}
+
+install_cmd="./bin/magento setup:install \
+    --db-host=${setupOptions[db_host]} \
+    --db-name=${setupOptions[db_name]} \
+    --db-user=${setupOptions[db_user]} \
+    --db-password=${setupOptions[db_password]} \
+    --backend-frontname=${setupOptions[admin_frontname]} \
+    --base-url=${setupOptions[base_url]} \
+    --language=${setupOptions[language]} \
+    --timezone=${setupOptions[timezone]} \
+    --currency=${setupOptions[currency]} \
+    --admin-lastname=${setupOptions[admin_lastname]} \
+    --admin-firstname=${setupOptions[admin_firstname]} \
+    --admin-email=${setupOptions[admin_email]} \
+    --admin-user=${setupOptions[admin_user]} \
+    --admin-password=${setupOptions[admin_password]} \
+    --cleanup-database \
+    --use-rewrites=1"
+
+# Configure Rabbit MQ
+#if [[ -d "${MAGENTO_ROOT}/app/code/Magento/MessageQueue" ]] || [[ -d "${MAGENTO_ROOT}/vendor/magento/module-message-queue" ]]; then
+#    install_cmd="${install_cmd} \
+#    --amqp-host=${setupOptions[amqp_host]} \
+#    --amqp-port=${setupOptions[amqp_port]} \
+#    --amqp-user=${setupOptions[amqp_user]} \
+#    --amqp-virtualhost=${setupOptions[amqp_virtualhost]} \
+#    --amqp-ssl=false \
+#    --amqp-ssl-options=[] \
+#    --amqp-password=${setupOptions[amqp_password]}"
+#fi
+
+# TODO: Permission denied
+#sudo chmod +x bin/magento
+status "${install_cmd}"
+php ${install_cmd} 2> >(logError) > >(log)
+php "${MAGENTO_ROOT}/bin/magento" module:disable Magento_CheckoutProxy Magento_SalesProxy Magento_QuoteProxy 2> >(logError) > >(log)
+monolith_host_name="http://$(bash ${get_config_value}/ "magento_host_name")/"
+php "${MAGENTO_ROOT}/bin/magento" config:set service/host/address "${monolith_host_name}" 2> >(logError) > >(log)
+
+# Comment out the line above and uncomment the one below to debug Magento Setup script
+# php -d xdebug.remote_autostart=1 ${install_cmd} 2> >(logError) > >(log)
+
+#status "Configuring Redis as cache backend"
+#php "${MAGENTO_ROOT}/bin/magento" setup:config:set --page-cache=redis --page-cache-redis-server=magento2-redis-master
+#php "${MAGENTO_ROOT}/bin/magento" setup:config:set --cache-backend=redis --cache-backend-redis-server=magento2-redis-master
+
+if [[ $? != 0 ]]; then
+    error "Magento installation failed."
+    exit 1
+fi
+
+# TODO: Confibure varnish
+#bash "${vagrant_dir}/scripts/guest/configure_varnish" -f
+
+# TODO: Remove
+#if [[ ${is_windows_host} == 1 ]] || [[ ${use_nfs} == 0 ]]; then
+#    status "Changing ownership of "${MAGENTO_ROOT}" to vagrant:vagrant"
+#    sudo chown -R vagrant:vagrant ${MAGENTO_ROOT}
+#fi
+
+#bash "${VAGRANT_ROOT}/scripts/guest/configure_search_engine"
+#bash "${VAGRANT_ROOT}/scripts/guest/change_magento_config_for_functional_tests"
+#bash "${VAGRANT_ROOT}/scripts/guest/update_magento_config" 'admin/security/session_lifetime' '86400'
+
+export SKIP_CACHE_CLEAN=0
+bash "${VAGRANT_ROOT}/scripts/guest/m-clear-cache"
+
+if [[ ${generate_basic_data} != 0 ]]; then
+    bash "${VAGRANT_ROOT}/scripts/guest/generate_basic_data"
+fi
diff --git a/scripts/guest/m-reinstall b/scripts/guest/m-reinstall
@@ -4,8 +4,28 @@ vagrant_dir="${VAGRANT_ROOT}"
 
 source "${vagrant_dir}/scripts/functions.sh"
 
+PORT=80
+for i in "$@"
+do
+case $i in
+    -p=*|--path=*)
+    PORT="${i#*=}"
+    shift # past argument=value
+    ;;
+    *)
+          # unknown option
+    ;;
+esac
+done
 get_config_value="${vagrant_dir}/scripts/get_config_value.sh"
 magento_host_name="$(bash ${get_config_value} "magento_host_name")"
+magento_db_name="magento"
+if [[ ${PORT} != 80 ]]; then
+    magento_host_name="${magento_host_name}:${PORT}"
+    magento_db_name="checkout"
+fi
+
+status ${magento_host_name}
 use_nfs="$(bash "${vagrant_dir}/scripts/get_config_value.sh" "guest_use_nfs")"
 is_windows_host=${IS_WINDOWS_HOST}
 generate_basic_data="$(bash ${get_config_value} "magento_generate_basic_data")"
@@ -18,7 +38,7 @@ setupOptions[currency]="$(bash ${get_config_value} "magento_currency")"
 setupOptions[admin_user]="$(bash ${get_config_value} "magento_admin_user")"
 setupOptions[admin_password]="$(bash ${get_config_value} "magento_admin_password")"
 setupOptions[db_host]='magento2-mysql'
-setupOptions[db_name]='magento'
+setupOptions[db_name]="${magento_db_name}"
 setupOptions[db_user]='root'
 setupOptions[db_password]='123123q'
 setupOptions[base_url]="http://${magento_host_name}/"
diff --git a/scripts/host/m_checkout_composer.sh b/scripts/host/m_checkout_composer.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+cd "$(dirname "${BASH_SOURCE[0]}")/../.." && vagrant_dir=$PWD
+
+source "${vagrant_dir}/scripts/functions.sh"
+
+cd "${vagrant_dir}"
+
+# TODO: parameterize container
+
+arguments=$@
+executeInMagento2CheckoutContainer -- "${vagrant_dir}/scripts/guest/composer_checkout.sh" ${arguments} 2> >(logError)
diff --git a/scripts/host/m_checkout_reinstall.sh b/scripts/host/m_checkout_reinstall.sh
diff --git a/scripts/host/m_switch_to_ce.sh b/scripts/host/m_switch_to_ce.sh
diff --git a/scripts/host/m_switch_to_ee.sh b/scripts/host/m_switch_to_ee.sh

-Original file line number
+Diff line change
   # [To apply changes: init_project.sh -fc]
   # [email protected]:magento/magento2ce.git OR custom one. Use '::' to specify a specific branch, e.g: [email protected]:magento/magento2.git::2.1
   ce: "[email protected]:magento/magento2.git"
 +  checkout: "[email protected]:magento/magento2.git"
   # [email protected]:magento/magento2ee.git OR custom one
   ee: ""
   # can be replaced with custom repository. Use '::' to specify a specific branch, e.g: [email protected]:magento/magento2-sample-data.git::2.1-develop