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

Jump to bottom

Fix missing Graalvm native-image binary symlink in generated container image #1500

Merged
merged 6 commits into from
Feb 21, 2022
Merged

Fix missing Graalvm native-image binary symlink in generated container image #1500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d7527ed
Fix native image tests to use latest docker image & add symlink to na…
kgston Feb 16, 2022
3e877fc
Fix typo
kgston Feb 16, 2022
2534e36
Try java 11 instead
kgston Feb 16, 2022
e7fc4b9
Fix wildcard interpolation
kgston Feb 16, 2022
beef48a
Remove unnecessary java dependency in test runner for graalvm
kgston Feb 18, 2022
eee5880
Merge branch 'master' into fix-graalvm-image-native-image
muuki88 Feb 21, 2022
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
6 changes: 1 addition & 5 deletions .github/workflows/validate-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,14 +251,10 @@ jobs:
key: ${{ runner.os }}-ivy-${{ hashFiles('**/*.sbt') }}
restore-keys: |
${{ runner.os }}-ivy-
- name: Set up Azul JDK 1.8 and SBT
uses: olafurpg/setup-scala@v10
with:
java-version: zulu@1.8
- name: Setup GraalVM environment
uses: olafurpg/setup-scala@v10
with:
java-version: graalvm@21.0.0
java-version: graalvm@22.0.0=tgz+https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.0.0.2/graalvm-ce-java11-linux-amd64-22.0.0.2.tar.gz
- name: Install native-image
run: gu install native-image
- name: Validate
Expand Down
1 change: 1 addition & 0 deletions src/main/scala/com/typesafe/sbt/packager/graalvmnativeimage/GraalVMNativeImagePlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ object GraalVMNativeImagePlugin extends AutoPlugin {
Cmd("FROM", baseImage),
Cmd("WORKDIR", "/opt/graalvm"),
ExecCmd("RUN", "gu", "install", "native-image"),
ExecCmd("RUN", "sh", "-c", "ln -s /opt/graalvm-ce-*/bin/native-image /usr/local/bin/native-image"),
ExecCmd("ENTRYPOINT", "native-image")
).makeContent

Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/graalvm-native-image/docker-native-image/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ enablePlugins(GraalVMNativeImagePlugin)

name := "docker-test"
version := "0.1.0"
graalVMNativeImageGraalVersion := Some("21.0.0")
graalVMNativeImageGraalVersion := Some("22.0.0.2")