Skip to content

Commit 6a70be2

Browse files
authored
Backport(v1.16) github: Use arm host (#1557,#1558) (#1559)
Signed-off-by: Kentaro Hayashi <[email protected]>
1 parent 93ad7c9 commit 6a70be2

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

.github/workflows/docker-build.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,13 @@ jobs:
9090
outputs: oci-mediatypes=false
9191
arm64:
9292
needs: define-matrix
93-
runs-on: ubuntu-latest
93+
runs-on: ubuntu-24.04-arm
9494
strategy:
9595
fail-fast: false
9696
matrix:
9797
component: ${{ fromJSON(needs.define-matrix.outputs.components) }}
9898
steps:
9999
- uses: actions/checkout@v4
100-
- name: Set up QEMU
101-
uses: docker/setup-qemu-action@v3
102100
- name: Set up Docker Buildx
103101
uses: docker/setup-buildx-action@v3
104102
with:

templates/Dockerfile.erb

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,7 @@
77

88
<% if is_arm64 %>
99
# For multiarch build on Docker hub automated build.
10-
FROM golang:alpine AS builder
11-
WORKDIR /go
12-
ENV QEMU_DOWNLOAD_SHA256 5db25cccb40ac7b1ca857653b883376b931d91b06ff34ffe70dcf6180bd07bb8
13-
RUN apk add curl --no-cache
14-
RUN curl -sL -o qemu-6.0.0.balena1-aarch64.tar.gz https://github.com/balena-io/qemu/releases/download/v6.0.0%2Bbalena1/qemu-6.0.0.balena1-aarch64.tar.gz && echo "$QEMU_DOWNLOAD_SHA256 *qemu-6.0.0.balena1-aarch64.tar.gz" | sha256sum -c - | tar zxvf qemu-6.0.0.balena1-aarch64.tar.gz -C . && mv qemu-6.0.0+balena1-aarch64/qemu-aarch64-static .
15-
1610
FROM fluent/fluentd:<%= fluentd_ver %>-debian-arm64-1.0
17-
COPY --from=builder /go/qemu-aarch64-static /usr/bin/
1811
<% else %>
1912
FROM fluent/fluentd:<%= fluentd_ver %>-debian-amd64-1.0
2013
<% end %>

0 commit comments

Comments
 (0)