Compare commits

..

81 Commits

Author SHA1 Message Date
Geoff Bourne
e50bbcd10f Auto-merging via docker-versions-create 2022-01-06 22:16:22 -06:00
Geoff Bourne
c6a7d11f60 Auto-merging via docker-versions-create 2021-12-23 16:09:20 -06:00
Geoff Bourne
28ce5118f3 Auto-merging via docker-versions-create 2021-12-13 21:29:18 -06:00
Geoff Bourne
f36a987f22 Auto-merging via docker-versions-create 2021-12-12 19:52:25 -06:00
Geoff Bourne
771951b38e Merging latest from master 2021-12-12 09:17:44 -06:00
Geoff Bourne
9e8a924ac7 Auto-merging via docker-versions-create 2021-12-11 16:25:04 -06:00
Geoff Bourne
b51813f026 Auto-merging via docker-versions-create 2021-12-10 21:05:02 -06:00
Geoff Bourne
ee738da7d7 Auto-merging via docker-versions-create 2021-12-10 10:42:46 -06:00
Geoff Bourne
0314d0eb09 Auto-merging via docker-versions-create 2021-12-10 07:58:00 -06:00
Geoff Bourne
0855f76512 Auto-merging via docker-versions-create 2021-12-06 22:06:35 -06:00
Geoff Bourne
e4733d1dca Auto-merging via docker-versions-create 2021-12-04 10:00:34 -06:00
Geoff Bourne
c5950bf7d2 Auto-merging via docker-versions-create 2021-12-02 19:47:18 -06:00
Geoff Bourne
ac1b8092e0 Auto-merging via docker-versions-create 2021-11-24 15:58:04 -06:00
Geoff Bourne
aa0dd571b4 Auto-merging via docker-versions-create 2021-11-24 14:34:51 -06:00
Geoff Bourne
6381b0aded Track latest from master 2021-11-16 19:02:41 -06:00
Geoff Bourne
b9a1434398 Auto-merging via docker-versions-create 2021-11-16 18:52:20 -06:00
Geoff Bourne
cf032f7d7e Auto-merging via docker-versions-create 2021-11-15 20:48:55 -06:00
Geoff Bourne
c5d032eeb7 Auto-merging via docker-versions-create 2021-11-13 19:18:19 -06:00
Geoff Bourne
2372cb93d3 Auto-merging via docker-versions-create 2021-11-13 18:52:52 -06:00
Geoff Bourne
375fb73586 Auto-merging via docker-versions-create 2021-11-12 21:24:41 -06:00
Geoff Bourne
e14311318c Auto-merging via docker-versions-create 2021-11-06 21:39:21 -05:00
Geoff Bourne
f3dd4f0123 Auto-merging via docker-versions-create 2021-11-04 21:06:04 -05:00
Geoff Bourne
102a3b54ba Auto-merging via docker-versions-create 2021-10-31 09:47:33 -05:00
Geoff Bourne
58de72c458 Switched base image to JDK
#1064
2021-10-27 21:27:04 -05:00
Geoff Bourne
738bfd51d5 Merge branch 'master' into java11-openj9 2021-10-27 21:26:47 -05:00
Geoff Bourne
68662fd2ca Auto-merging via docker-versions-create 2021-10-25 19:25:03 -05:00
Geoff Bourne
6d80a9d123 Auto-merging via docker-versions-create 2021-10-24 20:29:45 -05:00
Geoff Bourne
765ac6072d Auto-merging via docker-versions-create 2021-10-23 09:45:24 -05:00
Geoff Bourne
d9962dff26 Auto-merging via docker-versions-create 2021-10-22 15:55:42 -05:00
Geoff Bourne
9f19edf137 Auto-merging via docker-versions-create 2021-10-18 22:15:38 -05:00
Geoff Bourne
b452514c36 Auto-merging via docker-versions-create 2021-10-17 14:54:22 -05:00
Geoff Bourne
4304c75595 Auto-merging via docker-versions-create 2021-10-15 18:58:53 -05:00
Geoff Bourne
fd01947aaa Auto-merging via docker-versions-create 2021-10-15 18:49:34 -05:00
Geoff Bourne
b890882e54 Auto-merging via docker-versions-create 2021-10-10 09:57:54 -05:00
Geoff Bourne
1764d0c0a4 Auto-merging via docker-versions-create 2021-10-09 15:27:02 -05:00
Geoff Bourne
5c79befd28 Auto-merging via docker-versions-create 2021-10-09 12:05:38 -05:00
Geoff Bourne
2b865723bf Auto-merging via docker-versions-create 2021-10-02 19:23:38 -05:00
Geoff Bourne
15840cef6c Auto-merging via docker-versions-create 2021-09-29 10:27:04 -05:00
Geoff Bourne
ea80b658dc Auto-merging via docker-versions-create 2021-09-27 20:42:22 -05:00
Geoff Bourne
75759ded24 Auto-merging via docker-versions-create 2021-09-20 12:31:47 -05:00
Geoff Bourne
0cbb0aa0b5 Auto-merging via docker-versions-create 2021-09-15 21:32:22 -05:00
Geoff Bourne
0122b74815 Auto-merging via docker-versions-create 2021-09-15 21:08:24 -05:00
Geoff Bourne
1b4f26d2e8 Auto-merging via docker-versions-create 2021-09-15 20:38:19 -05:00
Geoff Bourne
5bf6013d6b Auto-merging via docker-versions-create 2021-08-30 21:38:48 -05:00
Geoff Bourne
428a7c1875 Auto-merging via docker-versions-create 2021-08-10 12:57:13 -05:00
Geoff Bourne
3ba8889194 Auto-merging via docker-versions-create 2021-08-01 12:14:17 -05:00
Geoff Bourne
c144da4485 Auto-merging via docker-versions-create 2021-07-31 09:28:40 -05:00
Geoff Bourne
2a1f5b7500 Auto-merging via docker-versions-create 2021-07-26 19:36:39 -05:00
Geoff Bourne
1725a6ed14 Merge branch 'master' into java11-openj9 2021-07-25 18:21:40 -05:00
Geoff Bourne
8ab55e1ef3 Auto-merging via docker-versions-create 2021-07-25 09:37:56 -05:00
Geoff Bourne
32a5ab5138 Auto-merging via docker-versions-create 2021-07-23 21:28:41 -05:00
Geoff Bourne
fb97af317e Auto-merging via docker-versions-create 2021-07-17 21:15:45 -05:00
Geoff Bourne
fe758aab61 Auto-merging via docker-versions-create 2021-07-17 20:58:31 -05:00
Geoff Bourne
4c2868f6c9 Auto-merging via docker-versions-create 2021-07-17 18:05:20 -05:00
Geoff Bourne
919aff0080 Auto-merging via docker-versions-create 2021-07-14 18:43:24 -05:00
Geoff Bourne
8504cf7caf Auto-merging via docker-versions-create 2021-07-12 19:10:45 -05:00
Geoff Bourne
101a7486f2 Auto-merging via docker-versions-create 2021-07-09 19:59:30 -05:00
Geoff Bourne
80e576db2d Auto-merging via docker-versions-create 2021-07-08 18:00:48 -05:00
Geoff Bourne
3a73e47b83 Auto-merging via docker-versions-create 2021-07-08 08:04:52 -05:00
itzg
62824051c8 Auto-merging via docker-versions-create 2021-07-08 12:56:06 +00:00
Geoff Bourne
c4a2403943 Auto-merging via docker-versions-create 2021-07-08 07:39:53 -05:00
itzg
2aad0a9407 Auto-merging via docker-versions-create 2021-07-04 19:54:06 +00:00
Geoff Bourne
6ead8c3cf0 Auto-merging from master 2021-07-03 14:25:28 -05:00
Geoff Bourne
3a18a19583 ci: auto-merge from master 2021-07-02 16:01:23 -05:00
itzg
f620b09134 Auto-merging via docker-versions-create 2021-07-02 16:56:00 +00:00
itzg
2838251c67 Auto-merging via docker-versions-create 2021-06-28 12:14:11 +00:00
itzg
f7cff34527 Auto-merging via docker-versions-create 2021-06-27 13:13:17 +00:00
itzg
acdf8c35fa Auto-merging via docker-versions-create 2021-06-24 12:47:11 +00:00
Geoff Bourne
c5f2bf1059 Auto-merging via docker-versions-create 2021-06-23 22:34:57 -05:00
Geoff Bourne
1f25fae04f Auto-merging via docker-versions-create 2021-06-20 12:49:56 -05:00
Geoff Bourne
caffa2fd8d Auto-merging via docker-versions-create 2021-06-05 17:53:21 -05:00
Geoff Bourne
8de8eb3104 Auto-merging via docker-versions-create 2021-05-24 20:52:01 -05:00
Geoff Bourne
2d3fa3c09e Merge branch 'master' into java11-openj9 2021-05-23 12:27:10 -05:00
Geoff Bourne
f7b3c77f78 Merge from master 2021-05-22 13:46:22 -05:00
Geoff Bourne
d968048ef5 Auto-merging via docker-versions-create 2021-05-21 23:02:53 -05:00
Geoff Bourne
6d26ca04be Auto-merging via docker-versions-create 2021-05-21 22:50:55 -05:00
Geoff Bourne
577eef3631 Merge branch 'master' into java11-openj9
# Conflicts:
#	.github/workflows/build-multiarch.yml
#	docker-versions-create.sh
2021-05-21 22:41:16 -05:00
Geoff Bourne
21d7fb476b ci: added java11-openj9 branch 2021-05-21 22:37:40 -05:00
Geoff Bourne
4c3a329e31 ci: adjusted CACHE_NAME 2021-05-21 17:34:05 -05:00
Geoff Bourne
6c94e49732 ci: updated java11 Dockerfile 2021-05-21 17:33:26 -05:00
Geoff Bourne
af77b29509 ci: add java11 to build/merge 2021-05-21 17:32:38 -05:00
3 changed files with 18 additions and 2 deletions

View File

@@ -79,7 +79,7 @@ jobs:
uses: docker/build-push-action@v2.7.0
with:
context: .
platforms: linux/amd64,linux/arm/v7,linux/arm64
platforms: linux/amd64
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
# ensure latest base image is used

View File

@@ -1,4 +1,4 @@
FROM eclipse-temurin:8-jdk
FROM adoptopenjdk:11-jdk-openj9
LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"

View File

@@ -124,6 +124,12 @@ case "${TYPE^^}" in
;;
FORGE)
log "**********************************************************************"
log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
log " since some mods require Java 8"
log " Exception traces reporting ClassCastException: class jdk.internal.loader.ClassLoaders\$AppClassLoader"
log " can be fixed with java8"
log "**********************************************************************"
exec ${SCRIPTS:-/}start-deployForge "$@"
;;
@@ -136,6 +142,10 @@ case "${TYPE^^}" in
;;
FTB|CURSEFORGE)
log "**********************************************************************"
log "NOTE: Some mods and modpacks may require Java 8."
log " If so, use itzg/minecraft-server:java8"
log "**********************************************************************"
exec ${SCRIPTS:-/}start-deployCF "$@"
;;
@@ -184,6 +194,12 @@ case "${TYPE^^}" in
;;
CRUCIBLE)
log "**********************************************************************"
log "WARNING: The image tag itzg/minecraft-server:java8 is recommended"
log " since some mods require Java 8"
log " Exception traces reporting ClassCastException: class jdk.internal.loader.ClassLoaders\$AppClassLoader"
log " can be fixed with java8"
log "**********************************************************************"
exec "${SCRIPTS:-/}start-deployCrucible" "$@"
;;