Upgraded CI to Docker file format v3 (but still declaring it as v2, as Travis doesn't support v3).

Author: shehi

.travis.yml

@@ -38,11 +38,6 @@ matrix:
         - DB_HOST=postgres
         - DB_USERNAME=postgres
 
-cache:
-  directories:
-    - ./node_modules
-    - ./vendor
-
 before_install:
   - curl -L https://github.com/docker/compose/releases/download/1.8.1/docker-compose-`uname -s`-`uname -m` > docker-compose; chmod +x docker-compose; true
   - sudo mv docker-compose /usr/local/bin/
@@ -67,8 +62,8 @@ install:
   - docker-compose up -d php${PHP_VERSION}-cli;
   - docker images;
   - docker-compose ps;
-  - echo $(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' basis_nginxForPhp${PHP_VERSION}_1) basis.audith.org | sudo tee -a /etc/hosts;
-  - docker exec basis_php${PHP_VERSION}-cli_1 /bin/bash -c "echo $(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' basis_nginxForPhp${PHP_VERSION}_1) basis.audith.org | sudo tee -a /etc/hosts";
+  - echo $(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' nginx) basis.audith.org | sudo tee -a /etc/hosts;
+  - docker exec dev-env /bin/bash -c "echo $(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' nginx) basis.audith.org | sudo tee -a /etc/hosts";
 
 before_script:
   - chmod +x ./storage/build/scripts/ci/build.sh;
@@ -77,7 +72,7 @@ script:
   - ./storage/build/scripts/ci/build.sh;
 
 after_script:
-  - docker exec basis_php${PHP_VERSION}-cli_1 /bin/bash -c "pkill sc";
+  - docker exec dev-env /bin/bash -c "pkill sc";
   - if [[ $PHP_VERSION == 7 && $DB_CONNECTION == 'mysql' ]]; then wget https://scrutinizer-ci.com/ocular.phar; php ocular.phar code-coverage:upload --format=php-clover ./storage/coverage/coverage-clover-merged.xml; fi
 
 notifications:

docker-compose.yml

@@ -2,18 +2,22 @@ version: '2'
 
 services:
   mariadb:
+    container_name: mariadb
     image: mariadb:10.1
     environment:
       MYSQL_DATABASE: "basis"
       MYSQL_ALLOW_EMPTY_PASSWORD: "true"
   postgres:
+    container_name: postgres
     image: postgres:latest
     environment:
       POSTGRES_DB: "basis"
       POSTGRES_PASSWORD: ""
   redis:
+    container_name: redis
     image: redis
   php5-fpm:
+    container_name: php-fpm
     build:
       context: ./storage/build/scripts/php_5.6-fpm
     image: audithsoftworks/basis:php_5.6-fpm
@@ -28,6 +32,7 @@ services:
       XDEBUG_CONFIG: "remote_host=172.17.0.1"
       REDIS_PORT: 6379
   php7-fpm:
+    container_name: php-fpm
     build:
       context: ./storage/build/scripts/php_7-fpm
     image: audithsoftworks/basis:php_7-fpm
@@ -42,6 +47,7 @@ services:
       XDEBUG_CONFIG: "remote_host=172.17.0.1"
       REDIS_PORT: 6379
   nginxForPhp5:
+    container_name: nginx
     build:
       context: ./storage/build/scripts/nginx
     image: audithsoftworks/basis:nginx
@@ -52,6 +58,7 @@ services:
     links:
       - php5-fpm:phpFpm
   nginxForPhp7:
+    container_name: nginx
     build:
       context: ./storage/build/scripts/nginx
     image: audithsoftworks/basis:nginx
@@ -62,6 +69,7 @@ services:
     links:
       - php7-fpm:phpFpm
   php5-cli:
+    container_name: dev-env
     build:
       context: ./storage/build/scripts/php_5.6
     image: audithsoftworks/basis:php_5.6
@@ -81,6 +89,7 @@ services:
     stdin_open: true
     tty: true
   php7-cli:
+    container_name: dev-env
     build:
       context: ./storage/build/scripts/php_7
     image: audithsoftworks/basis:php_7

storage/build/scripts/ci/build.sh

@@ -8,12 +8,15 @@ test -f .env || sed \
     -e "s/SAUCE_ACCESS_KEY=.*/SAUCE_ACCESS_KEY=${SAUCE_ACCESS_KEY}/g" .env.example \
     | tee .env > /dev/null 2>&1;
 
-docker exec basis_php${PHP_VERSION}-cli_1 /bin/bash -c "
+docker exec dev-env /bin/bash -c "
     export NPM_CONFIG_LOGLEVEL=warn;
     export SAUCE_BUILD=audithsoftworks-basis-travis-job-${TRAVIS_JOB_NUMBER};
     export SAUCE_USERNAME=${SAUCE_USERNAME};
     export SAUCE_ACCESS_KEY=${SAUCE_ACCESS_KEY};
 
+    sudo chown -R basis:basis ./*;
+    ls -l;
+
     daemon -U --respawn -- phantomjs --webdriver=25852 --webdriver-logfile=\$WORKDIR/storage/logs/phantomjs.log --webdriver-loglevel=DEBUG;
     if [[ ${PHP_VERSION} == 7 && ${DB_CONNECTION} == 'mysql' ]]; then
         wget -P ./storage/build/tools https://saucelabs.com/downloads/sc-4.4.5-linux.tar.gz;

storage/build/scripts/dev-env/build.sh

@@ -6,10 +6,6 @@
 #docker build -f storage/build/scripts/php_7/Dockerfile -t audithsoftworks/basis:php_7 .;
 #docker build -f storage/build/scripts/php_7-fpm/Dockerfile -t audithsoftworks/basis:php_7-fpm .;
 
-if [[ -z ${COMPOSE_PROJECT_NAME+x} ]]; then
-    export COMPOSE_PROJECT_NAME=basis_;
-fi;
-
 docker-compose build
 #docker-compose pull;
 
@@ -18,8 +14,8 @@ if [ -z ${PHP_VERSION+x} ]; then export PHP_VERSION='7'; fi; # 5|7
 docker-compose down;
 docker-compose up -d php${PHP_VERSION}-cli;
 docker-compose ps;
-docker exec ${COMPOSE_PROJECT_NAME}php${PHP_VERSION}-cli_1 \
-    /bin/bash -c "echo $(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${COMPOSE_PROJECT_NAME}nginxForPhp${PHP_VERSION}_1) basis.audith.org | sudo tee -a /etc/hosts";
+docker exec dev-env \
+    /bin/bash -c "echo $(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' nginx) basis.audith.org | sudo tee -a /etc/hosts";
 
 test -f .env || cat .env.example | tee .env > /dev/null 2>&1;
 
@@ -28,7 +24,7 @@ test -f .env || cat .env.example | tee .env > /dev/null 2>&1;
 # and SAUCE_ACCESS_KEY env variables to the environment for which the next 'docker exec' is being run.
 ###############################################################################################################
 
-docker exec ${COMPOSE_PROJECT_NAME}php${PHP_VERSION}-cli_1 bash -c "
+docker exec dev-env bash -c "
     if [ ! -f ~/.bash_profile ]; then touch ~/.bash_profile; fi;
     if [ ! \$(cat ~/.bash_profile | grep SAUCE_) ]; then
         echo 'export SAUCE_USERNAME=\"$SAUCE_USERNAME\"' | sudo tee -a ~/.bash_profile;