Skip to content

Commit 7f2fcb3

Browse files
authored
Merge c07a0db into 6fb6a8d
2 parents 6fb6a8d + c07a0db commit 7f2fcb3

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

.github/files/build/Dockerfile

+13-11
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,18 @@
22
FROM --platform=$BUILDPLATFORM busybox:1.36.1-uclibc@sha256:cc71f45a5a48738c4c295314b2bc9bcc18eb0c33e7bb127c3735b751b724141b AS env
33
ARG TARGETPLATFORM
44
RUN --mount=type=bind,source=artifact,target=artifact \
5-
if [ "$TARGETPLATFORM" = 'darwin/amd64' ]; then\
6-
cp artifact/x86_64-apple-darwin/binary .\
7-
;elif [ "$TARGETPLATFORM" = 'darwin/arm64' ]; then\
8-
cp artifact/aarch64-apple-darwin/binary .\
9-
;elif [ "$TARGETPLATFORM" = 'linux/amd64' ]; then\
10-
cp artifact/x86_64-unknown-linux-musl/binary .\
11-
;elif [ "$TARGETPLATFORM" = 'linux/arm64' ]; then\
12-
cp artifact/aarch64-unknown-linux-musl/binary .\
13-
;fi
5+
if [ "$TARGETPLATFORM" = 'darwin/amd64' ]; then\
6+
cp artifact/x86_64-apple-darwin/binary .\
7+
;elif [ "$TARGETPLATFORM" = 'darwin/arm64' ]; then\
8+
cp artifact/aarch64-apple-darwin/binary .\
9+
;elif [ "$TARGETPLATFORM" = 'linux/amd64' ]; then\
10+
cp artifact/x86_64-unknown-linux-musl/binary .\
11+
;elif [ "$TARGETPLATFORM" = 'linux/arm64' ]; then\
12+
cp artifact/aarch64-unknown-linux-musl/binary .\
13+
;fi
1414

1515
FROM --platform=$BUILDPLATFORM scratch as runner
16-
COPY --from=env --chmod=755 binary .
17-
ENTRYPOINT ["./binary"]
16+
ARG BINARY_NAME
17+
ENV BINARY_NAME=${BINARY_NAME}
18+
COPY --from=env --chmod=755 binary "${BINARY_NAME}"
19+
ENTRYPOINT ["./${BINARY_NAME}"]

.github/workflows/docker-publish.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
needs: build
9797
permissions:
9898
packages: write
99-
runs-on: 'ubuntu-latest'
99+
runs-on: "ubuntu-latest"
100100
outputs:
101101
image_tags: ${{ steps.meta.outputs.tags }}
102102
env:
@@ -138,6 +138,7 @@ jobs:
138138
- name: Build and push Docker image
139139
uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5.1.0
140140
with:
141+
build-args: BINARY_NAME=${{ env.BINARY_NAME }}
141142
context: .
142143
file: .github/files/build/Dockerfile
143144
platforms: darwin/amd64,darwin/arm64,linux/amd64,linux/arm64

0 commit comments

Comments
 (0)