Geoff Bourne
88e5b7e135
Auto-merging via docker-versions-create
2021-12-13 21:28:30 -06:00
Geoff Bourne
86190eafc7
Auto-merging via docker-versions-create
2021-12-12 19:51:45 -06:00
Geoff Bourne
6729ba462e
Merge branch 'master' of github.com:itzg/docker-minecraft-server
2021-12-12 15:35:14 -06:00
Geoff Bourne
4b28d5e472
fix: qualify Fabric server jar by installer version
...
Fixes #1191
2021-12-12 15:28:30 -06:00
Geoff Bourne
7983a4a3a2
Merging latest from master
2021-12-12 09:15:05 -06:00
Geoff Bourne
52ac180c77
Auto-merging via docker-versions-create
2021-12-11 16:24:32 -06:00
Geoff Bourne
3f2022da40
Merge branch 'master' of github.com:itzg/docker-minecraft-server
2021-12-11 16:23:25 -06:00
Geoff Bourne
0f7464403c
build: added github release creation step to docker-versions-create.sh
2021-12-11 16:09:15 -06:00
Geoff Bourne
32195e71c5
Auto-merging via docker-versions-create
2021-12-10 21:04:32 -06:00
Geoff Bourne
a0a578f452
Auto-merging via docker-versions-create
2021-12-10 10:42:16 -06:00
Geoff Bourne
ca0ddc80aa
Auto-merging via docker-versions-create
2021-12-10 07:57:27 -06:00
Geoff Bourne
1a625f09bb
Auto-merging via docker-versions-create
2021-12-06 22:05:02 -06:00
Geoff Bourne
9ab345a727
Auto-merging via docker-versions-create
2021-12-04 10:00:12 -06:00
Geoff Bourne
4e3031cff8
Auto-merging via docker-versions-create
2021-12-02 19:46:55 -06:00
Geoff Bourne
466e1728f6
Auto-merging via docker-versions-create
2021-11-24 15:57:45 -06:00
Geoff Bourne
8dddbc4120
Auto-merging via docker-versions-create
2021-11-24 14:34:30 -06:00
Geoff Bourne
53e9d36a05
Track latest from master
2021-11-16 19:02:30 -06:00
Geoff Bourne
275c2d0c54
Auto-merging via docker-versions-create
2021-11-16 18:52:01 -06:00
Geoff Bourne
cf9c40f331
Auto-merging via docker-versions-create
2021-11-15 20:48:30 -06:00
Geoff Bourne
491ffe49bf
Auto-merging via docker-versions-create
2021-11-13 19:18:03 -06:00
Geoff Bourne
d4a9b367c7
Auto-merging via docker-versions-create
2021-11-13 18:52:36 -06:00
Geoff Bourne
032d94a30f
Auto-merging via docker-versions-create
2021-11-12 21:24:26 -06:00
Geoff Bourne
3784d2df54
Auto-merging via docker-versions-create
2021-11-06 21:38:11 -05:00
Geoff Bourne
8a36823843
Auto-merging via docker-versions-create
2021-11-04 21:04:41 -05:00
Geoff Bourne
78c520572a
Auto-merging via docker-versions-create
2021-10-31 09:46:11 -05:00
Geoff Bourne
5303105265
Switched base image to JDK
...
#1064
2021-10-27 21:25:24 -05:00
Geoff Bourne
1f120c5fa4
Auto-merging via docker-versions-create
2021-10-25 19:23:56 -05:00
Geoff Bourne
70ec3b838d
Auto-merging via docker-versions-create
2021-10-24 20:28:03 -05:00
Geoff Bourne
b248ed342f
Auto-merging via docker-versions-create
2021-10-23 09:43:19 -05:00
Geoff Bourne
4c70184804
Merged latest from master
2021-10-22 15:53:10 -05:00
Geoff Bourne
b9ba062add
Auto-merged latest from master
2021-10-18 22:13:11 -05:00
Geoff Bourne
cbb1d0ea52
Added support for Crucible server type
...
#1052
2021-10-18 22:02:23 -05:00
Geoff Bourne
bbad3a3e7a
Auto-merging via docker-versions-create
2021-10-17 14:53:04 -05:00
Geoff Bourne
8965397a5a
Auto-merging via docker-versions-create
2021-10-15 18:57:28 -05:00
Geoff Bourne
c661fe7318
Auto-merging via docker-versions-create
2021-10-15 18:47:46 -05:00
Geoff Bourne
bae1feb750
Auto-merging via docker-versions-create
2021-10-10 09:56:39 -05:00
Geoff Bourne
edbcf80a70
Auto-merging via docker-versions-create
2021-10-09 15:25:44 -05:00
Geoff Bourne
fb23e12680
Auto-merging via docker-versions-create
2021-10-09 12:04:28 -05:00
Geoff Bourne
e30a2e6448
Auto-merging via docker-versions-create
2021-10-02 19:22:34 -05:00
Geoff Bourne
03d7babd68
Auto-merging via docker-versions-create
2021-09-29 10:26:54 -05:00
Geoff Bourne
332b929a6d
Auto-merging via docker-versions-create
2021-09-27 20:41:23 -05:00
Geoff Bourne
c138cabc65
Auto-merging via docker-versions-create
2021-09-20 12:30:46 -05:00
Geoff Bourne
41631e35e8
Auto-merging via docker-versions-create
2021-09-15 21:31:13 -05:00
Geoff Bourne
6f95fa6175
Auto-merging via docker-versions-create
2021-09-15 21:06:58 -05:00
Geoff Bourne
6f16da8309
Auto-merging via docker-versions-create
2021-09-15 20:37:01 -05:00
Geoff Bourne
8cee8d5618
Auto-merging via docker-versions-create
2021-08-30 21:37:26 -05:00
Geoff Bourne
8b76b5776a
Auto-merging via docker-versions-create
2021-08-10 12:56:12 -05:00
Geoff Bourne
e3af06d2e4
Auto-merging via docker-versions-create
2021-08-01 12:12:49 -05:00
Geoff Bourne
0ac583514c
Auto-merging via docker-versions-create
2021-07-31 09:27:29 -05:00
Geoff Bourne
bf3f15f5fb
Auto-merging via docker-versions-create
2021-07-26 19:35:26 -05:00
Geoff Bourne
4aec2322b5
Merge branch 'master' into java8-openj9
2021-07-25 18:20:13 -05:00
Geoff Bourne
51b2eb6851
Auto-merging via docker-versions-create
2021-07-25 09:36:44 -05:00
Geoff Bourne
846050f41a
Auto-merging via docker-versions-create
2021-07-23 21:27:37 -05:00
Geoff Bourne
485ec6a141
Auto-merging via docker-versions-create
2021-07-17 21:14:44 -05:00
Geoff Bourne
0096e41882
Auto-merging via docker-versions-create
2021-07-17 20:57:29 -05:00
Geoff Bourne
d45610723a
Auto-merging via docker-versions-create
2021-07-17 18:03:56 -05:00
Geoff Bourne
072704b54d
Auto-merging via docker-versions-create
2021-07-14 18:43:15 -05:00
Geoff Bourne
0f08e88c5b
Auto-merging via docker-versions-create
2021-07-12 19:09:42 -05:00
Geoff Bourne
89604c8d13
Auto-merging via docker-versions-create
2021-07-09 19:58:27 -05:00
Geoff Bourne
58842d444b
Auto-merging via docker-versions-create
2021-07-08 17:59:28 -05:00
Geoff Bourne
457d09e14d
Auto-merging via docker-versions-create
2021-07-08 08:03:47 -05:00
itzg
7210e81f47
Auto-merging via docker-versions-create
2021-07-08 12:56:00 +00:00
Geoff Bourne
ba86534e6e
Auto-merging via docker-versions-create
2021-07-08 07:38:39 -05:00
itzg
44bafbff09
Auto-merging via docker-versions-create
2021-07-04 19:54:01 +00:00
Geoff Bourne
75c51bf0c7
Merge branch 'master' into java8-openj9
2021-07-03 14:19:04 -05:00
Geoff Bourne
cf651f2279
ci: restored limited image platforms for java8-openj9
2021-07-02 16:23:42 -05:00
Geoff Bourne
6d0d7fe19c
ci: auto-merge from master
2021-07-02 15:56:54 -05:00
itzg
bb58d7a4c9
Auto-merging via docker-versions-create
2021-07-02 16:55:54 +00:00
itzg
6efaac2861
Auto-merging via docker-versions-create
2021-06-28 12:14:05 +00:00
itzg
806342d74b
Auto-merging via docker-versions-create
2021-06-27 13:13:11 +00:00
itzg
926e302595
Auto-merging via docker-versions-create
2021-06-24 12:47:05 +00:00
Geoff Bourne
10e85140ad
Auto-merging via docker-versions-create
2021-06-23 22:33:45 -05:00
Geoff Bourne
fc2ed9e612
Auto-merging via docker-versions-create
2021-06-20 12:48:15 -05:00
Geoff Bourne
edfe58079a
Auto-merging via docker-versions-create
2021-06-05 17:51:25 -05:00
Geoff Bourne
d423cc3b8d
Auto-merging via docker-versions-create
2021-05-24 20:50:52 -05:00
Geoff Bourne
1537e48e29
Merge branch 'master' into java8-openj9
2021-05-23 12:26:56 -05:00
Geoff Bourne
62473771dc
Merge from master
2021-05-22 13:00:01 -05:00
Geoff Bourne
c4528e8f79
Auto-merging via docker-versions-create
2021-05-21 23:02:00 -05:00
Geoff Bourne
0f797487ab
Auto-merging via docker-versions-create
2021-05-21 22:48:32 -05:00
Geoff Bourne
9511e3cc80
Merge branch 'master' into java8-openj9
2021-05-21 22:35:00 -05:00
Geoff Bourne
3aa4dd6c85
ci: added java8-openj9 branch
2021-05-21 22:31:40 -05:00
Geoff Bourne
27571999b2
Merge branch 'master' into java8-multiarch
2021-05-21 17:28:44 -05:00
Geoff Bourne
bbd7d9e39a
ci: introduced CACHE_NAME
2021-05-21 17:26:42 -05:00
Geoff Bourne
ef6f308229
Auto-merging via docker-versions-create
2021-05-19 20:27:42 -05:00
Geoff Bourne
49d89d3e73
Auto-merging via docker-versions-create
2021-05-19 20:25:00 -05:00
Geoff Bourne
74203b23f4
Auto-merging via docker-versions-create
2021-05-15 12:41:22 -05:00
Geoff Bourne
4fb791b490
Merge branch 'multiarch' into java8-multiarch
...
# Conflicts:
# Dockerfile
# start-configuration
2021-05-14 17:59:49 -05:00
Geoff Bourne
ced25ad50a
Auto-merging via docker-versions-create
2021-05-06 20:12:55 -05:00
Geoff Bourne
48efc224ba
Auto-merging via docker-versions-create
2021-04-30 14:28:07 -05:00
Geoff Bourne
467c1d9954
Auto-merging via docker-versions-create
2021-04-30 11:11:46 -05:00
Geoff Bourne
9ced230f55
Auto-merging via docker-versions-create
2021-04-28 16:51:29 -05:00
Geoff Bourne
f3a8276362
Auto-merging via docker-versions-create
2021-04-26 08:21:06 -05:00
Geoff Bourne
b91d63716e
Auto-merging via docker-versions-create
2021-04-24 13:42:37 -05:00
Geoff Bourne
46cccfd531
Auto-merging via docker-versions-create
2021-04-23 21:03:21 -05:00
Geoff Bourne
9fe1cb4a0d
ci: Switched multiarch-java8 to be based on adoptopenjdk:8-jre-hotspot
2021-04-21 20:13:22 -05:00
Geoff Bourne
076038b470
Auto-merging via docker-versions-create
2021-04-18 13:29:46 -05:00
Geoff Bourne
aa416729ea
Auto-merging via docker-versions-create
2021-04-11 10:09:19 -05:00
Geoff Bourne
812c6365ec
Merged latest from master
2021-04-08 19:14:45 -05:00
Geoff Bourne
42a5131b19
Merging latest from master
2021-04-01 16:32:55 -05:00
Geoff Bourne
624f6a210f
Added git
...
#819
2021-04-01 16:28:32 -05:00
Geoff Bourne
1c63cd18b7
Merge branch 'master' into java8-multiarch
...
# Conflicts:
# start-configuration
2021-03-06 16:24:55 -06:00
Geoff Bourne
6266a7e3cc
Shifted PATH-fix earlier in startup
2021-03-06 16:04:31 -06:00
Geoff Bourne
871ecd4d9d
Merge branch 'master' into java8-multiarch
...
# Conflicts:
# start-minecraftFinalSetup
2021-02-27 20:52:36 -06:00
Geoff Bourne
c572c95161
Ensure FTBA version.json is readable
...
#784
2021-02-27 16:58:25 -06:00
Geoff Bourne
f7b58fbbb1
Fix PATH to include java when needed
2021-02-10 14:51:24 -06:00
Geoff Bourne
eccfa444a9
Auto-merging via docker-versions-create
2021-02-10 14:02:05 -06:00
Geoff Bourne
e831d25706
Merged latest from master
2021-02-08 21:18:28 -06:00
Geoff Bourne
12e931332b
Auto-merging via docker-versions-create
...
CONFLICT (content): Merge conflict in Dockerfile
2021-02-07 18:06:06 -06:00
Geoff Bourne
ceee9eddc9
ci: restored base image to ubuntu and install openjdk-8
2021-02-06 15:53:59 -06:00
Geoff Bourne
60ba668743
Merge branch 'master' into java8-multiarch
...
# Conflicts:
# Dockerfile
2021-02-06 15:49:16 -06:00
Geoff Bourne
fd1b15e01f
ci: Added java8 variant of multiarch
2021-02-06 15:44:02 -06:00