Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix and test quarkus image #12568

Merged
merged 1 commit into from
Nov 5, 2024
+9 −9
Merged

Fix and test quarkus image #12568

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions smoke-tests/images/quarkus/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@ dependencies {
implementation("io.quarkus:quarkus-rest")
}

quarkus {
// Expected by jib extension.
// TODO(anuraaga): Switch to quarkus plugin native jib support.
setFinalName("opentelemetry-quarkus-$version")
}

// Quarkus 3.7+ requires Java 17+
val targetJDK = project.findProperty("targetJDK") ?: "17"

Expand All @@ -34,10 +28,10 @@ val tag = findProperty("tag")

java {
// this is needed to avoid jib failing with
// "Your project is using Java 17 but the base image is for Java 8"
// "Your project is using Java 21 but the base image is for Java 17"
// (it seems the jib plugins does not understand toolchains yet)
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

jib {
Expand All @@ -46,6 +40,12 @@ jib {
container {
mainClass = "bogus" // to suppress Jib warning about missing main class
}
pluginExtensions {
pluginExtension {
implementation = "com.google.cloud.tools.jib.gradle.extension.quarkus.JibQuarkusExtension"
properties = mapOf("packageType" to "fast-jar")
}
}
}

tasks {
Expand Down
Loading