diff --git a/.ci-scripts/make-edition.sh b/.ci-scripts/make-edition.sh index ddfbf9b..7545040 100755 --- a/.ci-scripts/make-edition.sh +++ b/.ci-scripts/make-edition.sh @@ -9,7 +9,7 @@ export SHORT_SHA=${GITHUB_SHA::6} export CI_COMMIT_SHORT_SHA=${CI_COMMIT_SHORT_SHA:-$SHORT_SHA} echo "building $EDITION" -export TARGET_DIR="target/x86_64-unknown-linux-musl/release" +export TARGET_DIR="target/release" ./test-edition.sh ./build-edition.sh diff --git a/Dockerfile b/Dockerfile index 75a7c9b..34f1517 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,9 @@ # syntax=docker/dockerfile:1 -FROM alpine:3.20 AS base -RUN apk add --no-cache ca-certificates libssl3 +FROM debian:bookworm-slim AS base +RUN apt-get update && apt-get install -y --no-install-recommends \ + ca-certificates \ + libssl3 \ + && rm -rf /var/lib/apt/lists/* FROM base AS node-holder COPY dist/rnex-server-backend-node-holder /rnex-server-backend-node-holder diff --git a/build-edition.sh b/build-edition.sh index 7263cd1..fed8630 100755 --- a/build-edition.sh +++ b/build-edition.sh @@ -10,4 +10,4 @@ source ./buildscripts/common.sh echo "Building $EDITION" echo "FEATURES: $EDITION_FEATURES" -PKG_CONFIG_ALLOW_CROSS=1 OPENSSL_INCLUDE_DIR="/usr/include -I/usr/include/x86_64-linux-gnu" OPENSSL_LIB_DIR=/usr/lib/x86_64-linux-gnu cargo build --release --features "$EDITION_FEATURES" --target x86_64-unknown-linux-musl \ No newline at end of file +cargo build --release --features "$EDITION_FEATURES" \ No newline at end of file diff --git a/test-edition.sh b/test-edition.sh index 34a8bf3..6ac646a 100755 --- a/test-edition.sh +++ b/test-edition.sh @@ -11,4 +11,4 @@ source ./buildscripts/common.sh echo FEATURES: echo $EDITION_FEATURES -PKG_CONFIG_ALLOW_CROSS=1 OPENSSL_INCLUDE_DIR="/usr/include -I/usr/include/x86_64-linux-gnu" OPENSSL_LIB_DIR=/usr/lib/x86_64-linux-gnu cargo build --release --features "$EDITION_FEATURES" --target x86_64-unknown-linux-musl +cargo build --release --features "$EDITION_FEATURES"