fix: switch to docker build hub

HerodotusDev · Oct 29, 2024 · b287617 · b287617
1 parent 7d917fc
commit b287617
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 15 deletions.
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
@@ -43,7 +43,7 @@ jobs:
             CHANGED_FILES=$(git diff --name-only HEAD^ HEAD)
           fi
           echo "Changed files: $CHANGED_FILES"
-          if echo "$CHANGED_FILES" | grep -qE '(tools/|contract_bootloader/|compiled_contracts/|setup.py|requirements.txt|setup.sh|environment.dockerfile)'; then
+          if echo "$CHANGED_FILES" | grep -qE '(tools/|src/contract_bootloader/|setup.py|requirements.txt|setup.sh|environment.dockerfile)'; then
             echo "CHANGES_DETECTED=true" >> $GITHUB_ENV
           else
             echo "CHANGES_DETECTED=false" >> $GITHUB_ENV
@@ -57,25 +57,33 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Create remote builder certificates
-        if: env.CHANGES_DETECTED == 'true' && github.event_name == 'push' && github.ref == 'refs/heads/main'
-        run: |
-          echo "${{ secrets.BUILDKIT_CA_PEM }}" > ${{ github.workspace }}/client-ca.pem
-          echo "${{ secrets.BUILDKIT_CERT_PEM }}" > ${{ github.workspace }}/client-cert.pem
-          echo "${{ secrets.BUILDKIT_KEY_PEM }}" > ${{ github.workspace }}/client-key.pem
+      # - name: Create remote builder certificates
+      #   if: env.CHANGES_DETECTED == 'true' && github.event_name == 'push' && github.ref == 'refs/heads/main'
+      #   run: |
+      #     echo "${{ secrets.BUILDKIT_CA_PEM }}" > ${{ github.workspace }}/client-ca.pem
+      #     echo "${{ secrets.BUILDKIT_CERT_PEM }}" > ${{ github.workspace }}/client-cert.pem
+      #     echo "${{ secrets.BUILDKIT_KEY_PEM }}" > ${{ github.workspace }}/client-key.pem
+
+      # - name: Set up Docker Buildx
+      #   if: env.CHANGES_DETECTED == 'true' && github.event_name == 'push' && github.ref == 'refs/heads/main'
+      #   uses: docker/setup-buildx-action@v3
+      #   with:
+      #     driver: remote
+      #     endpoint: "tcp://buildkit.herodotus.dev:5000"
+      #     driver-opts: |
+      #       cacert=${{ github.workspace }}/client-ca.pem
+      #       cert=${{ github.workspace }}/client-cert.pem
+      #       key=${{ github.workspace }}/client-key.pem
+      #     cleanup: true
 
       - name: Set up Docker Buildx
-        if: env.CHANGES_DETECTED == 'true' && github.event_name == 'push' && github.ref == 'refs/heads/main'
         uses: docker/setup-buildx-action@v3
         with:
-          driver: remote
-          endpoint: "tcp://buildkit.herodotus.dev:5000"
-          driver-opts: |
-            cacert=${{ github.workspace }}/client-ca.pem
-            cert=${{ github.workspace }}/client-cert.pem
-            key=${{ github.workspace }}/client-key.pem
+          version: "lab:latest"
+          driver: cloud
+          endpoint: "dataprocessor/github"
           cleanup: true
-
+          
       - name: Bump version
         if: env.CHANGES_DETECTED == 'true' && github.event_name == 'push' && github.ref == 'refs/heads/main'
         run: |

diff --git a/tools/make/requirements.txt b/tools/make/requirements.txt
@@ -7,3 +7,4 @@ pysha3
 web3==7.4.0
 trie
 black
+