Merge branch 'develop'

Author: EvilWizard99

.env-example

@@ -1,3 +1,11 @@
+# Target build/use environment
 APP_ENV=local
+BUILD_IMAGE=php-5.6-apache
+BUILD_IMAGE_TAG=v0.0.3
+
+# Making the npm versions changeable
+NPM_VERSION=6.4.1
+
+# App webserver ports
 APP_PORT=8080
-APP_PORT_SSL=8043
+APP_SSL_PORT=8043

README.md

@@ -17,7 +17,7 @@ Other Packages Included:
 - nodejs
 - default-mysql-client
 - vim
-- npm i npm@6.4.1 -g
+- npm i npm@`$NPM_VERSION`[^npm_version_note] -g
 - yaml-1.3.0
 
 PHP Extensions:
@@ -32,10 +32,22 @@ PHP Extensions:
 
 Build the ***Docker Image*** without using ***cached*** versions of previous image build stages.
 
+### Helper Script
+
+A helper script is available with the repo to force recreate the build & use the `docker-compose.yaml` file which reads the `.env` file.
+
+```bash
+./build-web.sh
+```
+
+### The long Way
+
 ```bash
 sudo docker build \
     -f php-5-6-apache.Dockerfile \
     --target php-5-6-build \
+    --build-arg APP_ENV=local \
+    --build-arg NPM_VERSION=6.4.1 \
     --no-cache \
     -t php-5-6-web-server:latest \
     .
@@ -50,6 +62,10 @@ sudo docker build \
 - Using `--target php-5-6-build`
 
     To select the ***build target stage***[^multi_stage_builds_note] from the *Dockerfile*.
+    
+- Using `--build-arg ARG=value`
+
+    To set build argument values to use.
 
 ### Create A Container
 
@@ -136,6 +152,8 @@ This Apache2 + PHP 5.6 build environment should ***NOT*** be used anywhere near
 
 [^docker_pull_cmd_note]: Use `docker pull ewc2020/web:php-5.6-apache` to get a copy of the image.
 
+[^npm_version_note]: Uses a `.env` ***build-arg*** called ***NPM_VERSION*** to specify the npm version.
+
 [^multi_stage_builds_note]: Used mostly in ***Multi Stage*** image builds.
 
 [^compose_name_note]: The `php-5-6-web-server` container name to build the image for.

build-web.sh

@@ -5,5 +5,11 @@
 # NOTE:
 # Rebuild the Web Docker image composition.
 
+echo -e "Rebuilding EWC Web Docker Image"
+
+# source the environment variables
+set -o allexport; source .env; set +o allexport
+
 docker-compose build --no-cache php-5-6-web-server \
-&& docker-compose up -d
+&& docker-compose up -d
+echo -e "http://localhost:$APP_PORT/"

docker-compose.yaml

@@ -2,6 +2,7 @@ version: '3.7'
 
 # Services/Containers to orchestrate in this composition
 services:
+
   # Basic PHP 5.6 & Apache2 Image Container
   php-5-6-web-server:
     container_name: php-5-6-web-server
@@ -12,21 +13,20 @@ services:
       target: php-5-6-build
       dockerfile: php-5-6-apache.Dockerfile
       args:
+        - NPM_VERSION=${NPM_VERSION}
         - APP_ENV=${APP_ENV}
       labels:
         ewc.name: "Web Server"
         ewc.description: "PHP & Apache Web Server"
         ewc.php.version: "5.6"
-        ewc.label-with-empty-value: ""
-    image: php-5-6-web-server:latest
+    image: $BUILD_IMAGE:$BUILD_IMAGE_TAG
     environment:
+        - NPM_VERSION=${NPM_VERSION}
         - APP_ENV=${APP_ENV}
-        - APP_PORT=${APP_PORT}
-        - APP_PORT_SSL=${APP_PORT_SSL}
     working_dir: /var/www
     ports:
       - ${APP_PORT}:80
-      - ${APP_PORT_SSL}:443
+      - ${APP_SSL_PORT}:443
     volumes:
       - ./public_html:/var/www/html
       - ./docker-files/php/local.ini:/usr/local/etc/php.ini

env-prep.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+# USAGE:
+# env-prep.sh
+#
+# NOTE:
+# This will copy the .env-example file to .env for use with the docker-compose.
+
+echo -e "Initializing PHP 5.6 & Apache2 Webserver Build Environment"
+
+if [ ! -f "$PWD/.env" ]; then
+    # Copy the default .env-example file
+    echo -e "No environment for build process"
+    echo -e "Copying default environment for build process"
+    cp -a "$PWD/.env-example" "$PWD/.env"
+fi

php-5-6-apache.Dockerfile

@@ -4,6 +4,9 @@ FROM php:5.6-apache as php-5-6-build
 LABEL evilwizardcreations.image.authors="evil.wizard95@googlemail.com" \
     evilwizardcreations.image.php.version="5.6"
 
+ARG NPM_VERSION=6.4.1
+ENV NPM_VERSION=$NPM_VERSION
+
 # copy the specific Composer PHAR version from the Composer image into the PHP image
 COPY --from=composer:1.7.1 /usr/bin/composer /usr/bin/composer
 
@@ -31,7 +34,7 @@ RUN set -ex; \
       default-mysql-client \ 
       vim; \
     apt-get clean; \
-    npm i npm@6.4.1 -g
+    npm i npm@$NPM_VERSION -g
 
 # Install some php extensions from the docker built source.
 RUN docker-php-ext-install gettext mysqli pdo_mysql zip

public_html/index.php

@@ -4,11 +4,11 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Document</title>
+    <title>Apache2 & PHP</title>
 </head>
 <body>
     <p>
-        Well look at that <?php echo "this is a php script"; ?><br />
+        Well look at that this is a php script running on PHP version <?php echo phpversion(); ?><br />
         take a look at <a href="phpinfo.php" title="phpinfo">phpinfo()</a>
     </p>
 </body>

push-build.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+# USAGE:
+# push-build.sh
+#
+# NOTE:
+# This wil tag the created image to the webserver repo & push the tagged imaged as latest.
+
+echo -e "Publishing EWC Web Docker Image Build"
+
+# source the environment variables
+set -o allexport; source .env; set +o allexport
+
+image=${BUILD_IMAGE:-php-5.6-apache}
+image_tag=${BUILD_IMAGE_TAG:-v0.0.3}
+
+# Tag the local copy to the remote webserver repo & push the release version
+echo -e "Tagging build image as :$image_tag to webserver repo"
+docker tag $image:$image_tag ewc2020/web:$image-$image_tag
+echo -e "Pushing :$image-$image_tag to webserver repo"
+docker push ewc2020/web:$image-$image_tag
+
+# Tag the local webserver to :image & push the image tag version
+echo -e "Tagging webserver image :$image-$image_tag to :$image-latest in webserver repo"
+docker tag ewc2020/web:$image-$image_tag ewc2020/web:$image-latest
+echo -e "Pushing :$image-latest to webserver repo"
+docker push ewc2020/web:$image-latest