amorfo77/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-09-03 04:37:14 +00:00
Code Issues Projects Releases Wiki Activity
519 Commits 35 Branches 546 Tags
a994e67ebf6f171ac48ad4f033a848e314c021ea
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Bourne a994e67ebf mc: fix isDebugging when not debugging 2019-02-03 09:54:55 -06:00
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
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
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
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
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
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
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
Geoff Bourne 7dc699ffbb Merge pull request #257 from mcrowson/mods 
Added MODS env variables
 2018-10-13 08:16:30 -05: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
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
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
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
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
Geoff Bourne ed32de76ca Merge pull request #243 from mattiaskagstrom/patch-1 
unzip fails if a file already exists in the zip file.
 2018-08-25 14:52:32 -05:00
Geoff Bourne a0db92cb5e circleci: remove run test for now 2018-08-19 11:30:59 -05:00
Geoff Bourne f33a94a6e2 circleci: allow a litte more time for mc test 2018-08-19 11:25:21 -05:00
Geoff Bourne bab31f1198 circleci: allow more time and capture the log 2018-08-19 11:22:43 -05:00
Geoff Bourne a5614ec03b Add testing of minecraft-server image in CircleCI 2018-08-19 11:18:08 -05:00
Geoff Bourne 70f49be4fc Merge branch 'master' of https://github.com/itzg/dockerfiles 2018-08-19 09:09:51 -05:00
Geoff Bourne 173f612d74 Add CircleCI 2 config 2018-08-19 09:09:21 -05: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 f65548894f Merge pull request #241 from JanikBot/patch-2 
Added warning if user doesn't use the server version of the modpack
 2018-08-18 15:39:23 -05:00
Geoff Bourne b910a7dbe5 mc: adjust FTB server pack check to look in subdirs 2018-08-18 15:38:27 -05: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
Geoff Bourne 5215dd569a Merge pull request #235 from sumomoneko/max_tick_time 
Fix typos in config file generation for max-tick-time setting.
 2018-07-25 22:14:25 -05: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
Geoff Bourne cce473c676 Merge pull request #225 from SConaway/patch-3 
Pin MC to latest 8-JRE
 2018-07-05 20:37:48 -05: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
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
Geoff Bourne 767fa4962b Merge pull request #215 from megaxlr/master 
Remove obsolete jar location
 2018-05-08 21:24:21 -05: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
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
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
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
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
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
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
Geoff Bourne 7047e565fc Merge pull request #183 from BinaryShock/minecraft-refactor 
Code refactorization
 2017-11-01 21:26:17 -05: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
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
Geoff Bourne 7f39d1f22e [mc] Properly check empty json files to fix 
For #162
 2017-07-15 20:02:40 -05: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
Geoff Bourne 2ff28675d4 [es] Adapt to new Dockerfile ADD behavior 2017-07-13 08:52:02 -05:00
Geoff Bourne e41efba176 [es] Using NON_DATA in 3x1GB stack 
For #165
 2017-07-04 18:08:10 -05:00