spacebar/account
Watch
10
0
Fork
You've already forked account
 2
Code Issues 2 Pull requests Projects Releases Packages 1 Wiki Activity Actions

dont force static builds

Browse source
This commit is contained in:
Maple Nebel 2026-05-29 08:00:01 +02:00
commit 3f2adf0c65
4 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile
View file

@ -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/
COPY --from=builder /app/dist/* /usr/local/bin/

6
build-edition.sh
View file

@ -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

10
rnex-core/src/executables/common.rs
View file

@ -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();
}
}

6
test-edition.sh
View file

@ -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