fix: Update docker builds for amd64 images - consolidate to single bu…

…ild target
Layr-Labs · Dec 17, 2024 · 1868a9b · 1868a9b
1 parent b73cf55
commit 1868a9b
Showing 1 changed file with 71 additions and 71 deletions.
diff --git a/.github/workflows/docker-upload.yml b/.github/workflows/docker-upload.yml
@@ -3,79 +3,79 @@ on:
   workflow_dispatch:
 
 jobs:
-  docker-amd64:
-    runs-on: linux-2xl
+  # docker-amd64:
+  #   runs-on: linux-2xl
 
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: 'recursive'
+  #   steps:
+  #     - name: Checkout
+  #       uses: actions/checkout@v4
+  #       with:
+  #         submodules: 'recursive'
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+  #     - name: Set up QEMU
+  #       uses: docker/setup-qemu-action@v3
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          install: true
-
-      # - name: Cache Docker layers
-      #   uses: actions/cache@v3
-      #   with:
-      #     path: /tmp/.buildx-cache
-      #     key: ${{ runner.os }}-buildx-${{ hashFiles('Dockerfile') }}
-      #     restore-keys: ${{ runner.os }}-buildx-
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            ghcr.io/${{ github.repository_owner }}/nitro-eigenda
-          tags: |
-            type=ref,event=branch
-            type=ref,event=pr
-            type=ref,event=tag
-            type=ref,event=tag,suffix={{sha}}
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=sha,prefix=,format=short,enable=true
-            type=raw,value=latest,enable={{is_default_branch}}
-            type=match,pattern=^(v\d+\.\d+\.\d+-\w*)\..*$,value=$1,enable={{is_default_branch}}
-
-      - name: "Build and push amd64"
-        uses: docker/build-push-action@v3
-        with:
-          target: nitro-node-dev
-          context: .
-          push: true
-          platforms: linux/amd64
-          provenance: false
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          # cache-from: type=local,src=/tmp/.buildx-cache
-          # cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
-
-      # - name: Move cache
-      #   run: |
-      #     rm -rf /tmp/.buildx-cache
-      #     mv /tmp/.buildx-cache-new /tmp/.buildx-cache
-
-      # - name: Clear cache on failure
-      #   if: failure()
-      #   run: |
-      #     keys=(${{ runner.os }}-buildx- ${{ runner.os }}-buildx-${{ hashFiles('Dockerfile') }})
-      #     for key in "${keys[@]}"; do
-      #       curl -X DELETE -H "Accept: application/vnd.github.v3+json" -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" "https://api.github.com/repos/${{ github.repository }}/actions/caches/$key"
-      #     done
+  #     - name: Set up Docker Buildx
+  #       uses: docker/setup-buildx-action@v3
+  #       with:
+  #         install: true
+
+  #     # - name: Cache Docker layers
+  #     #   uses: actions/cache@v3
+  #     #   with:
+  #     #     path: /tmp/.buildx-cache
+  #     #     key: ${{ runner.os }}-buildx-${{ hashFiles('Dockerfile') }}
+  #     #     restore-keys: ${{ runner.os }}-buildx-
+
+  #     - name: Login to GitHub Container Registry
+  #       uses: docker/login-action@v2
+  #       with:
+  #         registry: ghcr.io
+  #         username: ${{ github.actor }}
+  #         password: ${{ secrets.GITHUB_TOKEN }}
+
+  #     - name: Docker meta
+  #       id: meta
+  #       uses: docker/metadata-action@v5
+  #       with:
+  #         images: |
+  #           ghcr.io/${{ github.repository_owner }}/nitro-eigenda
+  #         tags: |
+  #           type=ref,event=branch
+  #           type=ref,event=pr
+  #           type=ref,event=tag
+  #           type=ref,event=tag,suffix={{sha}}
+  #           type=semver,pattern={{version}}
+  #           type=semver,pattern={{major}}.{{minor}}
+  #           type=sha,prefix=,format=short,enable=true
+  #           type=raw,value=latest,enable={{is_default_branch}}
+  #           type=match,pattern=^(v\d+\.\d+\.\d+-\w*)\..*$,value=$1,enable={{is_default_branch}}
+
+  #     - name: "Build and push amd64"
+  #       uses: docker/build-push-action@v3
+  #       with:
+  #         target: nitro-node-dev
+  #         context: .
+  #         push: true
+  #         platforms: linux/amd64
+  #         provenance: false
+  #         tags: ${{ steps.meta.outputs.tags }}
+  #         labels: ${{ steps.meta.outputs.labels }}
+  #         # cache-from: type=local,src=/tmp/.buildx-cache
+  #         # cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
+
+  #     # - name: Move cache
+  #     #   run: |
+  #     #     rm -rf /tmp/.buildx-cache
+  #     #     mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+
+  #     # - name: Clear cache on failure
+  #     #   if: failure()
+  #     #   run: |
+  #     #     keys=(${{ runner.os }}-buildx- ${{ runner.os }}-buildx-${{ hashFiles('Dockerfile') }})
+  #     #     for key in "${keys[@]}"; do
+  #     #       curl -X DELETE -H "Accept: application/vnd.github.v3+json" -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" "https://api.github.com/repos/${{ github.repository }}/actions/caches/$key"
+  #     #     done
 
   docker-arm64:
     runs-on: linux-xl-arm
@@ -130,7 +130,7 @@ jobs:
         with:
           target: nitro-node-dev
           context: .
-          platforms: linux/arm64
+          platforms: linux/arm64, linux/amd64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}