Skip to content

Commit 9ccbb20

Browse files
authored
Merge pull request moby#5695 from crazy-max/update-binfmt
dockerfile: update binfmt to v9.2.0-50
2 parents dc76379 + 38f9eee commit 9ccbb20

File tree

5 files changed

+2
-14
lines changed

5 files changed

+2
-14
lines changed

.github/workflows/.test.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ jobs:
4343
-
4444
name: Set up QEMU
4545
uses: docker/setup-qemu-action@v3
46-
with:
47-
image: tonistiigi/binfmt:qemu-v9.2.0
4846
-
4947
name: Set up Docker Buildx
5048
uses: docker/setup-buildx-action@v3
@@ -142,8 +140,6 @@ jobs:
142140
-
143141
name: Set up QEMU
144142
uses: docker/setup-qemu-action@v3
145-
with:
146-
image: tonistiigi/binfmt:qemu-v9.2.0
147143
-
148144
name: Set up Docker Buildx
149145
uses: docker/setup-buildx-action@v3

.github/workflows/buildkit.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ jobs:
9191
-
9292
name: Set up QEMU
9393
uses: docker/setup-qemu-action@v3
94-
with:
95-
image: tonistiigi/binfmt:qemu-v9.2.0
9694
-
9795
name: Set up Docker Buildx
9896
uses: docker/setup-buildx-action@v3
@@ -199,8 +197,6 @@ jobs:
199197
-
200198
name: Set up QEMU
201199
uses: docker/setup-qemu-action@v3
202-
with:
203-
image: tonistiigi/binfmt:qemu-v9.2.0
204200
-
205201
name: Set up Docker Buildx
206202
uses: docker/setup-buildx-action@v3

.github/workflows/dockerd.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@ jobs:
101101
-
102102
name: Set up QEMU
103103
uses: docker/setup-qemu-action@v3
104-
with:
105-
image: tonistiigi/binfmt:qemu-v9.2.0
106104
-
107105
name: Set up Docker Buildx
108106
uses: docker/setup-buildx-action@v3

.github/workflows/frontend.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,6 @@ jobs:
102102
-
103103
name: Set up QEMU
104104
uses: docker/setup-qemu-action@v3
105-
with:
106-
image: tonistiigi/binfmt:qemu-v9.2.0
107105
-
108106
name: Set up Docker Buildx
109107
uses: docker/setup-buildx-action@v3

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ COPY --from=cni-plugins-export / /
163163

164164
FROM scratch AS binaries-linux
165165
COPY --link --from=runc /usr/bin/runc /buildkit-runc
166-
# built from https://github.com/tonistiigi/binfmt/releases/tag/buildkit%2Fv7.1.0-30
167-
COPY --link --from=tonistiigi/binfmt:buildkit-v7.1.0-30@sha256:45dd57b4ba2f24e2354f71f1e4e51f073cb7a28fd848ce6f5f2a7701142a6bf0 / /
166+
# built from https://github.com/tonistiigi/binfmt/releases/tag/buildkit%2Fv9.2.0-50
167+
COPY --link --from=tonistiigi/binfmt:buildkit-v9.2.0-50@sha256:ff21b00e7238dce3bbd74fbe25591f7213837a77861b47b2df5e019540ec33fa / /
168168
COPY --link --from=cni-plugins-export-squashed / /
169169
COPY --link --from=buildctl /usr/bin/buildctl /
170170
COPY --link --from=buildkitd /usr/bin/buildkitd /

0 commit comments

Comments
 (0)