Merge pull request #383 from jjrom/develop

Build resto image for amd64 and arm64
jjrom · Nov 28, 2023 · e4f3a42 · e4f3a42
2 parents e40425f + 47a116a
commit e4f3a42
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 19 deletions.
diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
@@ -23,36 +23,31 @@ jobs:
     # defaults to shallow checkout
     - uses: actions/checkout@v2
 
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
     - name: Print values of all environment variables
       run: printenv
 
     - name: Login to DockerHub Registry
       run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
 
-    - name: Build the tagged Docker image
-      run: docker build . --file ./build/resto/Dockerfile --tag ${NAME}/${IMAGE}:latest
-
-    - name: Unshallow repository
-      run: git fetch --prune --unshallow 2> /dev/null || true
-
-    - name: Tag master branch and push to repository
-      if: ${{ startsWith(github.ref, 'refs/heads/master') }}
+    - name: Build and Push Image
+      if: ${{ startsWith(github.ref, 'refs/heads/master') && github.event_name != 'release' }}
       run: |
+
+        docker buildx build --push --platform linux/amd64,linux/arm64 --tag ${NAME}/${IMAGE}:latest --file ./build/resto/Dockerfile .
         
-        # Push image
-        docker push ${NAME}/${IMAGE}
-    
     - name: Tag latest release and push to repository
       if: ${{ github.event_name == 'release' }}
       run: |
         
         # Get latest release tag
         tag=$(git describe --tags --abbrev=0 | sed s/^v//)
         
-        # Tag image
-        docker tag ${NAME}/${IMAGE}:latest ${NAME}/${IMAGE}:${tag}
-
-        # Push release
-        docker push ${NAME}/${IMAGE}:${tag}
-    
+        docker buildx build --push --platform linux/amd64,linux/arm64 -t ${NAME}/${IMAGE}:latest -t ${NAME}/${IMAGE}:$tag --file ./build/resto/Dockerfile .
+      
       
diff --git a/build/resto/Dockerfile b/build/resto/Dockerfile
@@ -1,9 +1,9 @@
-FROM jjrom/nginx-fpm:8.1-1
+FROM jjrom/nginx-fpm:8.2
 LABEL maintainer="jerome.gasperi@gmail.com"
 
 # [IMPORTANT] S6_BEHAVIOUR_IF_STAGE2_FAILS set to 2 in order to restart the resto component until the database is ready
 ENV BUILD_DIR=./build/resto \
-    PHP_VERSION=8.1 \
+    PHP_VERSION=8.2 \
     RESTO_DEBUG=1 \
     S6_BEHAVIOUR_IF_STAGE2_FAILS=2