ExternalVendorCode/devilbox
1
0
Fork 0
mirror of https://github.com/cytopia/devilbox.git synced 2025-04-10 04:20:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix typos

Browse Source
This commit is contained in:
cytopia 2016-12-26 22:10:00 +01:00
parent f176f5a134
commit 3c3ecc5e4c
No known key found for this signature in database
GPG Key ID: 6D56EDB8695128A2
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.tests/test_single.sh
View File

@ -23,8 +23,8 @@ fi
### Get arguments
###
DEVILBOX_PATH="$( echo "${1}"| sed 's/\/*$//' )" # remove last slash(es): /
DEVILBOX_SERVER="${2}"
DEVILBOX_VERSION="${3}"
DEVILBOX_SERV="${2}" # Server
DEVILBOX_VERS="${3}" # Version
@ -69,30 +69,30 @@ set_host_port_pgsql "54320"
###
_httpd="apache-2.2"
_mysql="mariadb-10.2"
_pysql="9.6"
_pgsql="9.6"
_php="php-fpm-7.0"
###
### Set specific version
###
if [ "${DEVILBOX_SERVER}" = "httpd" ]; then
_httpd="${DEVILBOX_VERSION}"
_head="HTTPD: ${DEVILBOX_VERSION}"
elif [ "${DEVILBOX_SERVER}" = "mysql" ]; then
_mysql="${DEVILBOX_VERSION}"
_head="MYSQL: ${DEVILBOX_VERSION}"
elif [ "${DEVILBOX_SERVER}" = "pgsql" ]; then
_pgsql="${DEVILBOX_VERSION}"
_head="PGSQL: ${DEVILBOX_VERSION}"
elif [ "${DEVILBOX_SERVER}" = "php" ]; then
_php="${DEVILBOX_VERSION}"
_head="PHP: ${DEVILBOX_VERSION}"
if [ "${DEVILBOX_SERV}" = "httpd" ]; then
_httpd="${DEVILBOX_VERS}"
_head="HTTPD: ${DEVILBOX_VERS}"
elif [ "${DEVILBOX_SERV}" = "mysql" ]; then
_mysql="${DEVILBOX_VERS}"
_head="MYSQL: ${DEVILBOX_VERS}"
elif [ "${DEVILBOX_SERV}" = "pgsql" ]; then
_pgsql="${DEVILBOX_VERS}"
_head="PGSQL: ${DEVILBOX_VERS}"
elif [ "${DEVILBOX_SERV}" = "php" ]; then
_php="${DEVILBOX_VERS}"
_head="PHP: ${DEVILBOX_VERS}"
fi
###
### Go
###
devilbox_start "${_httpd}" "${_mysql}" "${_pysql}" "${_php}" "${_head}"
devilbox_start "${_httpd}" "${_mysql}" "${_pgsql}" "${_php}" "${_head}"
debilbox_test
devilbox_stop

11
.travis.yml
View File

@ -15,6 +15,7 @@ services:
###
env:
matrix:
# Test httpd
- SERVER=httpd VERSION=apache-2.2
- SERVER=httpd VERSION=apache-2.4
- SERVER=httpd VERSION=nginx-stable
@ -22,10 +23,10 @@ env:
#- SERVER=mysql
#- SERVER=pgsql
#- SERVER=php
global:
- DEVILBOX_PHP_VERSION="$( grep -Eo 'image:.*PHP.*:.*' docker-compose.yml | sed 's/.*:.*://g' )"
- DEVILBOX_HTTPD_VERSION="$( grep -Eo 'image:.*HTTPD.*:.*' docker-compose.yml | sed 's/.*:.*://g' )"
- DEVILBOX_MYSQL_VERSION="$( grep -Eo 'image:.*MYSQL.*:.*' docker-compose.yml | sed 's/.*:.*://g' )"
#global:
# - DEVILBOX_PHP_VERSION="$( grep -Eo 'image:.*PHP.*:.*' docker-compose.yml | sed 's/.*:.*://g' )"
# - DEVILBOX_HTTPD_VERSION="$( grep -Eo 'image:.*HTTPD.*:.*' docker-compose.yml | sed 's/.*:.*://g' )"
# - DEVILBOX_MYSQL_VERSION="$( grep -Eo 'image:.*MYSQL.*:.*' docker-compose.yml | sed 's/.*:.*://g' )"
###
@ -76,4 +77,4 @@ before_install:
###
script:
#- .tests/test_${SERVER}.sh .
- .tests/test_single.sh . ${SERVER} ${VERSION}
- .tests/test_single.sh . "${SERVER}" "${VERSION}"