From 39b3de60b615404c47594f5e42eacb2e31405f3f Mon Sep 17 00:00:00 2001 From: Younes Manton Date: Wed, 24 Aug 2022 19:48:52 -0700 Subject: [PATCH] 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 --- .../{Dockerfile.openj9-alpine => Dockerfile.hotspot-alpine} | 5 +---- .../{Dockerfile.openj9-ubuntu => Dockerfile.hotspot-ubuntu} | 0 2 files changed, 1 insertion(+), 4 deletions(-) rename scripts/build/{Dockerfile.openj9-alpine => Dockerfile.hotspot-alpine} (69%) rename scripts/build/{Dockerfile.openj9-ubuntu => Dockerfile.hotspot-ubuntu} (100%) diff --git a/scripts/build/Dockerfile.openj9-alpine b/scripts/build/Dockerfile.hotspot-alpine similarity index 69% rename from scripts/build/Dockerfile.openj9-alpine rename to 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 similarity index 100% rename from scripts/build/Dockerfile.openj9-ubuntu rename to scripts/build/Dockerfile.hotspot-ubuntu