diff --git a/base-dockerfile b/base-dockerfile index 7401daf..b8b6ec8 100644 --- a/base-dockerfile +++ b/base-dockerfile @@ -10,7 +10,7 @@ RUN cargo chef prepare --recipe-path recipe.json FROM chef AS builder COPY --from=planner /misarch-shoppingcart/recipe.json recipe.json -RUN apt update && apt install -y protobuf-compiler && rm -rf /var/lib/apt/lists/* +RUN apt update && apt install -y wget && rm -rf /var/lib/apt/lists/* # Build dependencies - this is the caching Docker layer! RUN cargo chef cook --release --recipe-path recipe.json @@ -22,6 +22,8 @@ RUN cargo build --release --bin misarch-shoppingcart # We do not need the Rust toolchain to run the binary! FROM debian:bookworm-slim AS runtime +RUN apt update && apt install -y wget && rm -rf /var/lib/apt/lists/* + WORKDIR /misarch-shoppingcart COPY --from=builder /misarch-shoppingcart/target/release/misarch-shoppingcart /usr/local/bin ENTRYPOINT ["/usr/local/bin/misarch-shoppingcart"] \ No newline at end of file diff --git a/dev-dockerfile b/dev-dockerfile index da50938..b3c0da2 100644 --- a/dev-dockerfile +++ b/dev-dockerfile @@ -1,5 +1,7 @@ FROM rust:1.75-slim-bookworm +RUN apt update && apt install -y wget && rm -rf /var/lib/apt/lists/* + WORKDIR /usr/src/misarch-shoppingcart COPY . . diff --git a/devcontainer-dockerfile b/devcontainer-dockerfile index f886e1c..2e15082 100644 --- a/devcontainer-dockerfile +++ b/devcontainer-dockerfile @@ -1,3 +1,5 @@ FROM rust:1.75-slim-bookworm +RUN apt update && apt install -y wget && rm -rf /var/lib/apt/lists/* + WORKDIR /usr/src/misarch-shoppingcart \ No newline at end of file diff --git a/docker-compose-base.yaml b/docker-compose-base.yaml index c139883..cf6865e 100644 --- a/docker-compose-base.yaml +++ b/docker-compose-base.yaml @@ -5,7 +5,7 @@ services: context: . dockerfile: base-dockerfile healthcheck: - test: wget http://localhost:8080/graphiql || exit 1 + test: wget -qO - http://localhost:8080/health || exit 1 interval: 1s timeout: 10s retries: 20