Docker configuration: Upgraded npm + Removed phantomjs + Added hostname alias for nginx

Author: shehi

docker-compose.yml

@@ -42,6 +42,16 @@ services:
     working_dir: /var/www
     links:
       - php-fpm:phpFpm
+    networks:
+      default:
+        aliases:
+          - basis.audith.org
+  selenium-chrome:
+    container_name: selenium-chrome
+    image: selenium/standalone-chrome-debug
+  selenium-firefox:
+    container_name: selenium-firefox
+    image: selenium/standalone-firefox-debug
   dev-env:
     container_name: dev-env
     build:
@@ -56,6 +66,8 @@ services:
       - postgres
       - redis
       - nginx
+      - selenium-chrome
+      - selenium-firefox
     environment:
       XDEBUG_CONFIG: "remote_host=172.18.0.1"
       REDIS_PORT: 6379

readme.md

@@ -5,8 +5,6 @@
 [![Code Quality](https://scrutinizer-ci.com/g/AudithSoftworks/Basis/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/AudithSoftworks/Basis)
 [![Coverage](https://scrutinizer-ci.com/g/AudithSoftworks/Basis/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/AudithSoftworks/Basis)
 
-[![Build Status](https://saucelabs.com/browser-matrix/shehi.svg)](https://saucelabs.com/beta/builds/299efd0fba8a43a9af0f17f96b9818f1)
-
 [![Latest Stable Version](https://img.shields.io/packagist/v/audithsoftworks/basis.svg?maxAge=2592000?style=plastic)](https://packagist.org/packages/audithsoftworks/basis)
 ![License](https://img.shields.io/github/license/AudithSoftworks/Basis.svg?maxAge=2592000?style=plastic)
 [![Contributors](https://img.shields.io/github/contributors/AudithSoftworks/Basis.svg?maxAge=2592000?style=plastic)](https://github.com/AudithSoftworks/Basis)
@@ -28,7 +26,7 @@ Audith Basis is an enhanced version of Laravel framework, a feature list for whi
 * [Front-end/UI] _Back-end control panel_ - comes with built-in control panel, featuring sample pages for you to expand upon.
 * [Front-end/UI] _Custom web-fonts, web typography support_ - build and use your own web-fonts with included toolset, from any TTF/OTF fontsets.
 * [Front-end/UI] _Webpack support_ - build all web assets with Webpack.
-* [DevOps/CI/CD] _Docker support_ - fully Dockerized package with pre-built PHP 5.6 and 7.0 containers.
+* [DevOps/CI/CD] _Docker support_ - fully Dockerized package with pre-built PHP-7 containers.
 
 ### Installation
 
@@ -37,10 +35,9 @@ Audith Basis is an enhanced version of Laravel framework, a feature list for whi
 I have included a build script in ```./storage/scripts/dev-env/build.sh``` inside of which you can see steps necessary to spin up desired Docker configuration and prepare your development environment. Steps involved are:
 
 1. Build or pull necessary Docker containers.
-2. Start your desired Docker-Compose configuration (any of: PHP 5.6 or 7.0).
-3. Update your ```/etc/hosts``` file to point to the primary container in your Docker configuration - generally ```php_XXX``` is the primary container, which is linked to ```php_XXX-fpm``` and other machines.
-4. Create ```.env``` file, containing your environmental variables.
-5. Switch into the primary container environment, to start building your environment (Note: before doing so, please read the important note in ```build.sh``` file!):
+2. Start your Docker-Compose configuration.
+3. Create ```.env``` file, containing your environmental variables.
+4. Switch into the primary container environment, to start building your environment (Note: before doing so, please read the important note in ```build.sh``` file!):
     1. Install Sauce Connect and start it as a daemon.
     2. Install NPM dependencies.
     3. Install ```woff-2``` and it's submodules; and build them (used to build custom web-fonts).

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

@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 
 #docker build -f storage/build/scripts/nginx/Dockerfile -t audithsoftworks/basis:nginx .
-#docker build -f storage/build/scripts/php_5.6/Dockerfile -t audithsoftworks/basis:php_5.6 .;
-#docker build -f storage/build/scripts/php_5.6-fpm/Dockerfile -t audithsoftworks/basis:php_5.6-fpm .;
 #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 .;
 
@@ -12,8 +10,6 @@ docker-compose build
 docker-compose down;
 docker-compose up -d;
 docker-compose ps;
-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;
 

storage/build/scripts/php/Dockerfile

@@ -94,21 +94,21 @@ RUN php -i | grep -i redis
 # Install Node
 RUN set -ex \
     && for key in \
-        9554F04D7259F04124DE6B476D5A82AC7E37093B \
         94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
-        0034A06D9D9B0064CE8ADF6BF1747F4AD2306D93 \
         FD3A5288F042B6850C66B31F09FE44734EB7990E \
         71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
         DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
-        B9AE9905FFD7803F25714661B63B535A4C206CA9 \
         C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
+        B9AE9905FFD7803F25714661B63B535A4C206CA9 \
+        56730D5401028683275BD23C23EFEFE93C4CFFFE \
+        77984A986EBC2AA786BC0F66B01FBB92821C587A \
     ; do \
-        gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key"; \
+        gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key" ; \
     done
 
 ENV NPM_CONFIG_LOGLEVEL info
-ENV NODE_VERSION 6.11.4
-ENV NPM_VERSION 4
+ENV NODE_VERSION 8.9.1
+ENV NPM_VERSION 5
 
 RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \
     && curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
@@ -119,18 +119,14 @@ RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-
     && rm "node-v$NODE_VERSION-linux-x64.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
     && ln -s /usr/local/bin/node /usr/local/bin/nodejs \
     && npm install -g npm@$NPM_VERSION \
-    && npm cache clear \
     && rm -rf /tmp/npm-*
 
 # Install Node global dependencies
-RUN npm install -g ttf2eot jshint phantomjs-prebuilt
+RUN npm install -g ttf2eot jshint
 
 # Port for node --inspect
 EXPOSE 9229
 
-# Port for our PhantomJs Ghost driver
-EXPOSE 25852
-
 # Clean-up
 RUN apt-get clean \
     && apt-get autoremove -y \