From 3499e6c3d45554c66cb919eccbc6309c75e558ab Mon Sep 17 00:00:00 2001 From: Ashay Date: Mon, 14 Oct 2024 22:30:10 +0530 Subject: [PATCH] Update the base images to bookworm, support kafka plugin --- bridge/Dockerfile | 10 +++++++--- bridge/svix-bridge-plugin-kafka/Cargo.toml | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bridge/Dockerfile b/bridge/Dockerfile index 550f7dfb0..810992e11 100644 --- a/bridge/Dockerfile +++ b/bridge/Dockerfile @@ -1,13 +1,14 @@ # Base build -FROM rust:1.72-slim-bullseye AS build +FROM rust:1.81-slim-bookworm AS build RUN apt-get update && apt-get install -y \ build-essential=12.* \ checkinstall=1.* \ curl=7.* \ libssl-dev=* \ - pkg-config=0.29.* \ + pkg-config=1.8.* \ zlib1g-dev=1:* \ + cmake=3.* \ --no-install-recommends RUN set -ex ; \ @@ -23,12 +24,15 @@ WORKDIR /app COPY Cargo.toml . COPY Cargo.lock . COPY svix-bridge-types/Cargo.toml svix-bridge-types/ +COPY svix-bridge-plugin-kafka/Cargo.toml svix-bridge-plugin-kafka/ COPY svix-bridge-plugin-queue/Cargo.toml svix-bridge-plugin-queue/ COPY svix-bridge/Cargo.toml svix-bridge/ RUN set -ex ;\ + mkdir svix-bridge-plugin-kafka/src ;\ mkdir svix-bridge-plugin-queue/src ;\ mkdir svix-bridge-types/src ;\ mkdir svix-bridge/src ;\ + echo '' > svix-bridge-plugin-kafka/src/lib.rs ;\ echo '' > svix-bridge-plugin-queue/src/lib.rs ;\ echo '' > svix-bridge-types/src/lib.rs ;\ echo 'fn main() { println!("Dummy!"); }' > svix-bridge/src/main.rs ;\ @@ -44,7 +48,7 @@ RUN touch */src/lib.rs && touch */src/main.rs RUN cargo build --release --frozen # Production -FROM debian:bullseye-slim AS prod +FROM debian:bookworm-slim AS prod RUN set -ex ; \ mkdir -p /app ;\ diff --git a/bridge/svix-bridge-plugin-kafka/Cargo.toml b/bridge/svix-bridge-plugin-kafka/Cargo.toml index 7d997eb6c..6073dc9f2 100644 --- a/bridge/svix-bridge-plugin-kafka/Cargo.toml +++ b/bridge/svix-bridge-plugin-kafka/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" publish = false [dependencies] -rdkafka = { version = "0.36.0", features = ["cmake-build", "ssl", "tracing"] } +rdkafka = { version = "0.36.2", features = ["cmake-build", "ssl", "tracing"] } serde.workspace = true serde_json.workspace = true svix-bridge-types.workspace = true