Fix building official docker image (#1023)

NethermindEth · Aug 7, 2023 · 3af1211 · 3af1211
1 parent 977b8fa
commit 3af1211
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/.github/workflows/docker-image-build-push.yml b/.github/workflows/docker-image-build-push.yml
@@ -27,13 +27,13 @@ jobs:
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-            
+
       - name: Login to Docker Hub
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-          
+
       - name: Build and push
         uses: docker/build-push-action@v4
         with:
@@ -59,14 +59,14 @@ jobs:
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-          
+
       - name: Build and push ARM
         uses: docker/build-push-action@v4
         with:
           context: .
           platforms: 'linux/arm64'
           push: true
-          tags: nethermindeth/juno:${{ github.event.inputs.tag }}-arm
+          tags: nethermindeth/juno:${{ github.event.inputs.tag }}-arm64
 
       - name: Cleanup self-hosted
         run: |
@@ -86,15 +86,12 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Create and push manifest
+      - name: Create and push manifest using buildx
         run: |
-          export DOCKER_CLI_EXPERIMENTAL=enabled
-          docker manifest create nethermind/juno:${{ github.event.inputs.tag }} \
-            nethermindeth/juno:${{ github.event.inputs.tag }} \
-            nethermindeth/juno:${{ github.event.inputs.tag }}-arm
-          docker manifest annotate nethermind/juno:${{ github.event.inputs.tag }} nethermindeth/juno:${{ github.event.inputs.tag }}-arm --os linux --arch arm64
-          docker manifest push nethermind/juno:${{ github.event.inputs.tag }}
-          
+            docker buildx imagetools create nethermindeth/juno:${{ github.event.inputs.tag }} \
+                nethermindeth/juno:${{ github.event.inputs.tag }}-arm64 \
+                --tag nethermind/juno:${{ github.event.inputs.tag }}
+
       - name: Clean up environment
         if: always()
         run: |