Mirrors/docker-minecraft-server
2
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server synced 2024-12-24 11:03:07 +00:00
Code Issues Projects Releases Packages Wiki Activity
1122 commits 25 branches 497 tags 20 MiB
Commit graph

1122 commits

This branch
This branch
All branches
Author SHA1 Message Date
Geoff Bourne
8b9051d72e Merge pull request #174 from Rob5Underscores/master 
Add support for a zip file of mod configs to be supplied!
 2017-07-17 06:56:44 -05:00
Rob Weddell
d6392f3aa9 Add support for a zip file of mod configs to be supplied! 
This was added such that Sponge servers are supported.
(For Sponge: TYPE=FORGE, MODPACK=[zip including sponge plugins and jar], MODCONFIG=[sponge configuration])
 2017-07-17 11:48:23 +01:00
Geoff Bourne
fe808be91b Merge pull request #173 from opHASnoNAME/master 
Set UID for ES_DEFAULT_USER to 1100, avoid conflicts with debian host…
 2017-07-16 14:16:24 -05:00
Arne Riemann
2cab10e906 Forgot -u for UID 2017-07-16 16:09:28 +02:00
Geoff Bourne
7f39d1f22e [mc] Properly check empty json files to fix 
For #162
 2017-07-15 20:02:40 -05:00
Arne Riemann
a9184368c1 Set UID for ES_DEFAULT_USER to 1100, avoid conflicts with debian host systems 2017-07-15 06:38:36 +02:00
Geoff Bourne
caf2fc2ab6 [es] Correcting old-ADD tar file path 2017-07-13 09:09:10 -05:00
Geoff Bourne
5dd8141e5e Merge pull request #169 from manojsb/patch-1 
Upgrade to ES 5.5.0
 2017-07-13 08:53:42 -05:00
Geoff Bourne
2ff28675d4 [es] Adapt to new Dockerfile ADD behavior 2017-07-13 08:52:02 -05:00
Manoj Kumar
519bd986b5 Update Dockerfile 
Updated to v5.5.0
 2017-07-12 11:41:13 +05:30
Geoff Bourne
e41efba176 [es] Using NON_DATA in 3x1GB stack 
For #165
 2017-07-04 18:08:10 -05:00
Geoff Bourne
0502813496 [es] Add NON_DATA type 
For #165
 2017-07-04 18:06:08 -05:00
Geoff Bourne
932a6828f9 [mc] Auto fix pre 1.12 empty json 
For #162
 2017-07-03 14:20:12 -05:00
Geoff Bourne
d176ef3f6a Merge pull request #167 from lukascernydis/master 
Added option REMOVE_OLD_MODS
 2017-07-01 20:09:12 -05:00
Lukáš Černý
deb98268f6 Added option REMOVE_OLD_MODS 2017-07-02 01:32:24 +02:00
Geoff Bourne
e1531c3237 [mc] Switch to openjdk alpine base image 2017-06-29 19:45:51 -05:00
Geoff Bourne
47af45a430 Merge pull request #166 from macman31/patch-1 
Fix typos in config file generation
 2017-06-29 19:19:11 -05:00
ATMD
0195b42eea Fix regex to change gamemode value 
The sed command `sed -i "/gamemode\s*=/ c gamemode=$MODE" $SERVER_PROPERTIES` matches all lines containing `gamemode=`.
This includes the line `force-gamemode` that is set it with `setServerProp "force-gamemode" "$FORCE_GAMEMODE"`
So basically the `force-gamemode` line is erased and the `gamemode=value` line is duplicated, and then the server cleans it up at start and deduplicates the `gamemode` line and create a new `force-gamemode` line with a default value.
This fix ensures that only the `gamemode=` line is modified when changing the gamemode value.
 2017-06-29 21:53:26 +02:00
ATMD
f875af5cdb Delete repetition of spawn-npcs 2017-06-29 20:25:24 +02:00
ATMD
32a918b902 Fix typo SPAWN_ANIMIALS 2017-06-29 19:56:14 +02:00
Geoff Bourne
d09a56075f [es] Add an example minimal composition 2017-06-28 23:17:39 -05:00
Geoff Bourne
e261fae348 [es] Upgrade to 5.4.2 2017-06-21 19:06:13 -05:00
Geoff Bourne
5b8668d73f [mc] Add dinnerbone's mcstatus and use it for HEALTHCHECK 
Part of #159
 2017-06-11 11:03:00 -05:00
Geoff Bourne
123292b56b Merge pull request #156 from dirkcjelli/mc_fixes 
minecraft-server: Fixed FORGEVERSION case, add support for BIOMESOP
Fixes #139
 2017-06-07 21:00:39 -05:00
Sascha Askani
0e0828f47f Revert "Fix FORGEVERSION -> FORGE_VERSION, remove unneeded statement in default" 
This reverts commit cb6643a345.
 2017-06-07 20:55:39 -05:00
Geoff Bourne
532c9fa69a Merge branch 'master' into mc_fixes 2017-06-07 20:54:35 -05:00
Geoff Bourne
e509563b10 [mc] Correctly pre-populate json config files 
For #158
 2017-06-07 20:43:35 -05:00
Geoff Bourne
899f31917c [mc] Add some FORGE_INSTALLER lookup messages 2017-06-07 08:07:44 -05:00
Geoff Bourne
e6ca9a1c6d [mc] glob for forge jar, but exclude installer 2017-06-06 23:09:45 -05:00
Geoff Bourne
24c68b9c2c [mc] Avoid trying to run forge installer as server 2017-06-06 22:36:39 -05:00
Geoff Bourne
2891e1ac3e [mc] Check for valid $FORGE_INSTALLER 2017-06-05 21:34:15 -05:00
Sascha Askani
da9618c08b add support for BIOMESOP level type 2017-06-05 16:09:26 +02:00
Sascha Askani
cb6643a345 Fix FORGEVERSION -> FORGE_VERSION, remove unneeded statement in default 
case
 2017-06-05 16:08:26 +02:00
Geoff Bourne
71527b87c1 [mc] Add support for custom Forge installer sources 
For #154
 2017-06-03 20:51:54 -05:00
Geoff Bourne
df25a22634 [es] Upgrade to 5.4.1 2017-06-02 12:02:11 -05:00
Geoff Bourne
5c6a2cf44f [mc] Use a probing approach to find Forge URL and launcher name 
For #91 and #153
 2017-05-28 20:55:09 -05:00
Geoff Bourne
536a7f6095 [mc] Adapt Forge install run for 1.6-1.10 
For #153
 2017-05-28 11:37:08 -05:00
Geoff Bourne
df9e725baf [es] Add kibana to the compose example 2017-05-27 10:21:59 -05:00
Geoff Bourne
156716a7d8 Merge branch 'feat/ftb-download-config' 
Fixes #151
 2017-05-26 20:09:03 -05:00
Geoff Bourne
0876ef7704 Copy additional meta files into FTB directory 2017-05-26 20:07:26 -05:00
Geoff Bourne
5c3ea25ff3 Merge pull request #152 from dschaper/patch-3 
Add optional `nogui`
 2017-05-20 11:20:20 -05:00
Geoff Bourne
bd8e0cf5d2 Fix FTB download and copy adjusted properties into FTB dir 2017-05-20 10:56:32 -05:00
Dan Schaper
1d5c4e3b0b Check both upper and lower arguments 2017-05-19 21:32:52 -07:00
Dan Schaper
6a565692a0 Add optional nogui 
If set via ENV, disable GUI on server.
 2017-05-19 19:53:45 -07:00
Geoff Bourne
cf68446a00 Add option to download FTB server zip 2017-05-19 20:44:59 -05:00
Geoff Bourne
c4a92f6706 Merge pull request #150 from jackwilsdon/curl-insecure 
Use cURL insecurely when downloading
 2017-05-12 17:14:50 -05:00
Jack Wilsdon
7bb397a031 Use cURL insecurely when downloading 
This fixes an error caused by the expired certificate on ci.mcadmin.net.
 2017-05-12 21:10:57 +01:00
Geoff Bourne
d86f034e96 [mc] Add python package and improve Forge install robustness 
For #148
 2017-05-08 22:35:37 -05:00
Geoff Bourne
20385507d8 [mc] Add mysql-client package for mods that need it 
For #145
 2017-05-05 20:46:35 -05:00
Geoff Bourne
91def1176d [mc] Run FTB server in its directory to support legacy 
For #144
 2017-05-05 20:18:31 -05:00