Commit Graph

1490 Commits

Author SHA1 Message Date
Geoff Bourne 44769b6001 Shifted PATH-fix earlier in startup 2021-03-06 16:06:43 -06:00
Geoff Bourne ebabfeb669 Shifted PATH-fix earlier in startup 2021-03-06 16:05:01 -06:00
Geoff Bourne 6266a7e3cc Shifted PATH-fix earlier in startup 2021-03-06 16:04:31 -06:00
Geoff Bourne 5c1f176848 Shifted PATH-fix earlier in startup 2021-03-06 16:03:37 -06:00
Geoff Bourne 4186cfd91c Auto-merging via docker-versions-create 2021.6.0-multiarch 2021-02-27 20:56:01 -06:00
Geoff Bourne 457e9b53c7 Auto-merging via docker-versions-create 2021.6.0-java15 2021-02-27 20:55:30 -06:00
Geoff Bourne 871ecd4d9d Merge branch 'master' into java8-multiarch
# Conflicts:
#	start-minecraftFinalSetup
2021.6.0-java8-multiarch
2021-02-27 20:52:36 -06:00
Geoff Bourne 861aec6bd6 Added option for MOHIST_BUILD
#781
2021.6.0
2021-02-27 20:37:59 -06:00
Geoff Bourne 21572d3547 Ensure FTBA version.json is readable
#784
2021-02-27 17:03:37 -06:00
Geoff Bourne 89afba7437 Ensure FTBA version.json is readable
#784
2021-02-27 17:03:09 -06:00
Geoff Bourne c572c95161 Ensure FTBA version.json is readable
#784
2021-02-27 16:58:25 -06:00
Geoff Bourne 53f5fbb77f docs: Fixed examples of quoting SEED and MOTD
#782
2021-02-27 11:05:16 -06:00
Geoff Bourne 9299f00d20 Pre-process special characters in REPLACE_ENV_VARIABLES
#718
2021-02-25 19:07:16 -06:00
Geoff Bourne e5e97a3560 Use file to speed up removal of old PaperMC server jars
#779
2021-02-23 20:04:34 -06:00
Geoff Bourne 32bc0382d6 Only show skipped properties when debugging 2021-02-21 14:36:03 -06:00
Geoff Bourne fa53abdfb7 Add missing server.properties when needed
#776
2021-02-21 14:32:41 -06:00
Geoff Bourne 0cbfb81b4c misc: Removed debug 2021-02-20 17:35:26 -06:00
Geoff Bourne d47c801b18 Separated JMX_BINDING from JMX_HOST in ENABLE_JMX usage 2021-02-20 17:34:00 -06:00
Geoff Bourne c056b9d2dd Improved handling of ENV_VARIABLE_PREFIX
#718
2021-02-20 17:30:50 -06:00
Geoff Bourne 92a15ea85d Updated forge examples to use java8 image
#770
2021-02-15 10:21:42 -06:00
Fersandi Pratama 6fe022ccc8 Fix README: volume should be in list (#767) 2021-02-13 12:24:58 -06:00
Geoff Bourne f397dd71a9 Fix PATH to include java when needed 2021-02-11 14:52:51 -06:00
Geoff Bourne b71eb666a7 Fix PATH to include java when needed
#749
2021-02-10 15:11:07 -06:00
Geoff Bourne 02e0a47a52 Merge branch master 2021.5.1-multiarch 2021-02-10 14:58:33 -06:00
Geoff Bourne b176be942d Fix PATH to include java when needed 2021.5.1-java15 2021-02-10 14:52:16 -06:00
Geoff Bourne f7b58fbbb1 Fix PATH to include java when needed 2021.5.1-java8-multiarch 2021-02-10 14:51:24 -06:00
Geoff Bourne a2ab0d75ed Fix PATH to include java when needed 2021.5.1 2021-02-10 14:46:09 -06:00
Geoff Bourne 60809fe5ad Merge from master
CONFLICT (content): Merge conflict in start-configuration
2021.5.0-multiarch
2021-02-10 14:08:21 -06:00
Geoff Bourne 51c5902db0 Merge from master
CONFLICT (content): Merge conflict in start-configuration
2021.5.0-java15
2021-02-10 14:06:10 -06:00
Geoff Bourne eccfa444a9 Auto-merging via docker-versions-create 2021.5.0-java8-multiarch 2021-02-10 14:02:05 -06:00
Geoff Bourne c48f6c31ce Missing EULA failed without proper log message
#749
2021.5.0
2021-02-10 13:57:14 -06:00
Geoff Bourne b2d23edf6d ci: Added pull:true to multiarch build 2021-02-08 21:27:25 -06:00
Geoff Bourne e831d25706 Merged latest from master 2021-02-08 21:18:28 -06:00
Geoff Bourne 31f25cfd1b Added java8 recommendation to CURSEFORGE / FTB 2021-02-08 21:15:28 -06:00
Geoff Bourne 7d4e4c167e Added support for Yatopia
#704
2021-02-08 20:42:54 -06:00
Geoff Bourne 4a8e416fe1 Auto-merging via docker-versions-create
CONFLICT (content): Merge conflict in Dockerfile
2021.4.0-multiarch
2021-02-07 18:22:16 -06:00
Geoff Bourne 090e624ebc Auto-merging via docker-versions-create
CONFLICT (content): Merge conflict in Dockerfile
2021.4.0-java15
2021-02-07 18:20:35 -06:00
Geoff Bourne 12e931332b Auto-merging via docker-versions-create
CONFLICT (content): Merge conflict in Dockerfile
2021.4.0-java8-multiarch
2021-02-07 18:06:06 -06:00
LichLord91 eb12030975 Update Invalid Server Type Logging Message (#758)
Includes Tuinity and Purpur

Co-authored-by: lichlord91 <lichlord91@users.noreply.github.com>
2021.4.0
2021-02-07 18:00:53 -06:00
Geoff Bourne e46af9d54c Fixed vanilla version lookup to fail early
#756
2021-02-07 17:58:50 -06:00
Geoff Bourne 861faaa285 Trimmed back some ENV defaults from Dockerfile 2021-02-07 17:52:42 -06:00
Geoff Bourne 8312233a93 Added support for Purpur servers
#746
2021-02-07 11:22:08 -06:00
Geoff Bourne 959bf73485 Limit depth when finding old PaperMC server jars
Fixes #750
2021-02-07 09:26:37 -06:00
Geoff Bourne ce4efd0b70 Auto-merging docker-versions-create.sh
CONFLICT (content): Merge conflict in Dockerfile
2021.3.0-multiarch
2021-02-07 09:16:33 -06:00
Geoff Bourne c8dc751b82 Auto-merging docker-versions-create.sh
CONFLICT (content): Merge conflict in Dockerfile
2021.3.0-java15
2021-02-07 09:15:01 -06:00
Geoff Bourne ceee9eddc9 ci: restored base image to ubuntu and install openjdk-8 2021.3.0-java8-multiarch 2021-02-06 15:53:59 -06:00
Geoff Bourne 60ba668743 Merge branch 'master' into java8-multiarch
# Conflicts:
#	Dockerfile
2021-02-06 15:49:16 -06:00
Geoff Bourne beeaf1a996 ci: Added java8-multiarch to build and docs 2021.3.0 2021-02-06 15:48:27 -06:00
Geoff Bourne fd1b15e01f ci: Added java8 variant of multiarch 2021-02-06 15:44:02 -06:00
Geoff Bourne f856276d71 Upgraded multiarch to Java 11 2021-02-06 15:22:15 -06:00