File tree Expand file tree Collapse file tree 6 files changed +13
-23
lines changed
metricbeat/module/kafka/_meta
testing/environments/docker Expand file tree Collapse file tree 6 files changed +13
-23
lines changed Original file line number Diff line number Diff line change 1
- FROM debian:stretch
1
+ FROM debian:bookworm
2
2
3
3
ARG KAFKA_VERSION
4
4
@@ -8,12 +8,7 @@ ENV KAFKA_LOGS_DIR="/kafka-logs"
8
8
ENV _JAVA_OPTIONS "-Djava.net.preferIPv4Stack=true"
9
9
ENV TERM=linux
10
10
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
17
12
18
13
RUN mkdir -p ${KAFKA_LOGS_DIR} && mkdir -p ${KAFKA_HOME} && \
19
14
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 && \
Original file line number Diff line number Diff line change 1
- FROM debian:stretch
1
+ FROM debian:bookworm
2
2
ARG SDK_VERSION
3
3
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
-
9
4
RUN \
10
5
apt-get update \
11
6
&& apt-get install -y \
12
7
apt-transport-https \
13
8
ca-certificates \
14
9
curl \
15
- python \
16
- openjdk-8 -jre \
10
+ python-is-python3 \
11
+ openjdk-17 -jre \
17
12
gnupg2 \
18
13
&& rm -rf /var/lib/apt/lists/*
19
14
Original file line number Diff line number Diff line change 1
1
variants :
2
- - SDK_VERSION : 398 .0.0-0
2
+ - SDK_VERSION : 467 .0.0-0
Original file line number Diff line number Diff line change 1
- FROM debian:buster
1
+ FROM debian:bookworm
2
2
3
3
ENV KAFKA_HOME=/kafka
4
4
# Controls the hostname advertised within the Docker network, should generally match the container
@@ -10,7 +10,7 @@ ENV KAFKA_VERSION=3.6.0
10
10
ENV _JAVA_OPTIONS="-Djava.net.preferIPv4Stack=true"
11
11
ENV TERM=linux
12
12
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
14
14
15
15
RUN mkdir -p ${KAFKA_LOGS_DIR} && mkdir -p ${KAFKA_HOME} && \
16
16
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 && \
Original file line number Diff line number Diff line change @@ -21,11 +21,11 @@ services:
21
21
- 9200:9200
22
22
23
23
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
25
25
build :
26
26
context : ${ES_BEATS}/testing/environments/docker/googlepubsub
27
27
args :
28
- SDK_VERSION : ${SDK_VERSION:-398 .0.0-0}
28
+ SDK_VERSION : ${SDK_VERSION:-467 .0.0-0}
29
29
hostname : googlepubsub
30
30
ports :
31
31
- 8432:8432
Original file line number Diff line number Diff line change @@ -21,11 +21,11 @@ services:
21
21
- 9200:9200
22
22
23
23
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
25
25
build :
26
26
context : ${ES_BEATS}/testing/environments/docker/googlepubsub
27
27
args :
28
- SDK_VERSION : ${SDK_VERSION:-398 .0.0-0}
28
+ SDK_VERSION : ${SDK_VERSION:-467 .0.0-0}
29
29
hostname : googlepubsub
30
30
ports :
31
31
- 8432:8432
@@ -57,4 +57,4 @@ services:
57
57
command :
58
58
- http-server
59
59
- --addr=:8090
60
- - --config=/files/config.yaml
60
+ - --config=/files/config.yaml
You can’t perform that action at this time.
0 commit comments