Merge pull request #720 from TeamPiped/21-temurin

Re-enable eclipse temurin docker builds.
TeamPiped · Oct 12, 2023 · ea6da37 · ea6da37
2 parents 2a9055d + f1f4fd1
commit ea6da37
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml
@@ -22,7 +22,7 @@ jobs:
           - testing/docker-compose.cockroachdb.yml
           - testing/docker-compose.yugabytedb.yml
         dockerfile:
-          #- Dockerfile.ci
+          - Dockerfile.ci
           - Dockerfile.azul.ci
           #- Dockerfile.openj9.ci
           - Dockerfile.graalvm-jvm.ci

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -19,8 +19,8 @@ jobs:
         include:
 #          - image: 1337kavin/piped:openj9
 #            dockerfile: ./Dockerfile.openj9.ci
-#          - image: 1337kavin/piped:hotspot
-#            dockerfile: ./Dockerfile.ci
+          - image: 1337kavin/piped:hotspot
+            dockerfile: ./Dockerfile.ci
           - image: 1337kavin/piped:latest,1337kavin/piped:azul-zulu
             dockerfile: ./Dockerfile.azul.ci
           - image: 1337kavin/piped:graalvm-jvm

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17-jdk AS build
+FROM eclipse-temurin:21-jdk AS build
 
 WORKDIR /app/
 
@@ -7,7 +7,7 @@ COPY . /app/
 RUN --mount=type=cache,target=/root/.gradle/caches/ \
  ./gradlew shadowJar
 
-FROM eclipse-temurin:17-jre
+FROM eclipse-temurin:21-jre
 
 RUN --mount=type=cache,target=/var/cache/apt/ \
  apt-get update && \

diff --git a/Dockerfile.ci b/Dockerfile.ci
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17-jre
+FROM eclipse-temurin:21-jre
 
 RUN --mount=type=cache,target=/var/cache/apt/ \
  apt-get update && \