ci: use append input (edge)

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
docker · Sep 23, 2022 · 9116e82 · 9116e82
1 parent 439b421
commit 9116e82
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 94 deletions.
diff --git a/.github/actions/setup-remote-builder/action.yml b/.github/actions/setup-remote-builder/action.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -51,43 +51,30 @@ jobs:
         name: Set up QEMU
         uses: docker/setup-qemu-action@v2
       -
-        name: Set up Docker Buildx
+        name: Set up BuildKit container
         id: builder
         uses: docker/setup-buildx-action@v2
       -
-        # necessary to be able to append remote builders
-        name: Set up container builder as remote
-        run: |
-          docker buildx create --use \
-            --name ${{ env.BUILDER_NAME }} \
-            --driver remote \
-            docker-container://buildx_buildkit_${{ steps.builder.outputs.name }}0
-      -
-        name: Set up AWS Graviton2 remote builder
-        uses: ./.github/actions/setup-remote-builder
-        with:
-          name: aws_graviton2
-          builder_name: ${{ env.BUILDER_NAME }}
-          endpoint: tcp://${{ secrets.AWS_ARM64_HOST }}:1234
-          cacert: ${{ secrets.AWS_ARM64_CACERT }}
-          ca: ${{ secrets.AWS_ARM64_CERT }}
-          key: ${{ secrets.AWS_ARM64_KEY }}
-          platforms: darwin/arm64,linux/arm64,linux/arm/v5,linux/arm/v6,linux/arm/v7,windows/arm64
-      -
-        name: Set up LinuxONE s390x remote builder
-        uses: ./.github/actions/setup-remote-builder
+        name: Set up Docker Buildx
+        # FIXME: use docker/setup-buildx-action@v2 when https://github.com/docker/setup-buildx-action/pull/165 merged
+        uses: crazy-max/docker-setup-buildx-action@append
         with:
-          name: linuxone_s390x
-          builder_name: ${{ env.BUILDER_NAME }}
-          endpoint: tcp://${{ secrets.LINUXONE_S390X_HOST }}:1234
-          cacert: ${{ secrets.LINUXONE_S390X_CACERT }}
-          ca: ${{ secrets.LINUXONE_S390X_CERT }}
-          key: ${{ secrets.LINUXONE_S390X_KEY }}
-          platforms: linux/s390x
-      -
-        name: List builders
-        run: |
-          docker buildx ls
+          driver: remote
+          endpoint: docker-container://buildx_buildkit_${{ steps.builder.outputs.name }}0
+          append: |
+            - name: aws_graviton2
+              endpoint: tcp://${{ secrets.AWS_ARM64_HOST }}:1234
+              platforms: darwin/arm64,linux/arm64,linux/arm/v5,linux/arm/v6,linux/arm/v7,windows/arm64
+            - name: linuxone_s390x
+              endpoint: tcp://${{ secrets.LINUXONE_S390X_HOST }}:1234
+              platforms: linux/s390x
+        env:
+          BUILDER_NODE_1_AUTH_TLS_CACERT: ${{ secrets.AWS_ARM64_CACERT }}
+          BUILDER_NODE_1_AUTH_TLS_CERT: ${{ secrets.AWS_ARM64_CERT }}
+          BUILDER_NODE_1_AUTH_TLS_KEY: ${{ secrets.AWS_ARM64_KEY }}
+          BUILDER_NODE_2_AUTH_TLS_CACERT: ${{ secrets.LINUXONE_S390X_CACERT }}
+          BUILDER_NODE_2_AUTH_TLS_CERT: ${{ secrets.LINUXONE_S390X_CERT }}
+          BUILDER_NODE_2_AUTH_TLS_KEY: ${{ secrets.LINUXONE_S390X_KEY }}
       -
         # necessary to use gha cache export
         name: Expose GitHub Runtime
@@ -102,12 +89,10 @@ jobs:
         name: List artifacts
         run: |
           tree -nh ./pkg/${{ matrix.name }}/bin
-      -
-        name: Cleanup
-        if: always()
-        run: |
-          docker buildx rm ${{ env.BUILDER_NAME }}
-          rm -rf ~/.certs
+
+
+
+
 # FIXME: Uncomment when repo made public
 #      -
 #        name: Upload artifacts