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
434 Commits 21 Branches 487 Tags 19 MiB
5fb09f57e3
Commit Graph

224 Commits

Author SHA1 Message Date
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
7f39d1f22e [mc] Properly check empty json files to fix 
For #162
 2017-07-15 20:02:40 -05:00
Geoff Bourne
932a6828f9 [mc] Auto fix pre 1.12 empty json 
For #162
 2017-07-03 14:20: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
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
5b8668d73f [mc] Add dinnerbone's mcstatus and use it for HEALTHCHECK 
Part of #159
 2017-06-11 11:03:00 -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
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
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
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
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
Benjamin
5ec21fc0ba change deprecated maintainer to label 2017-05-02 21:29:17 +02:00
Geoff Bourne
615d12bce3 [mc] Upgrade to rcon-cli 1.3 2017-04-09 08:30:20 -05:00
Geoff Bourne
72d055ac19 [mc] Add support for DOWNLOAD_*_URL overrides 
Also switched from wget to curl
 2017-04-08 07:20:04 -05:00
Geoff Bourne
80c18004c1 [mc] Integrate rcon-cli 2017-04-07 19:35:15 -05:00
Geoff Bourne
97e9b2901c [mc] Fixed docker-compose example 2017-04-06 12:41:21 -05:00
Geoff Bourne
027d94cc77 Initial content of minecraft-server container diagram 2017-04-05 10:36:03 -05:00
Geoff Bourne
66261af03d Added Minecraft server containment diagram 2017-04-05 10:31:21 -05:00
Geoff Bourne
290e2c734a [mc] Improved UID/GID handling in passwd/group files 
For #136
 2017-04-04 22:11:05 -05:00
Geoff Bourne
bbe1533f91 [mc] Adjust mem with MEMORY and INIT_/MAX_MEMORY 
For #126
 2017-03-19 09:35:58 -05:00
Geoff Bourne
97040f61ed [mc] Remove -u from unzip in FTB for Alpine compatibility 
For #132
 2017-03-09 18:56:19 -06:00
Geoff Bourne
07c32d8ee4 [mc] Fixed TYPE=FORGE for alpine base image 
For #128
 2017-02-28 18:32:15 -06:00
Geoff Bourne
c96c630fe5 Merged branch master into master 2017-02-22 16:49:21 -06:00
Geoff Bourne
f69e75cfc1 [mc] Add rcon to big composition 2017-02-22 16:49:08 -06:00
Geoff Bourne
854a158d3d Merge branch 'master' into alpine 2017-02-22 13:16:38 -06:00
Geoff Bourne
18919ef33c [mc] Upgrade to Alpine compatible restify 2017-02-22 13:14:48 -06:00
Geoff Bourne
32b0737e70 [mc] Add rcon to docker-compose.yml example 2017-02-18 11:53:44 -06:00
Geoff Bourne
79eb164e90 [mc] Adding example compose file for large minecraft server 2017-02-18 11:00:55 -06:00
Geoff Bourne
f5dbbcc2c6 [mc] Use G1 GC by default and simplify max memory setting 
For #126
 2017-02-14 22:15:36 -06:00
Henry Gessau
4a89f3c579 Add Feed-The-Beast (FTB) server modpack support 
The popular mod site https://www.feed-the-beast.com provides server
modpacks to go with their client modpacks. These server modpacks
include a custom start script that must be used to launch the server.
 2017-02-13 22:13:53 -05:00
Geoff Bourne
9fe0021a7a [mc] Upgrade base image to openjdk 
Fixes #122
 2017-01-12 19:40:58 -06:00
Ilkka Tengvall
2d8b3d7275 Remove commented lines 2016-12-07 19:10:18 +02:00
Ilkka Tengvall
f48eedee78 restored the java heap size 
I reduced it for RasPi, but forgot it low here too. Restored.
 2016-12-07 19:06:01 +02:00
Ilkka Tengvall
08d459c373 changed to work on alpine container 2016-12-07 00:31:06 +02:00
manuelgu
e766301d1e Fix formatting 2016-10-18 13:59:43 +02:00
Geoff Bourne
3348083424 [mc] Fix game mode shorthand handling of s* 
For #107
 2016-10-02 07:50:19 -05:00
Kirk Strauser
c48f85cc4f Oops! --noconsole for non-bootstrap, too 2016-09-22 19:51:44 -07:00
Kirk Strauser
aa13deecdb Added CONSOLE envvar to control console output 
By default, CONSOLE is true. When set to false, start-minecraft.sh
adds "--noconsole" to java. Use this to keep Spigot from burning CPU.
 2016-09-22 19:51:44 -07:00
Geoff Bourne
b5bcea7d61 [mc] Add SKIP_OWNERSHIP_FIX option 
For #104
 2016-09-10 08:22:30 -05:00
Geoff Bourne
76d4fd1bbc [mc] Check writability of /data before chown'ing it 
For #104
 2016-09-06 21:36:54 -05:00
Geoff Bourne
d14d666e24 [mc] Ensure home directory is writable 
For #102
 2016-08-30 17:11:10 -05:00
Geoff Bourne
911fcf8b42 [mc] Correcting EULA usage in compose example in README 
Part of #101
 2016-08-15 22:04:36 -05:00
Parthipan Ramesh
fe6e8c04ff minecraft-server: EULA var needs to be a string (docker-compose.yml) 
docker-compose refuses to build a container without the quotation marks.
 2016-08-15 20:06:12 +02:00
Jim Tremblay
5c5b8cd999 Add default value of ONLINE_MODE 2016-08-03 21:59:48 -04:00
Jim Tremblay
074424a5bd Add section about new option ONLINE_MODE 2016-08-03 21:58:07 -04:00
Jim Tremblay
99b1de0bbd Update start-minecraft.sh 2016-08-01 22:09:30 -04:00
Tomasz Majer
ada4a1fab5 Mention PaperSpigot in README.md 2016-07-22 13:48:50 +02:00
Tomasz Majer
ea78bdd559 Add support for PAPER as possible Minecraft server 2016-07-21 18:32:45 +02:00
Larry Wright
d89de80db8 Update start-minecraft.sh 
Each time this script is run it downloads the modpack if one is specified. When it tries to unzip the file, if the files already exist in the plugins directory, the script will hang indefinitely because unzip asks for confirmation that you want to overwrite the existing files. Adding -o to the unzip command will tell it to overwrite the files. I suspect the world download has the same issue, but I don't use that and so can't really test it.
 2016-07-07 09:17:13 -05:00
Geoff Bourne
379905c6ff [mc] Use restify to lookup Spigot/Bukkit URLs at startup 
For #87
 2016-07-01 22:17:10 -05:00
Geoff Bourne
0832bb0c43 [mc] Update Spigot info in README 
For #80 and #79
 2016-06-11 18:49:18 -05:00
Geoff Bourne
b97348d703 [mc] Remove extraneous exec java call 
Fixed #76
 2016-06-11 18:44:23 -05:00
Geoff Bourne
4cff161deb [mc] Use new versions metadata json URL 
For #83
 2016-06-11 18:42:33 -05:00
Geoff Bourne
c806c425fd [mc] Properly quote parameters passed into entry point 2016-05-30 11:41:03 -05:00
Geoff Bourne
0defd266a6 [mc] Use ENTRYPOINT and pass through extra args 
Enables experimenting for #80
 2016-05-28 20:58:36 -05:00
Geoff Bourne
5617936f10 Pre-compute the Bukkit/Spigot download URLs 
For #77
 2016-05-09 19:28:25 -05:00
Geoff Bourne
b5e459ab0a ...try wget for Spigot download 
#74
 2016-04-24 12:40:59 -05:00
Geoff Bourne
ae9109e2bf ...remove debugging code from Spigot download 
#74
 2016-04-24 11:59:44 -05:00
Geoff Bourne
b9f247728f [mc] Detect and display curl error during Spigot/Bukkit download 
#74
 2016-04-24 10:50:48 -05:00
Geoff Bourne
3052cd1155 [mc] Normalize on SPIGOT for plugin/world setup 
#75
 2016-04-24 10:32:59 -05:00
Geoff Bourne
46c865a123 Only create /home/minecraft if absent 
* only download/build Spigot/Bukkit when absent
* refactored download ops into functions
#72
 2016-04-24 07:26:26 -05:00
Geoff Bourne
cf5d194b14 [mc] Robust handling of Forge, Bukkit, and Spigot version selection 
* refactor server.properties sed ops into a utility function
* also switch to jq instead of jsawk
* simplify to BUILD_FROM_SOURCE from BUILD_SPIGOT_FROM_SOURCE
Fixes #70
 2016-04-23 22:23:55 -05:00
Geoff Bourne
a6580b3fe3 [mc] Adding Docker stars to README 2016-04-16 16:45:50 -05:00
Sander
a4835ec331 Build spigot using buildtools (#67) 
* Download buildtools

* Download buildtools

* Not a good idea to chmod /root

* Remove bukkit code

* fix jar not found

* Run start-minecraft as root (temp)

* Working buildtools

* Remove echo line

* Added more server properties, not working yet

* Show what server properties are being added

* Show what server properties are being added

* Add rcon.password

* Add max-world-size

* Added alot of server settings

* Expose rcon port

* Export home per itzg suggestion

* Update readme and server properties

* Env for building spigot from source

* Update readme
 2016-04-16 11:26:13 -05:00
Geoff Bourne
786192e4b7 Added docker pulls badge with link to hub 2016-03-26 08:47:01 -05:00
jtcressy
a195583990 Cleaned Up Code per itzg's suggestion 
Replaced hardcoded spigot_server.jar with $SERVER and broke up the line
to make it more readable.
 2016-03-16 21:18:31 -06:00
jtcressy
a1ead0634e [mc] New method of downloading newer spigot server executable. 
using double pipe "||", bash will continue to the next statement if the
first statement returns false or has an error. Using the -N option, wget
will overwrite the file if it is newer. So, if the -O option was used,
and both wget commands failed (both http and https were down) then wget
would overwrite the file with a 0 byte copy and effectively delete it.
-N works better in this case, since wget will not overwrite it with an
empty file if it can't download it.
 2016-03-15 13:09:28 -06:00
jtcressy
b23fb93366 Undid method of pulling spigot_server.jar 
rm -f $SERVER was a bad idea, as it deletes the server file regardless
of whether wget is able to download a new one. If you keep a copy of
spigot_server in the server directory, wget will fail if it's unable to
pull the file and it wont delete what you already have.
 2016-03-15 01:05:37 -06:00
Geoff Bourne
68d731c096 [mc] Ensure a fresh Bukkit/Spigot jar is downloaded every time 2016-03-06 15:34:02 -06:00
Geoff Bourne
a4bd241be6 [mc] Adding Spigot/Bukkit 1.9 support 
fixes #62
 2016-03-04 22:13:02 -06:00
Geoff Bourne
5f104a32db [mc] Adding back text editors (vim and nano) 2016-03-03 22:32:22 -06:00
Geoff Bourne
03d9064b35 [mc] Putting back usermod solution 2016-02-27 17:10:11 -06:00
Geoff Bourne
afa25e582d [mc] Upgrade base image to java:8 2016-02-20 18:05:41 -06:00
Geoff Bourne
dd0bcda23c Fixes #58 by allowing FML versions 1.8.8+ to be 3-part 2016-01-31 09:13:22 -06:00
Piero Steinger
70a55e3be1 [minecraft] Pass GID as docker option 2016-01-29 20:50:53 +01:00
Nick Lloyd
6253d5ddc0 Merge branch 'itzg-master' 2016-01-06 15:56:50 -05:00
Nick Lloyd
63e3123ab0 gamerules.txt is now bootstrap.txt 2016-01-06 15:55:45 -05:00
Geoff Bourne
1be18346ce [mc] Add Bukkit/Spigot support to MODPACK download-install 2016-01-03 09:37:27 -06:00
Geoff Bourne
9a90acab23 [mc] Fixed typo in Dockerfile 2016-01-01 22:23:26 -06:00
Geoff Bourne
edd69c40f6 Merge pull request #52 from sshipway/master 
Add Spigot support, and non-zip URLs
 2016-01-01 22:00:14 -06:00