Merge branch 'main' into multiple-instances

Author: rillian

Cargo.lock

@@ -9,17 +9,17 @@ edition = "2021"
 [dependencies]
 axum = "0.6.20"
 axum-prometheus = "0.4.0"
-base64 = "0.21.2"
+base64 = "0.21.3"
 calendar-duration = { git = "https://github.com/brave-experiments/calendar-duration", branch = "init" }
-clap = { version = "4.3.24", features = ["derive"] }
+clap = { version = "4.4.1", features = ["derive"] }
 metrics-exporter-prometheus = "0.12.1"
 ppoprf = "0.3.1"
 rlimit = "0.10"
-serde = "1.0.185"
+serde = "1.0.188"
 serde_json = "1.0.105"
 thiserror = "1.0.47"
 tikv-jemallocator = "0.5"
-time = { version = "0.3.27", features = ["formatting", "parsing"] }
+time = { version = "0.3.28", features = ["formatting", "parsing"] }
 tokio = { version = "1.32.0", features = ["full"] }
 tower-http = { version = "0.4.3", features = ["trace"] }
 tracing = "0.1.37"

Cargo.toml

@@ -7,7 +7,7 @@ FROM public.ecr.aws/docker/library/golang:1.21.0-bookworm as go-builder
 RUN CGO_ENABLED=0 go install -trimpath -ldflags="-s -w" -buildvcs=false github.com/brave/[email protected]
 
 # Build the web server application itself.
-FROM public.ecr.aws/docker/library/rust:1.71.1-slim-bookworm as rust-builder
+FROM public.ecr.aws/docker/library/rust:1.72.0-slim-bookworm as rust-builder
 
 RUN apt update && apt install -y build-essential
 

Dockerfile

@@ -1,6 +1,6 @@
 # Build the web server application itself.
 # Use the -alpine variant so it will run in a alpine-based container.
-FROM public.ecr.aws/docker/library/rust:1.71.1-alpine as rust-builder
+FROM public.ecr.aws/docker/library/rust:1.72.0-alpine as rust-builder
 # Base image may not support C linkage.
 RUN apk add musl-dev
 
@@ -13,7 +13,7 @@ RUN cargo build --locked --release
 
 RUN cargo install vsock-relay
 
-FROM amazonlinux:2.0.20230808.0
+FROM amazonlinux:2.0.20230822.0
 
 RUN echo "timeout=60.0" >> /etc/yum.conf
 RUN amazon-linux-extras install aws-nitro-enclaves-cli nginx1 -y && \