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