From 6910afd12a30b6900e35879cf37e53793e44a4e7 Mon Sep 17 00:00:00 2001 From: Radical Date: Sun, 1 Jun 2025 21:45:24 +0200 Subject: [PATCH] ci: back to debian we go --- .woodpecker/build-and-publish.yml | 21 +++++++-------------- Dockerfile | 4 ++-- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/.woodpecker/build-and-publish.yml b/.woodpecker/build-and-publish.yml index a8187fc..3a04b04 100644 --- a/.woodpecker/build-and-publish.yml +++ b/.woodpecker/build-and-publish.yml @@ -4,25 +4,18 @@ when: steps: - name: build-x86_64 - image: rust:alpine + image: rust:bookworm commands: - - apk add openssl-dev musl-dev openssl-libs-static - cargo build --release - name: build-arm64 - image: rust:alpine + image: rust:bookworm commands: - - apk add musl-dev - - echo "https://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories - - apk update - - apk add gcc-aarch64-linux-musl g++-aarch64-linux-musl - - apk add openssl-dev openssl-libs-static --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community --target=aarch64 --no-cache - - rustup target add aarch64-unknown-linux-musl - - cargo build --target aarch64-unknown-linux-musl --release + - dpkg --add-architecture arm64 + - apt-get update -y && apt-get install -y gcc-aarch64-linux-gnu libc6-dev-arm64-cross libssl-dev:arm64 pkg-config-aarch64-linux-gnu + - rustup target add aarch64-unknown-linux-gnu + - cargo build --target aarch64-unknown-linux-gnu --release environment: - CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER: aarch64-linux-musl-gcc - PKG_CONFIG_ALLOW_CROSS: 1 - PKG_CONFIG_PATH: /usr/aarch64-linux-musl/lib/pkgconfig - OPENSSL_DIR: /usr/aarch64-linux-musl + CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc - name: container-build-and-publish image: docker commands: diff --git a/Dockerfile b/Dockerfile index 230deaa..25795a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,13 +3,13 @@ FROM --platform=linux/amd64 debian:12-slim AS prep WORKDIR /src COPY target/release/backend backend-amd64 -COPY target/aarch64-unknown-linux-musl/release/backend backend-arm64 +COPY target/aarch64-unknown-linux-gnu/release/backend backend-arm64 FROM debian:12-slim ARG TARGETARCH -RUN apt update -y && apt install ca-certificates -y && rm -rf /var/lib/apt/lists/* /var/cache/apt/* /tmp/* +RUN apt update -y && apt install libssl3 ca-certificates -y && rm -rf /var/lib/apt/lists/* /var/cache/apt/* /tmp/* COPY --from=prep /src/backend-${TARGETARCH} /usr/bin/gorb-backend