v3.0.10 (#55)

Minor updates * Using latest base image * Moving PHP build to overlay/tmp Build updates * Adding GitHub packages
bfren · Mar 7, 2022 · eeff759 · eeff759
1 parent de7bb69
commit eeff759
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 3 deletions.
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -41,6 +41,13 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
         id: docker_build
@@ -54,6 +61,8 @@ jobs:
           tags: |
             bfren/freescout:dev
             bfren/freescout:${{ steps.version.outputs.contents }}-beta
+            ghcr.io/bfren/freescout:dev
+            ghcr.io/bfren/freescout:${{ steps.version.outputs.contents }}-beta
       -
         name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -64,6 +64,13 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
         id: docker_build
@@ -84,6 +91,15 @@ jobs:
             bfren/freescout:freescout${{ steps.freescout_minor.outputs.contents }}
             bfren/freescout:freescout${{ steps.freescout_minor.outputs.contents }}-${{ steps.version.outputs.contents }}
             bfren/freescout:freescout${{ steps.freescout_revision.outputs.contents }}
+            ghcr.io/bfren/freescout:latest
+            ghcr.io/bfren/freescout:${{ steps.version_major.outputs.contents }}
+            ghcr.io/bfren/freescout:${{ steps.version_minor.outputs.contents }}
+            ghcr.io/bfren/freescout:${{ steps.version.outputs.contents }}
+            ghcr.io/bfren/freescout:freescout${{ steps.freescout_major.outputs.contents }}
+            ghcr.io/bfren/freescout:freescout${{ steps.freescout_major.outputs.contents }}-${{ steps.version.outputs.contents }}
+            ghcr.io/bfren/freescout:freescout${{ steps.freescout_minor.outputs.contents }}
+            ghcr.io/bfren/freescout:freescout${{ steps.freescout_minor.outputs.contents }}-${{ steps.version.outputs.contents }}
+            ghcr.io/bfren/freescout:freescout${{ steps.freescout_revision.outputs.contents }}
       -
         name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM bfren/nginx-php:php7.4-4.1.1
+FROM bfren/nginx-php:php7.4-4.1.2
 
 ARG BF_IMAGE
 ARG BF_VERSION
@@ -21,7 +21,6 @@ ENV \
 
 COPY ./overlay /
 COPY ./FREESCOUT_REVISION /tmp/
-COPY ./PHP_BUILD /tmp/
 
 RUN bf-install
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.0.9
+3.0.10
diff --git a/PHP_BUILD → overlay/tmp/PHP_BUILD b/PHP_BUILD → overlay/tmp/PHP_BUILD