Auto-merging via docker-versions-create

fix: use Mojang log4j config file fixes by version (#1179 )
2026-02-17 23:16:24 +00:00 · 2021-12-10 10:43:00 -06:00 · 2021-12-10 10:40:56 -06:00 · 2021-12-10 07:58:17 -06:00 · 2021-12-06 22:06:46 -06:00 · 2021-12-04 10:00:46 -06:00
3 changed files with 21 additions and 3 deletions
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -9,6 +9,7 @@ on:
      - java16*
      - java17*
      - test/*
+      - fix/*
    tags:
      - "[0-9]+.[0-9]+.[0-9]+"
      - "[0-9]+.[0-9]+.[0-9]+-java8-multiarch"
@@ -80,7 +81,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
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17-jdk
+FROM adoptopenjdk:16-jdk-openj9

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

--- a/scripts/start-finalExec
+++ b/scripts/start-finalExec
@@ -85,8 +85,25 @@ if [ -n "$JVM_DD_OPTS" ]; then
      done
 fi

+patchLog4jConfig() {
+  file=${1?}
+  url=${2?}
+  if ! get -o "$file" "$url"; then
+    log "ERROR: failed to download corrected log4j config"
+    exit 1
+  fi
+  JVM_OPTS="-Dlog4j.configurationFile=${file} ${JVM_OPTS}"
+}
+
 # Patch Log4j remote code execution vulnerability
-JVM_OPTS="-Dlog4j2.formatMsgNoLookups=true ${JVM_OPTS}"
+# NOTE: Paper, bukkit, and spigot are normalized to SPIGOT
+if [[ ${TYPE^^} != SPIGOT ]] && versionLessThan 1.12; then
+  patchLog4jConfig log4j2_17-111.xml https://launcher.mojang.com/v1/objects/dd2b723346a8dcd48e7f4d245f6bf09e98db9696/log4j2_17-111.xml
+elif [[ ${TYPE^^} != SPIGOT ]] && versionLessThan 1.17; then
+  patchLog4jConfig log4j2_112-116.xml https://launcher.mojang.com/v1/objects/02937d122c86ce73319ef9975b58896fc1b491d1/log4j2_112-116.xml
+elif versionLessThan 1.18.1; then
+  JVM_OPTS="-Dlog4j2.formatMsgNoLookups=true ${JVM_OPTS}"
+fi

 if isTrue ${ENABLE_JMX}; then
  : ${JMX_PORT:=7091}
Author	SHA1	Message	Date
Geoff Bourne	3b0f82fedd	Auto-merging via docker-versions-create	2021-12-10 10:43:00 -06:00
Geoff Bourne	fb6fa9b7d7	fix: use Mojang log4j config file fixes by version (#1179 )	2021-12-10 10:40:56 -06:00
Geoff Bourne	ac234ae658	Auto-merging via docker-versions-create	2021-12-10 07:58:17 -06:00
Geoff Bourne	0f9d81e5f1	Auto-merging via docker-versions-create	2021-12-06 22:06:46 -06:00
Geoff Bourne	7072f5dc91	Auto-merging via docker-versions-create	2021-12-04 10:00:46 -06:00
Geoff Bourne	9b155f2496	Auto-merging via docker-versions-create	2021-12-02 19:47:29 -06:00
Geoff Bourne	add00ad38d	Auto-merging via docker-versions-create	2021-11-24 15:58:14 -06:00
Geoff Bourne	a3cff3ce88	Auto-merging via docker-versions-create	2021-11-24 14:35:05 -06:00
Geoff Bourne	601d587927	Track latest from master	2021-11-16 19:02:49 -06:00
Geoff Bourne	e195a38faa	Auto-merging via docker-versions-create	2021-11-16 18:52:40 -06:00
Geoff Bourne	e704348630	Auto-merging via docker-versions-create	2021-11-15 20:49:24 -06:00
Geoff Bourne	893f6754f0	Auto-merging via docker-versions-create	2021-11-13 19:18:35 -06:00
Geoff Bourne	f137251e22	Auto-merging via docker-versions-create	2021-11-13 18:53:09 -06:00
Geoff Bourne	869f167c0c	Auto-merging via docker-versions-create	2021-11-12 21:24:57 -06:00
Geoff Bourne	3d7107bdbd	Auto-merging via docker-versions-create	2021-11-06 21:40:38 -05:00
Geoff Bourne	bce01eb1a2	Auto-merging via docker-versions-create	2021-11-04 21:07:26 -05:00
Geoff Bourne	c5d1b655ce	Auto-merging via docker-versions-create	2021-10-31 09:48:44 -05:00
Geoff Bourne	529e9fd058	Switched base image to JDK #1064	2021-10-27 21:28:11 -05:00
Geoff Bourne	905768d050	Merge branch 'master' into java16-openj9	2021-10-27 21:27:47 -05:00
Geoff Bourne	0dd0199d5c	Auto-merging via docker-versions-create	2021-10-25 19:26:11 -05:00
Geoff Bourne	925a63f035	Auto-merging via docker-versions-create	2021-10-24 20:31:17 -05:00
Geoff Bourne	f4be04ceb4	Auto-merging via docker-versions-create	2021-10-23 09:46:52 -05:00
Geoff Bourne	db4594b3b3	Auto-merging via docker-versions-create	2021-10-22 15:57:06 -05:00
Geoff Bourne	bfd4e6247c	Auto-merging via docker-versions-create	2021-10-18 22:16:50 -05:00
Geoff Bourne	4e31acb896	Auto-merging via docker-versions-create	2021-10-17 14:55:46 -05:00
Geoff Bourne	78e4ecc1d7	Auto-merging via docker-versions-create	2021-10-15 19:00:24 -05:00
Geoff Bourne	a2251f23e1	Auto-merging via docker-versions-create	2021-10-15 18:51:30 -05:00
Geoff Bourne	6ef0da9a63	Auto-merging via docker-versions-create	2021-10-10 09:59:06 -05:00
Geoff Bourne	4321d2a7e6	Auto-merging via docker-versions-create	2021-10-09 15:28:15 -05:00
Geoff Bourne	639e0264c2	Auto-merging via docker-versions-create	2021-10-09 12:06:49 -05:00
Geoff Bourne	1c4db94b1b	Auto-merging via docker-versions-create	2021-10-02 19:24:42 -05:00
Geoff Bourne	f0cebe526a	Auto-merging via docker-versions-create	2021-09-29 10:27:14 -05:00
Geoff Bourne	20b1477672	Auto-merging via docker-versions-create	2021-09-27 20:53:03 -05:00
Geoff Bourne	c4b4997fac	Auto-merging via docker-versions-create	2021-09-20 12:32:48 -05:00
Geoff Bourne	d442f164ba	Auto-merging via docker-versions-create	2021-09-15 21:33:29 -05:00
Geoff Bourne	34d4385ea6	Auto-merging via docker-versions-create	2021-09-15 21:11:04 -05:00
Geoff Bourne	cc84e65979	Auto-merging via docker-versions-create	2021-09-15 20:39:44 -05:00
Geoff Bourne	6f5fcc42f9	Auto-merging via docker-versions-create	2021-08-30 21:40:08 -05:00
Geoff Bourne	071621b54a	Auto-merging via docker-versions-create	2021-08-10 12:58:17 -05:00
Geoff Bourne	230a64af1b	Auto-merging via docker-versions-create	2021-08-01 12:15:47 -05:00
Geoff Bourne	1f980edeb1	Auto-merging via docker-versions-create	2021-07-31 09:29:52 -05:00
Geoff Bourne	649263290f	Auto-merging via docker-versions-create	2021-07-26 19:37:48 -05:00
Geoff Bourne	990de92dd7	Merge branch 'master' into java16-openj9	2021-07-25 18:22:02 -05:00
Geoff Bourne	4f15c244b2	Auto-merging via docker-versions-create	2021-07-25 09:39:28 -05:00
Geoff Bourne	5f9c8f53e4	Auto-merging via docker-versions-create	2021-07-23 21:29:47 -05:00
Geoff Bourne	57fee8b46d	Auto-merging via docker-versions-create	2021-07-17 21:16:49 -05:00
Geoff Bourne	79face2d60	Auto-merging via docker-versions-create	2021-07-17 20:59:35 -05:00
Geoff Bourne	ceec69391c	Auto-merging via docker-versions-create	2021-07-17 18:06:45 -05:00
Geoff Bourne	dfa5add6ba	Auto-merging via docker-versions-create	2021-07-14 18:43:35 -05:00
Geoff Bourne	02677ce1e2	Auto-merging via docker-versions-create	2021-07-12 19:11:49 -05:00
Geoff Bourne	2902e13c61	Auto-merging via docker-versions-create	2021-07-09 20:00:33 -05:00
Geoff Bourne	6d01021a30	Auto-merging via docker-versions-create	2021-07-08 18:01:57 -05:00
Geoff Bourne	07ded28d20	Auto-merging via docker-versions-create	2021-07-08 08:06:08 -05:00
itzg	a2d79fb85b	Auto-merging via docker-versions-create	2021-07-08 12:56:12 +00:00
Geoff Bourne	ecf9a090b1	Auto-merging via docker-versions-create	2021-07-08 07:41:13 -05:00
itzg	17a3aa8079	Auto-merging via docker-versions-create	2021-07-04 19:54:11 +00:00
Geoff Bourne	14fb905ec1	Auto-merging from master	2021-07-03 14:29:24 -05:00
Geoff Bourne	8629bf5cb5	ci: auto-merge from master	2021-07-02 16:06:34 -05:00
itzg	f05891e475	Auto-merging via docker-versions-create	2021-07-02 16:56:06 +00:00
itzg	f1453dd4c1	Auto-merging via docker-versions-create	2021-06-28 12:14:17 +00:00
itzg	22b560ba5d	Auto-merging via docker-versions-create	2021-06-27 13:13:22 +00:00
itzg	e3acafee2f	Auto-merging via docker-versions-create	2021-06-24 12:47:16 +00:00
Geoff Bourne	03df627881	Auto-merging via docker-versions-create	2021-06-23 22:36:07 -05:00
Geoff Bourne	d87e5bdaa2	Auto-merging via docker-versions-create	2021-06-20 12:51:26 -05:00
Geoff Bourne	2543a5417c	Auto-merging via docker-versions-create	2021-06-05 17:55:19 -05:00
Geoff Bourne	614f6a4be0	Auto-merging via docker-versions-create	2021-05-24 20:53:08 -05:00
Geoff Bourne	fe9735d8c1	Merge branch 'master' into java16-openj9	2021-05-23 12:27:35 -05:00
Geoff Bourne	10dcbe7b03	Merge from master	2021-05-22 13:47:41 -05:00
Geoff Bourne	85103cd8cf	Auto-merging via docker-versions-create	2021-05-21 23:04:11 -05:00
Geoff Bourne	12915b04b7	Auto-merging via docker-versions-create	2021-05-21 22:53:22 -05:00
Geoff Bourne	fbc8f72a22	ci: adjusted for adoptopenjdk for openj9 only on amd64	2021-05-21 16:49:29 -05:00
Geoff Bourne	7229c40202	Merge branch 'master' into java16-openj9 # Conflicts: # .github/workflows/build-multiarch.yml # Dockerfile	2021-05-21 16:46:51 -05:00
Geoff Bourne	581b514970	ci: added java16-openj9 branch #885	2021-05-21 16:42:23 -05:00
Geoff Bourne	d030daf354	Auto-merging via docker-versions-create	2021-05-19 20:30:40 -05:00
Geoff Bourne	98e6adbe1a	Auto-merging via docker-versions-create	2021-05-15 12:43:32 -05:00
Geoff Bourne	b94cfc44a0	Merge branch 'multiarch' into java15-openj9 # Conflicts: # .github/workflows/build-multiarch.yml # Dockerfile	2021-05-14 18:03:39 -05:00
Geoff Bourne	8a9e85fb17	Auto-merging via docker-versions-create	2021-05-06 20:17:17 -05:00
Geoff Bourne	8a39719427	Auto-merging via docker-versions-create	2021-04-30 14:30:25 -05:00
Geoff Bourne	4100aa1f61	Auto-merging via docker-versions-create	2021-04-30 11:14:31 -05:00
Geoff Bourne	4d5fe0a03b	Auto-merging via docker-versions-create	2021-04-28 16:55:09 -05:00
Geoff Bourne	236bb565ce	Auto-merging via docker-versions-create	2021-04-26 08:23:22 -05:00
Geoff Bourne	7608168823	Auto-merging via docker-versions-create	2021-04-24 13:44:55 -05:00
Geoff Bourne	acabb9d93c	Auto-merging via docker-versions-create	2021-04-23 21:05:53 -05:00
Geoff Bourne	4e9c00c4d5	Auto-merging via docker-versions-create	2021-04-18 13:32:45 -05:00
Geoff Bourne	f3826422cf	Auto-merging via docker-versions-create	2021-04-11 10:12:00 -05:00
Geoff Bourne	9b7459ad5c	Merged latest from master	2021-04-08 19:28:35 -05:00
Geoff Bourne	c9dc6012f6	Auto-merging via docker-versions-create	2021-04-01 16:40:16 -05:00
Geoff Bourne	a5aec72837	Added git #819	2021-04-01 16:29:06 -05:00
Geoff Bourne	af38a8fc7a	ci: removed armv7 build since 15-openj9 doesn't include it	2021-03-06 17:27:08 -06:00
Geoff Bourne	58fa3c897d	Merge branch 'master' into java15-openj9	2021-03-06 17:23:02 -06:00
Geoff Bourne	e45621d8e2	ci: Added java15-openj9 branch	2021-03-06 17:22:36 -06:00