From ea7d2553e05eb7f7e440f9b8b66c01aafcd6cd37 Mon Sep 17 00:00:00 2001
From: Kavin <20838718+FireMasterK@users.noreply.github.com>
Date: Thu, 1 Jun 2023 19:36:32 +0100
Subject: [PATCH 1/4] Remove --enable-preview.

---
 Dockerfile    | 2 +-
 Dockerfile.ci | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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.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

From cf44a321b651a7219c740625a0694b425d8c7a89 Mon Sep 17 00:00:00 2001
From: Kavin <20838718+FireMasterK@users.noreply.github.com>
Date: Thu, 1 Jun 2023 19:38:20 +0100
Subject: [PATCH 2/4] Add azul docker files.

---
 Dockerfile.azul    | 20 ++++++++++++++++++++
 Dockerfile.azul.ci | 11 +++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 Dockerfile.azul
 create mode 100644 Dockerfile.azul.ci

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

From b1411ffa823ea1c2430f3286c2eaa0a9fea916ff Mon Sep 17 00:00:00 2001
From: Kavin <20838718+FireMasterK@users.noreply.github.com>
Date: Thu, 1 Jun 2023 19:39:27 +0100
Subject: [PATCH 3/4] Add azul build to tests.

---
 .github/workflows/docker-build-test.yml | 1 +
 1 file changed, 1 insertion(+)

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

From 9cfac947042daf0bca7ab8b6f97cfa6a8d0c6bc6 Mon Sep 17 00:00:00 2001
From: Kavin <20838718+FireMasterK@users.noreply.github.com>
Date: Thu, 1 Jun 2023 19:41:09 +0100
Subject: [PATCH 4/4] Make azul zulu the default image.

---
 .github/workflows/docker-build.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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: