Compare commits

..

7 Commits

Author SHA1 Message Date
Geoff Bourne
e22dfa898d Auto-merging via docker-versions-create 2021-02-27 20:56:33 -06:00
Geoff Bourne
c353752c0c Merge branch 'master' into multiarch-latest 2021-02-10 14:59:41 -06:00
Geoff Bourne
b566c82892 Auto-merging via docker-versions-create 2021-02-10 14:09:30 -06:00
Geoff Bourne
a4abb22690 Merge branch 'master' into multiarch-latest
# Conflicts:
#	start-configuration
2021-02-08 21:28:46 -06:00
Geoff Bourne
6a9551fafe Auto-merging via docker-versions-create
CONFLICT (content): Merge conflict in Dockerfile
2021-02-07 18:23:57 -06:00
Geoff Bourne
e8061c08f7 Auto-merging docker-versions-create.sh
CONFLICT (content): Merge conflict in Dockerfile
2021-02-07 09:18:13 -06:00
Geoff Bourne
2e085f174c Merge branch 'master' into multiarch-latest 2021-02-06 14:52:49 -06:00
3 changed files with 3 additions and 6 deletions

View File

@@ -1,4 +1,4 @@
FROM adoptopenjdk:15-jre
FROM adoptopenjdk:latest
LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"

View File

@@ -94,7 +94,7 @@ case "${TYPE^^}" in
FORGE)
log "**********************************************************************"
log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
log "WARNING: The image tag itzg/minecraft-server:java8-multiarch 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 is recommended"
log "WARNING: The image tag itzg/minecraft-server:java8-multiarch is recommended"
log " since some mods require Java 8"
log "**********************************************************************"
exec ${SCRIPTS:-/}start-deployCF "$@"

View File

@@ -43,9 +43,6 @@ 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