Move the processor and coordinator to Alpine

This commit is contained in:
Luke Parker 2024-02-09 04:00:44 -05:00
parent 17e86ff072
commit e3a789fc9f
No known key found for this signature in database
3 changed files with 15 additions and 9 deletions

View file

@ -15,9 +15,9 @@ pub fn coordinator(
) { ) {
let db = network.db(); let db = network.db();
let longer_reattempts = if network == Network::Dev { "longer-reattempts" } else { "" }; 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( &build_serai_service(
Os::Debian, Os::Alpine,
network.release(), network.release(),
&format!("{db} {longer_reattempts}"), &format!("{db} {longer_reattempts}"),
"serai-coordinator", "serai-coordinator",
@ -25,7 +25,7 @@ pub fn coordinator(
const ADDITIONAL_ROOT: &str = r#" const ADDITIONAL_ROOT: &str = r#"
# Install ca-certificates # Install ca-certificates
RUN apt install -y ca-certificates RUN apk add ca-certificates
"#; "#;
let env_vars = [ 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 res = setup + &run;
let mut coordinator_path = orchestration_path.to_path_buf(); let mut coordinator_path = orchestration_path.to_path_buf();

View file

@ -151,7 +151,13 @@ FROM rust:1.76.0-alpine3.19 as builder
COPY --from=mimalloc-alpine libmimalloc.so /usr/lib COPY --from=mimalloc-alpine libmimalloc.so /usr/lib
ENV LD_PRELOAD=libmimalloc.so 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
"# "#
} }
}; };

View file

@ -15,9 +15,9 @@ pub fn processor(
coin_key: Zeroizing<<Ristretto as Ciphersuite>::F>, coin_key: Zeroizing<<Ristretto as Ciphersuite>::F>,
entropy: Zeroizing<[u8; 32]>, entropy: Zeroizing<[u8; 32]>,
) { ) {
let setup = mimalloc(Os::Debian).to_string() + let setup = mimalloc(Os::Alpine).to_string() +
&build_serai_service( &build_serai_service(
Os::Debian, Os::Alpine,
network.release(), network.release(),
&format!("binaries {} {coin}", network.db()), &format!("binaries {} {coin}", network.db()),
"serai-processor", "serai-processor",
@ -25,7 +25,7 @@ pub fn processor(
const ADDITIONAL_ROOT: &str = r#" const ADDITIONAL_ROOT: &str = r#"
# Install ca-certificates # Install ca-certificates
RUN apt install -y ca-certificates RUN apk add ca-certificates
"#; "#;
// TODO: Randomly generate these // 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 res = setup + &run;
let mut processor_path = orchestration_path.to_path_buf(); let mut processor_path = orchestration_path.to_path_buf();