From f7836abc06272e7c596c1a250210ae4eb13f5f0e Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Mon, 6 Dec 2021 22:11:43 -0600
Subject: [PATCH 1/3] build: fixed combined test/build jobs

---
 .github/workflows/main.yml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 14c1cafd..ca028812 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,18 +19,7 @@ env:
   IMAGE_TO_TEST: itzg/minecraft-server:test-${{ github.repository_owner }}-${{ github.run_id }}
 
 jobs:
-  test:
-    runs-on: ubuntu-20.04
-
-    steps:
-      - uses: actions/checkout@v2.4.0
-
-      - name: Run tests
-        run: |
-          tests/test.sh
   build:
-    needs:
-      - test
     runs-on: ubuntu-20.04
 
     steps:

From 529d92fa63179cabbd457a5d8171d03a62334a69 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Mon, 6 Dec 2021 22:15:32 -0600
Subject: [PATCH 2/3] build: also run tests with java8

---
 .github/workflows/main.yml    |  6 ++++--
 tests/docker-compose.test.yml | 14 --------------
 tests/docker-compose.yml      |  1 +
 3 files changed, 5 insertions(+), 16 deletions(-)
 delete mode 100644 tests/docker-compose.test.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ca028812..d9202a04 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -54,7 +54,7 @@ jobs:
 
     - name: Build for test
       uses: docker/build-push-action@v2.7.0
-      if: github.ref_name == 'master'
+      if: github.ref_name == 'java8'
       with:
         context: .
         platforms: linux/amd64
@@ -67,9 +67,11 @@ jobs:
         cache-to: type=gha,mode=max
 
     - name: Run tests
-      if: github.ref_name == 'master'
+      if: github.ref_name == 'java8'
       run: |
         tests/test.sh
+      env:
+        MINECRAFT_VERSION: 1.12.2
 
     - name: Build and push
       id: docker_build
diff --git a/tests/docker-compose.test.yml b/tests/docker-compose.test.yml
deleted file mode 100644
index 1638b74b..00000000
--- a/tests/docker-compose.test.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-version: "3.8"
-
-services:
-  monitor:
-    depends_on:
-      - mc
-    image: itzg/mc-monitor:${MC_MONITOR_VERSION:-0.10.4}
-    command: --debug status --host mc --retry-interval 1s --retry-limit 240
-  mc:
-    restart: "no"
-    image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
-    environment:
-      EULA: "TRUE"
-
diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
index 63b75fc0..f3a0bb0a 100644
--- a/tests/docker-compose.yml
+++ b/tests/docker-compose.yml
@@ -11,4 +11,5 @@ services:
     image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
     environment:
       EULA: "TRUE"
+      VERSION: ${MINECRAFT_VERSION:-LATEST}
 

From 0718a6200727cf6ddc56721c9481754d900cf9d9 Mon Sep 17 00:00:00 2001
From: Pascal Sthamer <sthamer.pascal@gmail.com>
Date: Fri, 10 Dec 2021 14:52:19 +0100
Subject: [PATCH 3/3] security: patch log4j remote code execution vulnerability
 (#1178)

---
 scripts/start-finalExec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/start-finalExec b/scripts/start-finalExec
index 519883e9..be258049 100755
--- a/scripts/start-finalExec
+++ b/scripts/start-finalExec
@@ -85,6 +85,9 @@ if [ -n "$JVM_DD_OPTS" ]; then
       done
 fi
 
+# Patch Log4j remote code execution vulnerability
+JVM_OPTS="-Dlog4j2.formatMsgNoLookups=true ${JVM_OPTS}"
+
 if isTrue ${ENABLE_JMX}; then
   : ${JMX_PORT:=7091}
   JVM_OPTS="${JVM_OPTS}