v2.2.0 (#31)

Major updates * Using latest base image Build updates * Adding image name / version to builds
bfren · Dec 3, 2021 · 948a3f9 · 948a3f9
1 parent e6c4a99
commit 948a3f9
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 3 deletions.
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -21,6 +21,10 @@ jobs:
       -
         name: Checkout code
         uses: actions/checkout@v2
+      -
+        name: Get repository name
+        run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
+        shell: bash
       -
         name: Read image version
         uses: bfren/read-file@v1
@@ -44,6 +48,9 @@ jobs:
         id: docker_build
         uses: docker/build-push-action@v2
         with:
+          build-args: |
+            BF_IMAGE=${{ env.REPOSITORY_NAME }}
+            BF_VERSION=${{ steps.version.outputs.contents }}
           push: ${{ startsWith(github.ref, 'refs/heads/') }}
           platforms: linux/amd64,linux/arm/v7,linux/arm64
           tags: |

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -12,6 +12,10 @@ jobs:
       -
         name: Checkout code
         uses: actions/checkout@v2
+      -
+        name: Get repository name
+        run: echo "REPOSITORY_NAME=$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" >> $GITHUB_ENV
+        shell: bash
       -
         name: Read FreeScout version - major
         uses: bfren/read-file@v1
@@ -65,6 +69,9 @@ jobs:
         id: docker_build
         uses: docker/build-push-action@v2
         with:
+          build-args: |
+            BF_IMAGE=${{ env.REPOSITORY_NAME }}
+            BF_VERSION=${{ steps.version.outputs.contents }}
           push: true
           platforms: linux/amd64,linux/arm/v7,linux/arm64
           tags: |

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,7 @@
-FROM bfren/nginx-php:php7.4-3.1.0
+FROM bfren/nginx-php:php7.4-3.2.0
+
+ARG BF_IMAGE
+ARG BF_VERSION
 
 ENV \
     # set to the application's external URL

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.1.1
+2.2.0
diff --git a/VERSION_MINOR b/VERSION_MINOR
@@ -1 +1 @@
-2.1
+2.2