ExternalVendorCode/devilbox
1
0
Fork 0
mirror of https://github.com/cytopia/devilbox.git synced 2024-12-24 15:06:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

REL-0.10 Optimize travis checks to be extended in the future

Browse Source
This commit is contained in:
cytopia 2017-05-25 11:00:36 +02:00
parent c4b067a10f
commit 93f03adc58
No known key found for this signature in database
GPG Key ID: 6D56EDB8695128A2
2 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
.tests/.lib.sh
View File

@ -143,15 +143,6 @@ get_data_mounts() {
} }
###
### Default enabled Docker Versions
###
get_enabled_versions() {
grep -E '^[A-Z]+_SERVER=' "${DEVILBOX_PATH}/.env" | sed 's/_SERVER=/\t/g'
}
################################################################################ ################################################################################
# #
@ -305,6 +296,11 @@ devilbox_configure() {
} }
devilbox_configured_settings() {
grep -E '^[A-Z]+_SERVER=' "${DEVILBOX_PATH}/.env" | sed 's/_SERVER=/\t/g'
}
devilbox_pull() { devilbox_pull() {
# Make sure to pull until success # Make sure to pull until success
ret=1 ret=1
@ -351,28 +347,13 @@ devilbox_start() {
} }
devilbox_show() { devilbox_print_actual_settings() {
###
### 1. Show Info
###
print_h2 "Info"
# Show wanted versions
echo "[Wanted] .env settings"
echo "------------------------------------------------------------"
get_enabled_versions
echo
# Get actual versions
echo "[Actual] http://localhost settings"
echo "------------------------------------------------------------"
curl -q http://localhost/index.php 2>/dev/null | \ curl -q http://localhost/index.php 2>/dev/null | \
grep -E 'circles' | \ grep -E 'circles' | \
grep -oE '<strong.*strong>.*\(.*\)' | \ grep -oE '<strong.*strong>.*\(.*\)' | \
sed 's/<strong>//g' | \ sed 's/<strong>//g' | \
sed 's/<\/strong>.*(/\t/g' | \ sed 's/<\/strong>.*(/\t/g' | \
sed 's/)//g' sed 's/)//g'
echo
} }

16
.tests/test_single.sh
View File

@ -79,16 +79,27 @@ DEF_PGSQL="9.6"
### Configure ### Configure
### ###
print_h1 "Configuration: ${DVL_SRV1}-${DVL_VER1} vs ${DVL_SRV2}-${DVL_VER2}" print_h1 "Configuration: ${DVL_SRV1}-${DVL_VER1} vs ${DVL_SRV2}-${DVL_VER2}"
print_h2 "Enabled settings in .env"
devilbox_configure "${DVL_SRV1}" "${DVL_VER1}" "${DVL_SRV2}" "${DVL_VER2}" "${DEF_PHP}" "${DEF_HTTPD}" "${DEF_MYSQL}" "${DEF_PGSQL}" devilbox_configure "${DVL_SRV1}" "${DVL_VER1}" "${DVL_SRV2}" "${DVL_VER2}" "${DEF_PHP}" "${DEF_HTTPD}" "${DEF_MYSQL}" "${DEF_PGSQL}"
devilbox_configured_settings
### ###
### Download and run ### Download and run
### ###
print_h1 "Downloading and Run" print_h1 "Startup Devilbox"
print_h2 "Download"
devilbox_pull devilbox_pull
print_h2 "Run"
devilbox_start devilbox_start
devilbox_show
print_h2 "Actual settings from index.php"
devilbox_print_actual_settings
### ###
@ -115,6 +126,7 @@ if ! devilbox_test_url "http://localhost/index.php" "dvlbox-err" "0"; then
fi fi
### ###
### Stop ### Stop
### ###