From a4c86917d5d7a3e0dc56be6e6a8fb8337da97d65 Mon Sep 17 00:00:00 2001 From: emmanuelsoon Date: Fri, 17 May 2024 11:47:55 +0800 Subject: [PATCH 1/4] update docker file --- docker/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 368f7a9d..f8ed7f35 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -9,16 +9,17 @@ # ARG DOCKER_REGISTRY -FROM ${DOCKER_REGISTRY:+$DOCKER_REGISTRY/}openjdk:11-jdk +FROM ${DOCKER_REGISTRY:+$DOCKER_REGISTRY/}eclipse-temurin:11-jdk-focal RUN mkdir /zu COPY zu /zu WORKDIR /zu RUN ./gradlew --console=verbose --info shadowJar -FROM ${DOCKER_REGISTRY:+$DOCKER_REGISTRY/}zookeeper:3.7.2 +FROM ${DOCKER_REGISTRY:+$DOCKER_REGISTRY/}zookeeper:3.8.2-temurin COPY bin /usr/local/bin RUN chmod +x /usr/local/bin/* COPY --from=0 /zu/build/libs/zu.jar /opt/libs/ RUN apt-get -q update && \ - apt-get install -y dnsutils curl procps socat + apt-get install -y dnsutils curl procps socat; \ + rm -rf /var/lib/apt/lists/*; \ No newline at end of file From 34350c2a578d67b59a7654dc91a83b1d49a52f26 Mon Sep 17 00:00:00 2001 From: Emmanuel Soon Date: Fri, 17 May 2024 13:39:52 +0800 Subject: [PATCH 2/4] switch versions --- docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index f8ed7f35..7421ac4a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -9,13 +9,13 @@ # ARG DOCKER_REGISTRY -FROM ${DOCKER_REGISTRY:+$DOCKER_REGISTRY/}eclipse-temurin:11-jdk-focal +FROM ${DOCKER_REGISTRY:+$DOCKER_REGISTRY/}eclipse-temurin:11-jre RUN mkdir /zu COPY zu /zu WORKDIR /zu RUN ./gradlew --console=verbose --info shadowJar -FROM ${DOCKER_REGISTRY:+$DOCKER_REGISTRY/}zookeeper:3.8.2-temurin +FROM ${DOCKER_REGISTRY:+$DOCKER_REGISTRY/}zookeeper:3.8.3-jre-11 COPY bin /usr/local/bin RUN chmod +x /usr/local/bin/* COPY --from=0 /zu/build/libs/zu.jar /opt/libs/ From ab9e74f602c2398827cb3b1db08ee6484b47bd35 Mon Sep 17 00:00:00 2001 From: emmanuelsoon Date: Mon, 20 May 2024 12:48:03 +0800 Subject: [PATCH 3/4] upgrade gradle and shadow --- docker/zu/build.gradle.kts | 6 +++--- docker/zu/gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/zu/build.gradle.kts b/docker/zu/build.gradle.kts index 32bc7820..1a2f15ed 100644 --- a/docker/zu/build.gradle.kts +++ b/docker/zu/build.gradle.kts @@ -2,8 +2,8 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - kotlin("jvm") version "1.5.31" - id("com.github.johnrengelman.shadow") version "7.1.0" + kotlin("jvm") version "1.9.24" + id("com.github.johnrengelman.shadow") version "7.1.2" } repositories { @@ -12,7 +12,7 @@ repositories { dependencies { implementation(kotlin("stdlib")) - implementation("org.apache.zookeeper:zookeeper:3.7.2") + implementation("org.apache.zookeeper:zookeeper:3.8.3") } tasks.withType() { diff --git a/docker/zu/gradle/wrapper/gradle-wrapper.properties b/docker/zu/gradle/wrapper/gradle-wrapper.properties index ffed3a25..3994438e 100644 --- a/docker/zu/gradle/wrapper/gradle-wrapper.properties +++ b/docker/zu/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From cc4b6e9e3a29f10a2908d47e3f5d07192ab6ff23 Mon Sep 17 00:00:00 2001 From: emmanuelsoon Date: Mon, 20 May 2024 16:25:35 +0800 Subject: [PATCH 4/4] switch to 3.7.2 --- docker/Dockerfile | 9 ++++++--- docker/zu/build.gradle.kts | 4 ++-- docker/zu/gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 7421ac4a..68c33ac9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -15,11 +15,14 @@ COPY zu /zu WORKDIR /zu RUN ./gradlew --console=verbose --info shadowJar -FROM ${DOCKER_REGISTRY:+$DOCKER_REGISTRY/}zookeeper:3.8.3-jre-11 +FROM ${DOCKER_REGISTRY:+$DOCKER_REGISTRY/}zookeeper:3.7.2-jre-11 COPY bin /usr/local/bin RUN chmod +x /usr/local/bin/* COPY --from=0 /zu/build/libs/zu.jar /opt/libs/ RUN apt-get -q update && \ - apt-get install -y dnsutils curl procps socat; \ - rm -rf /var/lib/apt/lists/*; \ No newline at end of file + apt-get install -y dnsutils curl procps socat; + +RUN apt-get upgrade curl + + diff --git a/docker/zu/build.gradle.kts b/docker/zu/build.gradle.kts index 1a2f15ed..d37a5380 100644 --- a/docker/zu/build.gradle.kts +++ b/docker/zu/build.gradle.kts @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { kotlin("jvm") version "1.9.24" - id("com.github.johnrengelman.shadow") version "7.1.2" + id("com.github.johnrengelman.shadow") version "8.1.1" } repositories { @@ -16,7 +16,7 @@ dependencies { } tasks.withType() { - classifier = null + archiveClassifier = null manifest { attributes["Main-Class"] = "io.pravega.zookeeper.MainKt" } diff --git a/docker/zu/gradle/wrapper/gradle-wrapper.properties b/docker/zu/gradle/wrapper/gradle-wrapper.properties index 3994438e..48c0a02c 100644 --- a/docker/zu/gradle/wrapper/gradle-wrapper.properties +++ b/docker/zu/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists