From 9b3b648dae5702173122d025bc0b7dbfc960e4ae Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@webtide.com>
Date: Wed, 15 Jan 2020 21:57:08 +0100
Subject: [PATCH 1/4] revert to support arm with jre11

Signed-off-by: Greg Wilkins <gregw@webtide.com>
---
 9.4-jre11-slim/arches | 2 +-
 9.4-jre11/arches      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/9.4-jre11-slim/arches b/9.4-jre11-slim/arches
index 21d5bd8..e7b206a 100644
--- a/9.4-jre11-slim/arches
+++ b/9.4-jre11-slim/arches
@@ -1 +1 @@
-amd64
+amd64, arm64v8
diff --git a/9.4-jre11/arches b/9.4-jre11/arches
index 21d5bd8..e7b206a 100644
--- a/9.4-jre11/arches
+++ b/9.4-jre11/arches
@@ -1 +1 @@
-amd64
+amd64, arm64v8

From 28562cbee783f1ccb94c375b7e9165c6cfe6d2e2 Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@webtide.com>
Date: Wed, 15 Jan 2020 21:57:34 +0100
Subject: [PATCH 2/4] remove multistage build from 9.2 and 9.3

Signed-off-by: Greg Wilkins <gregw@webtide.com>
---
 9.2-jre8/Dockerfile | 16 +---------------
 9.3-jre8/Dockerfile | 16 +---------------
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/9.2-jre8/Dockerfile b/9.2-jre8/Dockerfile
index 9913c6a..10cfeb4 100644
--- a/9.2-jre8/Dockerfile
+++ b/9.2-jre8/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:13-jdk AS Jetty94
+FROM openjdk:8-jre
 
 ENV JETTY_VERSION 9.2.29.v20191105
 ENV JETTY_HOME /usr/local/jetty
@@ -53,20 +53,6 @@ RUN set -xe \
 	&& cd $JETTY_BASE \
 	&& modules="$(grep -- ^--module= "$JETTY_HOME/start.ini" | cut -d= -f2 | paste -d, -s)" \
 	&& java -jar "$JETTY_HOME/start.jar" --add-to-startd="$modules" \
-	&& rm -rf /tmp/hsperfdata_root
-
-# Start a new image on the target and import jetty
-FROM openjdk:8-jre
-
-ENV JETTY_HOME /usr/local/jetty
-ENV JETTY_BASE /var/lib/jetty
-ENV TMPDIR /tmp/jetty
-ENV PATH $JETTY_HOME/bin:$PATH
-
-COPY --from=Jetty94 $JETTY_HOME $JETTY_HOME
-COPY --from=Jetty94 $JETTY_BASE $JETTY_BASE
-
-RUN set -xe \
 	&& mkdir -p "$TMPDIR" \
 	&& groupadd -r jetty && useradd -r -g jetty jetty \
 	&& chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" \
diff --git a/9.3-jre8/Dockerfile b/9.3-jre8/Dockerfile
index 6b0af09..1ff04d4 100644
--- a/9.3-jre8/Dockerfile
+++ b/9.3-jre8/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:13-jdk AS Jetty94
+FROM openjdk:8-jre
 
 ENV JETTY_VERSION 9.3.28.v20191105
 ENV JETTY_HOME /usr/local/jetty
@@ -53,20 +53,6 @@ RUN set -xe \
 	&& cd $JETTY_BASE \
 	&& modules="$(grep -- ^--module= "$JETTY_HOME/start.ini" | cut -d= -f2 | paste -d, -s)" \
 	&& java -jar "$JETTY_HOME/start.jar" --add-to-startd="$modules" \
-	&& rm -rf /tmp/hsperfdata_root
-
-# Start a new image on the target and import jetty
-FROM openjdk:8-jre
-
-ENV JETTY_HOME /usr/local/jetty
-ENV JETTY_BASE /var/lib/jetty
-ENV TMPDIR /tmp/jetty
-ENV PATH $JETTY_HOME/bin:$PATH
-
-COPY --from=Jetty94 $JETTY_HOME $JETTY_HOME
-COPY --from=Jetty94 $JETTY_BASE $JETTY_BASE
-
-RUN set -xe \
 	&& mkdir -p "$TMPDIR" \
 	&& groupadd -r jetty && useradd -r -g jetty jetty \
 	&& chown -R jetty:jetty "$JETTY_HOME" "$JETTY_BASE" "$TMPDIR" \

From 25f2f18adcf3e58842c2b4e578ea1e11937a257e Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@webtide.com>
Date: Fri, 17 Jan 2020 17:56:51 +0100
Subject: [PATCH 3/4] fixed update to modify 9.4 Dockerfile

Signed-off-by: Greg Wilkins <gregw@webtide.com>
---
 9.4-jdk13-slim/Dockerfile | 2 +-
 9.4-jdk13/Dockerfile      | 2 +-
 9.4-jre11-slim/Dockerfile | 2 +-
 9.4-jre11/Dockerfile      | 2 +-
 9.4-jre8/Dockerfile       | 2 +-
 Dockerfile-9.4            | 2 +-
 Dockerfile-9.4-slim       | 2 +-
 update.sh                 | 4 +++-
 8 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/9.4-jdk13-slim/Dockerfile b/9.4-jdk13-slim/Dockerfile
index bb8254b..cedf51b 100644
--- a/9.4-jdk13-slim/Dockerfile
+++ b/9.4-jdk13-slim/Dockerfile
@@ -1,7 +1,7 @@
 # DO NOT EDIT. Edit Dockerfile-9.4 and use update.sh
 FROM openjdk:13-jdk-slim
 
-ENV JETTY_VERSION 9.4.24.v20191120
+ENV JETTY_VERSION 9.4.25.v20191220
 ENV JETTY_HOME /usr/local/jetty
 ENV JETTY_BASE /var/lib/jetty
 ENV TMPDIR /tmp/jetty
diff --git a/9.4-jdk13/Dockerfile b/9.4-jdk13/Dockerfile
index ab769aa..6e1fd93 100644
--- a/9.4-jdk13/Dockerfile
+++ b/9.4-jdk13/Dockerfile
@@ -1,7 +1,7 @@
 # DO NOT EDIT. Edit Dockerfile-9.4 and use update.sh
 FROM openjdk:13-jdk
 
-ENV JETTY_VERSION 9.4.24.v20191120
+ENV JETTY_VERSION 9.4.25.v20191220
 ENV JETTY_HOME /usr/local/jetty
 ENV JETTY_BASE /var/lib/jetty
 ENV TMPDIR /tmp/jetty
diff --git a/9.4-jre11-slim/Dockerfile b/9.4-jre11-slim/Dockerfile
index 02999c7..0d36994 100644
--- a/9.4-jre11-slim/Dockerfile
+++ b/9.4-jre11-slim/Dockerfile
@@ -1,7 +1,7 @@
 # DO NOT EDIT. Edit Dockerfile-9.4 and use update.sh
 FROM openjdk:11-jre-slim
 
-ENV JETTY_VERSION 9.4.24.v20191120
+ENV JETTY_VERSION 9.4.25.v20191220
 ENV JETTY_HOME /usr/local/jetty
 ENV JETTY_BASE /var/lib/jetty
 ENV TMPDIR /tmp/jetty
diff --git a/9.4-jre11/Dockerfile b/9.4-jre11/Dockerfile
index bf8c67b..7b28bb9 100644
--- a/9.4-jre11/Dockerfile
+++ b/9.4-jre11/Dockerfile
@@ -1,7 +1,7 @@
 # DO NOT EDIT. Edit Dockerfile-9.4 and use update.sh
 FROM openjdk:11-jre
 
-ENV JETTY_VERSION 9.4.24.v20191120
+ENV JETTY_VERSION 9.4.25.v20191220
 ENV JETTY_HOME /usr/local/jetty
 ENV JETTY_BASE /var/lib/jetty
 ENV TMPDIR /tmp/jetty
diff --git a/9.4-jre8/Dockerfile b/9.4-jre8/Dockerfile
index 2cff25c..9d702e1 100644
--- a/9.4-jre8/Dockerfile
+++ b/9.4-jre8/Dockerfile
@@ -1,7 +1,7 @@
 # DO NOT EDIT. Edit Dockerfile-9.4 and use update.sh
 FROM openjdk:8-jre
 
-ENV JETTY_VERSION 9.4.24.v20191120
+ENV JETTY_VERSION 9.4.25.v20191220
 ENV JETTY_HOME /usr/local/jetty
 ENV JETTY_BASE /var/lib/jetty
 ENV TMPDIR /tmp/jetty
diff --git a/Dockerfile-9.4 b/Dockerfile-9.4
index a7e2e9a..85a6eb6 100644
--- a/Dockerfile-9.4
+++ b/Dockerfile-9.4
@@ -1,6 +1,6 @@
 FROM openjdk:LABEL
 
-ENV JETTY_VERSION 9.4.24.v20191120
+ENV JETTY_VERSION 9.4.25.v20191220
 ENV JETTY_HOME /usr/local/jetty
 ENV JETTY_BASE /var/lib/jetty
 ENV TMPDIR /tmp/jetty
diff --git a/Dockerfile-9.4-slim b/Dockerfile-9.4-slim
index c473ad2..5272e30 100644
--- a/Dockerfile-9.4-slim
+++ b/Dockerfile-9.4-slim
@@ -1,6 +1,6 @@
 FROM openjdk:LABEL
 
-ENV JETTY_VERSION 9.4.24.v20191120
+ENV JETTY_VERSION 9.4.25.v20191220
 ENV JETTY_HOME /usr/local/jetty
 ENV JETTY_BASE /var/lib/jetty
 ENV TMPDIR /tmp/jetty
diff --git a/update.sh b/update.sh
index e6c2f5f..97876bd 100755
--- a/update.sh
+++ b/update.sh
@@ -54,10 +54,12 @@ for path in "${paths[@]}"; do
 	if [ -d "$path" ]; then
 	    cp docker-entrypoint.sh generate-jetty-start.sh "$path"
 	    if [ "$version" == "9.4" ] ; then
+	        sed -ri 's/^(ENV JETTY_VERSION) .*/\1 '"$fullVersion"'/; ' "Dockerfile-9.4${variant:+-$variant}"
 	        echo '# DO NOT EDIT. Edit Dockerfile-9.4 and use update.sh' > "$path"/Dockerfile
 	    	cat Dockerfile-9.4${variant:+-$variant} >> "$path"/Dockerfile
 	        sed -ri 's/^(FROM openjdk:)LABEL/\1'"$label"'/; ' "$path/Dockerfile"
+	    else 
+	        sed -ri 's/^(ENV JETTY_VERSION) .*/\1 '"$fullVersion"'/; ' "$path/Dockerfile"
 	    fi
-	    sed -ri 's/^(ENV JETTY_VERSION) .*/\1 '"$fullVersion"'/; ' "$path/Dockerfile"
 	fi
 done

From 4d8c5831719bd7dc409e990250e6c9ff95856b10 Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@webtide.com>
Date: Fri, 17 Jan 2020 19:31:48 +0100
Subject: [PATCH 4/4] updated to latest jetty

Signed-off-by: Greg Wilkins <gregw@webtide.com>
---
 9.4-jdk13-slim/Dockerfile | 2 +-
 9.4-jdk13/Dockerfile      | 2 +-
 9.4-jre11-slim/Dockerfile | 2 +-
 9.4-jre11/Dockerfile      | 2 +-
 9.4-jre8/Dockerfile       | 2 +-
 Dockerfile-9.4            | 2 +-
 Dockerfile-9.4-slim       | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/9.4-jdk13-slim/Dockerfile b/9.4-jdk13-slim/Dockerfile
index cedf51b..68b8e7a 100644
--- a/9.4-jdk13-slim/Dockerfile
+++ b/9.4-jdk13-slim/Dockerfile
@@ -1,7 +1,7 @@
 # DO NOT EDIT. Edit Dockerfile-9.4 and use update.sh
 FROM openjdk:13-jdk-slim
 
-ENV JETTY_VERSION 9.4.25.v20191220
+ENV JETTY_VERSION 9.4.26.v20200117
 ENV JETTY_HOME /usr/local/jetty
 ENV JETTY_BASE /var/lib/jetty
 ENV TMPDIR /tmp/jetty
diff --git a/9.4-jdk13/Dockerfile b/9.4-jdk13/Dockerfile
index 6e1fd93..a9fc011 100644
--- a/9.4-jdk13/Dockerfile
+++ b/9.4-jdk13/Dockerfile
@@ -1,7 +1,7 @@
 # DO NOT EDIT. Edit Dockerfile-9.4 and use update.sh
 FROM openjdk:13-jdk
 
-ENV JETTY_VERSION 9.4.25.v20191220
+ENV JETTY_VERSION 9.4.26.v20200117
 ENV JETTY_HOME /usr/local/jetty
 ENV JETTY_BASE /var/lib/jetty
 ENV TMPDIR /tmp/jetty
diff --git a/9.4-jre11-slim/Dockerfile b/9.4-jre11-slim/Dockerfile
index 0d36994..8fabea3 100644
--- a/9.4-jre11-slim/Dockerfile
+++ b/9.4-jre11-slim/Dockerfile
@@ -1,7 +1,7 @@
 # DO NOT EDIT. Edit Dockerfile-9.4 and use update.sh
 FROM openjdk:11-jre-slim
 
-ENV JETTY_VERSION 9.4.25.v20191220
+ENV JETTY_VERSION 9.4.26.v20200117
 ENV JETTY_HOME /usr/local/jetty
 ENV JETTY_BASE /var/lib/jetty
 ENV TMPDIR /tmp/jetty
diff --git a/9.4-jre11/Dockerfile b/9.4-jre11/Dockerfile
index 7b28bb9..f56d4cd 100644
--- a/9.4-jre11/Dockerfile
+++ b/9.4-jre11/Dockerfile
@@ -1,7 +1,7 @@
 # DO NOT EDIT. Edit Dockerfile-9.4 and use update.sh
 FROM openjdk:11-jre
 
-ENV JETTY_VERSION 9.4.25.v20191220
+ENV JETTY_VERSION 9.4.26.v20200117
 ENV JETTY_HOME /usr/local/jetty
 ENV JETTY_BASE /var/lib/jetty
 ENV TMPDIR /tmp/jetty
diff --git a/9.4-jre8/Dockerfile b/9.4-jre8/Dockerfile
index 9d702e1..b1b0968 100644
--- a/9.4-jre8/Dockerfile
+++ b/9.4-jre8/Dockerfile
@@ -1,7 +1,7 @@
 # DO NOT EDIT. Edit Dockerfile-9.4 and use update.sh
 FROM openjdk:8-jre
 
-ENV JETTY_VERSION 9.4.25.v20191220
+ENV JETTY_VERSION 9.4.26.v20200117
 ENV JETTY_HOME /usr/local/jetty
 ENV JETTY_BASE /var/lib/jetty
 ENV TMPDIR /tmp/jetty
diff --git a/Dockerfile-9.4 b/Dockerfile-9.4
index 85a6eb6..1c21a29 100644
--- a/Dockerfile-9.4
+++ b/Dockerfile-9.4
@@ -1,6 +1,6 @@
 FROM openjdk:LABEL
 
-ENV JETTY_VERSION 9.4.25.v20191220
+ENV JETTY_VERSION 9.4.26.v20200117
 ENV JETTY_HOME /usr/local/jetty
 ENV JETTY_BASE /var/lib/jetty
 ENV TMPDIR /tmp/jetty
diff --git a/Dockerfile-9.4-slim b/Dockerfile-9.4-slim
index 5272e30..331733e 100644
--- a/Dockerfile-9.4-slim
+++ b/Dockerfile-9.4-slim
@@ -1,6 +1,6 @@
 FROM openjdk:LABEL
 
-ENV JETTY_VERSION 9.4.25.v20191220
+ENV JETTY_VERSION 9.4.26.v20200117
 ENV JETTY_HOME /usr/local/jetty
 ENV JETTY_BASE /var/lib/jetty
 ENV TMPDIR /tmp/jetty