Switch to docker/build-push-action@v4

linagora · Jul 18, 2024 · b5627bd · b5627bd
1 parent 2ac672d
commit b5627bd
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 25 deletions.
diff --git a/.github/workflows/publish-matrix-invite.yml b/.github/workflows/publish-matrix-invite.yml
@@ -21,15 +21,27 @@ jobs:
           files: |
             packages/matrix-invite/**/*
             .github/workflows/**
-      - name: Publish to dockerhub
-        uses: elgohr/Publish-Docker-Github-Action@v5
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
         with:
-          name: linagora/matrix-invite
           username: ${{ secrets.DOCKERHUB_USER }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
-          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
-          workdir: "${{ github.workspace }}/packages/matrix-invite"
-          context: .
-          buildoptions: "-t linagora/matrix-invite -f Dockerfile"
-          tags: "latest,${{ steps.date.outputs.date }}"
-
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: linagora/matrix-invite
+      - name: Publish to dockerhub
+        uses: docker/build-push-action@v4
+        with:
+          context: ./packages/matrix-invite
+          file: Dockerfile
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6,linux/s390x
+          push: true
+          tags: |
+            linagora/matrix-invite:latest
+            linagora/matrix-invite:${{ steps.date.outputs.date }}"
diff --git a/.github/workflows/publish-tom-federated-identity-service.yml b/.github/workflows/publish-tom-federated-identity-service.yml
@@ -21,14 +21,27 @@ jobs:
           files: |
             packages/federated-identity-service/**/*
             .github/workflows/**
-      - name: Publish to dockerhub
-        uses: elgohr/Publish-Docker-Github-Action@v5
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
         with:
-          name: linagora/tom-federated-identity-service
           username: ${{ secrets.DOCKERHUB_USER }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
-          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
-          workdir: "${{ github.workspace }}"
-          context: .
-          buildoptions: "-t linagora/tom-federated-identity-service -f packages/federated-identity-service/Dockerfile"
-          tags: "latest,${{ steps.date.outputs.date }}"
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: linagora/tom-federated-identity-service
+      - name: Publish to dockerhub
+        uses: docker/build-push-action@v4
+        with:
+          context: ./
+          file: ./packages/federated-identity-service/Dockerfile
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6,linux/s390x
+          push: true
+          tags: |
+            linagora/tom-federated-identity-service:latest
+            linagora/tom-federated-identity-service:${{ steps.date.outputs.date }}"
diff --git a/.github/workflows/publish-tom-server.yml b/.github/workflows/publish-tom-server.yml
@@ -21,14 +21,27 @@ jobs:
           files: |
             packages/federated-identity-service/**/*
             .github/workflows/**
-      - name: Publish to dockerhub
-        uses: elgohr/Publish-Docker-Github-Action@v5
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
         with:
-          name: linagora/tom-server
           username: ${{ secrets.DOCKERHUB_USER }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
-          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
-          workdir: "${{ github.workspace }}"
-          context: .
-          buildoptions: "-t linagora/tom-server -f Dockerfile"
-          tags: "latest,${{ steps.date.outputs.date }}"
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: linagora/tom-server
+      - name: Publish to dockerhub
+        uses: docker/build-push-action@v4
+        with:
+          context: ./
+          file: Dockerfile
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6,linux/s390x
+          push: true
+          tags: |
+            linagora/tom-server:latest
+            linagora/tom-server:${{ steps.date.outputs.date }}"