remove statically linked openSSL
Some checks failed
Build and Test / build-editions (wii-u-chat) (push) Failing after 1m10s
Build and Test / build-editions (sonic-transformed) (push) Failing after 1m11s
Build and Test / build-editions (DATABASE_SMM, super-mario-maker) (push) Failing after 1m13s
Build and Test / build-editions (splatoon) (push) Failing after 1m13s
Build and Test / build-editions (DATABASE_SMM, wii-sports-club) (push) Failing after 1m13s
Build and Test / build-editions (terraria) (push) Failing after 1m14s
Build and Test / build-editions (mario-tennis) (push) Failing after 1m14s
Build and Test / build-editions (splatoon-testfire) (push) Failing after 1m16s
Build and Test / build-editions (fast-racing-neo) (push) Failing after 1m16s
Build and Test / build-editions (DATABASE_SMM, puyopuyo) (push) Failing after 1m16s
Build and Test / build-editions (minecraft-wiiu) (push) Failing after 1m16s
Build and Test / build-editions (DATABASE_FRIENDS, friends) (push) Failing after 1m16s
Some checks failed
Build and Test / build-editions (wii-u-chat) (push) Failing after 1m10s
Build and Test / build-editions (sonic-transformed) (push) Failing after 1m11s
Build and Test / build-editions (DATABASE_SMM, super-mario-maker) (push) Failing after 1m13s
Build and Test / build-editions (splatoon) (push) Failing after 1m13s
Build and Test / build-editions (DATABASE_SMM, wii-sports-club) (push) Failing after 1m13s
Build and Test / build-editions (terraria) (push) Failing after 1m14s
Build and Test / build-editions (mario-tennis) (push) Failing after 1m14s
Build and Test / build-editions (splatoon-testfire) (push) Failing after 1m16s
Build and Test / build-editions (fast-racing-neo) (push) Failing after 1m16s
Build and Test / build-editions (DATABASE_SMM, puyopuyo) (push) Failing after 1m16s
Build and Test / build-editions (minecraft-wiiu) (push) Failing after 1m16s
Build and Test / build-editions (DATABASE_FRIENDS, friends) (push) Failing after 1m16s
it just causes us grief for something that can be easily avoided by just using minimal alpine images. we can revisit it later if needed.
This commit is contained in:
parent
25d58b3083
commit
6a4764082d
4 changed files with 12 additions and 19 deletions
|
|
@ -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
|
||||
|
|
|
|||
13
Dockerfile
13
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"]
|
||||
|
|
@ -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
|
||||
cargo build --release --features "$EDITION_FEATURES" --target x86_64-unknown-linux-musl
|
||||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue