Mirror/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2024-06-07 19:40:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,009 Commits 21 Branches 487 Tags 19 MiB
b731eaaffb
Commit Graph

67 Commits

Author SHA1 Message Date
Geoff Bourne
cbf9577a24 Auto-merging via docker-versions-create 2021-04-11 10:11:28 -05:00
Jawa_Juice
70ea32e89d
Add option for Flare flags (#827) 2021-04-09 12:25:51 -05:00
Geoff Bourne
9ccfca5061 Merged latest from master 2021-04-08 19:24:14 -05:00
Geoff Bourne
190e401452 Added EXEC_DIRECTLY, ENABLE_ROLLING_LOGS, and SKIP_SUDO options 
#820
 2021-04-02 18:23:05 -05:00
Geoff Bourne
9690832247 Auto-merging via docker-versions-create 2021-04-01 16:39:46 -05:00
Geoff Bourne
a2132292ac Separated OVERRIDE_OPS|WHITELIST from OPS|WHITELIST logic 
#806
 2021-03-18 20:00:30 -05:00
Geoff Bourne
3c77abbbab Added debug output for deployForge and minecraftFinalSetup 
#799
 2021-03-11 16:21:59 -06:00
Geoff Bourne
6fa827e9a1 Fixed usage of EXTRA_ARGS 
#798
 2021-03-11 15:08:26 -06:00
Geoff Bourne
ebabfeb669 Shifted PATH-fix earlier in startup 2021-03-06 16:05:01 -06:00
Geoff Bourne
5c1f176848 Shifted PATH-fix earlier in startup 2021-03-06 16:03:37 -06:00
Geoff Bourne
457e9b53c7 Auto-merging via docker-versions-create 2021-02-27 20:55:30 -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
b71eb666a7 Fix PATH to include java when needed 
#749
 2021-02-10 15:11:07 -06:00
Geoff Bourne
b176be942d Fix PATH to include java when needed 2021-02-10 14:52:16 -06:00
Geoff Bourne
a2ab0d75ed Fix PATH to include java when needed 2021-02-10 14:46:09 -06:00
Geoff Bourne
b8ef6eba3f Auto-merging via docker-versions-create 2021-01-29 21:07:29 -06:00
Geoff Bourne
ad46f10b55 Added option to override whitelist and ops files 
#726
 2021-01-17 10:09:41 -06:00
Eugene
cd0fdfc95b
Add an option to override the icon which already has been set. (#723) 2021-01-13 16:47:15 -06:00
Geoff Bourne
ce1b337f7f Auto-merging via docker-versions-create 2021-01-09 11:25:38 -06:00
Geoff Bourne
55b5f6821f Fixed ops and white-list setup for CurseForge modpacks named with spaces 
For #717
 2021-01-06 22:38:18 -06:00
Geoff Bourne
3cc5cdbc06 Auto-merging via docker-versions-create 2020-12-27 22:08:29 -06:00
Gabriel Fontes
d40bbdc3a5
Envvars in files from /config and /mods now replaced as expected (#701) 
Envvars in files from `/config` and `/mods` now replaced as expected (#701)
 2020-12-27 22:01:03 -06:00
Geoff Bourne
51fc8e824d Auto-merging via docker-versions-create 2020-12-15 14:00:33 -06:00
Silthus
ca9f883352
feat: add COPY_CONFIG_DEST option (#689) 2020-12-15 13:31:51 -06:00
Silthus
9d68fa3b88
feat: improvde REMOVE_OLD_MODS option (#688) 2020-12-13 20:00:06 -06:00
Geoff Bourne
0908d21bed Merged from master 2020-11-25 16:01:42 -06:00
Geoff Bourne
6f1f8d7806 Added use of REMOVE_OLD_MODS to /mods processing 2020-10-03 14:34:02 -05:00
Geoff Bourne
42f90c8806 Added variable to configure stop duration 
Fixes #617
 2020-08-25 19:10:55 -05:00
Geoff Bourne
eba1ef6ab9 Auto-merging via docker-versions-create 
# Conflicts:
#	start-deployFTB
#	start-minecraftFinalSetup
 2020-07-26 08:35:13 -05:00
Geoff Bourne
06cffd9e15 Ensured eula and other files brought over when not using CF start script (#591) 2020-07-19 16:29:41 -05:00
Geoff Bourne
beaccbcf3b Added option to set USE_MODPACK_START_SCRIPT=false for CF modpacks (#591) 2020-07-19 15:01:19 -05:00
Geoff Bourne
8b5552bb62 Auto-merging via docker-versions-create 2020-07-18 18:41:10 -05:00
Geoff Bourne
692087dd25 Ensured ops.txt and white-list.txt are always provided for CURSEFORGE/FTB type (#584) 2020-07-18 13:49:40 -05:00
Geoff Bourne
c07f899870 Auto-merging via docker-versions-create 
# Conflicts:
#	start-deployFTB
 2020-07-10 17:13:05 -05:00
Geoff Bourne
9a7a532f7b Changed order of /plugins rsync to be before processing env vars 
For #577
 2020-07-06 17:16:51 -05:00
Geoff Bourne
e527fd9551 Auto-merging via docker-versions-create 2020-07-04 14:58:40 -05:00
Kamaroth92
c4654e44d8
Move server-icon.png to FTB_DIR if exists (#573) 
Co-authored-by: Tane Barriball <tanebarriball@gmail.com>
 2020-07-04 09:08:37 -05:00
Geoff Bourne
8493252645 Auto-merging via docker-versions-create 
# Conflicts:
#	Dockerfile
#	README.md
#	start
#	start-configuration
#	start-deployFTB
 2020-06-19 15:01:28 -05:00
Geoff Bourne
f5dde77efe Enabled iterative development with SCRIPTS var 2020-06-19 11:05:32 -05:00
Geoff Bourne
aa42633ab2 Added support for FTB application modpacks via modpacks.ch 
For #524
 2020-05-31 18:18:54 -05:00
Mitchell Skaggs
ede58d9159
Update flags as of 5/2/2020 (#534) 2020-05-18 19:55:32 -05:00
Geoff Bourne
c68997936a Added units description for DEBUG_MEMORY option 2020-04-27 08:04:11 -05:00
Geoff Bourne
40547439b2 Added DEBUG_MEMORY option 2020-04-27 07:55:38 -05:00
Geoff Bourne
e9b1332119 Added support for Magma servers 
For #497
 2020-04-21 18:30:48 -05:00
Geoff Bourne
1cf478f5b3 Removed pre-creating /mods /config /plugins 2020-04-17 21:16:04 -05:00
Matthieu Berthomé
220f2fbd79
add some /data prefixes in missing places (#493) 
Co-authored-by: rienafairefr <rienafairefr@gmail.com>
 2020-04-15 08:20:11 -05:00
Geoff Bourne
8dbbdd8cd2 Added logic to skip --noconsole on newer versions 
Fixes #452
 2020-04-13 18:29:44 -05:00
Geoff Bourne
1c2a0c506c Added support for TYPE=CURSE_INSTANCE 2020-04-12 14:31:19 -05:00
Geoff Bourne
cd70cbcbea Enhanced Aikar's flag logic to adjust for >12GB memory 
For #483
 2020-04-11 10:41:20 -05:00
Geoff Bourne
7910005086 Added option to use Aikar's flags 2020-04-11 08:43:17 -05:00