Commit Graph

1823 Commits

Author SHA1 Message Date
Jay Christopherson
87b2ce1c24 fixed env inheritance issue with su command; re-ordered OPTS a bit so that --path.plugins will always be the last in order 2016-07-10 07:00:10 -07:00
Geoff Bourne
55e38181bd [es] Upgraded to 2.3.4 and based on alpine 2016-07-09 12:52:02 -05:00
Geoff Bourne
ac3cbe75a9 Merge pull request #90 from larrywright/larrywright-patch-1
Update start-minecraft.sh
2016-07-07 18:02:20 -05: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
1e1a572227 Merged branch master into master 2016-07-01 22:17:35 -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
ec1dd96a7c [gb] Apply all files in /config to /data at startup 2016-06-27 11:16:09 -05:00
Geoff Bourne
413de37568 [gb] Allow dir or file of .git 2016-06-27 08:30:54 -05:00
Geoff Bourne
3147c5638f [gb] Option to auto-create and push existing content
For #85
2016-06-26 22:40:11 -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
b1c0e598ad [gitblit] Fix -p usage in README 2016-06-11 18:32:09 -05:00
Geoff Bourne
63035c347b [gitblit] Upgrade to latest version and add repo init feature 2016-06-11 18:18:17 -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
dd5a21067b [es] Upgrade to 2.3.2 2016-05-09 19:45:40 -05:00
Geoff Bourne
2d48bcb1a0 [cass] Upgrade to 2.2.6 2016-05-09 19:43:44 -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
0ea4ea7d0c [cass] Make sure to enable start_rpc
* also note in titan-gremlin that 1.x of ES is needed
* provide docker compose snippet
Part of #68
2016-04-17 12:21:53 -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
21c9be4ec1 [es] upgrade to 2.3.0 and switch to Java 8 2016-04-01 21:54:54 -05:00
Geoff Bourne
786192e4b7 Added docker pulls badge with link to hub 2016-03-26 08:47:01 -05:00
Geoff Bourne
8610e7d621 Merge pull request #65 from jtcressy/master
[mc] resolved issues with downloading new server executable
2016-03-18 11:57:38 -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
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