Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions Dockerfile.builder.linux-jre
Original file line number Diff line number Diff line change
@@ -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
13 changes: 13 additions & 0 deletions Dockerfile.jre
Original file line number Diff line number Diff line change
@@ -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" \
]
3 changes: 3 additions & 0 deletions RELEASE-NOTES.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 2 additions & 0 deletions builder.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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

Expand Down
13 changes: 13 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version=5.3.0-snapshot
version=5.4.0-snapshot