Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: switch to 3.7.2 as image is newer #607

Closed
wants to merge 6 commits into from
Closed

refactor: switch to 3.7.2 as image is newer #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a4c8691
update docker file
EmmanuelSoon May 17, 2024
878c5f5
Merge pull request #1 from EmmanuelSoon/upgrade-zk-to-3.8-and-upgrade…
EmmanuelSoon May 17, 2024
34350c2
switch versions
EmmanuelSoon May 17, 2024
ebe4e4b
Merge pull request #2 from EmmanuelSoon/upgrade-to-3.8.3-and-java-ver…
EmmanuelSoon May 17, 2024
ab9e74f
upgrade gradle and shadow
EmmanuelSoon May 20, 2024
cc4b6e9
switch to 3.7.2
EmmanuelSoon May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,20 @@
#

ARG DOCKER_REGISTRY
FROM ${DOCKER_REGISTRY:+$DOCKER_REGISTRY/}openjdk:11-jdk
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.7.2
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
apt-get install -y dnsutils curl procps socat;

RUN apt-get upgrade curl


8 changes: 4 additions & 4 deletions docker/zu/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "8.1.1"
}

repositories {
Expand All @@ -12,11 +12,11 @@ repositories {

dependencies {
implementation(kotlin("stdlib"))
implementation("org.apache.zookeeper:zookeeper:3.7.2")
implementation("org.apache.zookeeper:zookeeper:3.8.3")
}

tasks.withType<ShadowJar>() {
classifier = null
archiveClassifier = null
manifest {
attributes["Main-Class"] = "io.pravega.zookeeper.MainKt"
}
Expand Down
2 changes: 1 addition & 1 deletion docker/zu/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading