diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml index b84506b..f58a6a4 100644 --- a/.github/workflows/docker-build-test.yml +++ b/.github/workflows/docker-build-test.yml @@ -20,6 +20,7 @@ jobs: - testing/docker-compose.yugabytedb.yml dockerfile: - Dockerfile.ci + - Dockerfile.azul.ci - Dockerfile.openj9.ci - Dockerfile.graalvm-jvm.ci fail-fast: false diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index cf385b3..3327e48 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -15,8 +15,10 @@ jobs: include: - image: 1337kavin/piped:openj9 dockerfile: ./Dockerfile.openj9.ci - - image: 1337kavin/piped:latest,1337kavin/piped:hotspot + - image: 1337kavin/piped:hotspot dockerfile: ./Dockerfile.ci + - image: 1337kavin/piped:latest,1337kavin/piped:azul-zulu + dockerfile: ./Dockerfile.azul.ci - image: 1337kavin/piped:graalvm-jvm dockerfile: ./Dockerfile.graalvm-jvm.ci steps: diff --git a/Dockerfile b/Dockerfile index 3f08682..f0fa377 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,4 +17,4 @@ COPY VERSION . EXPOSE 8080 -CMD java -server -Xmx1G -XX:+UnlockExperimentalVMOptions -XX:+OptimizeStringConcat -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+UseNUMA -XX:+UseG1GC -Xshare:on --enable-preview -jar /app/piped.jar +CMD java -server -Xmx1G -XX:+UnlockExperimentalVMOptions -XX:+OptimizeStringConcat -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+UseNUMA -XX:+UseG1GC -Xshare:on -jar /app/piped.jar diff --git a/Dockerfile.azul b/Dockerfile.azul new file mode 100644 index 0000000..71b9c89 --- /dev/null +++ b/Dockerfile.azul @@ -0,0 +1,20 @@ +FROM azul/zulu-openjdk:17-latest AS build + +WORKDIR /app/ + +COPY . /app/ + +RUN --mount=type=cache,target=/root/.gradle/caches/ \ + ./gradlew shadowJar + +FROM azul/zulu-openjdk:17-jre-headless-latest + +WORKDIR /app/ + +COPY --from=build /app/build/libs/piped-1.0-all.jar /app/piped.jar + +COPY VERSION . + +EXPOSE 8080 + +CMD java -server -Xmx1G -XX:+UnlockExperimentalVMOptions -XX:+OptimizeStringConcat -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+UseNUMA -XX:+UseG1GC -Xshare:on -jar /app/piped.jar diff --git a/Dockerfile.azul.ci b/Dockerfile.azul.ci new file mode 100644 index 0000000..fe081cc --- /dev/null +++ b/Dockerfile.azul.ci @@ -0,0 +1,11 @@ +FROM azul/zulu-openjdk:17-jre-headless-latest + +WORKDIR /app/ + +COPY ./piped.jar /app/piped.jar + +COPY VERSION . + +EXPOSE 8080 + +CMD java -server -Xmx1G -XX:+UnlockExperimentalVMOptions -XX:+OptimizeStringConcat -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+UseNUMA -XX:+UseG1GC -Xshare:on -jar /app/piped.jar diff --git a/Dockerfile.ci b/Dockerfile.ci index 8dd60e5..525d716 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -8,4 +8,4 @@ COPY VERSION . EXPOSE 8080 -CMD java -server -Xmx1G -XX:+UnlockExperimentalVMOptions -XX:+OptimizeStringConcat -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+UseNUMA -XX:+UseG1GC -Xshare:on --enable-preview -jar /app/piped.jar +CMD java -server -Xmx1G -XX:+UnlockExperimentalVMOptions -XX:+OptimizeStringConcat -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+UseNUMA -XX:+UseG1GC -Xshare:on -jar /app/piped.jar