Compare commits

..

46 Commits

Author SHA1 Message Date
Geoff Bourne 07e9d59f50 Auto-merging via docker-versions-create 2021-05-19 20:32:29 -05:00
Geoff Bourne 02181021ce ci: avoid mix of tags and tags-ignore 2021-05-19 20:26:28 -05:00
Geoff Bourne 8ace9969af Auto-merging via docker-versions-create 2021-05-15 12:44:54 -05:00
Geoff Bourne 2dbda0bed4 Merge branch 'multiarch' into multiarch-latest
# Conflicts:
#	.github/workflows/build-multiarch.yml
#	Dockerfile
2021-05-14 18:06:10 -05:00
Geoff Bourne 6ac97c41a5 Auto-merging via docker-versions-create 2021-05-06 20:18:38 -05:00
Geoff Bourne a46dfa0a16 Auto-merging via docker-versions-create 2021-04-30 14:31:22 -05:00
Geoff Bourne 98989471f9 Auto-merging via docker-versions-create 2021-04-30 11:15:27 -05:00
Geoff Bourne 1aefe31c1c Auto-merging via docker-versions-create 2021-04-28 16:56:40 -05:00
Geoff Bourne 07b90ec1f4 Auto-merging via docker-versions-create 2021-04-26 08:24:13 -05:00
Geoff Bourne 11c7e64566 Auto-merging via docker-versions-create 2021-04-24 13:45:50 -05:00
Geoff Bourne 2becc9e25e Auto-merging via docker-versions-create 2021-04-23 21:06:52 -05:00
Geoff Bourne a941ee8093 Auto-merging via docker-versions-create 2021-04-18 13:33:58 -05:00
Geoff Bourne 635a17949d Auto-merging via docker-versions-create 2021-04-11 10:13:08 -05:00
Geoff Bourne c42d9b6170 Merged latest from master 2021-04-08 19:35:00 -05:00
Geoff Bourne f6ce093a9f Auto-merging via docker-versions-create 2021-04-01 16:41:19 -05:00
Geoff Bourne b754ce7ed4 Added git
#819
2021-04-01 16:29:22 -05:00
Geoff Bourne 26e75f29ba Merge branch 'master' into multiarch-latest 2021-03-06 16:28:10 -06:00
Geoff Bourne 43b090019d Shifted PATH-fix earlier in startup 2021-03-06 16:07:04 -06:00
Geoff Bourne a9fec728e1 Ensure FTBA version.json is readable
#784
2021-03-06 11:44:05 -06:00
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
Geoff Bourne b8ef6eba3f Auto-merging via docker-versions-create 2021-01-29 21:07:29 -06:00
Geoff Bourne cc5fe0859a Auto-merging via docker-versions-create 2021-01-12 17:28:33 -06:00
Geoff Bourne 8f15aac6fc Merge branch 'multiarch' into multiarch-latest 2021-01-12 17:06:00 -06:00
Geoff Bourne 84ce3b4b47 Merge branch 'multiarch' into multiarch-latest 2021-01-09 14:07:31 -06:00
Geoff Bourne b07c43a32f Merge branch 'multiarch' into multiarch-latest 2021-01-09 12:31:20 -06:00
Geoff Bourne ce1b337f7f Auto-merging via docker-versions-create 2021-01-09 11:25:38 -06:00
Geoff Bourne ee8e1b9322 Merged latest from master 2021-01-06 22:16:40 -06:00
Geoff Bourne 20bd5c4c36 Merge branch 'multiarch' into multiarch-latest 2020-12-31 13:19:34 -06:00
Geoff Bourne de082d0fb2 Merge branch 'multiarch' into multiarch-latest 2020-12-28 11:44:41 -06:00
Geoff Bourne 3cc5cdbc06 Auto-merging via docker-versions-create 2020-12-27 22:08:29 -06:00
Geoff Bourne b69ec47b18 Auto-merging via docker-versions-create 2020-12-19 08:26:49 -06:00
Geoff Bourne 51fc8e824d Auto-merging via docker-versions-create 2020-12-15 14:00:33 -06:00
Geoff Bourne aff9031284 Merge branch 'multiarch' into multiarch-latest 2020-11-26 08:46:26 -06:00
Geoff Bourne 397d080da2 Merge branch 'multiarch' into multiarch-latest 2020-11-25 21:36:48 -06:00
Geoff Bourne cb5d052829 Merge branch 'multiarch' into multiarch-latest
# Conflicts:
#	.github/workflows/build-multiarch.yml
2020-11-25 16:09:23 -06:00
Geoff Bourne 0908d21bed Merged from master 2020-11-25 16:01:42 -06:00
Marc Doughty 4d878985d4 Remove distro-provided JRE (#659)
We don't need Java 8 from Ubuntu, we have 15 from AdoptOpenJDK.
2020-11-03 06:33:19 -06:00
Geoff Bourne 72d7d4a65e Switched to latest Docker buildx github action 2020-10-31 14:48:51 -05:00
Geoff Bourne cb0add3b90 Added github action match for multiarch-latest branch 2020-10-31 13:38:44 -05:00
Marc Doughty 71a48ce10f Convert to AdoptOpenJDK (#658) 2020-10-31 13:36:47 -05:00
3 changed files with 17 additions and 7 deletions
+4 -6
View File
@@ -4,16 +4,14 @@ on:
branches:
- multiarch
- multiarch-latest
- java*
- java15
- java16
- test/multiarch/*
branches-ignore:
- java8
tags:
- "[0-9]+.[0-9]+.[0-9]+-multiarch"
- "[0-9]+.[0-9]+.[0-9]+-multiarch-latest"
- "[0-9]+.[0-9]+.[0-9]+-java*"
tags-ignore:
- "[0-9]+.[0-9]+.[0-9]+-java8"
- "[0-9]+.[0-9]+.[0-9]+-java15"
- "[0-9]+.[0-9]+.[0-9]+-java16"
paths-ignore:
- "*.md"
- "docs/**"
+1 -1
View File
@@ -1,4 +1,4 @@
FROM adoptopenjdk:8-jre-hotspot
FROM adoptopenjdk:latest
LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
+12
View File
@@ -98,6 +98,12 @@ case "${TYPE^^}" in
;;
FORGE)
log "**********************************************************************"
log "WARNING: The image tag itzg/minecraft-server:java8-multiarch is recommended"
log " since some mods require Java 8"
log " Exception traces reporting ClassCastException: class jdk.internal.loader.ClassLoaders\$AppClassLoader"
log " can be fixed with java8"
log "**********************************************************************"
exec ${SCRIPTS:-/}start-deployForge "$@"
;;
@@ -110,6 +116,12 @@ case "${TYPE^^}" in
;;
FTB|CURSEFORGE)
log "**********************************************************************"
log "WARNING: The image tag itzg/minecraft-server:java8-multiarch is recommended"
log " since some mods require Java 8"
log " Exception traces reporting ClassCastException: class jdk.internal.loader.ClassLoaders\$AppClassLoader"
log " can be fixed with java8"
log "**********************************************************************"
exec ${SCRIPTS:-/}start-deployCF "$@"
;;