diff --git a/Dockerfile b/Dockerfile index 704a00adb5..93eac61291 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax = docker/dockerfile:1.2 -FROM rust:1.76-bullseye as builder +FROM rust:1.76-bookworm as builder WORKDIR app COPY . . @@ -20,9 +20,12 @@ RUN --mount=type=cache,target=./target \ cp /app/target/release/collab /app/collab # Copy collab server binary to the runtime image -FROM debian:bullseye-slim as runtime +FROM debian:bookworm-slim as runtime RUN apt-get update; \ - apt-get install -y --no-install-recommends libcurl4-openssl-dev ca-certificates + apt-get install -y --no-install-recommends \ + libcurl4-openssl-dev \ + ca-certificates \ + linux-perf WORKDIR app COPY --from=builder /app/collab /app/collab COPY --from=builder /app/crates/collab/migrations /app/migrations diff --git a/crates/collab/k8s/collab.template.yml b/crates/collab/k8s/collab.template.yml index e1ec20b07c..f0484bf57e 100644 --- a/crates/collab/k8s/collab.template.yml +++ b/crates/collab/k8s/collab.template.yml @@ -78,10 +78,6 @@ spec: port: 8080 initialDelaySeconds: 1 periodSeconds: 1 - resources: - requests: - cpu: "20" - memory: "20Gi" env: - name: HTTP_PORT value: "8080"