Skip to content

Commit 24080a2

Browse files
authored
Merge pull request #19 from solsson/java-11
Use Java 11 everywhere
2 parents f3658d6 + 8cbe45b commit 24080a2

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

initutils/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# same FROM as kafka-jre, to keep pull times down and to provide the same shell distro+version
2-
FROM debian:stretch-slim@sha256:ea42520331a55094b90f6f6663211d4f5a62c5781673935fe17a4dfced777029
2+
FROM debian:9.6-slim@sha256:f05c05a218b7a4a5fe979045b1c8e2a9ec3524e5611ebfdd0ef5b8040f9008fa
33

4-
ENV KUBERNETES_VERSION=1.9.6 KUBERNETES_CLIENT_SHA256=2b1ab65171bcd43a099d4f7d05d7804c737272270e83f633e1c14ceed9a99133
4+
ENV KUBERNETES_VERSION=1.12.3 KUBERNETES_CLIENT_SHA256=4a3baa259869f3647f0b440effb04ce3455c1026ddac7e51b6692a0ee05eab1e
55

66
RUN set -ex; \
77
export DEBIAN_FRONTEND=noninteractive; \

kubectl-kafkacat/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
# Select digest to have the same FROM as kafka-jre
21
FROM solsson/kafkacat@sha256:be85344e8932d5dd4492fb37122be0bb9e65e560fe960058e0460ec13eea6547
32

4-
ENV KUBERNETES_VERSION=1.8.5 KUBERNETES_CLIENTS_SHA256=c32b6f90f1e8a15451f0d412d6d1f3db28948d2f7d76d4e28d83c11e1eb25f20
3+
ENV KUBERNETES_VERSION=1.12.3 KUBERNETES_CLIENT_SHA256=4a3baa259869f3647f0b440effb04ce3455c1026ddac7e51b6692a0ee05eab1e
54

65
RUN set -ex; \
76
export DEBIAN_FRONTEND=noninteractive; \
@@ -11,7 +10,7 @@ RUN set -ex; \
1110
rm -rf /var/lib/apt/lists/*; \
1211
\
1312
curl -sLS -o k.tar.gz -k https://dl.k8s.io/v${KUBERNETES_VERSION}/kubernetes-client-linux-amd64.tar.gz; \
14-
echo "$KUBERNETES_CLIENTS_SHA256 k.tar.gz" | sha256sum -c; \
13+
echo "$KUBERNETES_CLIENT_SHA256 k.tar.gz" | sha256sum -c; \
1514
tar -xvzf k.tar.gz -C /usr/local/bin/ --strip-components=3 kubernetes/client/bin/kubectl; \
1615
rm k.tar.gz; \
1716
\

manager/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM solsson/kafka-jre:8@sha256:1ebc3c27c30f5925d240aaa0858e111c2fa6d358048b0f488860ea9cd9c84822
1+
FROM solsson/jdk-opensource:11.0.1@sha256:740feb6c1ecbdf2beac1dc41405c3215511b90d83a7211f805e88f92946dd2a9
22

33
ENV KAFKA_MANAGER_VERSION=1.3.3.18
44

monitor/Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM solsson/kafka-jre:8@sha256:1ebc3c27c30f5925d240aaa0858e111c2fa6d358048b0f488860ea9cd9c84822
1+
FROM solsson/jdk-opensource:11.0.1@sha256:740feb6c1ecbdf2beac1dc41405c3215511b90d83a7211f805e88f92946dd2a9
22

33
ENV KAFKA_MONITOR_REPO=https://github.com/linkedin/kafka-monitor \
44
KAFKA_MONITOR_VERSION=2.0.0 \
@@ -11,9 +11,9 @@ RUN set -ex; \
1111
apt-get update && apt-get install -y $runDeps $buildDeps --no-install-recommends; \
1212
\
1313
cd /opt; \
14-
GRADLE_VERSION=4.3.1 PATH=$PATH:$(pwd)/gradle-$GRADLE_VERSION/bin; \
14+
GRADLE_VERSION=4.10.2 PATH=$PATH:$(pwd)/gradle-$GRADLE_VERSION/bin; \
1515
curl -SLs -o gradle-$GRADLE_VERSION-bin.zip https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip; \
16-
echo "15ebe098ce0392a2d06d252bff24143cc88c4e963346582c8d88814758d93ac7 gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -; \
16+
echo "b49c6da1b2cb67a0caf6c7480630b51c70a11ca2016ff2f555eaeda863143a29 gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -; \
1717
unzip gradle-$GRADLE_VERSION-bin.zip; \
1818
rm gradle-$GRADLE_VERSION-bin.zip; \
1919
gradle -v; \
@@ -25,7 +25,8 @@ RUN set -ex; \
2525
rm monitor.tar.gz; \
2626
\
2727
cd /opt/kafka-monitor; \
28-
./gradlew jar; \
28+
rm gradlew; \
29+
gradle --no-daemon jar; \
2930
\
3031
sed -i 's/localhost:2181/zookeeper:2181/' config/kafka-monitor.properties; \
3132
sed -i 's/localhost:9092/bootstrap:9092/' config/kafka-monitor.properties; \

prometheus-jmx-exporter/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM solsson/kafka-jre:8@sha256:1ebc3c27c30f5925d240aaa0858e111c2fa6d358048b0f488860ea9cd9c84822
1+
FROM solsson/jdk-opensource:11.0.1@sha256:740feb6c1ecbdf2beac1dc41405c3215511b90d83a7211f805e88f92946dd2a9
22

33
ENV EXPORTER_VERSION=parent-0.3.1
44
ENV EXPORTER_REPO=github.com/prometheus/jmx_exporter

0 commit comments

Comments
 (0)