Auto-merging via docker-versions-create

2026-02-17 23:16:24 +00:00 · 2021-08-01 12:12:49 -05:00 · 2021-07-31 09:27:29 -05:00 · 2021-07-26 19:35:26 -05:00 · 2021-07-25 18:20:13 -05:00 · 2021-07-25 09:36:44 -05:00
3 changed files with 2 additions and 16 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:8-jre-openj9
 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
--- a/14
+++ b/14
@@ -98,14 +98,6 @@ 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 "$@"
  ;;
@@ -118,12 +110,6 @@ case "${TYPE^^}" in
  ;;
  FTB|CURSEFORGE)
    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-deployCF "$@"
  ;;
Author	SHA1	Message	Date
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
`@@ -1,4 +1,4 @@`
	`FROM adoptopenjdk:16-jre`	`FROM adoptopenjdk:8-jre-openj9`

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