Commit Graph

192 Commits

Author SHA1 Message Date
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
b15ad9e799 Merge pull request #60 from itzg/mc/java8
Mc/java8
2016-02-21 20:02:37 -06:00
Geoff Bourne
17bfedd137 [cassandra] Upgrade to 2.2.5 2016-02-20 18:26:04 -06:00
Geoff Bourne
afa25e582d [mc] Upgrade base image to java:8 2016-02-20 18:05:41 -06:00
Geoff Bourne
7651cc658e [jenkins] Upgrade base to java:8-jdk 2016-02-04 21:19:42 -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
Geoff Bourne
afa710455d Merge pull request #57 from Jadaw1n/master
[minecraft] Pass GID as docker option
2016-01-29 15:56:18 -06:00
Piero Steinger
70a55e3be1 [minecraft] Pass GID as docker option 2016-01-29 20:50:53 +01:00
Geoff Bourne
13ee106dac Merge pull request #51 from nlloyd/master
Adding gamerule.txt configuration file handling (optional)
2016-01-06 15:53:16 -06: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
Steve Shipway
582c60cd03 Add /plugins mount for external bukkit plugins
Add TYPE=BUKKIT documentation
2016-01-02 13:11:07 +13:00
Steve Shipway
13a6d91295 Fix typo 2016-01-02 12:20:39 +13:00
Steve Shipway
d0263f31d6 Add bukkit/spigot type download 2016-01-02 12:12:20 +13:00
Steve Shipway
4ab31a049b Allow non-ZIP urls for download
Add directory rename for Spigot
2016-01-02 11:33:05 +13:00
Nick Lloyd
4b74d13f08 removing old exec java call 2016-01-01 17:11:10 -05:00
Nick Lloyd
2afbdc959e added special handling for on startup gamerules (/gamerule commands), unfortunately will clobber stdin for the running server process 2016-01-01 17:06:56 -05:00
Geoff Bourne
9fa27b9a3d [mc] Adding MODPACK download option similar to WORLD 2016-01-01 12:39:43 -06:00
Geoff Bourne
16b3f18400 Merge pull request #49 from sshipway/master
Add WORLD env var to download save via HTTP, and other fixes
2015-12-22 10:42:54 -06:00
Geoff Bourne
79f9e02446 [cassandra] Upgrade to 2.2.4 2015-12-22 10:19:48 -06:00
Steve Shipway
a313c03fff Verify source URL and log if not working 2015-12-22 20:39:53 +13:00
Steve Shipway
e76068e63e Many improvements to help it work with automated schedulers
- Allow -e WORLD=http://xxxx/world.zip to download archived world and unpack
- Allow 'adventure' and 'spectator' game modes
- Allow /mods and /config mounts for shared Forge mods without using /data
- Quote many strings in case of blank values
- Let VERSION take lowercase options, and set to LATEST if blank or invalid
- Enable command blocks by default (needed for adventure worlds)
- Allow DIFFICULTY to be given numerically
- default to empty banned-players and banned-ip files to avoid error message
2015-12-22 19:53:29 +13:00
root
2427cae5a2 Quote pathnames in case of spaces and such 2015-12-19 21:50:44 +13:00
root
e902c6f40f Set command blocks enabled on servers by default; improved use of
http world download.
2015-12-19 21:48:09 +13:00
Steve
ef34025dd8 Add support for download of world in zipfile
WORLD=http://hostname/world.zip
Zipfile should contain world/ directory, and optionally any required mods in mods/ as well as optionally
a default server.properties file (overwritten by any env vars)
Also export volumes /mods and /config, the contents of which are copied to /data/mods and /data/config.  This
allows shared read-only mounts for modules without affecting world.
2015-12-19 15:32:29 +13:00
Geoff Bourne
0acedd04b9 Merge remote-tracking branch 'refs/remotes/origin/mc-issue-47' 2015-12-01 21:47:02 -06:00
Geoff Bourne
2f5402195c Merge remote-tracking branch 'refs/remotes/origin/master' into mc-issue-47 2015-11-30 21:51:19 -06:00
Geoff Bourne
764ae807e0 Avoid text file busy prior to exec sudo 2015-11-30 20:56:25 -06:00
Geoff Bourne
32cb5f44e4 [mc] also apply to white-list property 2015-11-28 23:02:43 -06:00
Geoff Bourne
a6e32f0ea9 Merge pull request #46 from everett-toews/whitelist
Whitelist players
2015-11-28 22:37:18 -06:00
Everett Toews
111883e0d5 Whitelist players 2015-11-28 22:11:01 -06:00
Geoff Bourne
847f403bd3 [es] Fixed #45 with corrected binding and re-worked example
* also upgraded to 2.1.0
* added a MULTICAST env var for supporting networks
2015-11-28 11:35:59 -06:00
Geoff Bourne
39bb0d75e2 [cassandra] Upgrade to 2.1.11 2015-11-04 18:24:02 -06:00
Geoff Bourne
01473c4e43 Fixes #44 : use 2.0 plugin install syntax 2015-11-04 18:21:46 -06:00
Geoff Bourne
b3a79d6b08 [es] Upgrade to 2.0.0 2015-10-29 19:58:28 -05:00
Geoff Bourne
5484f50659 [es] Upgrade to 1.7.3 2015-10-29 19:35:20 -05:00
Geoff Bourne
53e727298e Refreshing apt baseline 2015-10-29 19:17:34 -05:00
Geoff Bourne
a4aa177d6e Merge pull request #43 from everett-toews/patch-1
Consistent use of name "mc" everywhere
2015-10-09 08:01:13 -05:00
Everett Toews
a412cfddad Missed one... 2015-10-08 21:01:24 -05:00
Everett Toews
594c9873c4 Consistent use of name "mc" everywhere 2015-10-08 20:57:03 -05:00
Geoff Bourne
94442458e3 [cassandra] Upgrade to 2.1.9 2015-10-03 07:19:36 -05:00