Commit Graph

568 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
Geoff Bourne
542798f7a6
Merge pull request #280 from L3vi47h4N/master
docker-compose.yml cleanup
2019-01-13 08:03:48 -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
Geoff Bourne
895b7d74f5
Merge pull request #275 from mediaessenz/feature/add-jvm-dd-opts
[Feature] add JVM_DD_OPTS
2018-12-28 17:50:01 -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
Geoff Bourne
091e79c550
Merge pull request #270 from Silthus/patch-1
feat(minecraft-server): add version argument for buildtools
2018-12-18 16:27:30 -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
Geoff Bourne
cc83007cea
Merge pull request #268 from Silthus/feat/copy-plugins
feat(minecraft-server): update spigot plugins using /plugins if newer
2018-12-15 09:09:42 -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
Geoff Bourne
479be8016a
Merge pull request #260 from Autom3/patch-1
[minecraft-server] Pass all command line arguments to start-configura…
2018-10-23 17:54:34 -05: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
Geoff Bourne
73974d1c40
Merge pull request #258 from mcrowson/mods
using find to match json files
2018-10-14 14:01:00 -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
Geoff Bourne
7dc699ffbb
Merge pull request #257 from mcrowson/mods
Added MODS env variables
2018-10-13 08:16:30 -05:00
Matthew Crowson
3fee3f0f41 Added mods env variables 2018-10-12 18:11:57 -04:00
Geoff Bourne
cf8b6e5d05
Merge pull request #255 from mattiaskagstrom/patch-2
only download world if there is no preexisting world
2018-10-07 09:45:26 -05: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
Geoff Bourne
44d2081b7b
Merge pull request #253 from proudlytm/master
mc: set umask to 0002 and chmod g+w the /data folder
2018-09-27 08:25:29 -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
Geoff Bourne
009309966b
Merge pull request #250 from proudlytm/master
README.md: Make it clearer how to override UID and GID.
2018-09-19 18:22:48 -05:00
Maxim Ivanov
d3e64ed56f
README.md: Make it clearer how to override UID and GID. 2018-09-19 23:27:44 +03:00
Geoff Bourne
715d9be403
Merge pull request #249 from duaneg/master
mc: run FTB installer from correct location
2018-09-18 22:40:58 -05:00