Revert "feat(build): add arm64 support with cross-compilation (#3659)"

This reverts commit 291e00c.
ZcashFoundation · Mar 1, 2022 · 08a8f51 · 08a8f51
1 parent cf364f2
commit 08a8f51
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 37 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -42,16 +42,8 @@ jobs:
       with:
         credentials_json: ${{ secrets.GOOGLE_CREDENTIALS }}
 
-    - name: Set up QEMU
-      id: qemu
-      uses: docker/setup-qemu-action@v1
-      with:
-        image: tonistiigi/binfmt:latest
-        platforms: all
-
     # Setup Docker Buildx to allow use of docker cache layers from GH
     - name: Set up Docker Buildx
-      id: buildx
       uses: docker/setup-buildx-action@v1
 
     - name: Login to Google Artifact Registry
@@ -76,9 +68,6 @@ jobs:
         target: runtime
         context: .
         file: ./docker/Dockerfile
-        platforms: |
-          linux/amd64
-          linux/arm64
         tags: |
           ${{ env.GAR_BASE }}/${{ env.GITHUB_HEAD_REF_SLUG_URL || env.GITHUB_REF_SLUG_URL }}:latest
           ${{ env.GAR_BASE }}/${{ env.GITHUB_HEAD_REF_SLUG_URL || env.GITHUB_REF_SLUG_URL }}:${{ env.GITHUB_SHA_SHORT }}

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -47,8 +47,9 @@ jobs:
 
       # Setup Docker Buildx to allow use of docker cache layers from GH
       - name: Set up Docker Buildx
-        id: buildx
         uses: docker/setup-buildx-action@v1
+        with:
+          driver-opts: network=host
 
       - name: Login to Google Artifact Registry
         uses: docker/login-action@v1.12.0

diff --git a/.github/workflows/zcash-lightwalletd.yml b/.github/workflows/zcash-lightwalletd.yml
@@ -46,16 +46,8 @@ jobs:
       with:
         credentials_json: ${{ secrets.GOOGLE_CREDENTIALS }}
 
-    - name: Set up QEMU
-      id: qemu
-      uses: docker/setup-qemu-action@v1
-      with:
-        image: tonistiigi/binfmt:latest
-        platforms: all
-
     # Setup Docker Buildx to allow use of docker cache layers from GH
     - name: Set up Docker Buildx
-      id: buildx
       uses: docker/setup-buildx-action@v1
 
     - name: Login to Google Artifact Registry
@@ -73,9 +65,6 @@ jobs:
         target: builder
         context: .
         file: ./zebra/docker/zcash-lightwalletd/Dockerfile
-        platforms: |
-          linux/amd64
-          linux/arm64
         tags: |
           ${{ env.GAR_BASE }}/${{ env.IMAGE_NAME }}:latest
           ${{ env.GAR_BASE }}/${{ env.IMAGE_NAME }}:${{ env.GITHUB_SHA_SHORT }}

diff --git a/.github/workflows/zcash-params.yml b/.github/workflows/zcash-params.yml
@@ -40,16 +40,8 @@ jobs:
       with:
         credentials_json: ${{ secrets.GOOGLE_CREDENTIALS }}
 
-    - name: Set up QEMU
-      id: qemu
-      uses: docker/setup-qemu-action@v1
-      with:
-        image: tonistiigi/binfmt:latest
-        platforms: all
-
     # Setup Docker Buildx to allow use of docker cache layers from GH
     - name: Set up Docker Buildx
-      id: buildx
       uses: docker/setup-buildx-action@v1
 
     - name: Login to Google Artifact Registry
@@ -67,9 +59,6 @@ jobs:
         target: builder
         context: .
         file: ./docker/zcash-params/Dockerfile
-        platforms: |
-          linux/amd64
-          linux/arm64
         tags: |
           ${{ env.GAR_BASE }}/${{ env.IMAGE_NAME }}:latest
           ${{ env.GAR_BASE }}/${{ env.IMAGE_NAME }}:${{ env.GITHUB_SHA_SHORT }}

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -27,8 +27,7 @@ RUN apt-get -qq update && \
     rm -rf /var/lib/apt/lists/* /tmp/*
 
 # Install google OS Config agent
-RUN if [ "$(uname -m)" != "aarch64" ]; then \
-    apt-get -qq update && \
+RUN apt-get -qq update && \
     apt-get -qq install -y --no-install-recommends \
     curl \
     lsb-release \
@@ -37,7 +36,6 @@ RUN if [ "$(uname -m)" != "aarch64" ]; then \
     curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \
     apt-get -qq update  && \
     apt-get -qq install -y --no-install-recommends google-osconfig-agent && \
-    ; fi && \
     rm -rf /var/lib/apt/lists/* /tmp/*
 
 # Optimize builds. In particular, regenerate-stateful-test-disks.yml was reaching the