From 8349f7f45c4d0f372231c9e2e2ba070f62ebf288 Mon Sep 17 00:00:00 2001
From: Zach Taylor <ztaylor@ibm.com>
Date: Fri, 22 Oct 2021 16:52:52 -0400
Subject: [PATCH] chore: fixing docker build

---
 .github/workflows/branch_build.yml | 10 ++++++++++
 .github/workflows/build_base.yml   |  5 +++++
 airgap/v2/go.mod                   |  2 ++
 airgap/v2/go.sum                   |  4 ++++
 internal/ci/workflows.cue          |  7 +++++++
 5 files changed, 28 insertions(+)

diff --git a/.github/workflows/branch_build.yml b/.github/workflows/branch_build.yml
index d25805bf1..0f38ef6bb 100644
--- a/.github/workflows/branch_build.yml
+++ b/.github/workflows/branch_build.yml
@@ -164,9 +164,14 @@ jobs:
         go-version: 1.16.8
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v1
+      with:
+        image: tonistiigi/binfmt:qemu-v6.1.0
+        platforms: all
     - id: buildx
       name: Set up docker buildx
       uses: docker/setup-buildx-action@v1
+      with:
+        config: .github/buildkitd.toml
     - name: Cache Go modules
       uses: actions/cache@v2
       with:
@@ -263,9 +268,14 @@ jobs:
         go-version: 1.16.8
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v1
+      with:
+        image: tonistiigi/binfmt:qemu-v6.1.0
+        platforms: all
     - id: buildx
       name: Set up docker buildx
       uses: docker/setup-buildx-action@v1
+      with:
+        config: .github/buildkitd.toml
     - name: Cache Go modules
       uses: actions/cache@v2
       with:
diff --git a/.github/workflows/build_base.yml b/.github/workflows/build_base.yml
index 19543244e..6628cd575 100644
--- a/.github/workflows/build_base.yml
+++ b/.github/workflows/build_base.yml
@@ -23,9 +23,14 @@ jobs:
         go-version: 1.16.8
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v1
+      with:
+        image: tonistiigi/binfmt:qemu-v6.1.0
+        platforms: all
     - id: buildx
       name: Set up docker buildx
       uses: docker/setup-buildx-action@v1
+      with:
+        config: .github/buildkitd.toml
     - name: Login to Docker Hub
       uses: docker/login-action@v1
       with:
diff --git a/airgap/v2/go.mod b/airgap/v2/go.mod
index 84f07afe2..60638e4be 100644
--- a/airgap/v2/go.mod
+++ b/airgap/v2/go.mod
@@ -18,6 +18,8 @@ require (
 	github.com/spf13/cobra v1.1.3
 	github.com/spf13/viper v1.7.0
 	github.com/twitchtv/twirp v8.1.0+incompatible
+	go.uber.org/atomic v1.9.0 // indirect
+	go.uber.org/multierr v1.7.0 // indirect
 	go.uber.org/zap v1.18.1
 	golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
diff --git a/airgap/v2/go.sum b/airgap/v2/go.sum
index df82dda00..5fb45a007 100644
--- a/airgap/v2/go.sum
+++ b/airgap/v2/go.sum
@@ -274,11 +274,15 @@ go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqe
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
+go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0=
 go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
+go.uber.org/multierr v1.7.0 h1:zaiO/rmgFjbmCXdSYJWQcdvOCsthmdaHfr3Gm2Kx4Ec=
+go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.18.1 h1:CSUJ2mjFszzEWt4CdKISEuChVIXGBn3lAPwkRGyVrc4=
 go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
diff --git a/internal/ci/workflows.cue b/internal/ci/workflows.cue
index a3987e841..dafb452a5 100644
--- a/internal/ci/workflows.cue
+++ b/internal/ci/workflows.cue
@@ -699,6 +699,9 @@ _#setupBuildX: _#step & {
 	name: "Set up docker buildx"
 	uses: "docker/setup-buildx-action@v1"
 	id:   "buildx"
+  with: {
+    "config": ".github/buildkitd.toml"
+  }
 }
 
 _#hasWriteAccess: _#step & {
@@ -711,6 +714,10 @@ _#hasWriteAccess: _#step & {
 _#setupQemu: _#step & {
 	name: "Set up QEMU"
 	uses: "docker/setup-qemu-action@v1"
+  with: {
+    image: "tonistiigi/binfmt:qemu-v6.1.0"
+    platforms: "all"
+  }
 }
 
 _#checkoutCode: _#step & {