Commit Graph

53 Commits

Author SHA1 Message Date
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
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
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
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
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
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
32cb5f44e4 [mc] also apply to white-list property 2015-11-28 23:02:43 -06:00
Everett Toews
111883e0d5 Whitelist players 2015-11-28 22:11:01 -06:00
Geoff Bourne
fec75cb117 Add support for level type and generator settings 2015-10-03 07:05:01 -05:00
nichivo
ed19d745cb URL format changed for Forge 1.7.10 from 10.13.2.1300 2015-06-13 16:51:07 +10:00
Tim Visher
ebc0405e72 typo. 2015-06-10 14:14:31 -04:00
Tim Visher
b86370295c Add difficulty knob. 2015-06-10 14:13:36 -04:00
55chevypickup
0f466e2146 Added the ability to select forge version
Added the ability to select forge version by adding -e FORGEVERSION=10.13.3.1403-1.7.10 or -e FORGEVERSION=RECOMMENDED
2015-05-11 15:45:23 -05:00
Geoff Bourne
63925a794c For #19: added PVP env var options
* also adding a marker env var for MCCY to reference
2015-03-29 13:39:25 -05:00
Geoff Bourne
b1f9d1c7c6 Use Forge recommended (not latest) version
* Misc Dockerfile cleanup
** use COPY instead of ADD
** wget is now pre-installed by base image
2015-03-20 20:26:43 -05:00
Geoff Bourne
01d9c54575 Simplify down our options when it comes to forge versions 2015-03-04 22:21:52 -06:00
Daniel L. Polanco
df09adbfd7 Add non-working code to work with Goeff 2015-03-04 20:07:37 -07:00
Daniel L. Polanco
2f4b73d862 Remove commented out cd /data from testing 2015-03-04 18:17:20 -07:00
Daniel L. Polanco
a252d794f9 Fix bad variable names 2015-03-04 18:15:36 -07:00
Daniel L. Polanco
79438e14de Simplify start-minecraft.sh 2015-03-04 17:47:54 -07:00
Daniel L. Polanco
87140179f2 Add option for Vanilla or Forge server 2015-03-04 16:55:57 -07:00
Andreas Heil
60b6eea1e2 propagate SIGTERM to the Minecraft process 2015-01-05 10:32:31 +01:00
Geoff Bourne
7e847829ee * also moved EULA check before download to fail-fast 2015-01-01 16:01:15 +00:00