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

bump JVM in Docker image #11883

Merged
merged 1 commit into from
Nov 25, 2021
Merged

bump JVM in Docker image #11883

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
2 changes: 1 addition & 1 deletion ci/docker/daml-sdk/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM adoptopenjdk:8-jdk-hotspot
FROM adoptopenjdk:11-jdk-hotspot
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This means we also use jdk8 in docker images for any pre 2.0 release we make now, e.g., SDK 1.18.0. Should we instead do a version check in the cron job and switch depending on that?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we have a 1.x set of images and a 2.x set of images for this purpose?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We run main branch YAML files but release commit source tree, so no, as I understand the script we'd still use Java 8 for the 1.18 branch.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sounds plausible, thanks for checking

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Specifically here:

              git checkout "$version"
              cd ci/docker/daml-sdk
              docker build -t digitalasset/daml-sdk:${version#v} --build-arg VERSION=${version#v} .

Note that this means this PR will not fix the current image, only the next one.

Copy link

@ghost ghost Nov 26, 2021 •
edited by ghost
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The adoptopenjdk images are now deprecated in favor of eclipse-temurin. We might want to switch to eclipse-temurin:11-jdk.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, thanks for raising.

ARG VERSION
# This is needed to get the DNS requests
# from Haskell binaries to succeed.
Expand Down