v1.1.4 (#4)

Minor updates
* Tweaking healthcheck

Build updates 
* Adding version to dev build

Author: bfren

.github/workflows/build_5_6-dev.yml

@@ -2,12 +2,12 @@ name: 5.6-dev
 
 on:
   push:
-    branches:
-      - '**'
+    branches-ignore:
+      - 'main'
     tags-ignore:
       - '**'
     paths:
-      - '.github/workflows/build_5_6-main.yml'
+      - '.github/workflows/build_5_6-dev.yml'
       - '5.6/**'
       - 'overlay/**'
       - 'VERSION'
@@ -19,6 +19,12 @@ jobs:
       -
         name: Checkout code
         uses: actions/checkout@v2
+      -
+        name: Read image version
+        uses: bencgreen/read-file-action@v1
+        with:
+          path: ./VERSION
+        id: version
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v1
@@ -43,6 +49,7 @@ jobs:
           tags: |
             bcgdesign/apache-php:dev
             bcgdesign/apache-php:dev-php-5.6
+            bcgdesign/apache-php:${{ steps.version.outputs.content }}
       -
         name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}

Dockerfile-automated

@@ -9,7 +9,6 @@ LABEL maintainer="Ben Green <ben@bcgdesign.com>" \
 RUN \
     a2enmod rewrite \
     && docker-php-ext-install mysql \
-    && apt update \
     && apt install wget
 
 COPY ./overlay /

VERSION

@@ -1 +1 @@
-1.1.3
+1.1.4

overlay/usr/local/bin/healthcheck

@@ -4,4 +4,4 @@
 # Attempt to load localhost using wget
 #======================================================================================================================
 
-wget --no-verbose --tries=1 --spider http://localhost || exit 1
+wget --no-verbose --spider --tries=1 http://localhost || exit 1