From 04f3105337ea23928752be20f4aeaf679e847a78 Mon Sep 17 00:00:00 2001 From: Solar Mithril Date: Mon, 12 May 2025 18:46:35 +0600 Subject: [PATCH 1/4] Use native rust image in Dockerimage --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index e907708..405982a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,11 +7,11 @@ # Based on https://depot.dev/blog/rust-dockerfile-best-practices # ARG FEATURES -ARG RBUILDER_BIN="op-rbuilder" - -FROM rust:1.85 AS base +ARG RBUILDER_BIN="rbuilder" ARG TARGETPLATFORM +FROM --platform=$TARGETPLATFORM rust:1.85 AS base + RUN apt-get update \ && apt-get install -y clang libclang-dev From 44888bf1d81bec271deb3b6c5a94c4eb3a13ea99 Mon Sep 17 00:00:00 2001 From: Solar Mithril Date: Mon, 12 May 2025 19:02:56 +0600 Subject: [PATCH 2/4] Removed qemu, because we have correct runners --- .github/workflows/release.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 874d361..122367c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -171,9 +171,6 @@ jobs: - name: checkout sources uses: actions/checkout@v4 - - name: docker qemu - uses: docker/setup-qemu-action@v3 - - name: docker buildx uses: docker/setup-buildx-action@v3 From 1224db4d37a562d26cec73dc2091769dd524c4ef Mon Sep 17 00:00:00 2001 From: Solar Mithril Date: Mon, 12 May 2025 19:20:38 +0600 Subject: [PATCH 3/4] Revert docker changes --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 405982a..e907708 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,10 +7,10 @@ # Based on https://depot.dev/blog/rust-dockerfile-best-practices # ARG FEATURES -ARG RBUILDER_BIN="rbuilder" -ARG TARGETPLATFORM +ARG RBUILDER_BIN="op-rbuilder" -FROM --platform=$TARGETPLATFORM rust:1.85 AS base +FROM rust:1.85 AS base +ARG TARGETPLATFORM RUN apt-get update \ && apt-get install -y clang libclang-dev From e286653feb868984b38ede0540f1d9647348da68 Mon Sep 17 00:00:00 2001 From: Solar Mithril Date: Mon, 12 May 2025 19:31:59 +0600 Subject: [PATCH 4/4] Fix platforms --- .github/workflows/release.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 122367c..d639bfc 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -171,6 +171,9 @@ jobs: - name: checkout sources uses: actions/checkout@v4 + - name: docker qemu + uses: docker/setup-qemu-action@v3 + - name: docker buildx uses: docker/setup-buildx-action@v3 @@ -204,7 +207,7 @@ jobs: file: Dockerfile context: . labels: ${{ steps.meta.outputs.labels }} - platforms: linux/amd64,linux/arm64 + platforms: ${{ matrix.configs.target }} push: true tags: ${{ steps.meta.outputs.tags }} build-args: |