Commit Graph

564 Commits

Author SHA1 Message Date
Geoff Bourne
959bdeef54 mc: added allow-flight option 2018-04-14 13:01:34 -05:00
Geoff Bourne
2627317e03 mc: Download Bukkit and Spigot from getbukkit.org 2018-03-16 17:03:21 -05:00
Geoff Bourne
c288557188 mc: upgrade base image to java 8u151 2018-03-16 09:24:48 -05:00
Geoff Bourne
7f82d3098c [mc] For FTB skip ops and white-list when not configured
Fixes #203
2018-03-04 19:01:31 -06:00
Geoff Bourne
0a7a666904
Merge pull request #197 from TheLeftMoose/196-set-server-port
Fixes #196 makes it possible to add server port as a env.
2018-02-15 11:43:18 -06:00
Dennis Schwartz-Knap
7bbe2fd28d added server_port to default env 2018-02-15 18:04:22 +01:00
Dennis Schwartz-Knap
8857abdc05 updateing readme with info about server port env 2018-02-12 18:11:33 +01:00
Dennis Schwartz-Knap
423b45cb7b Fixes #196 makes it possible to add server port as a env. 2018-02-12 17:26:44 +01:00
Geoff Bourne
6ef6bc68c2
Merge pull request #195 from scones/patch-2
test for the correct files at the correct locations
2018-02-07 12:10:06 -06:00
Dirk Gustke
b8e996d3c4
typo 2018-02-06 23:55:44 +01:00
Dirk Gustke
345696227d
test for the correct files at the correct locations 2018-02-06 21:21:23 +01:00
Geoff Bourne
66330af708
Merge pull request #194 from scones/patch-1
this somehow deleted the correctly modified properties file.
2018-02-03 09:44:08 -06:00
Dirk Gustke
3444d88e4d
this somehow deleted the correctly modified properties file.
as this is just a redundant remnant, i removing this line is save and works better
2018-02-03 15:24:37 +01:00
Geoff Bourne
95416a799e
Merge pull request #191 from scones/fix_properly_set_ftb_properties
Fix properly set ftb properties
2018-01-28 09:06:05 -06:00
Dirk Gustke
dc3c93becf fix_properly_set_ftb_properties - remove debugging information 2018-01-28 14:50:08 +01:00
Dirk Gustke
ce4b4ad208 fix_properly_set_ftb_properties - use correct variable 2018-01-28 14:48:50 +01:00
Dirk Gustke
7afa00b72c fix_properly_set_ftb_properties - use existing variables thus preventing override 2018-01-28 14:45:25 +01:00
Dirk Gustke
230b575983 fix_properly_set_ftb_properties - use a unified setter, set the correct file 2018-01-28 13:16:45 +01:00
Dirk Gustke
2f3e93c619 fix_properly_set_ftb_properties - revert disfunctional change 2018-01-28 13:15:41 +01:00
Geoff Bourne
59753d8310
Merge pull request #190 from scones/patch-1
making use of all the server properties magic in ftb packages ..
2018-01-27 12:38:23 -06:00
Dirk Gustke
4fb881a583
Update start-deployFTB 2018-01-27 15:33:50 +01:00
Dirk Gustke
e42e9ac489
making use of all the server properties magic in ftb packages .. 2018-01-27 15:06:09 +01:00
Geoff Bourne
f5f20f3563 [mc] For FTB add legacy java fixer option 2018-01-07 17:19:10 -06:00
Geoff Bourne
931c27a5ec
Clarify discontinued images in top level README 2017-12-25 11:33:46 -06:00
Geoff Bourne
bc100163c2 [mc] Use image rather than build in example proxied compose file 2017-12-08 10:03:45 -06:00
Geoff Bourne
3a64e32184 [mc] Add PROXY env var option
For #177
2017-12-08 09:48:55 -06:00
Geoff Bourne
b9787182e6
Merge pull request #184 from BinaryShock/spongeIntegration
Sponge integration
2017-11-07 21:13:33 -06:00
Aitor Ramos Sasselli
7797bf23fb
Added optional parameters on SpongeVanilla server 2017-11-06 09:52:26 +01:00
Aitor Ramos Sasselli
f347f30353 Added initial SpongeForge information to Readme 2017-11-05 22:41:11 +01:00
Aitor Ramos Sasselli
eb239bfdb7 Changes in master updated to this branch 2017-11-02 04:10:39 +01:00
Geoff Bourne
7047e565fc
Merge pull request #183 from BinaryShock/minecraft-refactor
Code refactorization
2017-11-01 21:26:17 -05:00
Aitor Ramos Sasselli
f178c6c0a1 SpongeVanilla integration and JSON check fix 2017-11-01 22:06:05 +01:00
Aitor Ramos Sasselli
ee5a95baa8 Repaired some bugs from refactor 2017-11-01 06:42:44 +01:00
Aitor Ramos Sasselli
0c1c6d198c Repaired some bugs from refactor 2017-11-01 06:41:55 +01:00
Aitor Ramos Sasselli
a0e605814f Code refactorization 2017-10-28 10:04:52 +02:00
Geoff Bourne
518986d28e [mc] Added support for LEVEL_TYPE = RTG 2017-10-02 20:06:41 -05:00
Geoff Bourne
2357914b4c [es] Upgrade to 5.5.2 2017-09-24 19:17:38 -05:00
Geoff Bourne
e5a4428515 [mc] Install iputils and wget for FTB compat 2017-09-24 11:46:47 -05:00
Geoff Bourne
6b9033318b [mc] For FTB pass-thru custom mod URLs
for #155
2017-09-03 20:20:25 -05:00
Geoff Bourne
9ee907783d [mc] Added issues link 2017-09-02 12:29:50 -05:00
Geoff Bourne
463cc62b75 [mc] Check writability of /data
Document JVM_OPTS
For #176 and #177
2017-09-02 12:24:09 -05:00
Geoff Bourne
5afd98edd8 [es] Upgrade to 5.5.1 2017-08-12 13:58:39 -05:00
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