Skip to content

Commit 58f44bb

Browse files
AndersonQbelimawrrdnerkhushijain21
authored
Use debian bookworm for docker images (#45363)
* Update the Docker images from Debian stretch to bookworm. * Use JDK 17 instead of JDK 11 * Remove sed edit hack on the source list * Update the Google Cloud SDK version --------- Co-authored-by: Tiago Queiroz <tiago.queiroz@elastic.co> Co-authored-by: Denis Rechkunov <denis.rechkunov@elastic.co> Co-authored-by: Khushi Jain <khushi.jain@elastic.co>
1 parent ab4b7af commit 58f44bb

File tree

6 files changed

+13
-23
lines changed

6 files changed

+13
-23
lines changed

metricbeat/module/kafka/_meta/Dockerfile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:stretch
1+
FROM debian:bookworm
22

33
ARG KAFKA_VERSION
44

@@ -8,12 +8,7 @@ ENV KAFKA_LOGS_DIR="/kafka-logs"
88
ENV _JAVA_OPTIONS "-Djava.net.preferIPv4Stack=true"
99
ENV TERM=linux
1010

11-
# TODO: use newer base
12-
RUN sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list \
13-
&& sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list \
14-
&& sed -i '/stretch-updates/d' /etc/apt/sources.list
15-
16-
RUN apt-get update && apt-get install -y curl openjdk-8-jre-headless netcat-openbsd dnsutils
11+
RUN apt-get update && apt-get install -y curl openjdk-17-jre-headless netcat-openbsd dnsutils
1712

1813
RUN mkdir -p ${KAFKA_LOGS_DIR} && mkdir -p ${KAFKA_HOME} && \
1914
curl -J -L -s -f -o - https://github.com/kadwanev/retry/releases/download/1.0.1/retry-1.0.1.tar.gz | tar xfz - -C /usr/local/bin && \

testing/environments/docker/googlepubsub/Dockerfile

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
1-
FROM debian:stretch
1+
FROM debian:bookworm
22
ARG SDK_VERSION
33

4-
# TODO: use newer base
5-
RUN sed -i s/deb.debian.org/archive.debian.org/g /etc/apt/sources.list \
6-
&& sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list \
7-
&& sed -i '/stretch-updates/d' /etc/apt/sources.list
8-
94
RUN \
105
apt-get update \
116
&& apt-get install -y \
127
apt-transport-https \
138
ca-certificates \
149
curl \
15-
python \
16-
openjdk-8-jre \
10+
python-is-python3 \
11+
openjdk-17-jre \
1712
gnupg2 \
1813
&& rm -rf /var/lib/apt/lists/*
1914

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
variants:
2-
- SDK_VERSION: 398.0.0-0
2+
- SDK_VERSION: 467.0.0-0

testing/environments/docker/kafka/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:buster
1+
FROM debian:bookworm
22

33
ENV KAFKA_HOME=/kafka
44
# Controls the hostname advertised within the Docker network, should generally match the container
@@ -10,7 +10,7 @@ ENV KAFKA_VERSION=3.6.0
1010
ENV _JAVA_OPTIONS="-Djava.net.preferIPv4Stack=true"
1111
ENV TERM=linux
1212

13-
RUN apt-get update && apt-get install -y curl openjdk-11-jre-headless netcat-openbsd
13+
RUN apt-get update && apt-get install -y curl openjdk-17-jre-headless netcat-openbsd
1414

1515
RUN mkdir -p ${KAFKA_LOGS_DIR} && mkdir -p ${KAFKA_HOME} && \
1616
curl -J -L -s -f -o - https://github.com/kadwanev/retry/releases/download/1.0.1/retry-1.0.1.tar.gz | tar xfz - -C /usr/local/bin && \

x-pack/agentbeat/docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ services:
2121
- 9200:9200
2222

2323
googlepubsub:
24-
image: docker.elastic.co/integrations-ci/beats-googlepubsub:emulator-${SDK_VERSION:-398.0.0-0}-1
24+
image: docker.elastic.co/integrations-ci/beats-googlepubsub:emulator-${SDK_VERSION:-467.0.0-0}-1
2525
build:
2626
context: ${ES_BEATS}/testing/environments/docker/googlepubsub
2727
args:
28-
SDK_VERSION: ${SDK_VERSION:-398.0.0-0}
28+
SDK_VERSION: ${SDK_VERSION:-467.0.0-0}
2929
hostname: googlepubsub
3030
ports:
3131
- 8432:8432

x-pack/filebeat/docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ services:
2121
- 9200:9200
2222

2323
googlepubsub:
24-
image: docker.elastic.co/integrations-ci/beats-googlepubsub:emulator-${SDK_VERSION:-398.0.0-0}-1
24+
image: docker.elastic.co/integrations-ci/beats-googlepubsub:emulator-${SDK_VERSION:-467.0.0-0}-1
2525
build:
2626
context: ${ES_BEATS}/testing/environments/docker/googlepubsub
2727
args:
28-
SDK_VERSION: ${SDK_VERSION:-398.0.0-0}
28+
SDK_VERSION: ${SDK_VERSION:-467.0.0-0}
2929
hostname: googlepubsub
3030
ports:
3131
- 8432:8432
@@ -57,4 +57,4 @@ services:
5757
command:
5858
- http-server
5959
- --addr=:8090
60-
- --config=/files/config.yaml
60+
- --config=/files/config.yaml

0 commit comments

Comments
 (0)