amorfo77/docker-minecraft-server
1
0 Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-10-18 17:18:11 +00:00
Code Issues Projects Releases Wiki Activity
865 Commits 35 Branches 550 Tags
6bb2323c4652f5be777a032c5f0fa6ca0984dfa0
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Bourne 6bb2323c46 Auto-merging docker-versions-create.sh 
CONFLICT (content): Merge conflict in docker-versions-create.sh
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Automatic merge failed; fix conflicts and then commit the result.
 2021-02-07 09:07:30 -06:00
Geoff Bourne beeaf1a996 ci: Added java8-multiarch to build and docs 2021-02-06 15:48:27 -06:00
Geoff Bourne 96aa1054dc Upgraded mainline/latest to Java 11 2021-02-06 15:21:20 -06:00
Geoff Bourne e7937206af ci: Added java15 to multiarch build 2021-02-06 15:12:34 -06:00
Geoff Bourne 081b2c11e4 ci: Introduced java15 branch 
ci: Deprecated adopt13, adopt14, openj9-nightly
 2021-02-06 15:11:03 -06:00
Geoff Bourne f342f4aa98 ci: Introduced java15 branch 
ci: Deprecated adopt13, adopt14, openj9-nightly
 2021-02-06 15:07:42 -06:00
Geoff Bourne 4e73e69342 ci: Added build-multiarch.yml to align merges 2021-02-06 14:52:20 -06:00
Geoff Bourne c6ff80b71c docs: Clarify MEMORY limits vs overall container memory 
Related to #691
 2021-02-01 21:15:33 -06:00
Geoff Bourne 7814ca21b5 Merge branch 'master' into java8 
# Conflicts:
#	README.md
#	start-configuration
 2021-01-30 18:56:33 -06:00
Geoff Bourne 5700f36a6f Renamed forge branch to java8 2021-01-30 18:49:46 -06:00
Geoff Bourne b8806629ec Merged latest from master 2021-01-30 16:48:11 -06:00
Geoff Bourne 4a7f838a0f Upgraded mainline/latest to Java 11 2021-01-30 16:16:36 -06:00
Geoff Bourne 34f800d815 ci: Added forge branch to builds 2021-01-30 16:02:15 -06:00
Geoff Bourne 2d07dee4df Prepared forge branch's Dockerfile 2021-01-30 15:58:03 -06:00
Geoff Bourne ffec50141a Fixed MODS provides from github release URLs 
For #731
 2021-01-28 20:55:08 -06:00
Geoff Bourne 54027049d3 docs: Added compose example to data attaching section 2021-01-24 12:31:56 -06:00
Geoff Bourne 4c2829e3d2 docs: Added a simple docker compose example 2021-01-21 13:36:41 -06:00
Geoff Bourne 69e308d420 Split eula header into two lines of comments 
#728
- Found that https://github.com/Yoosk/ServerStarter hard coded expectation that eula property was on third line
 2021-01-19 21:36:21 -06:00
Geoff Bourne ad46f10b55 Added option to override whitelist and ops files 
#726
 2021-01-17 10:09:41 -06:00
Geoff Bourne d95abfce82 ci: Added openj9-11 tags pattern 2021-01-12 17:33:03 -06:00
Geoff Bourne 942a125e04 ci: Added non-versioned cache as restore-key fallback 2021-01-12 17:30:58 -06:00
Geoff Bourne a3677d5aa8 ci: Enabled pull in build step 2021-01-12 17:20:57 -06:00
Geoff Bourne f927933c46 Added openj9 JDK11 variant 
For #721
 2021-01-12 17:18:08 -06:00
Geoff Bourne 5ab83bcb21 ci: Switched build to docker/build-push-action@v2 2021-01-09 14:13:18 -06:00
Geoff Bourne 8c6ca5e999 Restored the ability for PAPERBUILD to be used with TYPE=PAPER 
For #715
 2021-01-07 20:03:42 -06:00
Geoff Bourne bb2b9eeea9 docs: Changed FORGEVERSION example to use a valid combination 
For #716
 2021-01-07 11:02:19 -06:00
Geoff Bourne d1cbce3f89 docs: Clarified usage of VERSION with FORGE type 
For #716
 2021-01-06 22:49:22 -06:00
Geoff Bourne 55b5f6821f Fixed ops and white-list setup for CurseForge modpacks named with spaces 
For #717
 2021-01-06 22:38:18 -06:00
Geoff Bourne 02bce8c3a8 docs: Documented adopt15 and multiarch-latest tags 2021-01-02 11:12:07 -06:00
Geoff Bourne 8ee650f38d Allowed CF_BASE_DIR/FTB_BASE_DIR to be configured 
For #518
 2020-12-31 13:11:37 -06:00
Geoff Bourne 3de2bf88df Escaped backslashes when setting server property value (#706) 
* Escaped backslashes when setting server property value
For #446

* Fixed pattern substitution to "replace all"
 2020-12-30 09:42:29 -06:00
Geoff Bourne 1fcbd8410f Allow CUSTOM_SERVER to reference not-yet-existing file from GENERIC_PACK 
For #703
 2020-12-29 10:56:05 -06:00
Geoff Bourne f613228619 Restored support for PAPER_DOWNLOAD_URL 
Fixes #687
 2020-12-15 20:40:00 -06:00
Geoff Bourne d3a5885d95 Fixed handling of query parameters in MODS url 
For #684
 2020-12-12 15:22:07 -06:00
Geoff Bourne c1db13c1f6 Fixed dirname handling in find for SPIGOT WORLD handling 
For #685
 2020-12-12 11:10:13 -06:00
Geoff Bourne 59ca1ce3a6 Improved URL handling for GENERIC_PACK 
For #684
 2020-12-11 21:12:44 -06:00
Geoff Bourne 0f7bd5f4fd ci: Added adopt15 branch releases 2020-12-07 10:54:36 -06:00
Geoff Bourne a368f4cf57 misc: Added multiarch-latest to versions to release 2020-11-25 15:52:07 -06:00
Geoff Bourne 08a4bde6c1 Switched to PaperMC v2 API 
Fixes #670
 2020-11-25 15:42:27 -06:00
Geoff Bourne f68e979229 docs: Improved appearance of Discord badge 
For #481
 2020-11-06 14:47:04 -06:00
Geoff Bourne 544b1f243d Removed invalid spigot/bukkit download along with debug of content 
For #655
 2020-11-04 17:04:57 -06:00
Geoff Bourne 391e807c78 Added debug logging of bukkit/spigot curl download 
For #655
 2020-11-03 16:49:38 -06:00
Geoff Bourne 4099cde737 Revert "Improved handling of bad spigot/bukkit downloads via temp file For #655" 
This reverts commit e56a74dc
 2020-11-03 16:47:46 -06:00
Geoff Bourne e56a74dc81 Improved handling of bad spigot/bukkit downloads via temp file 
For #655
 2020-11-02 20:31:01 -06:00
Geoff Bourne 31b8535854 Added debug output for bukkit/sigot type 
For #655
 2020-10-30 17:03:13 -05:00
Geoff Bourne 6f1f8d7806 Added use of REMOVE_OLD_MODS to /mods processing 2020-10-03 14:34:02 -05:00
Geoff Bourne b06f1115d4 Added pruning of 'config' to CF modpack upgrade 
Fixes #626
 2020-09-27 10:27:46 -05:00
Geoff Bourne 777ad31de0 Resolve latest bukkit/spigot directly from getbukkit 
Fixes #629 #631
 2020-09-27 10:21:49 -05:00
Geoff Bourne 8b977f8786 Added adopt14 variant 2020-09-27 10:21:49 -05:00
Geoff Bourne 7c3139226c Changed Paper update process to check FORCE_REDOWNLOAD first 
For #634
 2020-09-16 17:09:16 -05:00
Geoff Bourne 0ddabf3089 Corrected Fabric installer variables in README 2020-09-10 16:25:29 -05:00
Geoff Bourne 6cfc7e45ef ci: prepared for adopt14 variant 2020-08-27 18:49:24 -05:00
Geoff Bourne 9ea675bc89 Improved handling of latest PaperMC version 
Fixes #563
 2020-08-25 21:44:36 -05:00
Geoff Bourne 42f90c8806 Added variable to configure stop duration 
Fixes #617
 2020-08-25 19:10:55 -05:00
Geoff Bourne c8b6eac8fe Updated FTBA modpack ID instructions 
Fixes #612
 2020-08-23 20:40:47 -05:00
Geoff Bourne 48ccdf128f Fixed CF_SERVER_MOD to handle spaces in the given filename 
Updated USE_MODPACK_START_SCRIPT=false to support forge provided by pack
For #608
 2020-08-18 20:44:11 -05:00
Geoff Bourne 2322dffd49 misc: Improved error log for missing Paper versions 2020-08-15 10:06:49 -05:00
Geoff Bourne 8a5e5bf01e Improved handling of missing Paper server version downloads 
Fixes #607
 2020-08-15 10:02:45 -05:00
Geoff Bourne 99ed83022e misc: added EOL config to .editorconfig 2020-08-12 20:47:52 -05:00
Geoff Bourne 07185534fb Upgraded to mc-server-runner 1.5.0 2020-08-09 13:28:36 -05:00
Geoff Bourne b5c91647ca Added testdata to dockerignore 2020-08-02 19:57:47 -05:00
Geoff Bourne c359a0f2ac Changed MODPACK and MODS to only resolve effective URL when needed 
For #592
 2020-08-02 19:57:12 -05:00
Geoff Bourne 49d9f4a89d Separated autopause config file location to keep scripts read-only 2020-07-26 13:22:07 -05:00
Geoff Bourne aebe35c9d4 misc: Refactor writeEula 2020-07-26 13:19:45 -05:00
Geoff Bourne a26361c79f misc: Renamed start-deployCF to align with multiarch branch 2020-07-26 13:07:30 -05:00
Geoff Bourne 8b6ee91ec1 Added support for upgrading with USE_MODPACK_START_SCRIPT=false 2020-07-19 18:10:16 -05:00
Geoff Bourne 06cffd9e15 Ensured eula and other files brought over when not using CF start script (#591) 2020-07-19 16:29:41 -05:00
Geoff Bourne beaccbcf3b Added option to set USE_MODPACK_START_SCRIPT=false for CF modpacks (#591) 2020-07-19 15:01:19 -05:00
Geoff Bourne 21ee5e2401 Changed handling of unrecognized VERSION and detect absent server in meta json 
For #590
 2020-07-19 12:22:15 -05:00
Geoff Bourne 692087dd25 Ensured ops.txt and white-list.txt are always provided for CURSEFORGE/FTB type (#584) 2020-07-18 13:49:40 -05:00
Geoff Bourne 6fe13e8654 Clarified "invalid type" message for FTBA on multiarch 2020-07-18 13:09:58 -05:00
Geoff Bourne 3b2b98b9fe Upgrade base image packages 
For #586
 2020-07-14 21:07:57 -05:00
Geoff Bourne 4fef391b64 misc: Switched maintainer label to opencontainers schema 2020-07-12 11:36:31 -05:00
Geoff Bourne 83f6cebd0b Merge pull request #581 from itzg/dev/add-ci-tests 
Added CI tests
 2020-07-11 14:29:59 -05:00
Geoff Bourne 90183ae823 ci: Don't restart failed container during test 2020-07-11 14:26:47 -05:00
Geoff Bourne 3c9df03584 ci: Only output server logs when failed 2020-07-11 14:13:51 -05:00
Geoff Bourne 367c6cfd92 ci: Added testing step to github actions 2020-07-11 14:09:08 -05:00
Geoff Bourne 5e75410e7c Confirm latest Paper jar is always downloaded 2020-07-11 13:30:39 -05:00
Geoff Bourne 38028f7d0c Confirm latest Spigot jar is always downloaded 2020-07-11 13:17:28 -05:00
Geoff Bourne a07ae685e2 Fixed attempted rsync when WORLD not set 2020-07-11 13:09:48 -05:00
Geoff Bourne cf691499a1 docs: Moved section for DISABLE_HEALTHCHECK to existing healthcheck section 2020-07-09 21:07:26 -05:00
Geoff Bourne 0bb9cccdc6 Added REPLACE_ENV_VARIABLES_EXCLUDE_PATHS 
For #575
 2020-07-09 21:05:17 -05:00
Geoff Bourne 4cb12f6cae Added DISABLE_HEALTHCHECK 2020-07-09 20:54:34 -05:00
Geoff Bourne ecbdeb2096 Added option to disable PLUGINS_SYNC_UPDATE 
For #576
 2020-07-08 19:07:53 -05:00
Geoff Bourne 9a7a532f7b Changed order of /plugins rsync to be before processing env vars 
For #577
 2020-07-06 17:16:51 -05:00
Geoff Bourne 825833c859 Added REPLACE_ENV_VARIABLES_EXCLUDES 
for #575
 2020-07-06 16:41:56 -05:00
Geoff Bourne c4c3613874 misc: added docs to release notes exclusion 2020-07-04 15:02:32 -05:00
Geoff Bourne 3a03156cb3 ci: Adjust pr workflow name 2020-07-04 14:55:45 -05:00
Geoff Bourne 260cc7d180 docs: added recommendation against using SERVER_PORT 2020-06-30 08:40:33 -05:00
Geoff Bourne bbe930e552 ci: changed gh actions to avoid image push on PR 2020-06-28 12:22:00 -05:00
Geoff Bourne a655fe860e docs: removed github readme link since Docker Hub docs are manual now 2020-06-28 12:17:07 -05:00
Geoff Bourne ddf36aa879 docs: updated example compose file for paper to use proper CONSOLE setting 2020-06-28 09:37:55 -05:00
Geoff Bourne 34c31c561d docs: removed most mentions of noconsole since it only applies pre-1.14 2020-06-28 09:36:31 -05:00
Geoff Bourne 3cc7d00d71 docs: added example compose file for autopause 
For #569
 2020-06-28 09:34:26 -05:00
Geoff Bourne ed214b1382 docs: updated image tag for running on RaspberryPi 2020-06-28 09:19:38 -05:00
Geoff Bourne f8405e298c ci: removed tagging image with git SHA since it seemed like too many 2020-06-26 17:17:41 -05:00
Geoff Bourne 539159ba50 docs: simplified top-level example compose file 
related to #518
 2020-06-25 14:10:21 -05:00
Geoff Bourne f2c9d2f905 Updated TYPE feedback when invalid choice given 
For #561
 2020-06-23 17:27:21 -05:00
Geoff Bourne 1b11331881 misc: added github action badge 2020-06-20 16:06:28 -05:00
Geoff Bourne b71afff29f misc: removed unused multiarch scripts 2020-06-20 16:05:46 -05:00