diff --git a/Dockerfile.builder.linux-jre b/Dockerfile.builder.linux-jre new file mode 100644 index 000000000..d83f7d29c --- /dev/null +++ b/Dockerfile.builder.linux-jre @@ -0,0 +1,7 @@ +FROM debian:9-slim + +WORKDIR /app/build +COPY ./build/artifacts/native-image-source/ /app/build +RUN mkdir -p /app/build/artifacts/linux-jre && mv dns-proxy-server.jar /app/build/artifacts/linux-jre/ + +ENTRYPOINT cat diff --git a/Dockerfile.jre b/Dockerfile.jre new file mode 100644 index 000000000..79916b955 --- /dev/null +++ b/Dockerfile.jre @@ -0,0 +1,13 @@ +FROM eclipse-temurin:21-jre + +WORKDIR /app +COPY ./build/artifacts/linux-jre/ /app + +LABEL dps.container=true +ENV DPS_CONTAINER=1 +VOLUME ["/var/run/docker.sock", "/var/run/docker.sock"] + +ENTRYPOINT [ \ + "java", \ + "-jar", "/app/dns-proxy-server.jar" \ +] diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index cdb87a82b..a3a01dcd8 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,3 +1,6 @@ +## 5.4.0 +* Releasing JRE Docker Image Version + ## 5.3.0 * Docker Solver: Specify Preferred Networks to use when solving container IP #662 diff --git a/builder.bash b/builder.bash index 8b02f6aa1..970b44a94 100755 --- a/builder.bash +++ b/builder.bash @@ -106,6 +106,7 @@ case $1 in docker tag defreitas/dns-proxy-server:${APP_VERSION} defreitas/dns-proxy-server:unstable &&\ echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin &&\ docker-compose push image-linux-amd64 &&\ + docker-compose push image-linux-jre &&\ docker push defreitas/dns-proxy-server:nightly &&\ docker push defreitas/dns-proxy-server:unstable echo "Push done" @@ -135,6 +136,7 @@ case $1 in # also builds the jar ./builder.bash build-backend amd64 + ./builder.bash build-backend jre ./builder.bash compress-artifacts diff --git a/docker-compose.yml b/docker-compose.yml index 657f82238..df12fac8e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,6 +27,12 @@ services: dockerfile: Dockerfile.builder.linux-aarch64 platform: linux/arm64/v8 + build-linux-jre: + image: defreitas/dns-proxy-server-build:${VERSION:-snapshot}-jre + build: + context: . + dockerfile: Dockerfile.builder.linux-jre + # end:build # tag:image @@ -47,4 +53,11 @@ services: build: context: . dockerfile: Dockerfile.aarch64 + + image-linux-jre: + image: defreitas/dns-proxy-server:${VERSION:-snapshot}-jre + build: + context: . + dockerfile: Dockerfile.jre + # end:image diff --git a/gradle.properties b/gradle.properties index d3573c222..fb702c18a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=5.3.0-snapshot +version=5.4.0-snapshot