Geoff Bourne
e49c1c2f01
Merge branch 'master' into java15
2021-02-06 15:11: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
57390b02ca
Merge branch 'master' into java15
2021-02-06 14:53:02 -06:00
Geoff Bourne
4e73e69342
ci: Added build-multiarch.yml to align merges
2021-02-06 14:52:20 -06:00
Geoff Bourne
a698248dff
ci: Based on adoptopenjdk:15-jre
2021-02-06 14:50:43 -06:00
Geoff Bourne
c6ff80b71c
docs: Clarify MEMORY limits vs overall container memory
...
Related to #691
2021-02-01 21:15:33 -06:00
M*C*O
37cad3f255
docs: Document LEVEL_TYPE: BIOMESOP ( #741 )
2021-02-01 12:39:55 -06:00
Geoff Bourne
5700f36a6f
Renamed forge branch to java8
2021-01-30 18:49:46 -06:00
Geoff Bourne
34f800d815
ci: Added forge branch to builds
2021-01-30 16:02:15 -06:00
Geoff Bourne
b8ef6eba3f
Auto-merging via docker-versions-create
2021-01-29 21:07:29 -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
Eugene
cd0fdfc95b
Add an option to override the icon which already has been set. ( #723 )
2021-01-13 16:47:15 -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
cc5fe0859a
Auto-merging via docker-versions-create
2021-01-12 17:28:33 -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
8f15aac6fc
Merge branch 'multiarch' into multiarch-latest
2021-01-12 17:06:00 -06:00
Michael Kirsch
b519c43e16
fix multiarch autopause daemon ( #722 )
2021-01-12 16:05:12 -06:00
Geoff Bourne
5ab83bcb21
ci: Switched build to docker/build-push-action@v2
2021-01-09 14:13:18 -06:00
Geoff Bourne
84ce3b4b47
Merge branch 'multiarch' into multiarch-latest
2021-01-09 14:07:31 -06:00
Geoff Bourne
02c8393bc6
ci: Added opencontainers labels
2021-01-09 14:07:05 -06:00
Geoff Bourne
b07c43a32f
Merge branch 'multiarch' into multiarch-latest
2021-01-09 12:31:20 -06:00
Geoff Bourne
9469291731
ci: Switched multiarch build caching to github actions
2021-01-09 12:28:27 -06:00
Geoff Bourne
ce1b337f7f
Auto-merging via docker-versions-create
2021-01-09 11:25:38 -06:00
Geoff Bourne
c29baf446d
Auto-merging via docker-versions-create
2021-01-09 11:24:53 -06:00
Dubhar
fdf5fb46bc
fix/681 ( #719 )
...
* [shellcheck] prevent globbing
* fix/681 remove old PaperMC before downloading new
Fixes #681
Co-authored-by: Dubhar <thorsten.jerosch@gmail.com>
2021-01-09 11:03:21 -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
ee8e1b9322
Merged latest from master
2021-01-06 22:16:40 -06:00
Geoff Bourne
f9b8db0715
Merged master
2021-01-06 22:14:46 -06:00
Michael Kirsch
2fb01b4adf
Autopause update: allow network interface selection ( #711 )
...
* Cherry-pick: Fixing AUTOPAUSE on Raspberry Pi 4s (#708 )
* implement autopause interface selection
* concentrate ps calls in function file
* wording and add note about PAPER's etc watchdogs
2021-01-02 11:27:03 -06:00
Geoff Bourne
02bce8c3a8
docs: Documented adopt15 and multiarch-latest tags
2021-01-02 11:12:07 -06:00
Nathanial L. McConnell
468671a3fa
Update README.md ( #712 )
...
Change "Please" to "Place"
2021-01-01 15:23:04 -06:00
Geoff Bourne
20bd5c4c36
Merge branch 'multiarch' into multiarch-latest
2020-12-31 13:19:34 -06:00
ErstBlack
ffb50cfe28
Fixing AUTOPAUSE on Raspberry Pi 4s ( #708 )
...
* Replacing killall with pkill and ps -a to ps -ax
* Adding net-tools and removing -q from pkill
* Missed the resume.sh
* Christ there's a lot of ps calls
* Adding -x to health.sh, replacing killall with pkill in sudoers-mv, and replacing su-exec with gosu in knockd-config.cfg
Co-authored-by: sean.sullivan.ctr@progeny.net <sean.sullivan.ctr@progeny.net>
2020-12-31 13:15:44 -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
de082d0fb2
Merge branch 'multiarch' into multiarch-latest
2020-12-28 11:44:41 -06:00
Geoff Bourne
51e6d5dfbd
Added install of sudo
...
For #699
2020-12-28 11:42:54 -06:00
Geoff Bourne
3cc5cdbc06
Auto-merging via docker-versions-create
2020-12-27 22:08:29 -06:00
Geoff Bourne
842c69fd80
Auto-merging via docker-versions-create
2020-12-27 22:08:02 -06:00
