Skip to content

Commit fecca5e

Browse files
authored
chore(deps): Upgrade debian usages to use bookworm (vectordotdev#18057)
* chore(deps): Upgrade debian usages to use bookworm Released in June. Prompted by vectordotdev#16673 (comment) Signed-off-by: Jesse Szwedko <[email protected]> * Try updating llvm Signed-off-by: Jesse Szwedko <[email protected]> * Try putting LLVM back Signed-off-by: Jesse Szwedko <[email protected]> --------- Signed-off-by: Jesse Szwedko <[email protected]>
1 parent 8663602 commit fecca5e

File tree

7 files changed

+10
-9
lines changed

7 files changed

+10
-9
lines changed

.github/workflows/publish.yml

+1
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@ jobs:
294294
- ubuntu:23.04
295295
- debian:10
296296
- debian:11
297+
- debian:12
297298
container:
298299
image: ${{ matrix.container }}
299300
steps:

distribution/docker/debian/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker.io/debian:bullseye-slim AS builder
1+
FROM docker.io/debian:bookworm-slim AS builder
22

33
WORKDIR /vector
44

@@ -7,7 +7,7 @@ RUN dpkg -i vector_*_"$(dpkg --print-architecture)".deb
77

88
RUN mkdir -p /var/lib/vector
99

10-
FROM docker.io/debian:bullseye-slim
10+
FROM docker.io/debian:bookworm-slim
1111

1212
RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates tzdata systemd && rm -rf /var/lib/apt/lists/*
1313

distribution/docker/distroless-libc/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker.io/debian:bullseye-slim AS builder
1+
FROM docker.io/debian:bookworm-slim AS builder
22

33
WORKDIR /vector
44

regression/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \
1919
#
2020
# TARGET
2121
#
22-
FROM docker.io/debian:bullseye-slim@sha256:b0d53c872fd640c2af2608ba1e693cfc7dedea30abcd8f584b23d583ec6dadc7
22+
FROM docker.io/debian:bookworm-slim@sha256:01bd742e2c269abf94e2fefb47b08b5b61c9a880b993417d23a1d0bd9fa60dc4
2323
RUN apt-get update && apt-get dist-upgrade -y && apt-get -y --no-install-recommends install zlib1g ca-certificates && rm -rf /var/lib/apt/lists/*
2424
COPY --from=lading /usr/bin/lading /usr/local/bin/lading
2525
COPY --from=builder /vector/vector /usr/local/bin/vector

scripts/integration/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
ARG RUST_VERSION
2-
FROM docker.io/rust:${RUST_VERSION}-slim-bullseye
2+
FROM docker.io/rust:${RUST_VERSION}-slim-bookworm
33

44
RUN apt-get update && apt-get install -y --no-install-recommends \
55
build-essential \
66
cmake \
77
curl \
88
g++ \
9-
libclang1-9 \
9+
libclang1 \
1010
libsasl2-dev \
1111
libssl-dev \
12-
llvm-9 \
12+
llvm \
1313
pkg-config \
1414
zlib1g-dev \
1515
unzip \

tests/data/dnstap/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker.io/library/debian:bullseye
1+
FROM docker.io/library/debian:bookworm
22

33
ENV DEBIAN_FRONTEND=noninteractive
44
RUN apt-get update \

tilt/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG RUST_VERSION
2-
ARG DEBIAN_RELEASE=bullseye
2+
ARG DEBIAN_RELEASE=bookworm
33
# Features required for both Agent and Aggregator Helm chart configurations
44
ARG FEATURES=api,api-client,sources-datadog_agent,sources-fluent,sources-host_metrics,sources-internal_metrics,sources-kubernetes_logs,sources-logstash,sources-splunk_hec,sources-statsd,sources-syslog,sources-vector,sinks-console,sinks-prometheus,sinks-vector
55

0 commit comments

Comments
 (0)