Commit graph

337 commits

Author SHA1 Message Date
Geoff Bourne
57a840b069 mc: added debug-ability to vanilla server downloading 2019-02-03 09:49:59 -06:00
Geoff Bourne
a273ef1763 mc: add gitter badge to README 2019-02-02 10:38:03 -06:00
Geoff Bourne
a63f474109 mc: adjust MAX_RAM in settings.cfg for some CurseForge modpacks
Fixes #285
2019-01-26 16:35:00 -06:00
Geoff Bourne
d368978949 mc: use rcon-cli to stop the server, when it's available 2019-01-24 18:39:26 -06:00
Geoff Bourne
90d721763d Add support for CurseForge modpacks with ServerStartLinux.sh entry
Add CurseForge info in README
Fixes #284
2019-01-21 21:07:38 -06:00
Geoff Bourne
6fc9ba4996
Merge pull request #279 from Silthus/master
feat(minecraft-server): add server-name to env variables
2019-01-14 06:48:49 -06:00
Silthus
10e08e172a
default SERVER_NAME to "Dedicated Server" 2019-01-14 11:09:20 +01:00
Geoff Bourne
46270f6bd5 mc: ensure JVM_DD_OPTS works for FTB also
For #281
2019-01-13 22:22:27 -06:00
Geoff Bourne
1c9274ad96 mc: add support for custom server JARs
For #238
2019-01-13 19:00:34 -06:00
L3vi47h4N
bcf95e5799
Rename minecraft-server/docker-compose-big.yml to minecraft-server/examples/docker-compose-big.yml 2019-01-13 01:30:15 -05:00
L3vi47h4N
02332ee8cd
Rename minecraft-server/docker-compose-proxied.yml to minecraft-server/examples/docker-compose-proxied.yml 2019-01-13 01:29:53 -05:00
L3vi47h4N
da4911c668
Create docker-compose-spongeforge.yml 2019-01-13 01:27:57 -05:00
L3vi47h4N
829eeebb7e
Update docker-compose.yml 2019-01-13 01:20:24 -05:00
Michael Reichenbach
20885c6cf7 style(minecraft-server): fix wrong formatting 2019-01-12 16:35:03 +01:00
Michael Reichenbach
f6465b5dac feat(minecraft-server): add server-name to env variables
The server-name (e.g. needed for bungeecord) can now
be set via the env variable SERVER_NAME.
Defaults to Unknown
2019-01-12 16:32:30 +01:00
Geoff Bourne
bd084cc261 mc: adjust WORLD destination directory when using FTB type
For #278
2019-01-08 18:28:34 -06:00
Alexander Grein
ddbd88c601
Add documentation for the new JVM_DD_OPTS parameter
Fix for #177
2018-12-28 10:16:15 +01:00
Alexander Grein
7e34cf5ac9
Add JVM_DD_OPTS to add -D Params to JVM_OPTS
Fix for #177
2018-12-28 09:56:28 +01:00
Geoff Bourne
8c26947fbc mc: set JAVA_PARAMETERS as alternative INIT_MEMORY for FTB server
For #271
2018-12-18 16:42:15 -06:00
Silthus
a31e2a8506
feat(minecraft-server): add version argument for buildtools
For future compatibility and to avoid breaking backwards compat I added a build argument with for the version of the build tools download.
2018-12-17 19:07:07 +01:00
Silthus
52d4cae74d feat(minecraft-server): onbuild trigger for downloading plugins and mods (#267)
* feat(minecraft-server): add onbuild trigger

Added a ONBUILD trigger for the [ToF-BuildTools](https://git.faldoria.de/tof/server/build-tools).
If a plugins.yml is provided the BuildTools will download all plugins configured in the YAML.

https://github.com/itzg/dockerfiles/issues/218

* feat(minecraft-server): add arg for build output

* fix(minecraft-server): syntax error in Dockerfile

* fix(minecraft-server): chown jar files after building

* feat(minecraft-server): cleanup buildtools after using

* fix(minecraft-server): remove /plugins volume

The /plugins volume causes weird behaviour when prepolulating it with
files on build. Removing it as an explicit volume fixes that.

* mc: add example Dockerfile for ToF builds

* docs(minecraft-server): add docs for new onbuild trigger

* fix(minecraft-server): use correct url for build tools download
2018-12-16 12:00:36 -06:00
Silthus
0d9c2d13f9
fix(minecraft-server): copy plugins and mods to parent dir
Using rsync will already create a subdir inside the /data volume do not create an extra layer.
2018-12-15 08:56:05 +01:00
Silthus
ccec190cb2
feat(minecraft-server): copy mods with rsync as well
Mods are now copied the same as plugins, with rsync. Removed the old cp command.
2018-12-15 08:29:43 +01:00
Silthus
c3ac69a030
fix(minecraft-server): typo from testing - change txt to jar 2018-12-14 11:31:46 +01:00
Michael Reichenbach
fd4e9d93e0 feat(minecraft-server): update spigot plugins using /plugins if newer
Deep copy and *.jar files in /plugins and update the corresponding files
in the /data/plugins dir.
2018-12-14 08:13:19 +01:00
Geoff Bourne
2e353c084a mc: add tzdata package to allow for localtime handling
fixes #263
2018-12-07 17:47:11 -06:00
Geoff Bourne
9b1272edac mc: properly handle spaces in MOTD during server properties setup 2018-12-02 17:52:23 -06:00
Autom3
3f3a2d8433
[minecraft-server] Pass all command line arguments to start-configuration
Regarding the minecraft-server image
The start script currently does not pass command line arguments to the next script. This makes it so server admins can't easily update their server to 1.13.2 by passing --forceUpgrade as an extra parameter after specifying the docker image. With this change it works as intended.

Proof that the arguments did not get added before and do now:
* Add this line to the start-minecraftFinalSetup script: `echo "Running with: mc-server-runner ${bootstrapArgs} java $JVM_XX_OPTS $JVM_OPTS -jar $SERVER ""$@"" $EXTRA_ARGS"`
* Build the image
* Run the image with extra arguments `--test`
* See this printed: `Running with: mc-server-runner -jar minecraft_server.1.13.2.jar`
* Update to this PR
* Build the image
* See this printed: `Running with: mc-server-runner -jar minecraft_server.1.13.2.jar --test`
2018-10-23 23:00:23 +02:00
Geoff Bourne
7be2020879 mc: fix WORLD downloading
fixes #259
2018-10-17 23:17:43 -05:00
Matthew Crowson
a4a22f3bfc loops only if there are JSON files present 2018-10-14 13:47:39 -04:00
Matthew Crowson
491abfc833 using find to match json files 2018-10-13 12:31:28 -04:00
Matthew Crowson
3fee3f0f41 Added mods env variables 2018-10-12 18:11:57 -04:00
Mattias Kågström
3bac706b8a
only download world if there is no preexisting world
My world just got overwritten when i re-created the container. this should hopefully solve it..
2018-10-07 14:01:08 +02:00
Geoff Bourne
6e3761ae91 mc: allow for any values of LEVEL_TYPE to support various mods 2018-10-06 08:08:13 -05:00
Geoff Bourne
b88ae49c3b mc: allow for a non-unique group ID when setting GID
For #254
2018-09-30 15:20:54 -05:00
Geoff Bourne
79756d13fd mc: support CurseForge modpacks with LaunchServer.sh entry script 2018-09-30 14:39:37 -05:00
Maxim Ivanov
e8be7685e9 mc: set umask to 0002 and chmod g+w the /data folder
Do this to allow write access for groups that the minecraft user is in.

This commit also fixes an issue if a group is specified with $GID and it has
no write access in the mounted host volume.
2018-09-27 10:27:50 +03:00
Geoff Bourne
2d6316e6c3 mc: fix container stop handling 2018-09-20 19:57:01 -05:00
Maxim Ivanov
d3e64ed56f
README.md: Make it clearer how to override UID and GID. 2018-09-19 23:27:44 +03:00
Duane Griffin
ebe0a30c14 mc: run FTB installer from correct location
We have pushd'ed into the directory so do not prefix the shell script
with the directory name.
2018-09-19 11:27:34 +12:00
Geoff Bourne
c8eb0f5874 mc: enhance the WORLD option to allow for directory sources
#247
2018-09-11 20:38:54 -05:00
Geoff Bourne
90907f7b1e mc: allow for RWG world type
Fixes #246
2018-09-01 16:35:31 -05:00
Geoff Bourne
d898796672 Support Paper builds for 1.13 and fix 1.12.2/1.11.2 builds
Fixed #244
2018-08-25 18:16:47 -05:00
Mattias Kågström
07fc31b401
unzip fails if a file already exists in the zip file.
Unzipping world
replace banned-ips.json? [y]es, [n]o, [A]ll, [N]one, [r]ename:

unzip: can't read standard input
2018-08-24 17:36:41 +02:00
Geoff Bourne
ba4578f451 mc: check validity of downloaded bukkit/spigot jar
Fixes #242
2018-08-18 18:51:45 -05:00
Geoff Bourne
1c5e4b17bf mc: chown /data when it doesn't match $UID
Fixes #239
2018-08-18 16:56:45 -05:00
Geoff Bourne
b910a7dbe5 mc: adjust FTB server pack check to look in subdirs 2018-08-18 15:38:27 -05:00
Janik Bussalb
1c24dc1def
Added warning if user doesn't use the server version of the modpack 2018-08-14 17:45:51 +02:00
Geoff Bourne
d9c2f26506 mc: handle FTB style start script within CurseForge subdirs
mc: upgrade mc-server-runner to launch start scripts via bash
2018-08-12 17:25:16 -05:00
Geoff Bourne
7005f00df0 mc: avoid usermod when UID matches current user ID 2018-08-05 16:38:22 -05:00
Geoff Bourne
6ec6655280 mc: removing confusing mention of MAX_RAM
for #229
2018-07-30 21:52:04 -05:00
Geoff Bourne
848cd8b994 mc: restore UID and GID options
for #234
2018-07-30 21:49:43 -05:00
Geoff Bourne
8a26e73dab mc: add support for BUFFET level type
mc: fix some typos in spigot download messages
2018-07-29 13:41:00 -05:00
Geoff Bourne
f66e1ff103 mc: use apk's --no-cache option 2018-07-28 10:33:24 -05:00
sumomoneko
ab5fe2d076 Fix typos in config file generation for max-tick-time setting. 2018-07-24 15:13:47 +09:00
Geoff Bourne
92f577e788 mc: force latest forge to derive from 1.12.2 for now 2018-07-19 18:52:58 -05:00
Geoff Bourne
4c0d53ee92 mc: add diagnostic log at start to confirm user and /data details 2018-07-18 20:10:22 -05:00
Geoff Bourne
c8cc882a57 mc: support the Install.sh step of CurseForge modpacks within TYPE=FTB
fixes #180
2018-07-13 22:33:55 -05:00
Geoff Bourne
a95bfdb192 mc: apply INIT/MAX RAM settings into FTB local settings file
fixes #222
2018-07-13 16:35:56 -05:00
Geoff Bourne
2a1fba1b45
Merge pull request #224 from SConaway/patch-2
Attempt to remove /data/.verify_access
2018-07-05 20:46:28 -05:00
Geoff Bourne
a44d114176
Merge pull request #223 from SConaway/patch-1
Update MC Dockerfile
2018-07-05 20:45:32 -05:00
Steven Conaway
5fb09f57e3
Update Dockerfile 2018-07-05 15:11:51 -07:00
Steven Conaway
eeacdc1e20
Pin MC to latest 8-JRE 2018-07-05 10:15:19 -07:00
Steven Conaway
d0577a43fd
Attempt to remove /data/.verify_access 2018-07-05 10:11:21 -07:00
Steven Conaway
e8b25d20a3
Update MC Dockerfiel 2018-07-04 17:57:18 -07:00
Geoff Bourne
4192bea3ab Consistently use curl instead of wget 2018-06-25 19:13:47 -05:00
Geoff Bourne
4ff14fbf61 Remove Dockerfile-raspberrypi since its maintained in a branch 2018-06-25 19:01:12 -05:00
Geoff Bourne
f0102119b6
Merge pull request #217 from Lemmons/better-ftb-startup
Allow existing world volume mount for FTB
2018-06-02 08:50:28 -05:00
Geoff Bourne
848e9e40e4
Merge pull request #216 from pcdevil/feat/add_snooper_argument
[mc] Add snooper enabled toggle
2018-05-20 06:54:16 -05:00
Attila Gonda
a12a258058 [mc] Clearify snooper config 2018-05-20 12:59:42 +02:00
Attila Gonda
bfa198de4e [mc] Add snooper enabled toggle 2018-05-20 01:07:16 +02:00
Geoff Bourne
04b4a3e8ca Adding RaspberryPi compatible dockerfile for reference 2018-05-19 17:48:20 -05:00
Geoff Bourne
f7d62474e8 Update mc-server-runner to allow for server to stop on its own 2018-05-19 17:34:03 -05:00
Geoff Bourne
5bf4a3fd1d Provide a kubernetes example 2018-05-18 16:21:44 -05:00
Geoff Bourne
35ec677446 [mc] Enable graceful shutdown on stop 2018-05-18 15:19:41 -05:00
Scott Lemmon
f4631703ca Allow existing world volume mount for FTB 2018-05-14 18:52:49 -07:00
MegaXLR
08ba471710 Remove obsolete jar location
Signed-off-by: MegaXLR <admin@megaxlr.net>
2018-05-08 14:27:00 +02:00
Geoff Bourne
d93f6bad16 mc: remove the need for entrypoint script to run as root 2018-04-25 20:57:57 -05:00
Geoff Bourne
488e478374 mc: use newest installed forge jar
fixes #211
2018-04-25 20:48:42 -05:00
Geoff Bourne
e2bf56938b mc: remove extraneous g flags on passwd file mod 2018-04-14 13:59:43 -05:00
Geoff Bourne
5267927c3f mc: compute default MOTD based on the given type and version 2018-04-14 13:52:46 -05:00
Geoff Bourne
1f04ca946c mc: fixed local var usage in deployPaper
fixes #209
2018-04-14 13:43:25 -05:00
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
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
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
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
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
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