Geoff Bourne
6510a6f361
Auto-merging via docker-versions-create
2021-12-10 07:57:12 -06:00
Geoff Bourne
9204e06b63
Auto-merging via docker-versions-create
2021-12-06 22:04:51 -06:00
Geoff Bourne
95b5088c3b
Auto-merging via docker-versions-create
2021-12-04 10:00:01 -06:00
Geoff Bourne
2c106575f0
Auto-merging via docker-versions-create
2021-12-02 19:46:44 -06:00
Geoff Bourne
234d70786e
Auto-merging via docker-versions-create
2021-11-24 15:57:35 -06:00
Geoff Bourne
7cf7193ef4
Auto-merging via docker-versions-create
2021-11-24 14:34:20 -06:00
Geoff Bourne
1d923a5878
Track latest from master
2021-11-16 19:02:25 -06:00
Geoff Bourne
34125769fa
Auto-merging via docker-versions-create
2021-11-16 18:51:52 -06:00
Geoff Bourne
c6124bdd01
Auto-merging via docker-versions-create
2021-11-15 20:48:18 -06:00
Geoff Bourne
9f0edde0b3
Auto-merging via docker-versions-create
2021-11-13 19:17:54 -06:00
Geoff Bourne
1d97fccfdf
Auto-merging via docker-versions-create
2021-11-13 18:52:27 -06:00
Geoff Bourne
5ad85de964
Auto-merging via docker-versions-create
2021-11-12 21:24:19 -06:00
Geoff Bourne
c273e99007
Auto-merging via docker-versions-create
2021-11-06 21:37:36 -05:00
Geoff Bourne
72ea47148a
Auto-merging via docker-versions-create
2021-11-04 21:03:58 -05:00
Geoff Bourne
25782fc63e
Auto-merging via docker-versions-create
2021-10-31 09:45:27 -05:00
Geoff Bourne
283b5ba431
Merge branch 'master' into java8-multiarch
2021-10-27 21:19:23 -05:00
Geoff Bourne
5933fffcca
Auto-merging via docker-versions-create
2021-10-25 19:23:22 -05:00
Geoff Bourne
de5b7cb601
Auto-merging via docker-versions-create
2021-10-24 20:25:49 -05:00
Geoff Bourne
c836e29ac3
Auto-merging via docker-versions-create
2021-10-23 09:42:40 -05:00
Geoff Bourne
d9214f0204
Merged latest from master
2021-10-21 21:58:01 -05:00
Geoff Bourne
a7efcfff49
Switched to eclipse-temurin:8-jdk
...
#1054 #1064
2021-10-19 22:14:33 -05:00
Geoff Bourne
618d6236ba
Auto-merged latest from master
2021-10-18 22:10:58 -05:00
Geoff Bourne
929eeeedfc
Added support for Crucible server type
...
#1052
2021-10-18 21:58:53 -05:00
Geoff Bourne
6494ca8864
Auto-merging via docker-versions-create
2021-10-17 14:52:29 -05:00
Geoff Bourne
d964231906
Auto-merging via docker-versions-create
2021-10-15 18:56:45 -05:00
Geoff Bourne
1d8c28e024
Auto-merging via docker-versions-create
2021-10-15 18:46:53 -05:00
Geoff Bourne
d63c570cf3
Auto-merging via docker-versions-create
2021-10-10 09:56:06 -05:00
Geoff Bourne
f7f1855e24
Auto-merging via docker-versions-create
2021-10-09 15:25:05 -05:00
Geoff Bourne
8ccf0201a8
Auto-merging via docker-versions-create
2021-10-09 12:03:54 -05:00
Geoff Bourne
fa9e59edd8
Auto-merging via docker-versions-create
2021-10-02 19:22:01 -05:00
Geoff Bourne
25a2ab6ff3
Auto-merging via docker-versions-create
2021-09-29 10:26:49 -05:00
Geoff Bourne
bb780c000d
Auto-merging via docker-versions-create
2021-09-27 20:40:52 -05:00
Geoff Bourne
cb4691a9ac
Auto-merging via docker-versions-create
2021-09-20 12:30:08 -05:00
Geoff Bourne
76b8b89295
Auto-merging via docker-versions-create
2021-09-15 21:30:40 -05:00
Geoff Bourne
551e4d6346
Auto-merging via docker-versions-create
2021-09-15 21:06:17 -05:00
Geoff Bourne
61a660ee48
Auto-merging via docker-versions-create
2021-09-15 20:36:24 -05:00
Geoff Bourne
5e9806736c
Auto-merging via docker-versions-create
2021-08-30 21:36:43 -05:00
Geoff Bourne
d5865cd60c
Auto-merging via docker-versions-create
2021-08-10 12:55:40 -05:00
Geoff Bourne
2b0b8f8a62
Auto-merging via docker-versions-create
2021-08-01 12:12:03 -05:00
Geoff Bourne
e94b40bddf
Auto-merging via docker-versions-create
2021-07-31 09:26:53 -05:00
Geoff Bourne
2dabf34349
Auto-merging via docker-versions-create
2021-07-26 19:34:50 -05:00
Geoff Bourne
eb864c0fb8
Merged latest from master
2021-07-25 18:19:51 -05:00
Geoff Bourne
2e0f469748
Auto-merging via docker-versions-create
2021-07-25 09:36:09 -05:00
Geoff Bourne
aa95dc291b
Auto-merging via docker-versions-create
2021-07-23 21:27:05 -05:00
Geoff Bourne
d22280fae7
Auto-merging via docker-versions-create
2021-07-17 21:14:11 -05:00
Geoff Bourne
aac3c1c77a
Auto-merging via docker-versions-create
2021-07-17 20:56:57 -05:00
Geoff Bourne
61b0eff4ca
Auto-merging via docker-versions-create
2021-07-17 18:03:14 -05:00
Geoff Bourne
8c5f0a53bf
Auto-merging via docker-versions-create
2021-07-14 18:43:09 -05:00
Geoff Bourne
fffeb7bb9c
Auto-merging via docker-versions-create
2021-07-12 19:09:09 -05:00
Geoff Bourne
a060cc88d1
Auto-merging via docker-versions-create
2021-07-09 19:57:54 -05:00
Geoff Bourne
4421aaa22d
Auto-merging via docker-versions-create
2021-07-08 17:58:52 -05:00
Geoff Bourne
3a51db6d24
Auto-merging via docker-versions-create
2021-07-08 08:03:13 -05:00
itzg
969a23ae27
Auto-merging via docker-versions-create
2021-07-08 12:55:57 +00:00
itzg
1a62592fe2
Auto-merging via docker-versions-create
2021-07-07 14:56:37 +00:00
itzg
c316dbb5d2
Auto-merging via docker-versions-create
2021-07-06 12:22:22 +00:00
itzg
bb64135c9b
Auto-merging via docker-versions-create
2021-07-05 12:10:26 +00:00
itzg
ef98de154c
Auto-merging via docker-versions-create
2021-07-04 19:53:59 +00:00
Geoff Bourne
3d00077ef8
Auto-merging via docker-versions-create
2021-07-03 14:23:40 -05:00
Geoff Bourne
0d3ab75683
ci: auto-merge from master
2021-07-02 15:54:54 -05:00
itzg
87681e64bb
Auto-merging via docker-versions-create
2021-07-02 16:55:52 +00:00
itzg
8ce986d3d7
Auto-merging via docker-versions-create
2021-06-28 12:14:01 +00:00
itzg
67fda61de4
Auto-merging via docker-versions-create
2021-06-27 13:13:08 +00:00
itzg
7c6ec41822
Auto-merging via docker-versions-create
2021-06-24 12:47:02 +00:00
Geoff Bourne
93af2025a2
Auto-merging via docker-versions-create
2021-06-23 22:33:07 -05:00
Geoff Bourne
c1b040af77
Auto-merging via docker-versions-create
2021-06-20 12:47:20 -05:00
Geoff Bourne
4148325787
Auto-merging via docker-versions-create
2021-06-05 17:50:27 -05:00
Geoff Bourne
7083cd15e8
Auto-merging via docker-versions-create
2021-05-24 20:50:17 -05:00
Geoff Bourne
7418dab476
Merge branch 'master' into java8-multiarch
2021-05-23 12:26:47 -05:00
Geoff Bourne
94bbc8e649
Merge from master
2021-05-22 12:59:25 -05:00
Geoff Bourne
3e5e62229a
Auto-merging via docker-versions-create
2021-05-21 23:01:34 -05:00
Geoff Bourne
fe2a9d56ed
Auto-merging via docker-versions-create
2021-05-21 22:47:56 -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