Auto-merging via docker-versions-create

2026-02-18 15:36:22 +00:00 · 2021-08-01 12:14:17 -05:00 · 2021-07-31 09:28:40 -05:00 · 2021-07-26 19:36:39 -05:00 · 2021-07-25 18:21:40 -05:00 · 2021-07-25 09:37:56 -05:00
3 changed files with 2 additions and 4 deletions
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -66,7 +66,7 @@ jobs:
        uses: docker/build-push-action@v2.6.1
        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
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM adoptopenjdk:16-jre
+FROM adoptopenjdk:11-jre-openj9
 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
--- a/2
+++ b/2
@@ -98,14 +98,12 @@ case "${TYPE^^}" in
  ;;
  FORGE)
    if versionLessThan 1.17; then
    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 "**********************************************************************"
    fi
    exec ${SCRIPTS:-/}start-deployForge "$@"
  ;;
Author	SHA1	Message	Date
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
`@@ -1,4 +1,4 @@`
	`FROM adoptopenjdk:16-jre`	`FROM adoptopenjdk:11-jre-openj9`

	`LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"`	`LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"`