v1.1.1 (#1)

Build updates
* Removing MAJOR / MINOR files and adding image version suffix to images
* Adding overlay to build definitions

Author: bfren

.github/workflows/build_5_6-dev.yml

@@ -9,6 +9,7 @@ on:
     paths:
       - '.github/workflows/build_5_6-main.yml'
       - '5.6/**'
+      - 'overlay/**'
       - 'VERSION'
 
 jobs:
@@ -26,7 +27,7 @@ jobs:
         uses: docker/setup-buildx-action@v1
       -
         name: Login to DockerHub
-        uses: docker/login-action@v1 
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/build_5_6-main.yml

@@ -9,6 +9,7 @@ on:
     paths:
       - '.github/workflows/build_5_6-main.yml'
       - '5.6/**'
+      - 'overlay/**'
       - 'VERSION'
 
 jobs:
@@ -18,18 +19,6 @@ jobs:
       -
         name: Checkout code
         uses: actions/checkout@v2
-      -
-        name: Read PHP version - major
-        uses: bencgreen/read-file-action@v1
-        with:
-          path: ./5.6/PHP_MAJOR
-        id: php_major
-      -
-        name: Read PHP version - minor
-        uses: bencgreen/read-file-action@v1
-        with:
-          path: ./5.6/PHP_MINOR
-        id: php_minor
       -
         name: Read PHP version - revision
         uses: bencgreen/read-file-action@v1
@@ -50,7 +39,7 @@ jobs:
         uses: docker/setup-buildx-action@v1
       -
         name: Login to DockerHub
-        uses: docker/login-action@v1 
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -66,8 +55,10 @@ jobs:
           tags: |
             bcgdesign/apache-php:latest
             bcgdesign/apache-php:${{ steps.version.outputs.content }}
-            bcgdesign/apache-php:php-${{ steps.php_major.outputs.content }}
-            bcgdesign/apache-php:php-${{ steps.php_minor.outputs.content }}
+            bcgdesign/apache-php:php-5
+            bcgdesign/apache-php:php-5-${{ steps.version.outputs.content }}
+            bcgdesign/apache-php:php-5.6
+            bcgdesign/apache-php:php-5.6-${{ steps.version.outputs.content }}
             bcgdesign/apache-php:php-${{ steps.php_revision.outputs.content }}
       -
         name: Image digest

5.6/PHP_MAJOR

@@ -1 +1 @@
-1.1.0
+1.1.1