Auto-merging via docker-versions-create

Ensure FTBA version.json is readable
#784
2026-02-22 09:06:23 +00:00 · 2021-02-27 20:56:01 -06:00 · 2021-02-27 17:03:09 -06:00 · 2021-02-11 14:52:51 -06:00 · 2021-02-10 14:58:33 -06:00 · 2021-02-10 14:08:21 -06:00
3 changed files with 6 additions and 3 deletions
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:latest
+FROM adoptopenjdk:11-jre

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

--- a/4
+++ b/4
@@ -94,7 +94,7 @@ case "${TYPE^^}" in

  FORGE)
    log "**********************************************************************"
-    log "WARNING: The image tag itzg/minecraft-server:java8-multiarch is recommended"
+    log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
    log "         since some mods require Java 8"
    log "**********************************************************************"
    exec ${SCRIPTS:-/}start-deployForge "$@"
@@ -110,7 +110,7 @@ case "${TYPE^^}" in

  FTB|CURSEFORGE)
    log "**********************************************************************"
-    log "WARNING: The image tag itzg/minecraft-server:java8-multiarch is recommended"
+    log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
    log "         since some mods require Java 8"
    log "**********************************************************************"
    exec ${SCRIPTS:-/}start-deployCF "$@"
--- a/3
+++ b/3
@@ -43,6 +43,9 @@ if ! [ -f "${ftbInstallMarker}" ] || [ $(cat "${ftbInstallMarker}") != "${FTB_MO
  echo "${FTB_MODPACK_ID}=${FTB_MODPACK_VERSION_ID}" > ${ftbInstallMarker}

  writeEula
+
+  # some modpacks result in --w----r-- permissions
+  chmod a+r version.json
 else
  log "FTB modpack ID ${FTB_MODPACK_ID}, version ID ${FTB_MODPACK_VERSION_ID} is ready to go"
 fi
Author	SHA1	Message	Date
Geoff Bourne	4186cfd91c	Auto-merging via docker-versions-create	2021-02-27 20:56:01 -06:00
Geoff Bourne	89afba7437	Ensure FTBA version.json is readable #784	2021-02-27 17:03:09 -06:00
Geoff Bourne	f397dd71a9	Fix PATH to include java when needed	2021-02-11 14:52:51 -06:00
Geoff Bourne	02e0a47a52	Merge branch master	2021-02-10 14:58:33 -06:00
Geoff Bourne	60809fe5ad	Merge from master CONFLICT (content): Merge conflict in start-configuration	2021-02-10 14:08:21 -06:00
Geoff Bourne	4a8e416fe1	Auto-merging via docker-versions-create CONFLICT (content): Merge conflict in Dockerfile	2021-02-07 18:22:16 -06:00
Geoff Bourne	ce4efd0b70	Auto-merging docker-versions-create.sh CONFLICT (content): Merge conflict in Dockerfile	2021-02-07 09:16:33 -06:00
Geoff Bourne	f856276d71	Upgraded multiarch to Java 11	2021-02-06 15:22:15 -06:00
Geoff Bourne	0300854c46	Merge branch 'master' into multiarch	2021-02-06 15:21:53 -06:00
Geoff Bourne	f06e9f5ede	Merge branch 'master' into multiarch	2021-02-06 14:52:35 -06:00
Geoff Bourne	8d3ca813ed	Auto-merging via docker-versions-create	2021-01-29 21:07:00 -06:00
Geoff Bourne	e97a00e61d	Auto-merging via docker-versions-create	2021-01-12 17:28:11 -06:00