From 81e7ac61a8102398f175e0dd5253957b856133c9 Mon Sep 17 00:00:00 2001 From: Jesse Szwedko Date: Fri, 21 Jul 2023 10:37:13 -0700 Subject: [PATCH 1/3] chore(deps): Upgrade debian usages to use bookworm Released in June. Prompted by https://github.com/vectordotdev/vector/issues/16673#issuecomment-1645602002 Signed-off-by: Jesse Szwedko --- .github/workflows/publish.yml | 1 + distribution/docker/debian/Dockerfile | 4 ++-- distribution/docker/distroless-libc/Dockerfile | 2 +- regression/Dockerfile | 2 +- scripts/integration/Dockerfile | 2 +- tests/data/dnstap/Dockerfile | 2 +- tilt/Dockerfile | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 6447afd489fc6..193557738e3bc 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -294,6 +294,7 @@ jobs: - ubuntu:23.04 - debian:10 - debian:11 + - debian:12 container: image: ${{ matrix.container }} steps: diff --git a/distribution/docker/debian/Dockerfile b/distribution/docker/debian/Dockerfile index 46afabb2480e4..b8f7210cc194d 100644 --- a/distribution/docker/debian/Dockerfile +++ b/distribution/docker/debian/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/debian:bullseye-slim AS builder +FROM docker.io/debian:bookworm-slim AS builder WORKDIR /vector @@ -7,7 +7,7 @@ RUN dpkg -i vector_*_"$(dpkg --print-architecture)".deb RUN mkdir -p /var/lib/vector -FROM docker.io/debian:bullseye-slim +FROM docker.io/debian:bookworm-slim RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates tzdata systemd && rm -rf /var/lib/apt/lists/* diff --git a/distribution/docker/distroless-libc/Dockerfile b/distribution/docker/distroless-libc/Dockerfile index 6c164dcd07dfe..44656fa365fc5 100644 --- a/distribution/docker/distroless-libc/Dockerfile +++ b/distribution/docker/distroless-libc/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/debian:bullseye-slim AS builder +FROM docker.io/debian:bookworm-slim AS builder WORKDIR /vector diff --git a/regression/Dockerfile b/regression/Dockerfile index 67bd022687de2..b1b1ca1b5cc1c 100644 --- a/regression/Dockerfile +++ b/regression/Dockerfile @@ -19,7 +19,7 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \ # # TARGET # -FROM docker.io/debian:bullseye-slim@sha256:b0d53c872fd640c2af2608ba1e693cfc7dedea30abcd8f584b23d583ec6dadc7 +FROM docker.io/debian:bookworm-slim@sha256:01bd742e2c269abf94e2fefb47b08b5b61c9a880b993417d23a1d0bd9fa60dc4 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/* COPY --from=lading /usr/bin/lading /usr/local/bin/lading COPY --from=builder /vector/vector /usr/local/bin/vector diff --git a/scripts/integration/Dockerfile b/scripts/integration/Dockerfile index d508730f70085..1f6fe0cf6dd79 100644 --- a/scripts/integration/Dockerfile +++ b/scripts/integration/Dockerfile @@ -1,5 +1,5 @@ ARG RUST_VERSION -FROM docker.io/rust:${RUST_VERSION}-slim-bullseye +FROM docker.io/rust:${RUST_VERSION}-slim-bookworm RUN apt-get update && apt-get install -y --no-install-recommends \ build-essential \ diff --git a/tests/data/dnstap/Dockerfile b/tests/data/dnstap/Dockerfile index cb61b13a2a101..ee929c6c2c925 100644 --- a/tests/data/dnstap/Dockerfile +++ b/tests/data/dnstap/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/library/debian:bullseye +FROM docker.io/library/debian:bookworm ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update \ diff --git a/tilt/Dockerfile b/tilt/Dockerfile index 833402a795bf6..1a7504769ad57 100644 --- a/tilt/Dockerfile +++ b/tilt/Dockerfile @@ -1,5 +1,5 @@ ARG RUST_VERSION -ARG DEBIAN_RELEASE=bullseye +ARG DEBIAN_RELEASE=bookworm # Features required for both Agent and Aggregator Helm chart configurations 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 From 3d2e206cd531280fbd4b8a07143a264d41cf4098 Mon Sep 17 00:00:00 2001 From: Jesse Szwedko Date: Mon, 24 Jul 2023 07:37:18 -0700 Subject: [PATCH 2/3] Try updating llvm Signed-off-by: Jesse Szwedko --- scripts/cross/bootstrap-ubuntu.sh | 15 ++------------- scripts/integration/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/scripts/cross/bootstrap-ubuntu.sh b/scripts/cross/bootstrap-ubuntu.sh index cf053aa365b20..9da3b46a27414 100755 --- a/scripts/cross/bootstrap-ubuntu.sh +++ b/scripts/cross/bootstrap-ubuntu.sh @@ -9,19 +9,8 @@ apt-get install -y \ gnupg \ wget -# we need LLVM >= 3.9 for onig_sys/bindgen - -cat <<-EOF > /etc/apt/sources.list.d/llvm.list -deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main -deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main -EOF - -wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add - - -apt-get update - # needed by onig_sys apt-get install -y \ - libclang1-9 \ - llvm-9 \ + libclang1-14 \ + llvm-14 \ unzip diff --git a/scripts/integration/Dockerfile b/scripts/integration/Dockerfile index 1f6fe0cf6dd79..1af2818543faf 100644 --- a/scripts/integration/Dockerfile +++ b/scripts/integration/Dockerfile @@ -6,10 +6,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ cmake \ curl \ g++ \ - libclang1-9 \ + libclang1-14 \ libsasl2-dev \ libssl-dev \ - llvm-9 \ + llvm-14 \ pkg-config \ zlib1g-dev \ unzip \ From 86ba0dfe3d280fc63b32e8d8dced19846800e4f1 Mon Sep 17 00:00:00 2001 From: Jesse Szwedko Date: Mon, 24 Jul 2023 10:28:57 -0700 Subject: [PATCH 3/3] Try putting LLVM back Signed-off-by: Jesse Szwedko --- scripts/cross/bootstrap-ubuntu.sh | 15 +++++++++++++-- scripts/integration/Dockerfile | 4 ++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/scripts/cross/bootstrap-ubuntu.sh b/scripts/cross/bootstrap-ubuntu.sh index 9da3b46a27414..cf053aa365b20 100755 --- a/scripts/cross/bootstrap-ubuntu.sh +++ b/scripts/cross/bootstrap-ubuntu.sh @@ -9,8 +9,19 @@ apt-get install -y \ gnupg \ wget +# we need LLVM >= 3.9 for onig_sys/bindgen + +cat <<-EOF > /etc/apt/sources.list.d/llvm.list +deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main +deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main +EOF + +wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add - + +apt-get update + # needed by onig_sys apt-get install -y \ - libclang1-14 \ - llvm-14 \ + libclang1-9 \ + llvm-9 \ unzip diff --git a/scripts/integration/Dockerfile b/scripts/integration/Dockerfile index 1af2818543faf..8479094588153 100644 --- a/scripts/integration/Dockerfile +++ b/scripts/integration/Dockerfile @@ -6,10 +6,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ cmake \ curl \ g++ \ - libclang1-14 \ + libclang1 \ libsasl2-dev \ libssl-dev \ - llvm-14 \ + llvm \ pkg-config \ zlib1g-dev \ unzip \