Skip to content

Commit 8713bb9

Browse files
committed
- Optimized installation flow
1 parent f4e976b commit 8713bb9

File tree

2 files changed

+21
-3
lines changed

2 files changed

+21
-3
lines changed

k-start

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/usr/bin/env bash
2+
3+
set -e
4+
5+
cd "$(dirname "${BASH_SOURCE[0]}")" && vagrant_dir=$PWD
6+
7+
source "${vagrant_dir}/scripts/functions.sh"
8+
resetNestingLevel
9+
10+
if [[ ! $(isMinikubeRunning) -eq 1 ]]; then
11+
// TDOO: Eliminate duplication with k-restart
12+
# minikube start --cache-images --cpus=2 --memory=4096 2> >(logError)
13+
minikube start --cpus=2 --memory=4096 2> >(logError)
14+
fi
15+
16+
17+
info "$(regular)See details in $(bold)${vagrant_dir}/log/${current_script_name}.log$(regular). For debug output set $(bold)debug:vagrant_project$(regular) to $(bold)1$(regular) in $(bold)etc/config.yaml$(regular)"

scripts/guest/m-reinstall

+4-3
Original file line numberDiff line numberDiff line change
@@ -117,16 +117,17 @@ fi
117117
# sudo chown -R vagrant:vagrant ${MAGENTO_ROOT}
118118
#fi
119119

120-
if [[ ${generate_basic_data} != 0 ]]; then
121-
bash "${VAGRANT_ROOT}/scripts/guest/generate_basic_data"
122-
fi
123120
bash "${VAGRANT_ROOT}/scripts/guest/configure_search_engine"
124121
bash "${VAGRANT_ROOT}/scripts/guest/change_magento_config_for_functional_tests"
125122
bash "${VAGRANT_ROOT}/scripts/guest/update_magento_config" 'admin/security/session_lifetime' '86400'
126123

127124
export SKIP_CACHE_CLEAN=0
128125
bash "${VAGRANT_ROOT}/scripts/guest/m-clear-cache"
129126

127+
if [[ ${generate_basic_data} != 0 ]]; then
128+
bash "${VAGRANT_ROOT}/scripts/guest/generate_basic_data"
129+
fi
130+
130131
status "Checking if Magento frontend is accessible at '${setupOptions[base_url]}'"
131132
magento_home_page_content="$(curl -sL ${setupOptions[base_url]})"
132133
pattern="All rights reserved."

0 commit comments

Comments
 (0)