Merge branch 'master' into openj9-11

Fix PATH to include java when needed
Auto-merging via docker-versions-create
2026-04-04 12:48:51 +00:00 · 2021-02-10 14:57:02 -06:00 · 2021-02-10 14:46:09 -06:00 · 2021-02-10 14:03:07 -06:00 · 2021-02-07 18:18:18 -06:00 · 2021-02-07 09:12:30 -06:00
2 changed files with 6 additions and 2 deletions
--- a/3
+++ b/3
@@ -1,8 +1,7 @@
-FROM adoptopenjdk/openjdk8-openj9:alpine
+FROM adoptopenjdk/openjdk11-openj9:alpine

 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"

-# upgrade all packages since alpine jre8 base image tops out at 8u212
 RUN apk -U --no-cache upgrade

 RUN apk add --no-cache -U \
--- a/5
+++ b/5
@@ -185,6 +185,11 @@ function copyFilesForCurseForge() {
  cp -f /data/eula.txt "${FTB_DIR}/"
 }

+if ! which java > /dev/null; then
+  log "Fixing PATH to include java"
+  PATH="${PATH}:/opt/java/openjdk/bin"
+fi
+
 mcServerRunnerArgs="--stop-duration ${STOP_DURATION:-60}s"
 if [[ ${TYPE} == "CURSE_INSTANCE" ]]; then
    if isTrue ${DEBUG_EXEC}; then
Author	SHA1	Message	Date
Geoff Bourne	6fd01d662f	Merge branch 'master' into openj9-11	2021-02-10 14:57:02 -06:00
Geoff Bourne	a2ab0d75ed	Fix PATH to include java when needed	2021-02-10 14:46:09 -06:00
Geoff Bourne	2fc56067fa	Auto-merging via docker-versions-create	2021-02-10 14:03:07 -06:00
Geoff Bourne	01fb2e1947	Auto-merging via docker-versions-create CONFLICT (content): Merge conflict in Dockerfile	2021-02-07 18:18:18 -06:00
Geoff Bourne	34edb10571	Auto-merging docker-versions-create.sh CONFLICT (content): Merge conflict in Dockerfile CONFLICT (add/add): Merge conflict in .github/workflows/build-multiarch.yml	2021-02-07 09:12:30 -06:00
Geoff Bourne	1de85d667f	Auto-merging via docker-versions-create	2021-01-29 21:04:06 -06:00
Geoff Bourne	97cb1a8c87	Auto-merging via docker-versions-create	2021-01-12 17:26:05 -06:00
Geoff Bourne	bd8c630f45	ci: Added openj9 JDK11 branch	2021-01-12 17:15:18 -06:00