Browse Source

fixed pgclient test

Ilya Nemtsev 7 months ago
parent
commit
724f7a4b3e

+ 1 - 1
frameworks/Kotlin/ktor/ktor-asyncdb/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip

+ 6 - 9
frameworks/Kotlin/ktor/ktor-jasync.dockerfile

@@ -1,13 +1,10 @@
-FROM maven:3.9.9-amazoncorretto-21-debian-bookworm as maven
-WORKDIR /app
-COPY ktor-asyncdb/gradle gradle
-COPY ktor-asyncdb/build.gradle.kts build.gradle.kts
-COPY ktor-asyncdb/gradle.properties gradle.properties
-COPY ktor-asyncdb/gradlew gradlew
+FROM gradle:jdk21
+
+WORKDIR /ktor-asyncdb
 COPY ktor-asyncdb/settings.gradle settings.gradle
 COPY ktor-asyncdb/settings.gradle settings.gradle
-COPY ktor-asyncdb/src src
-RUN /app/gradlew --no-daemon shadowJar
+COPY ktor-asyncdb/app app
+RUN gradle --no-daemon shadowJar
 
 
 EXPOSE 9090
 EXPOSE 9090
 
 
-CMD ["java", "-server","-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AlwaysPreTouch", "/app/build/libs/bench.jar", "jasync-sql"]
+CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AlwaysPreTouch", "/app/build/libs/bench.jar", "jasync-sql"]

+ 1 - 1
frameworks/Kotlin/ktor/ktor-pgclient.dockerfile

@@ -1,4 +1,4 @@
-FROM maven:3.9.9-amazoncorretto-21-debian-bookworm as build
+FROM gradle:jdk21 as build
 WORKDIR /app
 WORKDIR /app
 COPY ktor-pgclient/gradle gradle
 COPY ktor-pgclient/gradle gradle
 COPY ktor-pgclient/build.gradle.kts build.gradle.kts
 COPY ktor-pgclient/build.gradle.kts build.gradle.kts

+ 1 - 1
frameworks/Kotlin/ktor/ktor-pgclient/build.gradle.kts

@@ -29,7 +29,7 @@ dependencies {
 }
 }
 
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions.jvmTarget = "17"
+    kotlinOptions.jvmTarget = "21"
 }
 }
 
 
 tasks.shadowJar {
 tasks.shadowJar {

+ 1 - 1
frameworks/Kotlin/ktor/ktor-pgclient/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 zipStorePath=wrapper/dists