File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -93,7 +93,7 @@ install-deps:
9393
9494setup-phpipam : test-setup
9595 docker-compose -f tests/docker/docker-compose.yml up -d
96- sh tests/docker/setup_database .sh
96+ sh tests/docker/setup_phpipam .sh
9797
9898FORCE :
9999
Original file line number Diff line number Diff line change 33exec 10>&1
44exec > /dev/null 2>&1
55
6+ # split version number into semvar parts
7+ read -r MAJOR MINOR PATCH <<< $( echo ${PHPIPAM_VERSION# v} | tr . " " )
8+
69function info() {
710 echo " ${@ } " >&10
811}
1619
1720if " ${DOCKER_CMD} " ps | grep -q phpipam_test_webserver && ! eval " ${MYSQL_PING} " ; then
1821
22+ if [[ ${MINOR} -ge 7 ]] ; then
23+ info " Running version 1.7.0 or above, patching config"
24+ ${DOCKER_CMD} exec -t phpipam_test_webserver sh -c ' sed -i "s/api_stringify_results = false/api_stringify_results = true/g" /phpipam/config.dist.php'
25+ fi
26+
1927 info -n " Waiting for database connection "
2028 while ! eval " ${MYSQL_PING} " ; do
2129 info -n " ."
@@ -44,8 +52,8 @@ if [[ $(mysqlshow -u root -prootpw -h 127.0.0.1 -P 3306 phpipam 2>/dev/null | wc
4452
4553else
4654
47- info " Detabase already initiated" && exit 0
55+ info " Database already initiated" && exit 0
4856
4957fi
5058
51- info " Database initialisation $result "
59+ info " Database initialization $result "
You can’t perform that action at this time.
0 commit comments