diff --git a/orchestration/src/coordinator.rs b/orchestration/src/coordinator.rs index 96478736..ea249fde 100644 --- a/orchestration/src/coordinator.rs +++ b/orchestration/src/coordinator.rs @@ -15,9 +15,9 @@ pub fn coordinator( ) { let db = network.db(); let longer_reattempts = if network == Network::Dev { "longer-reattempts" } else { "" }; - let setup = mimalloc(Os::Debian).to_string() + + let setup = mimalloc(Os::Alpine).to_string() + &build_serai_service( - Os::Debian, + Os::Alpine, network.release(), &format!("{db} {longer_reattempts}"), "serai-coordinator", @@ -25,7 +25,7 @@ pub fn coordinator( const ADDITIONAL_ROOT: &str = r#" # Install ca-certificates -RUN apt install -y ca-certificates +RUN apk add ca-certificates "#; let env_vars = [ @@ -52,7 +52,7 @@ CMD {env_vars_str} serai-coordinator "# ); - let run = os(Os::Debian, ADDITIONAL_ROOT, "coordinator") + &run_coordinator; + let run = os(Os::Alpine, ADDITIONAL_ROOT, "coordinator") + &run_coordinator; let res = setup + &run; let mut coordinator_path = orchestration_path.to_path_buf(); diff --git a/orchestration/src/main.rs b/orchestration/src/main.rs index 6b0b9834..6ade075d 100644 --- a/orchestration/src/main.rs +++ b/orchestration/src/main.rs @@ -151,7 +151,13 @@ FROM rust:1.76.0-alpine3.19 as builder COPY --from=mimalloc-alpine libmimalloc.so /usr/lib ENV LD_PRELOAD=libmimalloc.so -RUN apk update && apk upgrade && apk add musl-dev +RUN apk update && apk upgrade + +# Add dev dependencies +RUN apk add musl-dev + +# Dependencies for the Serai node +RUN apk add make protoc "# } }; diff --git a/orchestration/src/processor.rs b/orchestration/src/processor.rs index 7cb9fb80..8a7ef732 100644 --- a/orchestration/src/processor.rs +++ b/orchestration/src/processor.rs @@ -15,9 +15,9 @@ pub fn processor( coin_key: Zeroizing<::F>, entropy: Zeroizing<[u8; 32]>, ) { - let setup = mimalloc(Os::Debian).to_string() + + let setup = mimalloc(Os::Alpine).to_string() + &build_serai_service( - Os::Debian, + Os::Alpine, network.release(), &format!("binaries {} {coin}", network.db()), "serai-processor", @@ -25,7 +25,7 @@ pub fn processor( const ADDITIONAL_ROOT: &str = r#" # Install ca-certificates -RUN apt install -y ca-certificates +RUN apk add ca-certificates "#; // TODO: Randomly generate these @@ -67,7 +67,7 @@ CMD {env_vars_str} serai-processor "# ); - let run = os(Os::Debian, ADDITIONAL_ROOT, "processor") + &run_processor; + let run = os(Os::Alpine, ADDITIONAL_ROOT, "processor") + &run_processor; let res = setup + &run; let mut processor_path = orchestration_path.to_path_buf();