Merge remote-tracking branch 'refs/remotes/afi/stable' into afi-master

# Conflicts:
#	VERSIONS
#	library/startup.php

.gitlab-ci.yml

@@ -16,9 +16,14 @@ test:php5_latest:
   tags:
     - docker
 
-test:php_local:
+test:php7_latest:
+  image: localhost:5000/bokeh_php7
+  services:
+    - localhost:5000/bokeh_mysql5
   script:
-    - bash scripts/ci_data_preparation.sh $MYSQL_DATABASE localhost $MYSQL_ROOT_PASSWORD
-    - bash build.sh $MYSQL_DATABASE root $MYSQL_ROOT_PASSWORD localhost
+    - bash scripts/ci_data_preparation.sh $MYSQL_DATABASE $MYSQL_HOST $MYSQL_ROOT_PASSWORD
+    - bash build.sh $MYSQL_DATABASE root $MYSQL_ROOT_PASSWORD $MYSQL_HOST
   except:
     - tags
+  tags:
+    - docker

build.sh

@@ -3,6 +3,7 @@ DBNAME=$1
 DBUSER=$2
 DBPASS=$3
 DBHOST=$4
+
 source ./update.sh
 cp config.ini.default config.ini
 sed -i "s/sgbd.config.host = localhost/sgbd.config.host = $DBHOST/g" config.ini
@@ -10,6 +11,9 @@ sed -i "s/sgbd.config.username =/sgbd.config.username = $DBUSER/g" config.ini
 sed -i "s/sgbd.config.password =/sgbd.config.password = $DBPASS/g" config.ini
 sed -i "s/sgbd.config.dbname =/sgbd.config.dbname = $DBNAME/g" config.ini
 touch local.php
+
+php --version
+
 php scripts/upgrade_db.php
 
 cd cosmogramme