From 3f2adf0c659c9d1874ef367515574ce6ade07af8 Mon Sep 17 00:00:00 2001 From: Maple Nebel Date: Fri, 29 May 2026 08:00:01 +0200 Subject: [PATCH] dont force static builds --- Dockerfile | 4 ++-- build-edition.sh | 6 +++++- rnex-core/src/executables/common.rs | 10 ++++++++++ test-edition.sh | 6 +++++- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 44e7ace..a9286b5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \ COPY . . RUN --mount=type=cache,target=/usr/local/cargo/registry \ --mount=type=cache,target=/app/target \ - ./test-edition.sh && ./build-edition.sh && \ + RNEX_STATIC=1 ./test-edition.sh && RNEX_STATIC=1 ./build-edition.sh && \ mkdir -p /app/dist && \ cp /app/target/x86_64-unknown-linux-musl/release/edge_node_holder_server /app/dist/ && \ cp /app/target/x86_64-unknown-linux-musl/release/proxy_insecure /app/dist/ && \ @@ -54,4 +54,4 @@ ENTRYPOINT ["/backend_server_secure"] FROM chef AS dev-container RUN apk add --no-cache openjdk21-jdk gcompat git bash protobuf-dev -COPY --from=builder /app/dist/* /usr/local/bin/ \ No newline at end of file +COPY --from=builder /app/dist/* /usr/local/bin/ diff --git a/build-edition.sh b/build-edition.sh index 6898acf..86e8a91 100755 --- a/build-edition.sh +++ b/build-edition.sh @@ -12,4 +12,8 @@ echo building $EDITION echo FEATURES: echo $EDITION_FEATURES -OPENSSL_LIB_DIR=/usr/lib OPENSSL_INCLUDE_DIR=/usr/include/openssl OPENSSL_STATIC=1 RUSTFLAGS="-C relocation-model=static -C linker=ld.lld" cargo build --release --features "$EDITION_FEATURES" --target x86_64-unknown-linux-musl +if [[ -v RNEX_STATIC ]]; then + cargo build --release --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 build --release --features "$EDITION_FEATURES" --target x86_64-unknown-linux-musl +fi diff --git a/rnex-core/src/executables/common.rs b/rnex-core/src/executables/common.rs index c94a463..fc9f6e3 100644 --- a/rnex-core/src/executables/common.rs +++ b/rnex-core/src/executables/common.rs @@ -114,3 +114,13 @@ where new_rmc_gateway_connection(stream.into(), move |r| fun_ref(user_connection_data, r)); } } + +#[cfg(test)] +mod test { + use crate::executables::common::try_get_ip; + + #[test] + fn test() { + try_get_ip().unwrap(); + } +} diff --git a/test-edition.sh b/test-edition.sh index aaafad6..8b1140f 100755 --- a/test-edition.sh +++ b/test-edition.sh @@ -13,4 +13,8 @@ echo $EDITION_FEATURES echo ENV SETTINGS: env -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 +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