diff options
| author | Younes Manton <ymanton@ca.ibm.com> | 2022-08-25 05:48:52 +0300 |
|---|---|---|
| committer | Andrei Vagin <avagin@gmail.com> | 2022-08-29 00:34:33 +0300 |
| commit | 84a72696500c02c1b16ff3764ed57b8d0502a093 (patch) | |
| tree | 81ca7e2988517b5febad106926033f1a264ac30c | |
| parent | 3aafc55e90a256fec535e66ef52b0fde55514dc6 (diff) | |
ci: Rename openj9 Dockerfiles to hotspot
We used to pull AdoptOpenJDK's OpenJ9 builds but switched to
Eclipse Temurin, which uses the HotSpot VM instead of OpenJ9.
Rename the corresponding Dockerfiles to hotspot.
Signed-off-by: Younes Manton <ymanton@ca.ibm.com>
| -rw-r--r-- | scripts/build/Dockerfile.hotspot-alpine (renamed from scripts/build/Dockerfile.openj9-alpine) | 5 | ||||
| -rw-r--r-- | scripts/build/Dockerfile.hotspot-ubuntu (renamed from scripts/build/Dockerfile.openj9-ubuntu) | 0 |
2 files changed, 1 insertions, 4 deletions
diff --git a/scripts/build/Dockerfile.openj9-alpine b/scripts/build/Dockerfile.hotspot-alpine index f92011283..d6e6e5130 100644 --- a/scripts/build/Dockerfile.openj9-alpine +++ b/scripts/build/Dockerfile.hotspot-alpine @@ -1,6 +1,4 @@ -# FIXME: Replace with eclipse-temurin once Alpine support has been added. -# https://github.com/adoptium/containers/pull/60 -FROM adoptopenjdk/openjdk8-openj9:alpine +FROM docker.io/library/eclipse-temurin:8-alpine ARG CC=gcc RUN apk update && apk add \ @@ -29,4 +27,3 @@ WORKDIR /criu RUN make mrproper && make -j $(nproc) CC="$CC" ENTRYPOINT mvn -q -f test/javaTests/pom.xml test - diff --git a/scripts/build/Dockerfile.openj9-ubuntu b/scripts/build/Dockerfile.hotspot-ubuntu index 8936adf81..8936adf81 100644 --- a/scripts/build/Dockerfile.openj9-ubuntu +++ b/scripts/build/Dockerfile.hotspot-ubuntu |