Skip to content

Commit

Permalink
install ca certificates
Browse files Browse the repository at this point in the history
  • Loading branch information
segfault-magnet committed Aug 20, 2024
1 parent b5a6cc3 commit acba38a
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 10 deletions.
7 changes: 7 additions & 0 deletions deployment/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@ RUN cargo build --release --bin fuel-block-committer
# Stage 2: Run
FROM ubuntu:22.04 as run

RUN apt-get update -y \
&& apt-get install -y --no-install-recommends ca-certificates \
# Clean up
&& apt-get autoremove -y \
&& apt-get clean -y \
&& rm -rf /var/lib/apt/lists/*

WORKDIR /root/

COPY --from=builder /build/target/release/fuel-block-committer .
Expand Down
35 changes: 25 additions & 10 deletions e2e/src/kms.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,20 +72,35 @@ fn spawn_log_printer(container: &testcontainers::ContainerAsync<KmsImage>) {
let mut stderr_lines = stderr.lines();
let mut stdout_lines = stdout.lines();

tokio::select! {
_ = async {
while let Ok(Some(line)) = stderr_lines.next_line().await {
eprintln!("KMS: {}", line);
let mut other_stream_closed = false;
loop {
tokio::select! {
stderr_result = stderr_lines.next_line() => {
match stderr_result {
Ok(Some(line)) => eprintln!("KMS (stderr): {}", line),
Ok(None) if other_stream_closed => break,
Ok(None) => other_stream_closed=true,
Err(e) => {
eprintln!("KMS: Error reading from stderr: {:?}", e);
break;
}
}
}
} => {}
_ = async {
while let Ok(Some(line)) = stdout_lines.next_line().await {
eprintln!("KMS: {}", line);
stdout_result = stdout_lines.next_line() => {
match stdout_result {
Ok(Some(line)) => eprintln!("KMS (stdout): {}", line),
Ok(None) if other_stream_closed => break,
Ok(None) => other_stream_closed=true,
Err(e) => {
eprintln!("KMS: Error reading from stdout: {:?}", e);
break;
}
}
}
} => {}
}
}

Ok::<_, anyhow::Error>(())
Ok::<(), std::io::Error>(())
});
}

Expand Down

0 comments on commit acba38a

Please sign in to comment.