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.

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

GraalVM 22.3.2 #703

Merged
merged 2 commits into from
Apr 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/sonarqube.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Setup GraalVM CE
uses: graalvm/setup-graalvm@v1
with:
version: '22.3.0'
version: '22.3.2'
java-version: '11'
components: 'native-image'
- name: Optional setup step
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public abstract class NativeImageDockerfile extends Dockerfile implements Docker
);
private static final String ARM_ARCH = "aarch64";
private static final String X86_64_ARCH = "amd64";
private static final String GRAAL_VERSION_CONVENTION = "22.3.0";
private static final String GRAAL_VERSION_CONVENTION = "22.3.2";

/**
* @return The JDK version to use with native image. Defaults to the toolchain version, or the current Java version.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ ENTRYPOINT ["java", "-jar", "/home/app/application.jar"]
result.task(":optimizedDockerBuildNative").outcome == TaskOutcome.SUCCESS

def dockerFile = normalizeLineEndings(file("build/docker/native-optimized/DockerfileNative").text)
dockerFile == """FROM ghcr.io/graalvm/native-image:ol7-java11-22.3.0 AS graalvm
dockerFile == """FROM ghcr.io/graalvm/native-image:ol7-java11-22.3.2 AS graalvm
WORKDIR /home/app
COPY layers/libs /home/app/libs
COPY layers/classes /home/app/classes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ micronaut:
expect:
task.outcome == TaskOutcome.SUCCESS
dockerFile == """
FROM ghcr.io/graalvm/native-image:ol7-java11-22.3.0 AS graalvm
FROM ghcr.io/graalvm/native-image:ol7-java11-22.3.2 AS graalvm
WORKDIR /home/alternate
COPY layers/libs /home/alternate/libs
COPY layers/classes /home/alternate/classes
Expand Down Expand Up @@ -680,7 +680,7 @@ ENTRYPOINT ["java", "-jar", "/home/app/application.jar"]

then:
def dockerfileNative = new File(testProjectDir.root, 'build/docker/native-main/DockerfileNative').text
dockerfileNative == """FROM ghcr.io/graalvm/native-image:ol7-java11-22.3.0 AS graalvm
dockerfileNative == """FROM ghcr.io/graalvm/native-image:ol7-java11-22.3.2 AS graalvm
WORKDIR /home/app
COPY layers/libs /home/app/libs
COPY server.iprof /home/app/server.iprof
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class LambdaNativeImageSpec extends AbstractFunctionalTest {

void 'native lambdas build in docker fetch the correct graalvm for #desc'() {
given:
def graalVersion = '22.3.0'
def graalVersion = '22.3.2'
settingsFile << "rootProject.name = 'hello-world'"
buildFile << """
plugins {
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pluginManagement {
}

plugins {
id 'io.micronaut.build.shared.settings' version '5.4.6'
id 'io.micronaut.build.shared.settings' version '5.4.9'
}

rootProject.name = 'micronaut-gradle-plugin-parent'
Expand Down
6 changes: 3 additions & 3 deletions src/docs/asciidoc/index.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -674,18 +674,18 @@ The default uses an `{default-docker-image}` base image, however you can easily
[source, groovy, subs="verbatim,attributes", role="multi-language-sample"]
----
tasks.named("dockerfile") {
baseImage = "oracle/graalvm-ce:22.3.0-java11"
baseImage = "oracle/graalvm-ce:22.3.2-java11"
}
----

[source, kotlin, subs="verbatim,attributes", role="multi-language-sample"]
----
tasks.named<MicronautDockerfile>("dockerfile") {
baseImage.set("oracle/graalvm-ce:22.3.0-java11")
baseImage.set("oracle/graalvm-ce:22.3.2-java11")
}
----

The above examples switches to use GraalVM CE 22.3.0 as a base image.
The above examples switches to use GraalVM CE 22.3.2 as a base image.

To build the application into a Native Image you can run:

Expand Down