Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): Upgrade debian usages to use bookworm #18057

Merged
merged 3 commits into from
Jul 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@ jobs:
- ubuntu:23.04
- debian:10
- debian:11
- debian:12
container:
image: ${{ matrix.container }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions distribution/docker/debian/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/debian:bullseye-slim AS builder
FROM docker.io/debian:bookworm-slim AS builder

WORKDIR /vector

Expand All @@ -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/*

Expand Down
2 changes: 1 addition & 1 deletion distribution/docker/distroless-libc/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/debian:bullseye-slim AS builder
FROM docker.io/debian:bookworm-slim AS builder

WORKDIR /vector

Expand Down
2 changes: 1 addition & 1 deletion regression/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions scripts/integration/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
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 \
cmake \
curl \
g++ \
libclang1-9 \
libclang1 \
libsasl2-dev \
libssl-dev \
llvm-9 \
llvm \
pkg-config \
zlib1g-dev \
unzip \
Expand Down
2 changes: 1 addition & 1 deletion tests/data/dnstap/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/library/debian:bullseye
FROM docker.io/library/debian:bookworm

ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion tilt/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
Loading