Merge branch 'master' into adopt11

Fix PATH to include java when needed
Auto-merging via docker-versions-create
2026-02-17 15:13:55 +00:00 · 2021-02-10 14:52:58 -06:00 · 2021-02-10 14:46:09 -06:00 · 2021-02-10 14:03:36 -06:00 · 2021-02-07 18:19:31 -06:00 · 2021-02-07 09:13:41 -06:00
1 changed files with 5 additions and 0 deletions
--- a/5
+++ b/5
@@ -168,6 +168,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	a598ef7f50	Merge branch 'master' into adopt11	2021-02-10 14:52:58 -06:00
Geoff Bourne	a2ab0d75ed	Fix PATH to include java when needed	2021-02-10 14:46:09 -06:00
Geoff Bourne	580b506ab7	Auto-merging via docker-versions-create	2021-02-10 14:03:36 -06:00
Geoff Bourne	e0874a9241	Auto-merging via docker-versions-create	2021-02-07 18:19:31 -06:00
Geoff Bourne	b351205a05	Auto-merging via docker-versions-create	2021-02-07 09:13:41 -06:00
Geoff Bourne	526db33c8f	Auto-merging via docker-versions-create	2021-01-29 21:05:07 -06:00
Geoff Bourne	3d7384f3e2	Auto-merging via docker-versions-create	2021-01-12 17:26:48 -06:00
Geoff Bourne	6e079c46c2	Auto-merging via docker-versions-create	2021-01-09 11:21:56 -06:00
Geoff Bourne	0d8d85876a	Auto-merging via docker-versions-create	2021-01-06 22:03:50 -06:00
Geoff Bourne	e56c5a63f4	Auto-merging via docker-versions-create	2020-12-27 22:06:10 -06:00
Geoff Bourne	03dd3d03ac	Auto-merging via docker-versions-create	2020-12-19 08:24:47 -06:00
Geoff Bourne	453230e5b4	Auto-merging via docker-versions-create	2020-12-15 13:59:58 -06:00
Geoff Bourne	4e0a1c8764	Auto-merging via docker-versions-create	2020-11-25 15:56:18 -06:00
Geoff Bourne	9affd5e446	Auto-merging via docker-versions-create	2020-08-09 13:07:09 -05:00
Geoff Bourne	fbca7982c5	Auto-merging via docker-versions-create	2020-07-26 08:29:57 -05:00
Geoff Bourne	ce6ce0adbc	Auto-merging via docker-versions-create	2020-07-18 18:40:24 -05:00
Geoff Bourne	5e0e7999a9	Auto-merging via docker-versions-create	2020-07-11 13:13:26 -05:00
Geoff Bourne	34e661267d	Auto-merging via docker-versions-create	2020-07-10 17:11:28 -05:00
Geoff Bourne	55a539860e	Auto-merging via docker-versions-create	2020-07-04 14:57:53 -05:00
Geoff Bourne	26b5647ca2	Auto-merging via docker-versions-create	2020-06-20 15:44:49 -05:00
Geoff Bourne	bfdb5c075b	Auto-merging via docker-versions-create	2020-06-19 13:26:45 -05:00
Geoff Bourne	bd4a184ad7	Auto-merging via docker-versions-create	2020-05-20 08:14:52 -05:00
Geoff Bourne	156786dacf	Auto-merging via docker-versions-create	2020-05-02 09:34:17 -05:00
Geoff Bourne	92186c9c8e	Auto-merging via docker-versions-create	2020-04-25 12:10:54 -05:00
Geoff Bourne	74ee8a621c	Auto-merging via docker-versions-create	2020-04-17 21:28:57 -05:00
Geoff Bourne	64345b0d82	Auto-merging via docker-versions-create	2020-04-11 08:51:46 -05:00
Geoff Bourne	5b45c4ea4e	Auto-merging via docker-versions-create	2020-04-10 11:08:53 -05:00
Geoff Bourne	a15e608421	Auto-merging via docker-versions-create	2020-04-03 13:31:40 -05:00
Geoff Bourne	f4561b7a3b	Auto-merging via docker-versions-create	2020-04-03 13:28:52 -05:00
Geoff Bourne	c6f0042686	Auto-merging via docker-versions-create	2020-04-02 17:47:41 -05:00
Geoff Bourne	79aabf82ff	Auto-merging via docker-versions-create	2020-03-30 08:32:02 -05:00
Geoff Bourne	89b60c7706	Auto-merging via docker-versions-create	2020-03-26 20:54:13 -05:00
Geoff Bourne	4b4cbdfce1	Auto-merging via docker-versions-create	2020-02-01 08:53:03 -06:00
Geoff Bourne	a424346d0c	Auto-merging via docker-versions-create	2020-01-17 08:29:12 -06:00
Geoff Bourne	fad48505d7	Auto-merging via docker-versions-create	2019-11-16 09:31:01 -06:00
Geoff Bourne	a535fb7873	Add adoptopenjdk/openjdk11:alpine-jre variant	2019-11-16 09:09:55 -06:00