From 4c705e4975c96983e8cf8dde5e913537f8549603 Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Wed, 28 Nov 2018 05:36:37 +0100 Subject: [PATCH 1/7] Uses JDK 11 for the other tools too --- manager/Dockerfile | 2 +- monitor/Dockerfile | 2 +- prometheus-jmx-exporter/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manager/Dockerfile b/manager/Dockerfile index f907f25..fcac82a 100644 --- a/manager/Dockerfile +++ b/manager/Dockerfile @@ -1,4 +1,4 @@ -FROM solsson/kafka-jre:8@sha256:1ebc3c27c30f5925d240aaa0858e111c2fa6d358048b0f488860ea9cd9c84822 +FROM solsson/jdk-opensource:11.0.1@sha256:740feb6c1ecbdf2beac1dc41405c3215511b90d83a7211f805e88f92946dd2a9 ENV KAFKA_MANAGER_VERSION=1.3.3.18 diff --git a/monitor/Dockerfile b/monitor/Dockerfile index 27b6438..4407281 100644 --- a/monitor/Dockerfile +++ b/monitor/Dockerfile @@ -1,4 +1,4 @@ -FROM solsson/kafka-jre:8@sha256:1ebc3c27c30f5925d240aaa0858e111c2fa6d358048b0f488860ea9cd9c84822 +FROM solsson/jdk-opensource:11.0.1@sha256:740feb6c1ecbdf2beac1dc41405c3215511b90d83a7211f805e88f92946dd2a9 ENV KAFKA_MONITOR_REPO=https://github.com/linkedin/kafka-monitor \ KAFKA_MONITOR_VERSION=2.0.0 \ diff --git a/prometheus-jmx-exporter/Dockerfile b/prometheus-jmx-exporter/Dockerfile index ed2bb78..0f8702f 100644 --- a/prometheus-jmx-exporter/Dockerfile +++ b/prometheus-jmx-exporter/Dockerfile @@ -1,4 +1,4 @@ -FROM solsson/kafka-jre:8@sha256:1ebc3c27c30f5925d240aaa0858e111c2fa6d358048b0f488860ea9cd9c84822 +FROM solsson/jdk-opensource:11.0.1@sha256:740feb6c1ecbdf2beac1dc41405c3215511b90d83a7211f805e88f92946dd2a9 ENV EXPORTER_VERSION=parent-0.3.1 ENV EXPORTER_REPO=github.com/prometheus/jmx_exporter From b6ba752161edb8c8460c7097fc3ea9cd552fdc70 Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Wed, 28 Nov 2018 05:38:45 +0100 Subject: [PATCH 2/7] Same Debian layer for non-java --- initutils/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/initutils/Dockerfile b/initutils/Dockerfile index e0cf94a..da58838 100644 --- a/initutils/Dockerfile +++ b/initutils/Dockerfile @@ -1,5 +1,5 @@ # same FROM as kafka-jre, to keep pull times down and to provide the same shell distro+version -FROM debian:stretch-slim@sha256:ea42520331a55094b90f6f6663211d4f5a62c5781673935fe17a4dfced777029 +FROM debian:9.6-slim@sha256:f05c05a218b7a4a5fe979045b1c8e2a9ec3524e5611ebfdd0ef5b8040f9008fa ENV KUBERNETES_VERSION=1.9.6 KUBERNETES_CLIENT_SHA256=2b1ab65171bcd43a099d4f7d05d7804c737272270e83f633e1c14ceed9a99133 From 8164b1e6bfbdad9e6d9d9562c545a151512760e7 Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Wed, 28 Nov 2018 05:47:08 +0100 Subject: [PATCH 3/7] Also upgrade kubectl for Yolean/kubernetes-kafka to a maintained version --- initutils/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/initutils/Dockerfile b/initutils/Dockerfile index da58838..89a2214 100644 --- a/initutils/Dockerfile +++ b/initutils/Dockerfile @@ -1,7 +1,7 @@ # same FROM as kafka-jre, to keep pull times down and to provide the same shell distro+version FROM debian:9.6-slim@sha256:f05c05a218b7a4a5fe979045b1c8e2a9ec3524e5611ebfdd0ef5b8040f9008fa -ENV KUBERNETES_VERSION=1.9.6 KUBERNETES_CLIENT_SHA256=2b1ab65171bcd43a099d4f7d05d7804c737272270e83f633e1c14ceed9a99133 +ENV KUBERNETES_VERSION=1.12.3 KUBERNETES_CLIENT_SHA256=4a3baa259869f3647f0b440effb04ce3455c1026ddac7e51b6692a0ee05eab1e RUN set -ex; \ export DEBIAN_FRONTEND=noninteractive; \ From a1cf20e5fa4f4e3245f28f27dcb1ebdf6b88732f Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Wed, 28 Nov 2018 05:49:24 +0100 Subject: [PATCH 4/7] Kafka-manager wouldn't build with JDK 11 so let's keep the old image --- manager/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager/Dockerfile b/manager/Dockerfile index fcac82a..f907f25 100644 --- a/manager/Dockerfile +++ b/manager/Dockerfile @@ -1,4 +1,4 @@ -FROM solsson/jdk-opensource:11.0.1@sha256:740feb6c1ecbdf2beac1dc41405c3215511b90d83a7211f805e88f92946dd2a9 +FROM solsson/kafka-jre:8@sha256:1ebc3c27c30f5925d240aaa0858e111c2fa6d358048b0f488860ea9cd9c84822 ENV KAFKA_MANAGER_VERSION=1.3.3.18 From 536820fc9917e63c2b8ece27008de2d722e78104 Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Wed, 28 Nov 2018 05:57:09 +0100 Subject: [PATCH 5/7] Avoids kafka-monitor's checked in gradlew so we can build with JDK 11 --- monitor/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/monitor/Dockerfile b/monitor/Dockerfile index 4407281..f2ce84a 100644 --- a/monitor/Dockerfile +++ b/monitor/Dockerfile @@ -11,9 +11,9 @@ RUN set -ex; \ apt-get update && apt-get install -y $runDeps $buildDeps --no-install-recommends; \ \ cd /opt; \ - GRADLE_VERSION=4.3.1 PATH=$PATH:$(pwd)/gradle-$GRADLE_VERSION/bin; \ + GRADLE_VERSION=4.10.2 PATH=$PATH:$(pwd)/gradle-$GRADLE_VERSION/bin; \ curl -SLs -o gradle-$GRADLE_VERSION-bin.zip https://services.gradle.org/distributions/gradle-$GRADLE_VERSION-bin.zip; \ - echo "15ebe098ce0392a2d06d252bff24143cc88c4e963346582c8d88814758d93ac7 gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -; \ + echo "b49c6da1b2cb67a0caf6c7480630b51c70a11ca2016ff2f555eaeda863143a29 gradle-$GRADLE_VERSION-bin.zip" | sha256sum -c -; \ unzip gradle-$GRADLE_VERSION-bin.zip; \ rm gradle-$GRADLE_VERSION-bin.zip; \ gradle -v; \ @@ -25,7 +25,8 @@ RUN set -ex; \ rm monitor.tar.gz; \ \ cd /opt/kafka-monitor; \ - ./gradlew jar; \ + rm gradlew; \ + gradle --no-daemon jar; \ \ sed -i 's/localhost:2181/zookeeper:2181/' config/kafka-monitor.properties; \ sed -i 's/localhost:9092/bootstrap:9092/' config/kafka-monitor.properties; \ From f7713d2f07052a3ad756e5d731288b492044c5f3 Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Wed, 28 Nov 2018 06:01:51 +0100 Subject: [PATCH 6/7] Same kubectl as in kafka-initutils --- kubectl-kafkacat/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kubectl-kafkacat/Dockerfile b/kubectl-kafkacat/Dockerfile index 9d3a11a..039a4ba 100644 --- a/kubectl-kafkacat/Dockerfile +++ b/kubectl-kafkacat/Dockerfile @@ -1,7 +1,6 @@ -# Select digest to have the same FROM as kafka-jre FROM solsson/kafkacat@sha256:be85344e8932d5dd4492fb37122be0bb9e65e560fe960058e0460ec13eea6547 -ENV KUBERNETES_VERSION=1.8.5 KUBERNETES_CLIENTS_SHA256=c32b6f90f1e8a15451f0d412d6d1f3db28948d2f7d76d4e28d83c11e1eb25f20 +ENV KUBERNETES_VERSION=1.12.3 KUBERNETES_CLIENT_SHA256=4a3baa259869f3647f0b440effb04ce3455c1026ddac7e51b6692a0ee05eab1e RUN set -ex; \ export DEBIAN_FRONTEND=noninteractive; \ @@ -11,7 +10,7 @@ RUN set -ex; \ rm -rf /var/lib/apt/lists/*; \ \ curl -sLS -o k.tar.gz -k https://dl.k8s.io/v${KUBERNETES_VERSION}/kubernetes-client-linux-amd64.tar.gz; \ - echo "$KUBERNETES_CLIENTS_SHA256 k.tar.gz" | sha256sum -c; \ + echo "$KUBERNETES_CLIENT_SHA256 k.tar.gz" | sha256sum -c; \ tar -xvzf k.tar.gz -C /usr/local/bin/ --strip-components=3 kubernetes/client/bin/kubectl; \ rm k.tar.gz; \ \ From 8cbe45b2cf62ad63b0549ac6d58f78a82b84dcc8 Mon Sep 17 00:00:00 2001 From: Staffan Olsson Date: Wed, 28 Nov 2018 06:07:03 +0100 Subject: [PATCH 7/7] Actually let's keep the build failing for kafka-manager until Java 11 build is supported. This reverts commit a1cf20e5fa4f4e3245f28f27dcb1ebdf6b88732f. --- manager/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager/Dockerfile b/manager/Dockerfile index f907f25..fcac82a 100644 --- a/manager/Dockerfile +++ b/manager/Dockerfile @@ -1,4 +1,4 @@ -FROM solsson/kafka-jre:8@sha256:1ebc3c27c30f5925d240aaa0858e111c2fa6d358048b0f488860ea9cd9c84822 +FROM solsson/jdk-opensource:11.0.1@sha256:740feb6c1ecbdf2beac1dc41405c3215511b90d83a7211f805e88f92946dd2a9 ENV KAFKA_MANAGER_VERSION=1.3.3.18