Browse Source

Disable testresources and downgrade docker images (#9084)

This is an attempt to fix the JIT-only regression introduced by f2b0b607acb50c71890f00693bc2f467d217ba4f .
Jonas Konrad 1 year ago
parent
commit
e50dde3cdd

+ 1 - 1
frameworks/Java/micronaut/micronaut-data-jdbc-graalvm.dockerfile

@@ -2,7 +2,7 @@ FROM ghcr.io/graalvm/native-image-community:21-ol9 as build
 RUN microdnf install findutils # Gradle 8.7 requires xargs
 RUN microdnf install findutils # Gradle 8.7 requires xargs
 COPY . /home/gradle/src
 COPY . /home/gradle/src
 WORKDIR /home/gradle/src
 WORKDIR /home/gradle/src
-RUN ./gradlew micronaut-data-jdbc:nativeCompile -x test --no-daemon
+RUN ./gradlew micronaut-data-jdbc:nativeCompile -x test -x internalStartTestResourcesService --no-daemon
 
 
 FROM cgr.dev/chainguard/wolfi-base:latest
 FROM cgr.dev/chainguard/wolfi-base:latest
 WORKDIR /micronaut
 WORKDIR /micronaut

+ 3 - 3
frameworks/Java/micronaut/micronaut-data-jdbc.dockerfile

@@ -1,9 +1,9 @@
-FROM gradle:8.7.0-jdk21 as build
+FROM gradle:8.7.0-jdk17 as build
 COPY --chown=gradle:gradle . /home/gradle/src
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
 WORKDIR /home/gradle/src
-RUN gradle micronaut-data-jdbc:build -x test --no-daemon
+RUN gradle micronaut-data-jdbc:build -x test -x internalStartTestResourcesService --no-daemon
 
 
-FROM openjdk:22
+FROM openjdk:21
 WORKDIR /micronaut
 WORKDIR /micronaut
 COPY --from=build /home/gradle/src/micronaut-data-jdbc/build/libs/micronaut-data-jdbc-all.jar micronaut.jar
 COPY --from=build /home/gradle/src/micronaut-data-jdbc/build/libs/micronaut-data-jdbc-all.jar micronaut.jar
 COPY run_benchmark.sh run_benchmark.sh
 COPY run_benchmark.sh run_benchmark.sh

+ 1 - 1
frameworks/Java/micronaut/micronaut-data-mongodb-graalvm.dockerfile

@@ -2,7 +2,7 @@ FROM ghcr.io/graalvm/native-image-community:21-ol9 as build
 RUN microdnf install findutils # Gradle 8.7 requires xargs
 RUN microdnf install findutils # Gradle 8.7 requires xargs
 COPY . /home/gradle/src
 COPY . /home/gradle/src
 WORKDIR /home/gradle/src
 WORKDIR /home/gradle/src
-RUN ./gradlew micronaut-data-mongodb:nativeCompile -x test --no-daemon
+RUN ./gradlew micronaut-data-mongodb:nativeCompile -x test -x internalStartTestResourcesService --no-daemon
 
 
 FROM cgr.dev/chainguard/wolfi-base:latest
 FROM cgr.dev/chainguard/wolfi-base:latest
 WORKDIR /micronaut
 WORKDIR /micronaut

+ 3 - 3
frameworks/Java/micronaut/micronaut-data-mongodb.dockerfile

@@ -1,9 +1,9 @@
-FROM gradle:8.7.0-jdk21 as build
+FROM gradle:8.7.0-jdk17 as build
 COPY --chown=gradle:gradle . /home/gradle/src
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
 WORKDIR /home/gradle/src
-RUN gradle micronaut-data-mongodb:build -x test --no-daemon
+RUN gradle micronaut-data-mongodb:build -x test -x internalStartTestResourcesService --no-daemon
 
 
-FROM openjdk:22
+FROM openjdk:21
 WORKDIR /micronaut
 WORKDIR /micronaut
 COPY --from=build /home/gradle/src/micronaut-data-mongodb/build/libs/micronaut-data-mongodb-all.jar micronaut.jar
 COPY --from=build /home/gradle/src/micronaut-data-mongodb/build/libs/micronaut-data-mongodb-all.jar micronaut.jar
 COPY run_benchmark.sh run_benchmark.sh
 COPY run_benchmark.sh run_benchmark.sh

+ 1 - 1
frameworks/Java/micronaut/micronaut-data-r2dbc-graalvm.dockerfile

@@ -2,7 +2,7 @@ FROM ghcr.io/graalvm/native-image-community:21-ol9 as build
 RUN microdnf install findutils # Gradle 8.7 requires xargs
 RUN microdnf install findutils # Gradle 8.7 requires xargs
 COPY . /home/gradle/src
 COPY . /home/gradle/src
 WORKDIR /home/gradle/src
 WORKDIR /home/gradle/src
-RUN ./gradlew micronaut-data-r2dbc:nativeCompile -x test --no-daemon
+RUN ./gradlew micronaut-data-r2dbc:nativeCompile -x test -x internalStartTestResourcesService --no-daemon
 
 
 FROM cgr.dev/chainguard/wolfi-base:latest
 FROM cgr.dev/chainguard/wolfi-base:latest
 WORKDIR /micronaut
 WORKDIR /micronaut

+ 3 - 3
frameworks/Java/micronaut/micronaut-data-r2dbc.dockerfile

@@ -1,9 +1,9 @@
-FROM gradle:8.7.0-jdk21 as build
+FROM gradle:8.7.0-jdk17 as build
 COPY --chown=gradle:gradle . /home/gradle/src
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
 WORKDIR /home/gradle/src
-RUN gradle micronaut-data-r2dbc:build -x test --no-daemon
+RUN gradle micronaut-data-r2dbc:build -x test -x internalStartTestResourcesService --no-daemon
 
 
-FROM openjdk:22
+FROM openjdk:21
 WORKDIR /micronaut
 WORKDIR /micronaut
 COPY --from=build /home/gradle/src/micronaut-data-r2dbc/build/libs/micronaut-data-r2dbc-all.jar micronaut.jar
 COPY --from=build /home/gradle/src/micronaut-data-r2dbc/build/libs/micronaut-data-r2dbc-all.jar micronaut.jar
 COPY run_benchmark.sh run_benchmark.sh
 COPY run_benchmark.sh run_benchmark.sh

+ 1 - 1
frameworks/Java/micronaut/micronaut-graalvm.dockerfile

@@ -2,7 +2,7 @@ FROM ghcr.io/graalvm/native-image-community:21-ol9 as build
 RUN microdnf install findutils # Gradle 8.7 requires xargs
 RUN microdnf install findutils # Gradle 8.7 requires xargs
 COPY . /home/gradle/src
 COPY . /home/gradle/src
 WORKDIR /home/gradle/src
 WORKDIR /home/gradle/src
-RUN ./gradlew micronaut-vertx-pg-client:nativeCompile -x test --no-daemon
+RUN ./gradlew micronaut-vertx-pg-client:nativeCompile -x test -x internalStartTestResourcesService --no-daemon
 
 
 FROM cgr.dev/chainguard/wolfi-base:latest
 FROM cgr.dev/chainguard/wolfi-base:latest
 RUN apk --no-cache update && apk add libstdc++
 RUN apk --no-cache update && apk add libstdc++

+ 1 - 1
frameworks/Java/micronaut/micronaut-jdbc-graalvm.dockerfile

@@ -2,7 +2,7 @@ FROM ghcr.io/graalvm/native-image-community:21-ol9 as build
 RUN microdnf install findutils # Gradle 8.7 requires xargs
 RUN microdnf install findutils # Gradle 8.7 requires xargs
 COPY . /home/gradle/src
 COPY . /home/gradle/src
 WORKDIR /home/gradle/src
 WORKDIR /home/gradle/src
-RUN ./gradlew micronaut-jdbc:nativeCompile -x test --no-daemon
+RUN ./gradlew micronaut-jdbc:nativeCompile -x test -x internalStartTestResourcesService --no-daemon
 
 
 FROM cgr.dev/chainguard/wolfi-base:latest
 FROM cgr.dev/chainguard/wolfi-base:latest
 WORKDIR /micronaut
 WORKDIR /micronaut

+ 3 - 3
frameworks/Java/micronaut/micronaut-jdbc.dockerfile

@@ -1,9 +1,9 @@
-FROM gradle:8.7.0-jdk21 as build
+FROM gradle:8.7.0-jdk17 as build
 COPY --chown=gradle:gradle . /home/gradle/src
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
 WORKDIR /home/gradle/src
-RUN gradle micronaut-jdbc:build -x test --no-daemon
+RUN gradle micronaut-jdbc:build -x test -x internalStartTestResourcesService --no-daemon
 
 
-FROM openjdk:22
+FROM openjdk:21
 WORKDIR /micronaut
 WORKDIR /micronaut
 COPY --from=build /home/gradle/src/micronaut-jdbc/build/libs/micronaut-jdbc-all.jar micronaut.jar
 COPY --from=build /home/gradle/src/micronaut-jdbc/build/libs/micronaut-jdbc-all.jar micronaut.jar
 COPY run_benchmark.sh run_benchmark.sh
 COPY run_benchmark.sh run_benchmark.sh

+ 3 - 3
frameworks/Java/micronaut/micronaut-r2dbc.dockerfile

@@ -1,9 +1,9 @@
-FROM gradle:8.7.0-jdk21 as build
+FROM gradle:8.7.0-jdk17 as build
 COPY --chown=gradle:gradle . /home/gradle/src
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
 WORKDIR /home/gradle/src
-RUN gradle micronaut-r2dbc:build -x test --no-daemon
+RUN gradle micronaut-r2dbc:build -x test -x internalStartTestResourcesService --no-daemon
 
 
-FROM openjdk:22
+FROM openjdk:21
 WORKDIR /micronaut
 WORKDIR /micronaut
 COPY --from=build /home/gradle/src/micronaut-r2dbc/build/libs/micronaut-r2dbc-all.jar micronaut.jar
 COPY --from=build /home/gradle/src/micronaut-r2dbc/build/libs/micronaut-r2dbc-all.jar micronaut.jar
 COPY run_benchmark.sh run_benchmark.sh
 COPY run_benchmark.sh run_benchmark.sh

+ 3 - 3
frameworks/Java/micronaut/micronaut.dockerfile

@@ -1,9 +1,9 @@
-FROM gradle:8.7.0-jdk21 as build
+FROM gradle:8.7.0-jdk17 as build
 COPY --chown=gradle:gradle . /home/gradle/src
 COPY --chown=gradle:gradle . /home/gradle/src
 WORKDIR /home/gradle/src
 WORKDIR /home/gradle/src
-RUN gradle micronaut-vertx-pg-client:build -x test --no-daemon
+RUN gradle micronaut-vertx-pg-client:build -x test -x internalStartTestResourcesService --no-daemon
 
 
-FROM openjdk:22
+FROM openjdk:21
 WORKDIR /micronaut
 WORKDIR /micronaut
 COPY --from=build /home/gradle/src/micronaut-vertx-pg-client/build/libs/micronaut-vertx-pg-client-all.jar micronaut.jar
 COPY --from=build /home/gradle/src/micronaut-vertx-pg-client/build/libs/micronaut-vertx-pg-client-all.jar micronaut.jar
 COPY run_benchmark.sh run_benchmark.sh
 COPY run_benchmark.sh run_benchmark.sh