diff --git a/.ci-scripts/make-edition.sh b/.ci-scripts/make-edition.sh index e0872e1..ddfbf9b 100755 --- a/.ci-scripts/make-edition.sh +++ b/.ci-scripts/make-edition.sh @@ -9,7 +9,6 @@ export SHORT_SHA=${GITHUB_SHA::6} export CI_COMMIT_SHORT_SHA=${CI_COMMIT_SHORT_SHA:-$SHORT_SHA} echo "building $EDITION" -export RNEX_STATIC=1 export TARGET_DIR="target/x86_64-unknown-linux-musl/release" ./test-edition.sh diff --git a/Dockerfile b/Dockerfile index d5b6969..75a7c9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,20 +1,23 @@ # syntax=docker/dockerfile:1 -FROM scratch AS node-holder +FROM alpine:3.20 AS base +RUN apk add --no-cache ca-certificates libssl3 + +FROM base AS node-holder COPY dist/rnex-server-backend-node-holder /rnex-server-backend-node-holder ENTRYPOINT ["/rnex-server-backend-node-holder"] -FROM scratch AS proxy-insecure +FROM base AS proxy-insecure COPY dist/proxy_insecure /proxy_insecure ENTRYPOINT ["/proxy_insecure"] -FROM scratch AS proxy-secure +FROM base AS proxy-secure COPY dist/proxy_secure /proxy_secure ENTRYPOINT ["/proxy_secure"] -FROM scratch AS backend-auth +FROM base AS backend-auth COPY dist/rnex-server-backend-auth /rnex-server-backend-auth ENTRYPOINT ["/rnex-server-backend-auth"] -FROM scratch AS backend-secure +FROM base AS backend-secure COPY dist/rnex-server-backend-secure /rnex-server-backend-secure ENTRYPOINT ["/rnex-server-backend-secure"] \ No newline at end of file diff --git a/build-edition.sh b/build-edition.sh index 441b491..603b7a2 100755 --- a/build-edition.sh +++ b/build-edition.sh @@ -7,12 +7,7 @@ if [ -z ${EDITION+x} ]; then fi source ./buildscripts/common.sh -echo building $EDITION -echo FEATURES: -echo $EDITION_FEATURES +echo "Building $EDITION" +echo "FEATURES: $EDITION_FEATURES" -if [[ ! -v RNEX_STATIC ]]; then - cargo build --release --features "$EDITION_FEATURES" -else - CC_x86_64_unknown_linux_musl=musl-gcc OPENSSL_LIB_DIR=/usr/lib/x86_64-linux-gnu OPENSSL_INCLUDE_DIR=/usr/include OPENSSL_STATIC=1 RUSTFLAGS="-C relocation-model=static -C linker=ld.lld" cargo build --release --features "$EDITION_FEATURES" --target x86_64-unknown-linux-musl -fi \ No newline at end of file +cargo build --release --features "$EDITION_FEATURES" --target x86_64-unknown-linux-musl \ No newline at end of file diff --git a/test-edition.sh b/test-edition.sh index 8b1140f..a5a01b4 100755 --- a/test-edition.sh +++ b/test-edition.sh @@ -13,8 +13,4 @@ echo $EDITION_FEATURES echo ENV SETTINGS: env -if [[ ! -v RNEX_STATIC ]]; then - cargo test --features "$EDITION_FEATURES" -else - OPENSSL_LIB_DIR=/usr/lib OPENSSL_INCLUDE_DIR=/usr/include/openssl OPENSSL_STATIC=1 RUSTFLAGS="-C relocation-model=static -C linker=ld.lld" cargo test --features "$EDITION_FEATURES" --target x86_64-unknown-linux-musl -fi +cargo test --features "$EDITION_FEATURES" --target x86_64-unknown-linux-musl