Auto-merging via docker-versions-create

Merging latest from master
2026-02-17 15:13:55 +00:00 · 2021-12-13 21:28:54 -06:00 · 2021-12-12 19:52:07 -06:00 · 2021-12-12 09:16:19 -06:00 · 2021-12-11 16:24:47 -06:00 · 2021-12-10 21:04:47 -06:00
4 changed files with 3 additions and 5 deletions
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -81,7 +81,7 @@ jobs:
        uses: docker/build-push-action@v2.7.0
        with:
          context: .
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
          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-jdk-openj9
+FROM adoptopenjdk:11-jdk

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

--- a/README.md
+++ b/README.md
@@ -275,7 +275,7 @@ When using the image `itzg:/minecraft-server` without a tag, the `latest` image

 | Tag name       | Java version | Linux  | JVM Type | Architecture      |
 | -------------- | -------------|--------|----------|-------------------|
-| latest         | 16           | Debian | Hotspot  | amd64,arm64,armv7 |
+| latest         | 17           | Debian | Hotspot  | amd64,arm64,armv7 |
 | java8          | 8            | Alpine | Hotspot  | amd64             |
 | java8-multiarch | 8           | Debian | Hotspot  | amd64,arm64,armv7 |
 | java8-openj9   | 8            | Debian | OpenJ9   | amd64             |
--- a/scripts/start-configuration
+++ b/scripts/start-configuration
@@ -115,14 +115,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	885d5a36eb	Auto-merging via docker-versions-create	2021-12-13 21:28:54 -06:00
Geoff Bourne	15a4569dc5	Auto-merging via docker-versions-create	2021-12-12 19:52:07 -06:00
Geoff Bourne	9b5bd3787f	Merging latest from master	2021-12-12 09:16:19 -06:00
Geoff Bourne	a1665bc874	Auto-merging via docker-versions-create	2021-12-11 16:24:47 -06:00
Geoff Bourne	b77586a10a	Auto-merging via docker-versions-create	2021-12-10 21:04:47 -06:00
Geoff Bourne	9a3f3fc33f	Auto-merging via docker-versions-create	2021-12-10 10:42:32 -06:00
Geoff Bourne	a88c046d59	Auto-merging via docker-versions-create	2021-12-10 07:57:43 -06:00
Geoff Bourne	871d54f44e	Merge latest from master	2021-12-06 22:06:03 -06:00
Geoff Bourne	cd59602d40	Auto merge branch with master	2021-12-04 10:00:25 -06:00
Geoff Bourne	793bedcd14	Auto-merging via docker-versions-create	2021-12-04 10:00:24 -06:00
Geoff Bourne	0f94d0aece	Auto-merging via docker-versions-create	2021-12-02 19:47:07 -06:00
Geoff Bourne	6ee44b3409	Auto-merging via docker-versions-create	2021-11-24 15:57:54 -06:00
Geoff Bourne	faa7553e54	Auto-merging via docker-versions-create	2021-11-24 14:34:41 -06:00
Geoff Bourne	0d85d672ef	Track latest from master	2021-11-16 19:02:35 -06:00
Geoff Bourne	0e6c85f25a	Auto-merging via docker-versions-create	2021-11-16 18:52:12 -06:00
Geoff Bourne	484417c7a3	Auto-merging via docker-versions-create	2021-11-15 20:48:43 -06:00
Geoff Bourne	dc44c328d4	Auto-merging via docker-versions-create	2021-11-13 19:18:11 -06:00
Geoff Bourne	7a4e308e8c	Auto-merging via docker-versions-create	2021-11-13 18:52:44 -06:00
Geoff Bourne	b267afc0bc	Auto-merging via docker-versions-create	2021-11-12 21:24:34 -06:00
Geoff Bourne	13a6b2c44e	Auto-merging via docker-versions-create	2021-11-06 21:38:46 -05:00
Geoff Bourne	1db04946df	Auto-merging via docker-versions-create	2021-11-04 21:05:23 -05:00
Geoff Bourne	c682e4ebf6	Auto-merging via docker-versions-create	2021-10-31 09:46:50 -05:00
Geoff Bourne	5132a662e7	Switched base image to JDK #1064	2021-10-27 21:26:20 -05:00
Geoff Bourne	79d169cb9a	Merge branch 'master' into java11	2021-10-27 21:25:57 -05:00
Geoff Bourne	6950c05ea0	Auto-merging via docker-versions-create	2021-10-25 19:24:29 -05:00
Geoff Bourne	71dc5af9a9	Auto-merging via docker-versions-create	2021-10-24 20:29:00 -05:00
Geoff Bourne	098ba9554e	Auto-merging via docker-versions-create	2021-10-23 09:44:17 -05:00
Geoff Bourne	c6925eb316	Auto-merging via docker-versions-create	2021-10-22 15:54:57 -05:00
Geoff Bourne	82963e7474	Auto-merging via docker-versions-create	2021-10-18 22:15:02 -05:00
Geoff Bourne	59fde19e3f	Auto-merging via docker-versions-create	2021-10-17 14:53:37 -05:00
Geoff Bourne	63c5acfe49	Auto-merging via docker-versions-create	2021-10-15 18:58:11 -05:00
Geoff Bourne	1f1fa02031	Auto-merging via docker-versions-create	2021-10-15 18:48:40 -05:00
Geoff Bourne	250ce7849b	Auto-merging via docker-versions-create	2021-10-10 09:57:18 -05:00
Geoff Bourne	c6587a115c	Auto-merging via docker-versions-create	2021-10-09 15:26:23 -05:00
Geoff Bourne	a2ce3a7437	Auto-merging via docker-versions-create	2021-10-09 12:05:03 -05:00
Geoff Bourne	80cad3572d	Auto-merging via docker-versions-create	2021-10-02 19:23:05 -05:00
Geoff Bourne	9a2eb0042f	Auto-merging via docker-versions-create	2021-09-29 10:26:59 -05:00
Geoff Bourne	559745dd80	Auto-merging via docker-versions-create	2021-09-27 20:41:53 -05:00
Geoff Bourne	a3972d83bb	Auto-merging via docker-versions-create	2021-09-20 12:31:17 -05:00
Geoff Bourne	baf7cdd7e2	Auto-merging via docker-versions-create	2021-09-15 21:31:47 -05:00
Geoff Bourne	f24096e584	Auto-merging via docker-versions-create	2021-09-15 21:07:40 -05:00
Geoff Bourne	d39f3b0afc	Auto-merging via docker-versions-create	2021-09-15 20:37:38 -05:00
Geoff Bourne	add67113ff	Auto-merging via docker-versions-create	2021-08-30 21:38:08 -05:00
Geoff Bourne	fe67ee5c79	Auto-merging via docker-versions-create	2021-08-10 12:56:42 -05:00
Geoff Bourne	5b777eff5b	Auto-merging via docker-versions-create	2021-08-01 12:13:34 -05:00
Geoff Bourne	f36dd34f72	Auto-merging via docker-versions-create	2021-07-31 09:28:04 -05:00
Geoff Bourne	c4fa657c61	Auto-merging via docker-versions-create	2021-07-26 19:36:01 -05:00
Geoff Bourne	bfb0d19372	Merge branch 'master' into java11	2021-07-25 18:20:51 -05:00
Geoff Bourne	bef6e7b432	Auto-merging via docker-versions-create	2021-07-25 09:37:18 -05:00
Geoff Bourne	3263a23140	Auto-merging via docker-versions-create	2021-07-23 21:28:09 -05:00
Geoff Bourne	8163e266fe	Auto-merging via docker-versions-create	2021-07-17 21:15:14 -05:00
Geoff Bourne	349f27f345	Auto-merging via docker-versions-create	2021-07-17 20:57:59 -05:00
Geoff Bourne	9b6b813fe8	Auto-merging via docker-versions-create	2021-07-17 18:04:38 -05:00
Geoff Bourne	1f39283fd0	Auto-merging via docker-versions-create	2021-07-14 18:43:19 -05:00
Geoff Bourne	2086562d03	Auto-merging via docker-versions-create	2021-07-12 19:10:15 -05:00
Geoff Bourne	67404c017a	Auto-merging via docker-versions-create	2021-07-09 19:58:58 -05:00
Geoff Bourne	41e97454a9	Auto-merging via docker-versions-create	2021-07-08 18:00:07 -05:00
Geoff Bourne	31d082574d	Auto-merging via docker-versions-create	2021-07-08 08:04:19 -05:00
itzg	0f59ec97b7	Auto-merging via docker-versions-create	2021-07-08 12:56:03 +00:00
Geoff Bourne	a1ce1b5a24	Auto-merging via docker-versions-create	2021-07-08 07:39:17 -05:00
itzg	fb3504ec1a	Auto-merging via docker-versions-create	2021-07-04 19:54:04 +00:00
Geoff Bourne	b75f83cbf1	Auto-merging via docker-versions-create	2021-07-03 14:24:32 -05:00
Geoff Bourne	dc5192e2e7	ci: auto-merge from master	2021-07-02 15:59:12 -05:00
itzg	76b5ec75cc	Auto-merging via docker-versions-create	2021-07-02 16:55:58 +00:00
itzg	4663723b84	Auto-merging via docker-versions-create	2021-06-28 12:14:08 +00:00
itzg	2acb45dc62	Auto-merging via docker-versions-create	2021-06-27 13:13:14 +00:00
itzg	de42f62031	Auto-merging via docker-versions-create	2021-06-24 12:47:08 +00:00
Geoff Bourne	7e690849b6	Auto-merging via docker-versions-create	2021-06-23 22:34:21 -05:00
Geoff Bourne	0a1c00f701	Auto-merging via docker-versions-create	2021-06-20 12:49:10 -05:00
Geoff Bourne	dc8c9e5d1a	Auto-merging via docker-versions-create	2021-06-05 17:52:23 -05:00
Geoff Bourne	9577c84d6a	Auto-merging via docker-versions-create	2021-05-24 20:51:26 -05:00
Geoff Bourne	575197a109	Merge branch 'master' into java11	2021-05-23 12:27:03 -05:00
Geoff Bourne	2b621b8236	Merge from master	2021-05-22 13:45:56 -05:00
Geoff Bourne	14d3446f52	Auto-merging via docker-versions-create	2021-05-21 23:02:26 -05:00
Geoff Bourne	83a7481027	Auto-merging via docker-versions-create	2021-05-21 22:50:35 -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