Commit graph

484 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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