From 673de974b44c93affd508b550753256f377d4bf8 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 5 Nov 2019 12:32:05 -0600
Subject: [PATCH 001/264] New version of Zulu 8u232 and 11u5

---
 docker/alpine/Dockerfile.zulu-11u5-jdk                 | 2 +-
 docker/alpine/Dockerfile.zulu-11u5-jre                 | 2 +-
 docker/alpine/Dockerfile.zulu-11u5-jre-headless        | 2 +-
 docker/alpine/Dockerfile.zulu-11u5-jre-headless-tools  | 2 +-
 docker/alpine/Dockerfile.zulu-8u232-jdk                | 2 +-
 docker/alpine/Dockerfile.zulu-8u232-jre                | 2 +-
 docker/alpine/Dockerfile.zulu-8u232-jre-headless       | 2 +-
 docker/alpine/Dockerfile.zulu-8u232-jre-headless-tools | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker/alpine/Dockerfile.zulu-11u5-jdk b/docker/alpine/Dockerfile.zulu-11u5-jdk
index cea752c6..c9900c1d 100644
--- a/docker/alpine/Dockerfile.zulu-11u5-jdk
+++ b/docker/alpine/Dockerfile.zulu-11u5-jdk
@@ -11,7 +11,7 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-ARG ZULU_DIR=zulu-11-azure-jdk_11.35.13-11.0.5-linux_musl_x64
+ARG ZULU_DIR=zulu-11-azure-jdk_11.35.15-11.0.5-linux_musl_x64
 
 RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
diff --git a/docker/alpine/Dockerfile.zulu-11u5-jre b/docker/alpine/Dockerfile.zulu-11u5-jre
index 1b1dc2d9..5dba2853 100644
--- a/docker/alpine/Dockerfile.zulu-11u5-jre
+++ b/docker/alpine/Dockerfile.zulu-11u5-jre
@@ -11,7 +11,7 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-ARG ZULU_DIR=zulu-11-azure-jre_11.35.13-11.0.5-linux_musl_x64
+ARG ZULU_DIR=zulu-11-azure-jre_11.35.15-11.0.5-linux_musl_x64
 
 RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
diff --git a/docker/alpine/Dockerfile.zulu-11u5-jre-headless b/docker/alpine/Dockerfile.zulu-11u5-jre-headless
index 4b766f8d..20734ca3 100644
--- a/docker/alpine/Dockerfile.zulu-11u5-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-11u5-jre-headless
@@ -11,7 +11,7 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-ARG ZULU_DIR=zulu-11-azure-jre-headless_11.35.13-11.0.5-linux_musl_x64
+ARG ZULU_DIR=zulu-11-azure-jre-headless_11.35.15-11.0.5-linux_musl_x64
 
 RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
diff --git a/docker/alpine/Dockerfile.zulu-11u5-jre-headless-tools b/docker/alpine/Dockerfile.zulu-11u5-jre-headless-tools
index 42c5eee4..8b2f2437 100644
--- a/docker/alpine/Dockerfile.zulu-11u5-jre-headless-tools
+++ b/docker/alpine/Dockerfile.zulu-11u5-jre-headless-tools
@@ -11,7 +11,7 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-ARG ZULU_DIR=zulu-11-azure-jre-headless-tools_11.35.13-11.0.5-linux_musl_x64
+ARG ZULU_DIR=zulu-11-azure-jre-headless-tools_11.35.15-11.0.5-linux_musl_x64
 
 RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
diff --git a/docker/alpine/Dockerfile.zulu-8u232-jdk b/docker/alpine/Dockerfile.zulu-8u232-jdk
index 3f8d81c0..fd93a2d9 100644
--- a/docker/alpine/Dockerfile.zulu-8u232-jdk
+++ b/docker/alpine/Dockerfile.zulu-8u232-jdk
@@ -11,7 +11,7 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-ARG ZULU_DIR=zulu-8-azure-jdk_8.42.0.21-8.0.232-linux_musl_x64
+ARG ZULU_DIR=zulu-8-azure-jdk_8.42.0.23-8.0.232-linux_musl_x64
 
 RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
diff --git a/docker/alpine/Dockerfile.zulu-8u232-jre b/docker/alpine/Dockerfile.zulu-8u232-jre
index 96984ed2..a73d86e5 100644
--- a/docker/alpine/Dockerfile.zulu-8u232-jre
+++ b/docker/alpine/Dockerfile.zulu-8u232-jre
@@ -11,7 +11,7 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-ARG ZULU_DIR=zulu-8-azure-jre_8.42.0.21-8.0.232-linux_musl_x64
+ARG ZULU_DIR=zulu-8-azure-jre_8.42.0.23-8.0.232-linux_musl_x64
 
 RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
diff --git a/docker/alpine/Dockerfile.zulu-8u232-jre-headless b/docker/alpine/Dockerfile.zulu-8u232-jre-headless
index 7748308b..b2838917 100644
--- a/docker/alpine/Dockerfile.zulu-8u232-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-8u232-jre-headless
@@ -11,7 +11,7 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-ARG ZULU_DIR=zulu-8-azure-jre-headless_8.42.0.21-8.0.232-linux_musl_x64
+ARG ZULU_DIR=zulu-8-azure-jre-headless_8.42.0.23-8.0.232-linux_musl_x64
 
 RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
diff --git a/docker/alpine/Dockerfile.zulu-8u232-jre-headless-tools b/docker/alpine/Dockerfile.zulu-8u232-jre-headless-tools
index 77d44e95..a6a37545 100644
--- a/docker/alpine/Dockerfile.zulu-8u232-jre-headless-tools
+++ b/docker/alpine/Dockerfile.zulu-8u232-jre-headless-tools
@@ -11,7 +11,7 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-ARG ZULU_DIR=zulu-8-azure-jre-headless-tools_8.42.0.21-8.0.232-linux_musl_x64
+ARG ZULU_DIR=zulu-8-azure-jre-headless-tools_8.42.0.23-8.0.232-linux_musl_x64
 RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
     BIN_DIR=/usr/bin && \

From ab6171450a1802136b56fcb9e99b10e3da717572 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 5 Nov 2019 12:33:14 -0600
Subject: [PATCH 002/264] New version of Zulu 8u232 and 11u5

---
 docker/centos/Dockerfile.zulu-11u5-jdk           | 2 +-
 docker/centos/Dockerfile.zulu-11u5-jre           | 2 +-
 docker/centos/Dockerfile.zulu-11u5-jre-headless  | 2 +-
 docker/centos/Dockerfile.zulu-8u232-jdk          | 2 +-
 docker/centos/Dockerfile.zulu-8u232-jre          | 2 +-
 docker/centos/Dockerfile.zulu-8u232-jre-headless | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker/centos/Dockerfile.zulu-11u5-jdk b/docker/centos/Dockerfile.zulu-11u5-jdk
index c273c90f..6bd3e74f 100644
--- a/docker/centos/Dockerfile.zulu-11u5-jdk
+++ b/docker/centos/Dockerfile.zulu-11u5-jdk
@@ -10,6 +10,6 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
-    yum -q -y install zulu-11-azure-jdk-11.35+13
+    yum -q -y install zulu-11-azure-jdk-11.35+15
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure
diff --git a/docker/centos/Dockerfile.zulu-11u5-jre b/docker/centos/Dockerfile.zulu-11u5-jre
index 8c70935c..ec224781 100644
--- a/docker/centos/Dockerfile.zulu-11u5-jre
+++ b/docker/centos/Dockerfile.zulu-11u5-jre
@@ -10,6 +10,6 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
-    yum -q -y install zulu-11-azure-jre-11.35+13
+    yum -q -y install zulu-11-azure-jre-11.35+15
 
 ENV JAVA_HOME=/usr/lib/jvm/jre-11-azure
diff --git a/docker/centos/Dockerfile.zulu-11u5-jre-headless b/docker/centos/Dockerfile.zulu-11u5-jre-headless
index 8b87548a..dc0cf2d1 100644
--- a/docker/centos/Dockerfile.zulu-11u5-jre-headless
+++ b/docker/centos/Dockerfile.zulu-11u5-jre-headless
@@ -10,6 +10,6 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
-    yum -q -y install zulu-11-azure-jre-headless-11.35+13
+    yum -q -y install zulu-11-azure-jre-headless-11.35+15
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure
diff --git a/docker/centos/Dockerfile.zulu-8u232-jdk b/docker/centos/Dockerfile.zulu-8u232-jdk
index a32778fa..0ed494e0 100644
--- a/docker/centos/Dockerfile.zulu-8u232-jdk
+++ b/docker/centos/Dockerfile.zulu-8u232-jdk
@@ -10,6 +10,6 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
-    yum -q -y install zulu-8-azure-jdk-8.42.0.21
+    yum -q -y install zulu-8-azure-jdk-8.42.0.23
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure
diff --git a/docker/centos/Dockerfile.zulu-8u232-jre b/docker/centos/Dockerfile.zulu-8u232-jre
index 06845d4b..8ca7a18c 100644
--- a/docker/centos/Dockerfile.zulu-8u232-jre
+++ b/docker/centos/Dockerfile.zulu-8u232-jre
@@ -10,6 +10,6 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
-    yum -q -y install zulu-8-azure-jre-8.42.0.21
+    yum -q -y install zulu-8-azure-jre-8.42.0.23
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure
diff --git a/docker/centos/Dockerfile.zulu-8u232-jre-headless b/docker/centos/Dockerfile.zulu-8u232-jre-headless
index d2751640..c45a68ae 100644
--- a/docker/centos/Dockerfile.zulu-8u232-jre-headless
+++ b/docker/centos/Dockerfile.zulu-8u232-jre-headless
@@ -10,6 +10,6 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
-    yum -q -y install zulu-8-azure-jre-headless-8.42.0.21
+    yum -q -y install zulu-8-azure-jre-headless-8.42.0.23
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure

From e14dd941b271dca0b6a579b3a1e9fe01a7c339c0 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 5 Nov 2019 12:34:07 -0600
Subject: [PATCH 003/264] New version of Zulu 8u232 and 11u5

---
 docker/debian8/Dockerfile.zulu-11u5-jdk           | 2 +-
 docker/debian8/Dockerfile.zulu-11u5-jre           | 2 +-
 docker/debian8/Dockerfile.zulu-11u5-jre-headless  | 2 +-
 docker/debian8/Dockerfile.zulu-8u232-jdk          | 2 +-
 docker/debian8/Dockerfile.zulu-8u232-jre          | 2 +-
 docker/debian8/Dockerfile.zulu-8u232-jre-headless | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker/debian8/Dockerfile.zulu-11u5-jdk b/docker/debian8/Dockerfile.zulu-11u5-jdk
index ddddd262..e44fb69e 100644
--- a/docker/debian8/Dockerfile.zulu-11u5-jdk
+++ b/docker/debian8/Dockerfile.zulu-11u5-jdk
@@ -12,7 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-11-azure-jdk=11.35+13 && \
+    apt-get -y --no-install-recommends install zulu-11-azure-jdk=11.35+15 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-11u5-jre b/docker/debian8/Dockerfile.zulu-11u5-jre
index fc5e6e34..90d97495 100644
--- a/docker/debian8/Dockerfile.zulu-11u5-jre
+++ b/docker/debian8/Dockerfile.zulu-11u5-jre
@@ -12,7 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-11-azure-jre=11.35+13 && \
+    apt-get -y --no-install-recommends install zulu-11-azure-jre=11.35+15 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-11u5-jre-headless b/docker/debian8/Dockerfile.zulu-11u5-jre-headless
index 597b62d1..54040e4e 100644
--- a/docker/debian8/Dockerfile.zulu-11u5-jre-headless
+++ b/docker/debian8/Dockerfile.zulu-11u5-jre-headless
@@ -12,7 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-11-azure-jre-headless=11.35+13 && \
+    apt-get -y --no-install-recommends install zulu-11-azure-jre-headless=11.35+15 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-8u232-jdk b/docker/debian8/Dockerfile.zulu-8u232-jdk
index 15d70c48..8f4de8d4 100644
--- a/docker/debian8/Dockerfile.zulu-8u232-jdk
+++ b/docker/debian8/Dockerfile.zulu-8u232-jdk
@@ -14,7 +14,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jdk=8.42.0.21 && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jdk=8.42.0.23 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-8u232-jre b/docker/debian8/Dockerfile.zulu-8u232-jre
index fd040a31..f9d699e3 100644
--- a/docker/debian8/Dockerfile.zulu-8u232-jre
+++ b/docker/debian8/Dockerfile.zulu-8u232-jre
@@ -12,7 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jre=8.42.0.21 && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jre=8.42.0.23 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-8u232-jre-headless b/docker/debian8/Dockerfile.zulu-8u232-jre-headless
index 5e44c050..7768dd0b 100644
--- a/docker/debian8/Dockerfile.zulu-8u232-jre-headless
+++ b/docker/debian8/Dockerfile.zulu-8u232-jre-headless
@@ -12,7 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jre-headless=8.42.0.21 && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jre-headless=8.42.0.23 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64

From 44973fa7f28206cf8a6f1a96e83ce22b9faba6aa Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 5 Nov 2019 12:35:00 -0600
Subject: [PATCH 004/264] New version of Zulu 8u232 and 11u5

---
 docker/debian9/Dockerfile.zulu-11u5-jdk           | 2 +-
 docker/debian9/Dockerfile.zulu-11u5-jre           | 2 +-
 docker/debian9/Dockerfile.zulu-11u5-jre-headless  | 2 +-
 docker/debian9/Dockerfile.zulu-8u232-jdk          | 2 +-
 docker/debian9/Dockerfile.zulu-8u232-jre          | 2 +-
 docker/debian9/Dockerfile.zulu-8u232-jre-headless | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker/debian9/Dockerfile.zulu-11u5-jdk b/docker/debian9/Dockerfile.zulu-11u5-jdk
index 351002ef..e9df98f6 100644
--- a/docker/debian9/Dockerfile.zulu-11u5-jdk
+++ b/docker/debian9/Dockerfile.zulu-11u5-jdk
@@ -12,7 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-11-azure-jdk=11.35+13 && \
+    apt-get -y --no-install-recommends install zulu-11-azure-jdk=11.35+15 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u5-jre b/docker/debian9/Dockerfile.zulu-11u5-jre
index d4f64bb7..5553f841 100644
--- a/docker/debian9/Dockerfile.zulu-11u5-jre
+++ b/docker/debian9/Dockerfile.zulu-11u5-jre
@@ -12,7 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-11-azure-jre=11.35+13 && \
+    apt-get -y --no-install-recommends install zulu-11-azure-jre=11.35+15 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u5-jre-headless b/docker/debian9/Dockerfile.zulu-11u5-jre-headless
index d05ff01f..25641fd6 100644
--- a/docker/debian9/Dockerfile.zulu-11u5-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-11u5-jre-headless
@@ -12,7 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-11-azure-jre-headless=11.35+13 && \
+    apt-get -y --no-install-recommends install zulu-11-azure-jre-headless=11.35+15 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u232-jdk b/docker/debian9/Dockerfile.zulu-8u232-jdk
index 6de04005..dd30ddd8 100644
--- a/docker/debian9/Dockerfile.zulu-8u232-jdk
+++ b/docker/debian9/Dockerfile.zulu-8u232-jdk
@@ -12,7 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jdk=8.42.0.21 && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jdk=8.42.0.23 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u232-jre b/docker/debian9/Dockerfile.zulu-8u232-jre
index 4183233c..017d0cd2 100644
--- a/docker/debian9/Dockerfile.zulu-8u232-jre
+++ b/docker/debian9/Dockerfile.zulu-8u232-jre
@@ -12,7 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jre=8.42.0.21 && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jre=8.42.0.23 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u232-jre-headless b/docker/debian9/Dockerfile.zulu-8u232-jre-headless
index 4f087ebe..cbacf470 100644
--- a/docker/debian9/Dockerfile.zulu-8u232-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-8u232-jre-headless
@@ -12,7 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jre-headless=8.42.0.21 && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jre-headless=8.42.0.23 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64

From 77b52f6768dc007044260ecd6213dc3a5620cf9c Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 5 Nov 2019 12:35:50 -0600
Subject: [PATCH 005/264] New version of Zulu 8u232 and 11u5

---
 docker/ubuntu/Dockerfile.zulu-11u5-jdk           | 2 +-
 docker/ubuntu/Dockerfile.zulu-11u5-jre           | 2 +-
 docker/ubuntu/Dockerfile.zulu-11u5-jre-headless  | 2 +-
 docker/ubuntu/Dockerfile.zulu-8u232-jdk          | 2 +-
 docker/ubuntu/Dockerfile.zulu-8u232-jre          | 2 +-
 docker/ubuntu/Dockerfile.zulu-8u232-jre-headless | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker/ubuntu/Dockerfile.zulu-11u5-jdk b/docker/ubuntu/Dockerfile.zulu-11u5-jdk
index dfb2d790..cbe9da86 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u5-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-11u5-jdk
@@ -12,7 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-11-azure-jdk=11.35+13 && \
+    apt-get -y --no-install-recommends install zulu-11-azure-jdk=11.35+15 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u5-jre b/docker/ubuntu/Dockerfile.zulu-11u5-jre
index cf633f1a..674485ac 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u5-jre
+++ b/docker/ubuntu/Dockerfile.zulu-11u5-jre
@@ -12,7 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-11-azure-jre=11.35+13 && \
+    apt-get -y --no-install-recommends install zulu-11-azure-jre=11.35+15 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u5-jre-headless b/docker/ubuntu/Dockerfile.zulu-11u5-jre-headless
index 22707704..f8675bfb 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u5-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-11u5-jre-headless
@@ -12,7 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-11-azure-jre-headless=11.35+13 && \
+    apt-get -y --no-install-recommends install zulu-11-azure-jre-headless=11.35+15 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u232-jdk b/docker/ubuntu/Dockerfile.zulu-8u232-jdk
index 84eb96b1..24c33d03 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u232-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-8u232-jdk
@@ -12,7 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jdk=8.42.0.21 && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jdk=8.42.0.23 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u232-jre b/docker/ubuntu/Dockerfile.zulu-8u232-jre
index e4e1c060..6591539e 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u232-jre
+++ b/docker/ubuntu/Dockerfile.zulu-8u232-jre
@@ -12,7 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jre=8.42.0.21 && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jre=8.42.0.23 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u232-jre-headless b/docker/ubuntu/Dockerfile.zulu-8u232-jre-headless
index 0e0a0bf0..88ffecea 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u232-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-8u232-jre-headless
@@ -12,7 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jre-headless=8.42.0.21 && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jre-headless=8.42.0.23 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64

From efeb1ba70116b1e4cf1206d1e44310d158c0faa1 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 5 Nov 2019 12:36:30 -0600
Subject: [PATCH 006/264] New version of Zulu 8u232 and 11u5

---
 docker/windowsservercore/Dockerfile.zulu-11u5-jdk  | 2 +-
 docker/windowsservercore/Dockerfile.zulu-11u5-jre  | 2 +-
 docker/windowsservercore/Dockerfile.zulu-8u232-jdk | 2 +-
 docker/windowsservercore/Dockerfile.zulu-8u232-jre | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker/windowsservercore/Dockerfile.zulu-11u5-jdk b/docker/windowsservercore/Dockerfile.zulu-11u5-jdk
index 0689010b..57b86419 100644
--- a/docker/windowsservercore/Dockerfile.zulu-11u5-jdk
+++ b/docker/windowsservercore/Dockerfile.zulu-11u5-jdk
@@ -7,7 +7,7 @@
 FROM microsoft/windowsservercore:ltsc2016
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN setx PACKAGE zulu-11-azure-jdk_11.35.13-11.0.5-win_x64.msi && \
+RUN setx PACKAGE zulu-11-azure-jdk_11.35.15-11.0.5-win_x64.msi && \
     setx PACKAGE_DIR zulu-11/11.0.5 && \
     setx /m JAVA_HOME "C:\Program Files\zulu\zulu-11"
 
diff --git a/docker/windowsservercore/Dockerfile.zulu-11u5-jre b/docker/windowsservercore/Dockerfile.zulu-11u5-jre
index 230cc1a3..248a28f9 100644
--- a/docker/windowsservercore/Dockerfile.zulu-11u5-jre
+++ b/docker/windowsservercore/Dockerfile.zulu-11u5-jre
@@ -7,7 +7,7 @@
 FROM microsoft/windowsservercore:ltsc2016
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN setx PACKAGE zulu-11-azure-jre_11.35.13-11.0.5-win_x64.msi && \
+RUN setx PACKAGE zulu-11-azure-jre_11.35.15-11.0.5-win_x64.msi && \
     setx PACKAGE_DIR zulu-11/11.0.5 && \
     setx /m JAVA_HOME "C:\Program Files\zulu\zulu-11"
 
diff --git a/docker/windowsservercore/Dockerfile.zulu-8u232-jdk b/docker/windowsservercore/Dockerfile.zulu-8u232-jdk
index cf2207c5..273c1f85 100644
--- a/docker/windowsservercore/Dockerfile.zulu-8u232-jdk
+++ b/docker/windowsservercore/Dockerfile.zulu-8u232-jdk
@@ -7,7 +7,7 @@
 FROM microsoft/windowsservercore:ltsc2016
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN setx PACKAGE zulu-8-azure-jdk_8.42.0.21-8.0.232-win_x64.msi && \
+RUN setx PACKAGE zulu-8-azure-jdk_8.42.0.23-8.0.232-win_x64.msi && \
     setx PACKAGE_DIR zulu-8/8u232 && \
     setx /m JAVA_HOME "C:\Program Files\zulu\zulu-8"
 
diff --git a/docker/windowsservercore/Dockerfile.zulu-8u232-jre b/docker/windowsservercore/Dockerfile.zulu-8u232-jre
index 8a1ea5e7..8cdd79d7 100644
--- a/docker/windowsservercore/Dockerfile.zulu-8u232-jre
+++ b/docker/windowsservercore/Dockerfile.zulu-8u232-jre
@@ -7,7 +7,7 @@
 FROM microsoft/windowsservercore:ltsc2016
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN setx PACKAGE zulu-8-azure-jre_8.42.0.21-8.0.232-win_x64.msi && \
+RUN setx PACKAGE zulu-8-azure-jre_8.42.0.23-8.0.232-win_x64.msi && \
     setx PACKAGE_DIR zulu-8/8u232 && \
     setx /m JAVA_HOME "C:\Program Files\zulu\zulu-8"
 

From 481a0d3d015a6df785399335ee8ef4d92ea0e4cf Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 14 Jan 2020 14:36:09 -0600
Subject: [PATCH 007/264] Added January 2020 PSU Dockerfiles

---
 docker/alpine/Dockerfile.zulu-11u6-jdk        | 30 +++++++++++++
 docker/alpine/Dockerfile.zulu-11u6-jre        | 30 +++++++++++++
 .../alpine/Dockerfile.zulu-11u6-jre-headless  | 30 +++++++++++++
 .../Dockerfile.zulu-11u6-jre-headless-tools   | 27 ++++++++++++
 docker/alpine/Dockerfile.zulu-13u2-jdk        | 30 +++++++++++++
 docker/alpine/Dockerfile.zulu-13u2-jre        | 27 ++++++++++++
 .../alpine/Dockerfile.zulu-13u2-jre-headless  | 27 ++++++++++++
 .../Dockerfile.zulu-13u2-jre-headless-tools   | 30 +++++++++++++
 docker/alpine/Dockerfile.zulu-7u252-jdk       | 42 +++++++++++++++++++
 docker/alpine/Dockerfile.zulu-7u252-jre       | 42 +++++++++++++++++++
 .../alpine/Dockerfile.zulu-7u252-jre-headless | 42 +++++++++++++++++++
 docker/alpine/Dockerfile.zulu-8u242-jdk       | 30 +++++++++++++
 docker/alpine/Dockerfile.zulu-8u242-jre       | 30 +++++++++++++
 .../alpine/Dockerfile.zulu-8u242-jre-headless | 30 +++++++++++++
 .../Dockerfile.zulu-8u242-jre-headless-tools  | 29 +++++++++++++
 15 files changed, 476 insertions(+)
 create mode 100644 docker/alpine/Dockerfile.zulu-11u6-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-11u6-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-11u6-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-11u6-jre-headless-tools
 create mode 100644 docker/alpine/Dockerfile.zulu-13u2-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-13u2-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-13u2-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-13u2-jre-headless-tools
 create mode 100644 docker/alpine/Dockerfile.zulu-7u252-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-7u252-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-7u252-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-8u242-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-8u242-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-8u242-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-8u242-jre-headless-tools

diff --git a/docker/alpine/Dockerfile.zulu-11u6-jdk b/docker/alpine/Dockerfile.zulu-11u6-jdk
new file mode 100644
index 00000000..5d68ad82
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u6-jdk
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jdk_11.37.17-11.0.6-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.6/$ZULU_PACK && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-11u6-jre b/docker/alpine/Dockerfile.zulu-11u6-jre
new file mode 100644
index 00000000..d85dab87
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u6-jre
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jre_11.37.17-11.0.6-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.6/$ZULU_PACK && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-11u6-jre-headless b/docker/alpine/Dockerfile.zulu-11u6-jre-headless
new file mode 100644
index 00000000..0c0b4e93
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u6-jre-headless
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jre-headless_11.37.17-11.0.6-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.6/$ZULU_PACK && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-11u6-jre-headless-tools b/docker/alpine/Dockerfile.zulu-11u6-jre-headless-tools
new file mode 100644
index 00000000..7cc4cc2c
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u6-jre-headless-tools
@@ -0,0 +1,27 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jre-headless-tools_11.37.17-11.0.6-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.6/$ZULU_PACK && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-13u2-jdk b/docker/alpine/Dockerfile.zulu-13u2-jdk
new file mode 100644
index 00000000..ef715bde
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u2-jdk
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jdk_13.29.9-13.0.2-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.2/$ZULU_PACK && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-13u2-jre b/docker/alpine/Dockerfile.zulu-13u2-jre
new file mode 100644
index 00000000..01fc57bd
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u2-jre
@@ -0,0 +1,27 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jre_13.29.9-13.0.2-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.2/$ZULU_PACK && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-13u2-jre-headless b/docker/alpine/Dockerfile.zulu-13u2-jre-headless
new file mode 100644
index 00000000..48789ec2
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u2-jre-headless
@@ -0,0 +1,27 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jre-headless_13.29.9-13.0.2-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.2/$ZULU_PACK && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-13u2-jre-headless-tools b/docker/alpine/Dockerfile.zulu-13u2-jre-headless-tools
new file mode 100644
index 00000000..ec10b185
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u2-jre-headless-tools
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jre-headless-tools_13.29.9-13.0.2-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.2/$ZULU_PACK && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-7u252-jdk b/docker/alpine/Dockerfile.zulu-7u252-jdk
new file mode 100644
index 00000000..79adbae6
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-7u252-jdk
@@ -0,0 +1,42 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-7-azure-jdk_7.36.0.5-7.0.252-linux_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk update && \
+    apk --no-cache add binutils ca-certificates wget && \
+    wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+    wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
+    wget -O gcc-libs.tar.xz https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    tar -xJf gcc-libs.tar.xz -C /tmp && \
+    tar -xJf zlib.tar.xz -C /tmp && \
+    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
+    rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u252/$ZULU_PACK && \
+    rm /root/.wget-hsts && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-7u252-jre b/docker/alpine/Dockerfile.zulu-7u252-jre
new file mode 100644
index 00000000..84f05154
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-7u252-jre
@@ -0,0 +1,42 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-7-azure-jre_7.36.0.5-7.0.252-linux_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk update && \
+    apk --no-cache add binutils ca-certificates wget && \
+    wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+    wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
+    wget -O gcc-libs.tar.xz https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    tar -xJf gcc-libs.tar.xz -C /tmp && \
+    tar -xJf zlib.tar.xz -C /tmp && \
+    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
+    rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u252/$ZULU_PACK && \
+    rm /root/.wget-hsts && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-7u252-jre-headless b/docker/alpine/Dockerfile.zulu-7u252-jre-headless
new file mode 100644
index 00000000..7ce4b1d0
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-7u252-jre-headless
@@ -0,0 +1,42 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-7-azure-jre-headless_7.36.0.5-7.0.252-linux_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk update && \
+    apk --no-cache add binutils ca-certificates wget && \
+    wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+    wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
+    wget -O gcc-libs.tar.xz https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    tar -xJf gcc-libs.tar.xz -C /tmp && \
+    tar -xJf zlib.tar.xz -C /tmp && \
+    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
+    rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u252/$ZULU_PACK && \
+    rm /root/.wget-hsts && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-8u242-jdk b/docker/alpine/Dockerfile.zulu-8u242-jdk
new file mode 100644
index 00000000..acdbc8da
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u242-jdk
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jdk_8.44.0.9-8.0.242-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u242/$ZULU_PACK && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-8u242-jre b/docker/alpine/Dockerfile.zulu-8u242-jre
new file mode 100644
index 00000000..d22fe468
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u242-jre
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre_8.44.0.9-8.0.242-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u242/$ZULU_PACK && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-8u242-jre-headless b/docker/alpine/Dockerfile.zulu-8u242-jre-headless
new file mode 100644
index 00000000..de74ce7c
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u242-jre-headless
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre-headless_8.44.0.9-8.0.242-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u242/$ZULU_PACK && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-8u242-jre-headless-tools b/docker/alpine/Dockerfile.zulu-8u242-jre-headless-tools
new file mode 100644
index 00000000..159d7576
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u242-jre-headless-tools
@@ -0,0 +1,29 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre-headless-tools_8.44.0.9-8.0.242-linux_musl_x64
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u242/$ZULU_PACK && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}

From 7513c1010c91e24452513202adc26001a7469b07 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 14 Jan 2020 14:37:32 -0600
Subject: [PATCH 008/264] Added January 2020 PSU Dockerfiles

---
 docker/centos/Dockerfile.zulu-11u6-jdk           | 15 +++++++++++++++
 docker/centos/Dockerfile.zulu-11u6-jre           | 15 +++++++++++++++
 docker/centos/Dockerfile.zulu-11u6-jre-headless  | 15 +++++++++++++++
 docker/centos/Dockerfile.zulu-13u2-jdk           | 15 +++++++++++++++
 docker/centos/Dockerfile.zulu-13u2-jre           | 15 +++++++++++++++
 docker/centos/Dockerfile.zulu-13u2-jre-headless  | 15 +++++++++++++++
 docker/centos/Dockerfile.zulu-7u252-jdk          | 15 +++++++++++++++
 docker/centos/Dockerfile.zulu-7u252-jre          | 15 +++++++++++++++
 docker/centos/Dockerfile.zulu-7u252-jre-headless | 15 +++++++++++++++
 docker/centos/Dockerfile.zulu-8u242-jdk          | 15 +++++++++++++++
 docker/centos/Dockerfile.zulu-8u242-jre          | 15 +++++++++++++++
 docker/centos/Dockerfile.zulu-8u242-jre-headless | 15 +++++++++++++++
 12 files changed, 180 insertions(+)
 create mode 100644 docker/centos/Dockerfile.zulu-11u6-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-11u6-jre
 create mode 100644 docker/centos/Dockerfile.zulu-11u6-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-13u2-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-13u2-jre
 create mode 100644 docker/centos/Dockerfile.zulu-13u2-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-7u252-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-7u252-jre
 create mode 100644 docker/centos/Dockerfile.zulu-7u252-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-8u242-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-8u242-jre
 create mode 100644 docker/centos/Dockerfile.zulu-8u242-jre-headless

diff --git a/docker/centos/Dockerfile.zulu-11u6-jdk b/docker/centos/Dockerfile.zulu-11u6-jdk
new file mode 100644
index 00000000..6cec3b06
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u6-jdk
@@ -0,0 +1,15 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y install zulu-11-azure-jdk-11.37+17
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure
diff --git a/docker/centos/Dockerfile.zulu-11u6-jre b/docker/centos/Dockerfile.zulu-11u6-jre
new file mode 100644
index 00000000..726b1222
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u6-jre
@@ -0,0 +1,15 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y install zulu-11-azure-jre-11.37+17
+
+ENV JAVA_HOME=/usr/lib/jvm/jre-11-azure
diff --git a/docker/centos/Dockerfile.zulu-11u6-jre-headless b/docker/centos/Dockerfile.zulu-11u6-jre-headless
new file mode 100644
index 00000000..37c5bdba
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u6-jre-headless
@@ -0,0 +1,15 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y install zulu-11-azure-jre-headless-11.37+17
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure
diff --git a/docker/centos/Dockerfile.zulu-13u2-jdk b/docker/centos/Dockerfile.zulu-13u2-jdk
new file mode 100644
index 00000000..b0a5cd6f
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-13u2-jdk
@@ -0,0 +1,15 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y install zulu-13-azure-jdk-13.29+9
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure
diff --git a/docker/centos/Dockerfile.zulu-13u2-jre b/docker/centos/Dockerfile.zulu-13u2-jre
new file mode 100644
index 00000000..0d2c09ce
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-13u2-jre
@@ -0,0 +1,15 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y install zulu-13-azure-jre-13.29+9
+
+ENV JAVA_HOME=/usr/lib/jvm/jre-13-azure
diff --git a/docker/centos/Dockerfile.zulu-13u2-jre-headless b/docker/centos/Dockerfile.zulu-13u2-jre-headless
new file mode 100644
index 00000000..6a465f50
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-13u2-jre-headless
@@ -0,0 +1,15 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y install zulu-13-azure-jre-headless-13.29+9
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure
diff --git a/docker/centos/Dockerfile.zulu-7u252-jdk b/docker/centos/Dockerfile.zulu-7u252-jdk
new file mode 100644
index 00000000..2257b972
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-7u252-jdk
@@ -0,0 +1,15 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y install zulu-7-azure-jdk-7.36.0.5
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure
diff --git a/docker/centos/Dockerfile.zulu-7u252-jre b/docker/centos/Dockerfile.zulu-7u252-jre
new file mode 100644
index 00000000..3c4ad1a7
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-7u252-jre
@@ -0,0 +1,15 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y install zulu-7-azure-jre-7.36.0.5
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure
diff --git a/docker/centos/Dockerfile.zulu-7u252-jre-headless b/docker/centos/Dockerfile.zulu-7u252-jre-headless
new file mode 100644
index 00000000..758160dc
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-7u252-jre-headless
@@ -0,0 +1,15 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y install zulu-7-azure-jre-headless-7.36.0.5
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure
diff --git a/docker/centos/Dockerfile.zulu-8u242-jdk b/docker/centos/Dockerfile.zulu-8u242-jdk
new file mode 100644
index 00000000..015df9c2
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u242-jdk
@@ -0,0 +1,15 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y install zulu-8-azure-jdk-8.44.0.9
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure
diff --git a/docker/centos/Dockerfile.zulu-8u242-jre b/docker/centos/Dockerfile.zulu-8u242-jre
new file mode 100644
index 00000000..3c3ff956
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u242-jre
@@ -0,0 +1,15 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y install zulu-8-azure-jre-8.44.0.9
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure
diff --git a/docker/centos/Dockerfile.zulu-8u242-jre-headless b/docker/centos/Dockerfile.zulu-8u242-jre-headless
new file mode 100644
index 00000000..5bb52e76
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u242-jre-headless
@@ -0,0 +1,15 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y install zulu-8-azure-jre-headless-8.44.0.9
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure

From c3d3167708f05113deef23c9436e93cb4c47a4aa Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 14 Jan 2020 14:39:29 -0600
Subject: [PATCH 009/264] Added January 2020 PSU Dockerfiles

---
 docker/debian8/Dockerfile.zulu-11u6-jdk       | 18 +++++++++++++++++
 docker/debian8/Dockerfile.zulu-11u6-jre       | 18 +++++++++++++++++
 .../debian8/Dockerfile.zulu-11u6-jre-headless | 18 +++++++++++++++++
 docker/debian8/Dockerfile.zulu-13u2-jdk       | 18 +++++++++++++++++
 docker/debian8/Dockerfile.zulu-13u2-jre       | 18 +++++++++++++++++
 .../debian8/Dockerfile.zulu-13u2-jre-headless | 18 +++++++++++++++++
 docker/debian8/Dockerfile.zulu-7u252-jdk      | 18 +++++++++++++++++
 docker/debian8/Dockerfile.zulu-7u252-jre      | 18 +++++++++++++++++
 .../Dockerfile.zulu-7u252-jre-headless        | 18 +++++++++++++++++
 docker/debian8/Dockerfile.zulu-8u242-jdk      | 20 +++++++++++++++++++
 docker/debian8/Dockerfile.zulu-8u242-jre      | 18 +++++++++++++++++
 .../Dockerfile.zulu-8u242-jre-headless        | 18 +++++++++++++++++
 12 files changed, 218 insertions(+)
 create mode 100644 docker/debian8/Dockerfile.zulu-11u6-jdk
 create mode 100644 docker/debian8/Dockerfile.zulu-11u6-jre
 create mode 100644 docker/debian8/Dockerfile.zulu-11u6-jre-headless
 create mode 100644 docker/debian8/Dockerfile.zulu-13u2-jdk
 create mode 100644 docker/debian8/Dockerfile.zulu-13u2-jre
 create mode 100644 docker/debian8/Dockerfile.zulu-13u2-jre-headless
 create mode 100644 docker/debian8/Dockerfile.zulu-7u252-jdk
 create mode 100644 docker/debian8/Dockerfile.zulu-7u252-jre
 create mode 100644 docker/debian8/Dockerfile.zulu-7u252-jre-headless
 create mode 100644 docker/debian8/Dockerfile.zulu-8u242-jdk
 create mode 100644 docker/debian8/Dockerfile.zulu-8u242-jre
 create mode 100644 docker/debian8/Dockerfile.zulu-8u242-jre-headless

diff --git a/docker/debian8/Dockerfile.zulu-11u6-jdk b/docker/debian8/Dockerfile.zulu-11u6-jdk
new file mode 100644
index 00000000..55b61fa4
--- /dev/null
+++ b/docker/debian8/Dockerfile.zulu-11u6-jdk
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:jessie
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-11-azure-jdk=11.37+17 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-11u6-jre b/docker/debian8/Dockerfile.zulu-11u6-jre
new file mode 100644
index 00000000..80d12340
--- /dev/null
+++ b/docker/debian8/Dockerfile.zulu-11u6-jre
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:jessie
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-11-azure-jre=11.37+17 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-11u6-jre-headless b/docker/debian8/Dockerfile.zulu-11u6-jre-headless
new file mode 100644
index 00000000..167a1c4b
--- /dev/null
+++ b/docker/debian8/Dockerfile.zulu-11u6-jre-headless
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:jessie
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-11-azure-jre-headless=11.37+17 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-13u2-jdk b/docker/debian8/Dockerfile.zulu-13u2-jdk
new file mode 100644
index 00000000..d905279c
--- /dev/null
+++ b/docker/debian8/Dockerfile.zulu-13u2-jdk
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:jessie
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-13-azure-jdk=13.29+9 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-13u2-jre b/docker/debian8/Dockerfile.zulu-13u2-jre
new file mode 100644
index 00000000..3fa7df53
--- /dev/null
+++ b/docker/debian8/Dockerfile.zulu-13u2-jre
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:jessie
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-13-azure-jre=13.29+9 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-13u2-jre-headless b/docker/debian8/Dockerfile.zulu-13u2-jre-headless
new file mode 100644
index 00000000..d96dd461
--- /dev/null
+++ b/docker/debian8/Dockerfile.zulu-13u2-jre-headless
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:jessie
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-13-azure-jre-headless=13.29+9 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-7u252-jdk b/docker/debian8/Dockerfile.zulu-7u252-jdk
new file mode 100644
index 00000000..9e9d4339
--- /dev/null
+++ b/docker/debian8/Dockerfile.zulu-7u252-jdk
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:jessie
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-7-azure-jdk=7.36.0.5 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-7u252-jre b/docker/debian8/Dockerfile.zulu-7u252-jre
new file mode 100644
index 00000000..2ecf8474
--- /dev/null
+++ b/docker/debian8/Dockerfile.zulu-7u252-jre
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:jessie
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-7-azure-jre=7.36.0.5 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-7u252-jre-headless b/docker/debian8/Dockerfile.zulu-7u252-jre-headless
new file mode 100644
index 00000000..cb9f67f7
--- /dev/null
+++ b/docker/debian8/Dockerfile.zulu-7u252-jre-headless
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:jessie
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-7-azure-jre-headless=7.36.0.5 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-8u242-jdk b/docker/debian8/Dockerfile.zulu-8u242-jdk
new file mode 100644
index 00000000..c7d3cd22
--- /dev/null
+++ b/docker/debian8/Dockerfile.zulu-8u242-jdk
@@ -0,0 +1,20 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:jessie
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jdk=8.44.0.9 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-8u242-jre b/docker/debian8/Dockerfile.zulu-8u242-jre
new file mode 100644
index 00000000..ef3c4960
--- /dev/null
+++ b/docker/debian8/Dockerfile.zulu-8u242-jre
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:jessie
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jre=8.44.0.9 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-8u242-jre-headless b/docker/debian8/Dockerfile.zulu-8u242-jre-headless
new file mode 100644
index 00000000..47871afd
--- /dev/null
+++ b/docker/debian8/Dockerfile.zulu-8u242-jre-headless
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:jessie
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jre-headless=8.44.0.9 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64

From 5378e474b12f7a8e4cb8d8106e0bacc3fa049608 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 14 Jan 2020 14:41:47 -0600
Subject: [PATCH 010/264] Added January 2020 PSU Dockerfiles

---
 docker/debian9/Dockerfile.zulu-11u6-jdk        | 18 ++++++++++++++++++
 docker/debian9/Dockerfile.zulu-11u6-jre        | 18 ++++++++++++++++++
 .../debian9/Dockerfile.zulu-11u6-jre-headless  | 18 ++++++++++++++++++
 docker/debian9/Dockerfile.zulu-13u2-jdk        | 18 ++++++++++++++++++
 docker/debian9/Dockerfile.zulu-13u2-jre        | 18 ++++++++++++++++++
 .../debian9/Dockerfile.zulu-13u2-jre-headless  | 18 ++++++++++++++++++
 docker/debian9/Dockerfile.zulu-7u252-jdk       | 18 ++++++++++++++++++
 docker/debian9/Dockerfile.zulu-7u252-jre       | 18 ++++++++++++++++++
 .../debian9/Dockerfile.zulu-7u252-jre-headless | 18 ++++++++++++++++++
 docker/debian9/Dockerfile.zulu-8u242-jdk       | 18 ++++++++++++++++++
 docker/debian9/Dockerfile.zulu-8u242-jre       | 18 ++++++++++++++++++
 .../debian9/Dockerfile.zulu-8u242-jre-headless | 18 ++++++++++++++++++
 12 files changed, 216 insertions(+)
 create mode 100644 docker/debian9/Dockerfile.zulu-11u6-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-11u6-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-11u6-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-13u2-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-13u2-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-13u2-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-7u252-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-7u252-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-7u252-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-8u242-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-8u242-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-8u242-jre-headless

diff --git a/docker/debian9/Dockerfile.zulu-11u6-jdk b/docker/debian9/Dockerfile.zulu-11u6-jdk
new file mode 100644
index 00000000..b1d3cd33
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u6-jdk
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-11-azure-jdk=11.37+17 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u6-jre b/docker/debian9/Dockerfile.zulu-11u6-jre
new file mode 100644
index 00000000..2dfb8ac3
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u6-jre
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-11-azure-jre=11.37+17 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u6-jre-headless b/docker/debian9/Dockerfile.zulu-11u6-jre-headless
new file mode 100644
index 00000000..73d0fbdf
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u6-jre-headless
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-11-azure-jre-headless=11.37+17 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u2-jdk b/docker/debian9/Dockerfile.zulu-13u2-jdk
new file mode 100644
index 00000000..af768ba9
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-13u2-jdk
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-13-azure-jdk=13.29+9 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u2-jre b/docker/debian9/Dockerfile.zulu-13u2-jre
new file mode 100644
index 00000000..1ecef845
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-13u2-jre
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-13-azure-jre=13.29+9 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u2-jre-headless b/docker/debian9/Dockerfile.zulu-13u2-jre-headless
new file mode 100644
index 00000000..a8e22fad
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-13u2-jre-headless
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-13-azure-jre-headless=13.29+9 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u252-jdk b/docker/debian9/Dockerfile.zulu-7u252-jdk
new file mode 100644
index 00000000..7e98fb0e
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-7u252-jdk
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-7-azure-jdk=7.36.0.5 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u252-jre b/docker/debian9/Dockerfile.zulu-7u252-jre
new file mode 100644
index 00000000..78d57232
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-7u252-jre
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-7-azure-jre=7.36.0.5 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u252-jre-headless b/docker/debian9/Dockerfile.zulu-7u252-jre-headless
new file mode 100644
index 00000000..efc322ab
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-7u252-jre-headless
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-7-azure-jre-headless=7.36.0.5 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u242-jdk b/docker/debian9/Dockerfile.zulu-8u242-jdk
new file mode 100644
index 00000000..a3e600b0
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u242-jdk
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jdk=8.44.0.9 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u242-jre b/docker/debian9/Dockerfile.zulu-8u242-jre
new file mode 100644
index 00000000..6948daf9
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u242-jre
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jre=8.44.0.9 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u242-jre-headless b/docker/debian9/Dockerfile.zulu-8u242-jre-headless
new file mode 100644
index 00000000..b856b394
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u242-jre-headless
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jre-headless=8.44.0.9 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64

From a54f13e962062b2846232f083f6205af2a9121a6 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 14 Jan 2020 14:42:58 -0600
Subject: [PATCH 011/264] Added January 2020 PSU Dockerfile

---
 docker/maven/Dockerfile.zulu-8u242-jdk-maven | 31 ++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 docker/maven/Dockerfile.zulu-8u242-jdk-maven

diff --git a/docker/maven/Dockerfile.zulu-8u242-jdk-maven b/docker/maven/Dockerfile.zulu-8u242-jdk-maven
new file mode 100644
index 00000000..61668756
--- /dev/null
+++ b/docker/maven/Dockerfile.zulu-8u242-jdk-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+ 
+FROM mcr.microsoft.com/java/jdk:8u242-zulu-debian9
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+ 
+ARG MAVEN_VERSION=3.6.2
+ARG USER_HOME_DIR="/root"
+ARG SHA=d941423d115cd021514bfd06c453658b1b3e39e6240969caf4315ab7119a77299713f14b620fb2571a264f8dff2473d8af3cb47b05acf0036fc2553199a5c1ee
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+ 
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+ 
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+ 
+COPY October/debian9/maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY October/debian9/maven/settings-docker.xml /usr/share/maven/ref/
+ 
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]

From 976d9c5b706fbe0605688f430debd7f225c6688e Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 14 Jan 2020 14:43:52 -0600
Subject: [PATCH 012/264] Added January 2020 PSU Dockerfiles

---
 docker/ubuntu/Dockerfile.zulu-11u6-jdk         | 18 ++++++++++++++++++
 docker/ubuntu/Dockerfile.zulu-11u6-jre         | 18 ++++++++++++++++++
 .../ubuntu/Dockerfile.zulu-11u6-jre-headless   | 18 ++++++++++++++++++
 docker/ubuntu/Dockerfile.zulu-13u2-jdk         | 18 ++++++++++++++++++
 docker/ubuntu/Dockerfile.zulu-13u2-jre         | 18 ++++++++++++++++++
 .../ubuntu/Dockerfile.zulu-13u2-jre-headless   | 18 ++++++++++++++++++
 docker/ubuntu/Dockerfile.zulu-7u252-jdk        | 18 ++++++++++++++++++
 docker/ubuntu/Dockerfile.zulu-7u252-jre        | 18 ++++++++++++++++++
 .../ubuntu/Dockerfile.zulu-7u252-jre-headless  | 18 ++++++++++++++++++
 docker/ubuntu/Dockerfile.zulu-8u242-jdk        | 18 ++++++++++++++++++
 docker/ubuntu/Dockerfile.zulu-8u242-jre        | 18 ++++++++++++++++++
 .../ubuntu/Dockerfile.zulu-8u242-jre-headless  | 18 ++++++++++++++++++
 12 files changed, 216 insertions(+)
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u6-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u6-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u6-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-13u2-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-13u2-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-13u2-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-7u252-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-7u252-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-7u252-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u242-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u242-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u242-jre-headless

diff --git a/docker/ubuntu/Dockerfile.zulu-11u6-jdk b/docker/ubuntu/Dockerfile.zulu-11u6-jdk
new file mode 100644
index 00000000..60f29680
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u6-jdk
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-11-azure-jdk=11.37+17 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u6-jre b/docker/ubuntu/Dockerfile.zulu-11u6-jre
new file mode 100644
index 00000000..079b1a53
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u6-jre
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-11-azure-jre=11.37+17 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u6-jre-headless b/docker/ubuntu/Dockerfile.zulu-11u6-jre-headless
new file mode 100644
index 00000000..c7e13410
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u6-jre-headless
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-11-azure-jre-headless=11.37+17 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u2-jdk b/docker/ubuntu/Dockerfile.zulu-13u2-jdk
new file mode 100644
index 00000000..aa288abe
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-13u2-jdk
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-13-azure-jdk=13.29+9 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u2-jre b/docker/ubuntu/Dockerfile.zulu-13u2-jre
new file mode 100644
index 00000000..7aa70154
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-13u2-jre
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-13-azure-jre=13.29+9 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u2-jre-headless b/docker/ubuntu/Dockerfile.zulu-13u2-jre-headless
new file mode 100644
index 00000000..2c329224
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-13u2-jre-headless
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-13-azure-jre-headless=13.29+9 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u252-jdk b/docker/ubuntu/Dockerfile.zulu-7u252-jdk
new file mode 100644
index 00000000..1284fe32
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-7u252-jdk
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-7-azure-jdk=7.36.0.5 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u252-jre b/docker/ubuntu/Dockerfile.zulu-7u252-jre
new file mode 100644
index 00000000..b5c947b0
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-7u252-jre
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-7-azure-jre=7.36.0.5 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u252-jre-headless b/docker/ubuntu/Dockerfile.zulu-7u252-jre-headless
new file mode 100644
index 00000000..1902e0f2
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-7u252-jre-headless
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-7-azure-jre-headless=7.36.0.5 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u242-jdk b/docker/ubuntu/Dockerfile.zulu-8u242-jdk
new file mode 100644
index 00000000..57e4564a
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u242-jdk
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jdk=8.44.0.9 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u242-jre b/docker/ubuntu/Dockerfile.zulu-8u242-jre
new file mode 100644
index 00000000..d66ae065
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u242-jre
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jre=8.44.0.9 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u242-jre-headless b/docker/ubuntu/Dockerfile.zulu-8u242-jre-headless
new file mode 100644
index 00000000..bfd7a9a8
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u242-jre-headless
@@ -0,0 +1,18 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jre-headless=8.44.0.9 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64

From bbeef7d4c7cb833498d3b9a0ea0666b2c80d325c Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 14 Jan 2020 14:44:59 -0600
Subject: [PATCH 013/264] Added January 2020 PSU Dockerfiles

---
 .../Dockerfile.zulu-11u6-jdk                  | 19 +++++++++++++++++++
 .../Dockerfile.zulu-11u6-jre                  | 19 +++++++++++++++++++
 .../Dockerfile.zulu-13u2-jdk                  | 19 +++++++++++++++++++
 .../Dockerfile.zulu-13u2-jre                  | 19 +++++++++++++++++++
 .../Dockerfile.zulu-7u252-jdk                 | 19 +++++++++++++++++++
 .../Dockerfile.zulu-7u252-jre                 | 19 +++++++++++++++++++
 .../Dockerfile.zulu-8u242-jdk                 | 19 +++++++++++++++++++
 .../Dockerfile.zulu-8u242-jre                 | 19 +++++++++++++++++++
 8 files changed, 152 insertions(+)
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-11u6-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-11u6-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-13u2-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-13u2-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-7u252-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-7u252-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-8u242-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-8u242-jre

diff --git a/docker/windowsservercore/Dockerfile.zulu-11u6-jdk b/docker/windowsservercore/Dockerfile.zulu-11u6-jdk
new file mode 100644
index 00000000..eb1ea607
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-11u6-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-11-azure-jdk_11.37.17-11.0.6-win_x64.msi && \
+    setx PACKAGE_DIR zulu-11/11.0.6 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-11"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
+
+RUN java -version
+
diff --git a/docker/windowsservercore/Dockerfile.zulu-11u6-jre b/docker/windowsservercore/Dockerfile.zulu-11u6-jre
new file mode 100644
index 00000000..e8c0ff01
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-11u6-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-11-azure-jre_11.37.17-11.0.6-win_x64.msi && \
+    setx PACKAGE_DIR zulu-11/11.0.6 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-11"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
+
+RUN java -version
+
diff --git a/docker/windowsservercore/Dockerfile.zulu-13u2-jdk b/docker/windowsservercore/Dockerfile.zulu-13u2-jdk
new file mode 100644
index 00000000..3a919d13
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-13u2-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-13-azure-jdk_13.29.9-13.0.2-win_x64.msi && \
+    setx PACKAGE_DIR zulu-13/13.0.2 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-13"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
+
+RUN java -version
+
diff --git a/docker/windowsservercore/Dockerfile.zulu-13u2-jre b/docker/windowsservercore/Dockerfile.zulu-13u2-jre
new file mode 100644
index 00000000..1013e5a0
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-13u2-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-13-azure-jre_13.29.9-13.0.2-win_x64.msi && \
+    setx PACKAGE_DIR zulu-13/13.0.2 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-13"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
+
+RUN java -version
+
diff --git a/docker/windowsservercore/Dockerfile.zulu-7u252-jdk b/docker/windowsservercore/Dockerfile.zulu-7u252-jdk
new file mode 100644
index 00000000..6b94edb2
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-7u252-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-7-azure-jdk_7.36.0.5-7.0.252-win_x64.msi && \
+    setx PACKAGE_DIR zulu-7/7u252 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-7"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
+
+RUN java -version
+
diff --git a/docker/windowsservercore/Dockerfile.zulu-7u252-jre b/docker/windowsservercore/Dockerfile.zulu-7u252-jre
new file mode 100644
index 00000000..8fb4f2ff
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-7u252-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-7-azure-jre_7.36.0.5-7.0.252-win_x64.msi && \
+    setx PACKAGE_DIR zulu-7/7u252 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-7"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
+
+RUN java -version
+
diff --git a/docker/windowsservercore/Dockerfile.zulu-8u242-jdk b/docker/windowsservercore/Dockerfile.zulu-8u242-jdk
new file mode 100644
index 00000000..21a366f8
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-8u242-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-8-azure-jdk_8.44.0.9-8.0.242-win_x64.msi && \
+    setx PACKAGE_DIR zulu-8/8u242 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-8"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
+
+RUN java -version
+
diff --git a/docker/windowsservercore/Dockerfile.zulu-8u242-jre b/docker/windowsservercore/Dockerfile.zulu-8u242-jre
new file mode 100644
index 00000000..d9393004
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-8u242-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-8-azure-jre_8.44.0.9-8.0.242-win_x64.msi && \
+    setx PACKAGE_DIR zulu-8/8u242 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-8"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
+
+RUN java -version
+

From dd1cc545b96800373178b8ec104f19cfc97e654c Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 14 Jan 2020 17:20:04 -0600
Subject: [PATCH 014/264] Upgrade to Maven v3.6.3

---
 docker/maven/Dockerfile.zulu-8u242-jdk-maven | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/maven/Dockerfile.zulu-8u242-jdk-maven b/docker/maven/Dockerfile.zulu-8u242-jdk-maven
index 61668756..0141c65d 100644
--- a/docker/maven/Dockerfile.zulu-8u242-jdk-maven
+++ b/docker/maven/Dockerfile.zulu-8u242-jdk-maven
@@ -6,9 +6,9 @@
 FROM mcr.microsoft.com/java/jdk:8u242-zulu-debian9
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
  
-ARG MAVEN_VERSION=3.6.2
+ARG MAVEN_VERSION=3.6.3
 ARG USER_HOME_DIR="/root"
-ARG SHA=d941423d115cd021514bfd06c453658b1b3e39e6240969caf4315ab7119a77299713f14b620fb2571a264f8dff2473d8af3cb47b05acf0036fc2553199a5c1ee
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
 ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
  
 RUN apt-get -q update && \

From 6bf2d9bcfef32cb041b700b2b67e1abdb76b273e Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Sun, 19 Jan 2020 09:27:47 -0600
Subject: [PATCH 015/264] Rework

---
 README.zulu-jdk.md | 111 ++++++++-------------------------------------
 1 file changed, 18 insertions(+), 93 deletions(-)

diff --git a/README.zulu-jdk.md b/README.zulu-jdk.md
index a8fdc3c9..d82c2580 100644
--- a/README.zulu-jdk.md
+++ b/README.zulu-jdk.md
@@ -1,110 +1,35 @@
-## Tags
-+ `docker pull mcr.microsoft.com/java/jdk`
-
-Java 11 Update 2:
-+ `11u2-zulu-alpine` - [Dockerfile][zulu-11u2-jdk-alpine]
-+ `11u2-zulu-centos` - [Dockerfile][zulu-11u2-jdk-centos]
-+ `11u2-zulu-debian8` - [Dockerfile][zulu-11u2-jdk-debian8]
-+ `11u2-zulu-debian9` - [Dockerfile][zulu-11u2-jdk-debian9]
-+ `11u2-zulu-ubuntu` - [Dockerfile][zulu-11u2-jdk-ubuntu]
-+ `11u2-zulu-windowsservercore` - [Dockerfile][zulu-11u2-jdk-windowsservercore]
-
-Java 8 Update 192:
-+ `8u192-zulu-alpine` - [Dockerfile][zulu-8u192-jdk-alpine]
-+ `8u192-zulu-centos` - [Dockerfile][zulu-8u192-jdk-centos]
-+ `8u192-zulu-debian8` - [Dockerfile][zulu-8u192-jdk-debian8]
-+ `8u192-zulu-debian9` - [Dockerfile][zulu-8u192-jdk-debian9]
-+ `8u192-zulu-ubuntu` - [Dockerfile][zulu-8u192-jdk-ubuntu]
-+ `8u192-zulu-windowsservercore` - [Dockerfile][zulu-8u192-jdk-windowsservercore]
-
-Java 8 Update 181:
-+ `8u181-zulu-alpine` - [Dockerfile][zulu-8u181-jdk-alpine]
-+ `8u181-zulu-centos` - [Dockerfile][zulu-8u181-jdk-centos]
-+ `8u181-zulu-debian8` - [Dockerfile][zulu-8u181-jdk-debian8]
-+ `8u181-zulu-debian9` - [Dockerfile][zulu-8u181-jdk-debian9]
-+ `8u181-zulu-ubuntu` - [Dockerfile][zulu-8u181-jdk-ubuntu]
-+ `8u181-zulu-windowsservercore` - [Dockerfile][zulu-8u181-jdk-windowsservercore]
-
-Java 7 Update 201:
-+ `7u201-zulu-alpine` - [Dockerfile][zulu-7u201-jdk-alpine]
-+ `7u201-zulu-centos` - [Dockerfile][zulu-7u201-jdk-centos]
-+ `7u201-zulu-debian8` - [Dockerfile][zulu-7u201-jdk-debian8]
-+ `7u201-zulu-debian9` - [Dockerfile][zulu-7u201-jdk-debian9]
-+ `7u201-zulu-ubuntu` - [Dockerfile][zulu-7u201-jdk-ubuntu]
-+ `7u201-zulu-windowsservercore` - [Dockerfile][zulu-7u201-jdk-windowsservercore]
-
-Java 7 Update 191:
-+ `7u191-zulu-alpine` - [Dockerfile][zulu-7u191-jdk-alpine]
-+ `7u191-zulu-centos` - [Dockerfile][zulu-7u191-jdk-centos]
-+ `7u191-zulu-debian8` - [Dockerfile][zulu-7u191-jdk-debian8]
-+ `7u191-zulu-debian9` - [Dockerfile][zulu-7u191-jdk-debian9]
-+ `7u191-zulu-ubuntu` - [Dockerfile][zulu-7u191-jdk-ubuntu]
-+ `7u191-zulu-windowsservercore` - [Dockerfile][zulu-7u191-jdk-windowsservercore]
-
-[zulu-11u2-jdk-alpine]:https://github.com/Microsoft/java/tree/master/docker/alpine/Dockerfile.zulu-11u2-jdk
-[zulu-11u2-jdk-centos]:https://github.com/Microsoft/java/tree/master/docker/centos/Dockerfile.zulu-11u2-jdk
-[zulu-11u2-jdk-debian8]:https://github.com/Microsoft/java/tree/master/docker/debian8/Dockerfile.zulu-11u2-jdk
-[zulu-11u2-jdk-debian9]:https://github.com/Microsoft/java/tree/master/docker/debian9/Dockerfile.zulu-11u2-jdk
-[zulu-11u2-jdk-ubuntu]:https://github.com/Microsoft/java/tree/master/docker/ubuntu/Dockerfile.zulu-11u2-jdk
-[zulu-11u2-jdk-windowsservercore]:https://github.com/Microsoft/java/tree/master/docker/windowsservercore/Dockerfile.zulu-11u2-jdk
-
-[zulu-8u192-jdk-alpine]:https://github.com/Microsoft/java/tree/master/docker/alpine/Dockerfile.zulu-8u192-jdk
-[zulu-8u192-jdk-centos]:https://github.com/Microsoft/java/tree/master/docker/centos/Dockerfile.zulu-8u192-jdk
-[zulu-8u192-jdk-debian8]:https://github.com/Microsoft/java/tree/master/docker/debian8/Dockerfile.zulu-8u192-jdk
-[zulu-8u192-jdk-debian9]:https://github.com/Microsoft/java/tree/master/docker/debian9/Dockerfile.zulu-8u192-jdk
-[zulu-8u192-jdk-ubuntu]:https://github.com/Microsoft/java/tree/master/docker/ubuntu/Dockerfile.zulu-8u192-jdk
-[zulu-8u192-jdk-windowsservercore]:https://github.com/Microsoft/java/tree/master/docker/windowsservercore/Dockerfile.zulu-8u192-jdk
-
-[zulu-8u181-jdk-alpine]:https://github.com/Microsoft/java/tree/master/docker/alpine/Dockerfile.zulu-8u181-jdk
-[zulu-8u181-jdk-centos]:https://github.com/Microsoft/java/tree/master/docker/centos/Dockerfile.zulu-8u181-jdk
-[zulu-8u181-jdk-debian8]:https://github.com/Microsoft/java/tree/master/docker/debian8/Dockerfile.zulu-8u181-jdk
-[zulu-8u181-jdk-debian9]:https://github.com/Microsoft/java/tree/master/docker/debian9/Dockerfile.zulu-8u181-jdk
-[zulu-8u181-jdk-ubuntu]:https://github.com/Microsoft/java/tree/master/docker/ubuntu/Dockerfile.zulu-8u181-jdk
-[zulu-8u181-jdk-windowsservercore]:https://github.com/Microsoft/java/tree/master/docker/windowsservercore/Dockerfile.zulu-8u181-jdk
-
-[zulu-7u201-jdk-alpine]:https://github.com/Microsoft/java/tree/master/docker/alpine/Dockerfile.zulu-7u201-jdk
-[zulu-7u201-jdk-centos]:https://github.com/Microsoft/java/tree/master/docker/centos/Dockerfile.zulu-7u201-jdk
-[zulu-7u201-jdk-debian8]:https://github.com/Microsoft/java/tree/master/docker/debian8/Dockerfile.zulu-7u201-jdk
-[zulu-7u201-jdk-debian9]:https://github.com/Microsoft/java/tree/master/docker/debian9/Dockerfile.zulu-7u201-jdk
-[zulu-7u201-jdk-ubuntu]:https://github.com/Microsoft/java/tree/master/docker/ubuntu/Dockerfile.zulu-7u201-jdk
-[zulu-7u201-jdk-windowsservercore]:https://github.com/Microsoft/java/tree/master/docker/windowsservercore/Dockerfile.zulu-7u201-jdk
-
-[zulu-7u191-jdk-alpine]:https://github.com/Microsoft/java/tree/master/docker/alpine/Dockerfile.zulu-7u191-jdk
-[zulu-7u191-jdk-centos]:https://github.com/Microsoft/java/tree/master/docker/centos/Dockerfile.zulu-7u191-jdk
-[zulu-7u191-jdk-debian8]:https://github.com/Microsoft/java/tree/master/docker/debian8/Dockerfile.zulu-7u191-jdk
-[zulu-7u191-jdk-debian9]:https://github.com/Microsoft/java/tree/master/docker/debian9/Dockerfile.zulu-7u191-jdk
-[zulu-7u191-jdk-ubuntu]:https://github.com/Microsoft/java/tree/master/docker/ubuntu/Dockerfile.zulu-7u191-jdk
-[zulu-7u191-jdk-windowsservercore]:https://github.com/Microsoft/java/tree/master/docker/windowsservercore/Dockerfile.zulu-7u191-jdk
-
 ## About
-	These Zulu OpenJDK Docker images and corresponding Dockerfiles are
-	to be used solely with Java applications or Java application components
-	that are being developed for deployment on Microsoft Azure or Azure Stack,
-	and are not intended to be used for any other purpose.
+These Zulu OpenJDK Docker images and corresponding Dockerfiles are
+to be used solely with Java applications or Java application components
+that are being developed for deployment on Microsoft Azure or Azure Stack,
+and are not intended to be used for any other purpose.
 
-	Each image contains the base operating system, taken at a point in time,
-	and an installed version of the Azul Zulu JDK (Java Development Kit).
+Each image contains the base operating system, taken at a point in time,
+and an installed version of the Azul Zulu JDK (Java Development Kit).
 
 ## How To Use
-+ `docker pull mcr.microsoft.com/java/jdk:tag`
-+ `docker run --rm -it mcr.microsoft.com/java/jdk:tag`
+docker pull mcr.microsoft.com/java/jdk:tag<br>
+docker run --rm -it mcr.microsoft.com/java/jdk:tag`
+
+## Further Information
+* [java/jdk](https://hub.docker.com/_/microsoft-java-jdk): Java SE JDK
 
-## Featured Repositories
+## Featured Repos
 * `https://repos.azul.com/azure-only/zulu/yum`
-* `https://repos.azul.com/azure-only/zulu/apt`
+https://repos.azul.com/azure-only/zulu/apt
 
 ## Quick Reference
 * [Azul Zulu JVM for Azure FAQ](https://assets.azul.com/files/Zulu-for-Azure-FAQ.pdf)
 * [Azul Zulu JVM for Azure](https://www.azul.com/downloads/azure-only/zulu/)
 
-## License
-[Zulu for Microsoft Azure Terms of Use](https://www.azul.com/downloads/azure-only/zulu/terms-of-use)
-
 ## Support
-[Microsoft Azure Support](https://support.microsoft.com/en-us/help/4026305/sql-contact-microsoft-azure-support)
+For support or general questions [Microsoft Azure Support](https://support.microsoft.com/en-us/help/4026305/sql-contact-microsoft-azure-support)
 
 ## Issues
-Report Docker image or Dockerfile issues [here](https://github.com/Microsoft/java/issues)
+Please direct all feedback to [Microsoft/Java](https://github.com/Microsoft/java/issues)
+
+## License
+This image is for use with [Zulu for Microsoft Azure Terms of Use](https://www.azul.com/downloads/azure-only/zulu/terms-of-use)
 
 ## Further Reading
 * [Java on Azure](https://azure.microsoft.com/en-us/develop/java/)

From c750d1e325b611170b6f6b71d34fbcf6b507e223 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Sun, 19 Jan 2020 09:32:36 -0600
Subject: [PATCH 016/264] Update README.zulu-jdk.md

---
 README.zulu-jdk.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.zulu-jdk.md b/README.zulu-jdk.md
index d82c2580..ca86a162 100644
--- a/README.zulu-jdk.md
+++ b/README.zulu-jdk.md
@@ -12,11 +12,11 @@ docker pull mcr.microsoft.com/java/jdk:tag<br>
 docker run --rm -it mcr.microsoft.com/java/jdk:tag`
 
 ## Further Information
-* [java/jdk](https://hub.docker.com/_/microsoft-java-jdk): Java SE JDK
+* [Java SE JDK](https://hub.docker.com/_/microsoft-java-jdk)
 
 ## Featured Repos
 * `https://repos.azul.com/azure-only/zulu/yum`
-https://repos.azul.com/azure-only/zulu/apt
+* `https://repos.azul.com/azure-only/zulu/apt`
 
 ## Quick Reference
 * [Azul Zulu JVM for Azure FAQ](https://assets.azul.com/files/Zulu-for-Azure-FAQ.pdf)

From 253bd7b4f82847d597e8481d55f9ef297a9bdfdb Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Sun, 19 Jan 2020 09:50:28 -0600
Subject: [PATCH 017/264] Updated README files

---
 README.md                   |   2 +-
 README.zulu-jdk.md          |   4 +-
 README.zulu-jre-headless.md | 109 ++++++------------------------------
 README.zulu-jre.md          | 109 ++++++------------------------------
 README.zulu-maven.md        |  39 ++++++-------
 5 files changed, 54 insertions(+), 209 deletions(-)

diff --git a/README.md b/README.md
index e6af828e..fb7a94f8 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ These Zulu OpenJDK Dockerfiles are to be used solely with Java applications
 or Java application components that are being developed for deployment on Microsoft
 Azure or Azure Stack, and are not intended to be used for any other purpose.
 
-# Further Information
+# Further Information On Docker Hub
 + [Azul Zulu JDK](https://hub.docker.com/_/microsoft-java-jdk)
 + [Azul Zulu JRE](https://hub.docker.com/_/microsoft-java-jre)
 + [Azul Zulu Headless JRE](https://hub.docker.com/_/microsoft-java-jre-headless)
diff --git a/README.zulu-jdk.md b/README.zulu-jdk.md
index ca86a162..cf535953 100644
--- a/README.zulu-jdk.md
+++ b/README.zulu-jdk.md
@@ -11,8 +11,8 @@ and an installed version of the Azul Zulu JDK (Java Development Kit).
 docker pull mcr.microsoft.com/java/jdk:tag<br>
 docker run --rm -it mcr.microsoft.com/java/jdk:tag`
 
-## Further Information
-* [Java SE JDK](https://hub.docker.com/_/microsoft-java-jdk)
+## Further Information On Docker Hub
+* [Azul Zulu JDK](https://hub.docker.com/_/microsoft-java-jdk)
 
 ## Featured Repos
 * `https://repos.azul.com/azure-only/zulu/yum`
diff --git a/README.zulu-jre-headless.md b/README.zulu-jre-headless.md
index 8c1caf74..cd54c565 100644
--- a/README.zulu-jre-headless.md
+++ b/README.zulu-jre-headless.md
@@ -1,95 +1,20 @@
-## Tags
-+ `docker pull mcr.microsoft.com/java/jre-headless`
-
-Java 11 Update 2:
-+ `11u2-zulu-alpine` - [Dockerfile][zulu-11u2-jre-hl-alpine]
-+ `11u2-zulu-centos` - [Dockerfile][zulu-11u2-jre-hl-centos]
-+ `11u2-zulu-debian8` - [Dockerfile][zulu-11u2-jre-hl-debian8]
-+ `11u2-zulu-debian9` - [Dockerfile][zulu-11u2-jre-hl-debian9]
-+ `11u2-zulu-ubuntu` - [Dockerfile][zulu-11u2-jre-hl-ubuntu]
-+ `11u2-zulu-windowsservercore` - [Dockerfile][zulu-11u2-jre-hl-windowsservercore]
-
-Java 8 Update 192:
-+ `8u192-zulu-alpine` - [Dockerfile][zulu-8u192-jre-hl-alpine]
-+ `8u192-zulu-centos` - [Dockerfile][zulu-8u192-jre-hl-centos]
-+ `8u192-zulu-debian8` - [Dockerfile][zulu-8u192-jre-hl-debian8]
-+ `8u192-zulu-debian9` - [Dockerfile][zulu-8u192-jre-hl-debian9]
-+ `8u192-zulu-ubuntu` - [Dockerfile][zulu-8u192-jre-hl-ubuntu]
-+ `8u192-zulu-windowsservercore` - [Dockerfile][zulu-8u192-jre-hl-windowsservercore]
-
-Java 8 Update 181:
-+ `8u181-zulu-alpine` - [Dockerfile][zulu-8u181-jre-hl-alpine]
-+ `8u181-zulu-centos` - [Dockerfile][zulu-8u181-jre-hl-centos]
-+ `8u181-zulu-debian8` - [Dockerfile][zulu-8u181-jre-hl-debian8]
-+ `8u181-zulu-debian9` - [Dockerfile][zulu-8u181-jre-hl-debian9]
-+ `8u181-zulu-ubuntu` - [Dockerfile][zulu-8u181-jre-hl-ubuntu]
-+ `8u181-zulu-windowsservercore` - [Dockerfile][zulu-8u181-jre-hl-windowsservercore]
-
-Java 7 Update 201:
-+ `7u201-zulu-alpine` - [Dockerfile][zulu-7u201-jre-hl-alpine]
-+ `7u201-zulu-centos` - [Dockerfile][zulu-7u201-jre-hl-centos]
-+ `7u201-zulu-debian8` - [Dockerfile][zulu-7u201-jre-hl-debian8]
-+ `7u201-zulu-debian9` - [Dockerfile][zulu-7u201-jre-hl-debian9]
-+ `7u201-zulu-ubuntu` - [Dockerfile][zulu-7u201-jre-hl-ubuntu]
-+ `7u201-zulu-windowsservercore` - [Dockerfile][zulu-7u201-jre-hl-windowsservercore]
-
-Java 7 Update 191:
-+ `7u191-zulu-alpine` - [Dockerfile][zulu-7u191-jre-hl-alpine]
-+ `7u191-zulu-centos` - [Dockerfile][zulu-7u191-jre-hl-centos]
-+ `7u191-zulu-debian8` - [Dockerfile][zulu-7u191-jre-hl-debian8]
-+ `7u191-zulu-debian9` - [Dockerfile][zulu-7u191-jre-hl-debian9]
-+ `7u191-zulu-ubuntu` - [Dockerfile][zulu-7u191-jre-hl-ubuntu]
-+ `7u191-zulu-windowsservercore` - [Dockerfile][zulu-7u191-jre-hl-windowsservercore]
-
-[zulu-11u2-jre-hl-alpine]:https://github.com/Microsoft/java/tree/master/docker/alpine/Dockerfile.zulu-11u2-jre-headless
-[zulu-11u2-jre-hl-centos]:https://github.com/Microsoft/java/tree/master/docker/centos/Dockerfile.zulu-11u2-jre-headless
-[zulu-11u2-jre-hl-debian8]:https://github.com/Microsoft/java/tree/master/docker/debian8/Dockerfile.zulu-11u2-jre-headless
-[zulu-11u2-jre-hl-debian9]:https://github.com/Microsoft/java/tree/master/docker/debian9/Dockerfile.zulu-11u2-jre-headless
-[zulu-11u2-jre-hl-ubuntu]:https://github.com/Microsoft/java/tree/master/docker/ubuntu/Dockerfile.zulu-11u2-jre-headless
-[zulu-11u2-jre-hl-windowsservercore]:https://github.com/Microsoft/java/tree/master/docker/windowsservercore/Dockerfile.zulu-11u2-jre-headless
-
-[zulu-8u192-jre-hl-alpine]:https://github.com/Microsoft/java/tree/master/docker/alpine/Dockerfile.zulu-8u192-jre-headless
-[zulu-8u192-jre-hl-centos]:https://github.com/Microsoft/java/tree/master/docker/centos/Dockerfile.zulu-8u192-jre-headless
-[zulu-8u192-jre-hl-debian8]:https://github.com/Microsoft/java/tree/master/docker/debian8/Dockerfile.zulu-8u192-jre-headless
-[zulu-8u192-jre-hl-debian9]:https://github.com/Microsoft/java/tree/master/docker/debian9/Dockerfile.zulu-8u192-jre-headless
-[zulu-8u192-jre-hl-ubuntu]:https://github.com/Microsoft/java/tree/master/docker/ubuntu/Dockerfile.zulu-8u192-jre-headless
-[zulu-8u192-jre-hl-windowsservercore]:https://github.com/Microsoft/java/tree/master/docker/windowsservercore/Dockerfile.zulu-8u192-jre-headless
-
-[zulu-8u181-jre-hl-alpine]:https://github.com/Microsoft/java/tree/master/docker/alpine/Dockerfile.zulu-8u181-jre-headless
-[zulu-8u181-jre-hl-centos]:https://github.com/Microsoft/java/tree/master/docker/centos/Dockerfile.zulu-8u181-jre-headless
-[zulu-8u181-jre-hl-debian8]:https://github.com/Microsoft/java/tree/master/docker/debian8/Dockerfile.zulu-8u181-jre-headless
-[zulu-8u181-jre-hl-debian9]:https://github.com/Microsoft/java/tree/master/docker/debian9/Dockerfile.zulu-8u181-jre-headless
-[zulu-8u181-jre-hl-ubuntu]:https://github.com/Microsoft/java/tree/master/docker/ubuntu/Dockerfile.zulu-8u181-jre-headless
-[zulu-8u181-jre-hl-windowsservercore]:https://github.com/Microsoft/java/tree/master/docker/windowsservercore/Dockerfile.zulu-8u181-jre-headless
-
-[zulu-7u201-jre-hl-alpine]:https://github.com/Microsoft/java/tree/master/docker/alpine/Dockerfile.zulu-7u201-jre-headless
-[zulu-7u201-jre-hl-centos]:https://github.com/Microsoft/java/tree/master/docker/centos/Dockerfile.zulu-7u201-jre-headless
-[zulu-7u201-jre-hl-debian8]:https://github.com/Microsoft/java/tree/master/docker/debian8/Dockerfile.zulu-7u201-jre-headless
-[zulu-7u201-jre-hl-debian9]:https://github.com/Microsoft/java/tree/master/docker/debian9/Dockerfile.zulu-7u201-jre-headless
-[zulu-7u201-jre-hl-ubuntu]:https://github.com/Microsoft/java/tree/master/docker/ubuntu/Dockerfile.zulu-7u201-jre-headless
-[zulu-7u201-jre-hl-windowsservercore]:https://github.com/Microsoft/java/tree/master/docker/windowsservercore/Dockerfile.zulu-7u201-jre-headless
-
-[zulu-7u191-jre-hl-alpine]:https://github.com/Microsoft/java/tree/master/docker/alpine/Dockerfile.zulu-7u191-jre-headless
-[zulu-7u191-jre-hl-centos]:https://github.com/Microsoft/java/tree/master/docker/centos/Dockerfile.zulu-7u191-jre-headless
-[zulu-7u191-jre-hl-debian8]:https://github.com/Microsoft/java/tree/master/docker/debian8/Dockerfile.zulu-7u191-jre-headless
-[zulu-7u191-jre-hl-debian9]:https://github.com/Microsoft/java/tree/master/docker/debian9/Dockerfile.zulu-7u191-jre-headless
-[zulu-7u191-jre-hl-ubuntu]:https://github.com/Microsoft/java/tree/master/docker/ubuntu/Dockerfile.zulu-7u191-jre-headless
-[zulu-7u191-jre-hl-windowsservercore]:https://github.com/Microsoft/java/tree/master/docker/windowsservercore/Dockerfile.zulu-7u191-jre-headless
-
 ## About
-	These Zulu OpenJDK Docker images and corresponding Dockerfiles are
-	to be used solely with Java applications or Java application components
-	that are being developed for deployment on Microsoft Azure or Azure Stack,
-	and are not intended to be used for any other purpose.
+These Zulu OpenJDK Docker images and corresponding Dockerfiles are
+to be used solely with Java applications or Java application components
+that are being developed for deployment on Microsoft Azure or Azure Stack,
+and are not intended to be used for any other purpose.
 
-	Each image contains the base operating system, taken at a point in time,
-	and an installed version of the Azul Zulu Headless JRE (Java Runtime Environment).
+Each image contains the base operating system, taken at a point in time,
+and an installed version of the Azul Zulu Headless JRE (Java Runtime Environment).
 
 ## How To Use
-+ `docker pull mcr.microsoft.com/java/jre-headless:tag`
-+ `docker run --rm -it mcr.microsoft.com/java/jre-headless:tag`
+docker pull mcr.microsoft.com/java/jre-headless:tag<br>
+docker run --rm -it mcr.microsoft.com/java/jre-headless:tag
+
+## Further Information On Docker Hub
+* [Azul Zulu Headless JRE](https://hub.docker.com/_/microsoft-java-jre-headless)
 
-## Featured Repositories
+## Featured Repos
 * `https://repos.azul.com/azure-only/zulu/yum`
 * `https://repos.azul.com/azure-only/zulu/apt`
 
@@ -97,14 +22,14 @@ Java 7 Update 191:
 * [Azul Zulu JVM for Azure FAQ](https://assets.azul.com/files/Zulu-for-Azure-FAQ.pdf)
 * [Azul Zulu JVM for Azure](https://www.azul.com/downloads/azure-only/zulu/)
 
-## License
-[Zulu for Microsoft Azure Terms of Use](https://www.azul.com/downloads/azure-only/zulu/terms-of-use)
-
 ## Support
-[Microsoft Azure Support](https://support.microsoft.com/en-us/help/4026305/sql-contact-microsoft-azure-support)
+For support or general questions [Microsoft Azure Support](https://support.microsoft.com/en-us/help/4026305/sql-contact-microsoft-azure-support)
 
 ## Issues
-Report Docker image or Dockerfile issues [here](https://github.com/Microsoft/java/issues)
+Please direct all feedback to [Microsoft/Java](https://github.com/Microsoft/java/issues)
+
+## License
+This image is for use with [Zulu for Microsoft Azure Terms of Use](https://www.azul.com/downloads/azure-only/zulu/terms-of-use)
 
 ## Further Reading
 * [Java on Azure](https://azure.microsoft.com/en-us/develop/java/)
diff --git a/README.zulu-jre.md b/README.zulu-jre.md
index 249e982b..ae9a9d7b 100644
--- a/README.zulu-jre.md
+++ b/README.zulu-jre.md
@@ -1,95 +1,20 @@
-## Tags
-+ `docker pull mcr.microsoft.com/java/jre`
-
-Java 11 Update 2:
-+ `11u2-zulu-alpine` - [Dockerfile][zulu-11u2-jre-alpine]
-+ `11u2-zulu-centos` - [Dockerfile][zulu-11u2-jre-centos]
-+ `11u2-zulu-debian8` - [Dockerfile][zulu-11u2-jre-debian8]
-+ `11u2-zulu-debian9` - [Dockerfile][zulu-11u2-jre-debian9]
-+ `11u2-zulu-ubuntu` - [Dockerfile][zulu-11u2-jre-ubuntu]
-+ `11u2-zulu-windowsservercore` - [Dockerfile][zulu-11u2-jre-windowsservercore]
-
-Java 8 Update 192:
-+ `8u192-zulu-alpine` - [Dockerfile][zulu-8u192-jre-alpine]
-+ `8u192-zulu-centos` - [Dockerfile][zulu-8u192-jre-centos]
-+ `8u192-zulu-debian8` - [Dockerfile][zulu-8u192-jre-debian8]
-+ `8u192-zulu-debian9` - [Dockerfile][zulu-8u192-jre-debian9]
-+ `8u192-zulu-ubuntu` - [Dockerfile][zulu-8u192-jre-ubuntu]
-+ `8u192-zulu-windowsservercore` - [Dockerfile][zulu-8u192-jre-windowsservercore]
-
-Java 8 Update 181:
-+ `8u181-zulu-alpine` - [Dockerfile][zulu-8u181-jre-alpine]
-+ `8u181-zulu-centos` - [Dockerfile][zulu-8u181-jre-centos]
-+ `8u181-zulu-debian8` - [Dockerfile][zulu-8u181-jre-debian8]
-+ `8u181-zulu-debian9` - [Dockerfile][zulu-8u181-jre-debian9]
-+ `8u181-zulu-ubuntu` - [Dockerfile][zulu-8u181-jre-ubuntu]
-+ `8u181-zulu-windowsservercore` - [Dockerfile][zulu-8u181-jre-windowsservercore]
-
-Java 7 Update 201:
-+ `7u201-zulu-alpine` - [Dockerfile][zulu-7u201-jre-alpine]
-+ `7u201-zulu-centos` - [Dockerfile][zulu-7u201-jre-centos]
-+ `7u201-zulu-debian8` - [Dockerfile][zulu-7u201-jre-debian8]
-+ `7u201-zulu-debian9` - [Dockerfile][zulu-7u201-jre-debian9]
-+ `7u201-zulu-ubuntu` - [Dockerfile][zulu-7u201-jre-ubuntu]
-+ `7u201-zulu-windowsservercore` - [Dockerfile][zulu-7u201-jre-windowsservercore]
-
-Java 7 Update 191:
-+ `7u191-zulu-alpine` - [Dockerfile][zulu-7u191-jre-alpine]
-+ `7u191-zulu-centos` - [Dockerfile][zulu-7u191-jre-centos]
-+ `7u191-zulu-debian8` - [Dockerfile][zulu-7u191-jre-debian8]
-+ `7u191-zulu-debian9` - [Dockerfile][zulu-7u191-jre-debian9]
-+ `7u191-zulu-ubuntu` - [Dockerfile][zulu-7u191-jre-ubuntu]
-+ `7u191-zulu-windowsservercore` - [Dockerfile][zulu-7u191-jre-windowsservercore]
-
-[zulu-11u2-jre-alpine]:https://github.com/Microsoft/java/tree/master/docker/alpine/Dockerfile.zulu-11u2-jre
-[zulu-11u2-jre-centos]:https://github.com/Microsoft/java/tree/master/docker/centos/Dockerfile.zulu-11u2-jre
-[zulu-11u2-jre-debian8]:https://github.com/Microsoft/java/tree/master/docker/debian8/Dockerfile.zulu-11u2-jre
-[zulu-11u2-jre-debian9]:https://github.com/Microsoft/java/tree/master/docker/debian9/Dockerfile.zulu-11u2-jre
-[zulu-11u2-jre-ubuntu]:https://github.com/Microsoft/java/tree/master/docker/ubuntu/Dockerfile.zulu-11u2-jre
-[zulu-11u2-jre-windowsservercore]:https://github.com/Microsoft/java/tree/master/docker/windowsservercore/Dockerfile.zulu-11u2-jre
-
-[zulu-8u192-jre-alpine]:https://github.com/Microsoft/java/tree/master/docker/alpine/Dockerfile.zulu-8u192-jre
-[zulu-8u192-jre-centos]:https://github.com/Microsoft/java/tree/master/docker/centos/Dockerfile.zulu-8u192-jre
-[zulu-8u192-jre-debian8]:https://github.com/Microsoft/java/tree/master/docker/debian8/Dockerfile.zulu-8u192-jre
-[zulu-8u192-jre-debian9]:https://github.com/Microsoft/java/tree/master/docker/debian9/Dockerfile.zulu-8u192-jre
-[zulu-8u192-jre-ubuntu]:https://github.com/Microsoft/java/tree/master/docker/ubuntu/Dockerfile.zulu-8u192-jre
-[zulu-8u192-jre-windowsservercore]:https://github.com/Microsoft/java/tree/master/docker/windowsservercore/Dockerfile.zulu-8u192-jre
-
-[zulu-8u181-jre-alpine]:https://github.com/Microsoft/java/tree/master/docker/alpine/Dockerfile.zulu-8u181-jre
-[zulu-8u181-jre-centos]:https://github.com/Microsoft/java/tree/master/docker/centos/Dockerfile.zulu-8u181-jre
-[zulu-8u181-jre-debian8]:https://github.com/Microsoft/java/tree/master/docker/debian8/Dockerfile.zulu-8u181-jre
-[zulu-8u181-jre-debian9]:https://github.com/Microsoft/java/tree/master/docker/debian9/Dockerfile.zulu-8u181-jre
-[zulu-8u181-jre-ubuntu]:https://github.com/Microsoft/java/tree/master/docker/ubuntu/Dockerfile.zulu-8u181-jre
-[zulu-8u181-jre-windowsservercore]:https://github.com/Microsoft/java/tree/master/docker/windowsservercore/Dockerfile.zulu-8u181-jre
-
-[zulu-7u201-jre-alpine]:https://github.com/Microsoft/java/tree/master/docker/alpine/Dockerfile.zulu-7u201-jre
-[zulu-7u201-jre-centos]:https://github.com/Microsoft/java/tree/master/docker/centos/Dockerfile.zulu-7u201-jre
-[zulu-7u201-jre-debian8]:https://github.com/Microsoft/java/tree/master/docker/debian8/Dockerfile.zulu-7u201-jre
-[zulu-7u201-jre-debian9]:https://github.com/Microsoft/java/tree/master/docker/debian9/Dockerfile.zulu-7u201-jre
-[zulu-7u201-jre-ubuntu]:https://github.com/Microsoft/java/tree/master/docker/ubuntu/Dockerfile.zulu-7u201-jre
-[zulu-7u201-jre-windowsservercore]:https://github.com/Microsoft/java/tree/master/docker/windowsservercore/Dockerfile.zulu-7u201-jre
-
-[zulu-7u191-jre-alpine]:https://github.com/Microsoft/java/tree/master/docker/alpine/Dockerfile.zulu-7u191-jre
-[zulu-7u191-jre-centos]:https://github.com/Microsoft/java/tree/master/docker/centos/Dockerfile.zulu-7u191-jre
-[zulu-7u191-jre-debian8]:https://github.com/Microsoft/java/tree/master/docker/debian8/Dockerfile.zulu-7u191-jre
-[zulu-7u191-jre-debian9]:https://github.com/Microsoft/java/tree/master/docker/debian9/Dockerfile.zulu-7u191-jre
-[zulu-7u191-jre-ubuntu]:https://github.com/Microsoft/java/tree/master/docker/ubuntu/Dockerfile.zulu-7u191-jre
-[zulu-7u191-jre-windowsservercore]:https://github.com/Microsoft/java/tree/master/docker/windowsservercore/Dockerfile.zulu-7u191-jre
-
 ## About
-	These Zulu OpenJDK Docker images and corresponding Dockerfiles are
-	to be used solely with Java applications or Java application components
-	that are being developed for deployment on Microsoft Azure or Azure Stack,
-	and are not intended to be used for any other purpose.
+These Zulu OpenJDK Docker images and corresponding Dockerfiles are
+to be used solely with Java applications or Java application components
+that are being developed for deployment on Microsoft Azure or Azure Stack,
+and are not intended to be used for any other purpose.
 
-	Each image contains the base operating system, taken at a point in time,
-	and an installed version of the Azul Zulu Full JRE (Java Runtime Environment).
+Each image contains the base operating system, taken at a point in time,
+and an installed version of the Azul Zulu Full JRE (Java Runtime Environment).
 
 ## How To Use
-+ `docker pull mcr.microsoft.com/java/jre:tag`
-+ `docker run --rm -it mcr.microsoft.com/java/jre:tag`
+docker pull mcr.microsoft.com/java/jre:tag<br>
+docker run --rm -it mcr.microsoft.com/java/jre:tag
+
+## Further Information On Docker Hub
+* [Azul Zulu JRE](https://hub.docker.com/_/microsoft-java-jre)
 
-## Featured Repositories
+## Featured Repos
 * `https://repos.azul.com/azure-only/zulu/yum`
 * `https://repos.azul.com/azure-only/zulu/apt`
 
@@ -97,14 +22,14 @@ Java 7 Update 191:
 * [Azul Zulu JVM for Azure FAQ](https://assets.azul.com/files/Zulu-for-Azure-FAQ.pdf)
 * [Azul Zulu JVM for Azure](https://www.azul.com/downloads/azure-only/zulu/)
 
-## License
-[Zulu for Microsoft Azure Terms of Use](https://www.azul.com/downloads/azure-only/zulu/terms-of-use)
-
 ## Support
-[Microsoft Azure Support](https://support.microsoft.com/en-us/help/4026305/sql-contact-microsoft-azure-support)
+For support or general questions [Microsoft Azure Support](https://support.microsoft.com/en-us/help/4026305/sql-contact-microsoft-azure-support)
 
 ## Issues
-Report Docker image or Dockerfile issues [here](https://github.com/Microsoft/java/issues)
+Please direct all feedback to [Microsoft/Java](https://github.com/Microsoft/java/issues)
+
+## License
+This image is for use with [Zulu for Microsoft Azure Terms of Use](https://www.azul.com/downloads/azure-only/zulu/terms-of-use)
 
 ## Further Reading
 * [Java on Azure](https://azure.microsoft.com/en-us/develop/java/)
diff --git a/README.zulu-maven.md b/README.zulu-maven.md
index 1c2eead4..54939397 100644
--- a/README.zulu-maven.md
+++ b/README.zulu-maven.md
@@ -1,25 +1,20 @@
-## Tags
-+ `docker pull mcr.microsoft.com/java/maven`
-
-Java 8 Update 192:
-+ `8u192-zulu-debian9` - [Dockerfile][zulu-8u192-jdk-debian9]
-
-[zulu-8u192-jdk-debian9]:https://github.com/Microsoft/java/tree/master/docker/maven/Dockerfile.zulu-8u192-jdk-maven
-
 ## About
-	These Zulu OpenJDK Docker images and corresponding Dockerfiles are
-	to be used solely with Java applications or Java application components
-	that are being developed for deployment on Microsoft Azure or Azure Stack,
-	and are not intended to be used for any other purpose.
+These Zulu OpenJDK Docker images and corresponding Dockerfiles are
+to be used solely with Java applications or Java application components
+that are being developed for deployment on Microsoft Azure or Azure Stack,
+and are not intended to be used for any other purpose.
 
-	Each image contains the base operating system, taken at a point in time,
-	and an installed version of the Azul Zulu JDK (Java Development Kit) and Maven.
+Each image contains the base operating system, taken at a point in time,
+and an installed version of the Azul Zulu JDK (Java Development Kit) and Maven.
 
 ## How To Use
-+ `docker pull mcr.microsoft.com/java/maven:tag`
-+ `docker run --rm -it mcr.microsoft.com/java/maven:tag`
+docker pull mcr.microsoft.com/java/maven:tag<br>
+docker run --rm -it mcr.microsoft.com/java/maven:tag
+
+## Further Information On Docker Hub
+* [Azul Zulu JDK And Maven](https://hub.docker.com/_/microsoft-java-maven)
 
-## Featured Repositories
+## Featured Repos
 * `https://repos.azul.com/azure-only/zulu/yum`
 * `https://repos.azul.com/azure-only/zulu/apt`
 
@@ -27,14 +22,14 @@ Java 8 Update 192:
 * [Azul Zulu JVM for Azure FAQ](https://assets.azul.com/files/Zulu-for-Azure-FAQ.pdf)
 * [Azul Zulu JVM for Azure](https://www.azul.com/downloads/azure-only/zulu/)
 
-## License
-[Zulu for Microsoft Azure Terms of Use](https://www.azul.com/downloads/azure-only/zulu/terms-of-use)
-
 ## Support
-[Microsoft Azure Support](https://support.microsoft.com/en-us/help/4026305/sql-contact-microsoft-azure-support)
+For support or general questions [Microsoft Azure Support](https://support.microsoft.com/en-us/help/4026305/sql-contact-microsoft-azure-support)
 
 ## Issues
-Report Docker image or Dockerfile issues [here](https://github.com/Microsoft/java/issues)
+Please direct all feedback to [Microsoft/Java](https://github.com/Microsoft/java/issues)
+
+## License
+This image is for use with [Zulu for Microsoft Azure Terms of Use](https://www.azul.com/downloads/azure-only/zulu/terms-of-use)
 
 ## Further Reading
 * [Java on Azure](https://azure.microsoft.com/en-us/develop/java/)

From 387fcd0d735687b4d776154b7d54422e4c333555 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Sun, 19 Jan 2020 09:51:22 -0600
Subject: [PATCH 018/264] Update README.md

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index fb7a94f8..3074ceda 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,15 @@
-# About
+## About
 These Zulu OpenJDK Dockerfiles are to be used solely with Java applications
 or Java application components that are being developed for deployment on Microsoft
 Azure or Azure Stack, and are not intended to be used for any other purpose.
 
-# Further Information On Docker Hub
+## Further Information On Docker Hub
 + [Azul Zulu JDK](https://hub.docker.com/_/microsoft-java-jdk)
 + [Azul Zulu JRE](https://hub.docker.com/_/microsoft-java-jre)
 + [Azul Zulu Headless JRE](https://hub.docker.com/_/microsoft-java-jre-headless)
 + [Azul Zulu JDK And Maven](https://hub.docker.com/_/microsoft-java-maven)
 
-# Contributing
+## Contributing
 This project welcomes contributions and suggestions.  Most contributions require you to agree to a
 Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us
 the rights to use your contribution. For details, visit https://cla.microsoft.com.
@@ -18,6 +18,6 @@ When you submit a pull request, a CLA-bot will automatically determine whether y
 a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions
 provided by the bot. You will only need to do this once across all repos using our CLA.
  
-# Code of Conduct
+## Code of Conduct
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
 

From 6744011b5a2fff0908628693eb13c6a09f2f6700 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Sun, 19 Jan 2020 10:41:30 -0600
Subject: [PATCH 019/264] Add files via upload

---
 README.zulu-jdk.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.zulu-jdk.md b/README.zulu-jdk.md
index cf535953..d6e641d8 100644
--- a/README.zulu-jdk.md
+++ b/README.zulu-jdk.md
@@ -9,7 +9,7 @@ and an installed version of the Azul Zulu JDK (Java Development Kit).
 
 ## How To Use
 docker pull mcr.microsoft.com/java/jdk:tag<br>
-docker run --rm -it mcr.microsoft.com/java/jdk:tag`
+docker run --rm -it mcr.microsoft.com/java/jdk:tag
 
 ## Further Information On Docker Hub
 * [Azul Zulu JDK](https://hub.docker.com/_/microsoft-java-jdk)

From 8461d34b2367c60601b157cd210a8a0ae5a76b3b Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Sun, 19 Jan 2020 16:58:42 -0600
Subject: [PATCH 020/264] Updated README files

---
 README.md                   | 10 +++++-----
 README.zulu-jdk.md          | 14 +++++---------
 README.zulu-jre-headless.md | 14 +++++---------
 README.zulu-jre.md          | 14 +++++---------
 4 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/README.md b/README.md
index 3074ceda..b81e11f4 100644
--- a/README.md
+++ b/README.md
@@ -3,11 +3,11 @@ These Zulu OpenJDK Dockerfiles are to be used solely with Java applications
 or Java application components that are being developed for deployment on Microsoft
 Azure or Azure Stack, and are not intended to be used for any other purpose.
 
-## Further Information On Docker Hub
-+ [Azul Zulu JDK](https://hub.docker.com/_/microsoft-java-jdk)
-+ [Azul Zulu JRE](https://hub.docker.com/_/microsoft-java-jre)
-+ [Azul Zulu Headless JRE](https://hub.docker.com/_/microsoft-java-jre-headless)
-+ [Azul Zulu JDK And Maven](https://hub.docker.com/_/microsoft-java-maven)
+## Further Information
++ See [Azul Zulu JDK](https://hub.docker.com/_/microsoft-java-jdk) on Docker Hub for more information.
++ See [Azul Zulu JRE](https://hub.docker.com/_/microsoft-java-jre) on Docker Hub for more information
++ See [Azul Zulu Headless JRE](https://hub.docker.com/_/microsoft-java-jre-headless) on Docker Hub for more information.
++ See [Azul Zulu JDK And Maven](https://hub.docker.com/_/microsoft-java-maven) on Docker Hub for more information.
 
 ## Contributing
 This project welcomes contributions and suggestions.  Most contributions require you to agree to a
diff --git a/README.zulu-jdk.md b/README.zulu-jdk.md
index d6e641d8..9c94d6c9 100644
--- a/README.zulu-jdk.md
+++ b/README.zulu-jdk.md
@@ -1,18 +1,14 @@
 ## About
-These Zulu OpenJDK Docker images and corresponding Dockerfiles are
-to be used solely with Java applications or Java application components
-that are being developed for deployment on Microsoft Azure or Azure Stack,
-and are not intended to be used for any other purpose.
-
-Each image contains the base operating system, taken at a point in time,
-and an installed version of the Azul Zulu JDK (Java Development Kit).
+These Zulu OpenJDK Dockerfiles are to be used solely with Java applications
+or Java application components that are being developed for deployment on Microsoft
+Azure or Azure Stack, and are not intended to be used for any other purpose.
 
 ## How To Use
 docker pull mcr.microsoft.com/java/jdk:tag<br>
 docker run --rm -it mcr.microsoft.com/java/jdk:tag
 
-## Further Information On Docker Hub
-* [Azul Zulu JDK](https://hub.docker.com/_/microsoft-java-jdk)
+## Further Information 
+See [Azul Zulu JDK](https://hub.docker.com/_/microsoft-java-jdk) on Docker Hub for more information.
 
 ## Featured Repos
 * `https://repos.azul.com/azure-only/zulu/yum`
diff --git a/README.zulu-jre-headless.md b/README.zulu-jre-headless.md
index cd54c565..be1261fe 100644
--- a/README.zulu-jre-headless.md
+++ b/README.zulu-jre-headless.md
@@ -1,18 +1,14 @@
 ## About
-These Zulu OpenJDK Docker images and corresponding Dockerfiles are
-to be used solely with Java applications or Java application components
-that are being developed for deployment on Microsoft Azure or Azure Stack,
-and are not intended to be used for any other purpose.
-
-Each image contains the base operating system, taken at a point in time,
-and an installed version of the Azul Zulu Headless JRE (Java Runtime Environment).
+These Zulu OpenJDK Dockerfiles are to be used solely with Java applications
+or Java application components that are being developed for deployment on Microsoft
+Azure or Azure Stack, and are not intended to be used for any other purpose.
 
 ## How To Use
 docker pull mcr.microsoft.com/java/jre-headless:tag<br>
 docker run --rm -it mcr.microsoft.com/java/jre-headless:tag
 
-## Further Information On Docker Hub
-* [Azul Zulu Headless JRE](https://hub.docker.com/_/microsoft-java-jre-headless)
+## Further Information
+See [Azul Zulu Headless JRE](https://hub.docker.com/_/microsoft-java-jre-headless) on Docker Hub for more information.
 
 ## Featured Repos
 * `https://repos.azul.com/azure-only/zulu/yum`
diff --git a/README.zulu-jre.md b/README.zulu-jre.md
index ae9a9d7b..ae7ee11d 100644
--- a/README.zulu-jre.md
+++ b/README.zulu-jre.md
@@ -1,18 +1,14 @@
 ## About
-These Zulu OpenJDK Docker images and corresponding Dockerfiles are
-to be used solely with Java applications or Java application components
-that are being developed for deployment on Microsoft Azure or Azure Stack,
-and are not intended to be used for any other purpose.
-
-Each image contains the base operating system, taken at a point in time,
-and an installed version of the Azul Zulu Full JRE (Java Runtime Environment).
+These Zulu OpenJDK Dockerfiles are to be used solely with Java applications
+or Java application components that are being developed for deployment on Microsoft
+Azure or Azure Stack, and are not intended to be used for any other purpose.
 
 ## How To Use
 docker pull mcr.microsoft.com/java/jre:tag<br>
 docker run --rm -it mcr.microsoft.com/java/jre:tag
 
-## Further Information On Docker Hub
-* [Azul Zulu JRE](https://hub.docker.com/_/microsoft-java-jre)
+## Further Information
+See [Azul Zulu JRE](https://hub.docker.com/_/microsoft-java-jre) on Docker Hub for more information.
 
 ## Featured Repos
 * `https://repos.azul.com/azure-only/zulu/yum`

From 988504eec1c591f8f229ac90fe086a0098b974d2 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Sun, 19 Jan 2020 17:02:12 -0600
Subject: [PATCH 021/264] Updated README files

---
 README.md                   |  8 ++++----
 README.zulu-jdk.md          |  2 +-
 README.zulu-jre-headless.md |  2 +-
 README.zulu-jre.md          |  2 +-
 README.zulu-maven.md        | 14 +++++---------
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index b81e11f4..36c7e05b 100644
--- a/README.md
+++ b/README.md
@@ -4,10 +4,10 @@ or Java application components that are being developed for deployment on Micros
 Azure or Azure Stack, and are not intended to be used for any other purpose.
 
 ## Further Information
-+ See [Azul Zulu JDK](https://hub.docker.com/_/microsoft-java-jdk) on Docker Hub for more information.
-+ See [Azul Zulu JRE](https://hub.docker.com/_/microsoft-java-jre) on Docker Hub for more information
-+ See [Azul Zulu Headless JRE](https://hub.docker.com/_/microsoft-java-jre-headless) on Docker Hub for more information.
-+ See [Azul Zulu JDK And Maven](https://hub.docker.com/_/microsoft-java-maven) on Docker Hub for more information.
++ See [Java SE JDK](https://hub.docker.com/_/microsoft-java-jdk) on Docker Hub for more information.
++ See [Java SE JRE](https://hub.docker.com/_/microsoft-java-jre) on Docker Hub for more information
++ See [Java SE Headless JRE](https://hub.docker.com/_/microsoft-java-jre-headless) on Docker Hub for more information.
++ See [Java SE JDK And Maven](https://hub.docker.com/_/microsoft-java-maven) on Docker Hub for more information.
 
 ## Contributing
 This project welcomes contributions and suggestions.  Most contributions require you to agree to a
diff --git a/README.zulu-jdk.md b/README.zulu-jdk.md
index 9c94d6c9..4ad46b19 100644
--- a/README.zulu-jdk.md
+++ b/README.zulu-jdk.md
@@ -8,7 +8,7 @@ docker pull mcr.microsoft.com/java/jdk:tag<br>
 docker run --rm -it mcr.microsoft.com/java/jdk:tag
 
 ## Further Information 
-See [Azul Zulu JDK](https://hub.docker.com/_/microsoft-java-jdk) on Docker Hub for more information.
+See [Java SE JDK](https://hub.docker.com/_/microsoft-java-jdk) on Docker Hub for more information.
 
 ## Featured Repos
 * `https://repos.azul.com/azure-only/zulu/yum`
diff --git a/README.zulu-jre-headless.md b/README.zulu-jre-headless.md
index be1261fe..2aa5697d 100644
--- a/README.zulu-jre-headless.md
+++ b/README.zulu-jre-headless.md
@@ -8,7 +8,7 @@ docker pull mcr.microsoft.com/java/jre-headless:tag<br>
 docker run --rm -it mcr.microsoft.com/java/jre-headless:tag
 
 ## Further Information
-See [Azul Zulu Headless JRE](https://hub.docker.com/_/microsoft-java-jre-headless) on Docker Hub for more information.
+See [Java SE Headless JRE](https://hub.docker.com/_/microsoft-java-jre-headless) on Docker Hub for more information.
 
 ## Featured Repos
 * `https://repos.azul.com/azure-only/zulu/yum`
diff --git a/README.zulu-jre.md b/README.zulu-jre.md
index ae7ee11d..784d2867 100644
--- a/README.zulu-jre.md
+++ b/README.zulu-jre.md
@@ -8,7 +8,7 @@ docker pull mcr.microsoft.com/java/jre:tag<br>
 docker run --rm -it mcr.microsoft.com/java/jre:tag
 
 ## Further Information
-See [Azul Zulu JRE](https://hub.docker.com/_/microsoft-java-jre) on Docker Hub for more information.
+See [Java SE JRE](https://hub.docker.com/_/microsoft-java-jre) on Docker Hub for more information.
 
 ## Featured Repos
 * `https://repos.azul.com/azure-only/zulu/yum`
diff --git a/README.zulu-maven.md b/README.zulu-maven.md
index 54939397..cd7b475a 100644
--- a/README.zulu-maven.md
+++ b/README.zulu-maven.md
@@ -1,18 +1,14 @@
 ## About
-These Zulu OpenJDK Docker images and corresponding Dockerfiles are
-to be used solely with Java applications or Java application components
-that are being developed for deployment on Microsoft Azure or Azure Stack,
-and are not intended to be used for any other purpose.
-
-Each image contains the base operating system, taken at a point in time,
-and an installed version of the Azul Zulu JDK (Java Development Kit) and Maven.
+These Zulu OpenJDK Dockerfiles are to be used solely with Java applications
+or Java application components that are being developed for deployment on Microsoft
+Azure or Azure Stack, and are not intended to be used for any other purpose.
 
 ## How To Use
 docker pull mcr.microsoft.com/java/maven:tag<br>
 docker run --rm -it mcr.microsoft.com/java/maven:tag
 
-## Further Information On Docker Hub
-* [Azul Zulu JDK And Maven](https://hub.docker.com/_/microsoft-java-maven)
+## Further Information
+See [Java SE JDK And Maven](https://hub.docker.com/_/microsoft-java-maven) on Docker Hub for more information.
 
 ## Featured Repos
 * `https://repos.azul.com/azure-only/zulu/yum`

From 4f2fefcd66360e655495d585dcaf01332430ce0b Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 20 Jan 2020 11:10:29 -0600
Subject: [PATCH 022/264] Updated README files

---
 README.zulu-jdk.md          | 4 ++--
 README.zulu-jre-headless.md | 4 ++--
 README.zulu-jre.md          | 4 ++--
 README.zulu-maven.md        | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.zulu-jdk.md b/README.zulu-jdk.md
index 4ad46b19..61411178 100644
--- a/README.zulu-jdk.md
+++ b/README.zulu-jdk.md
@@ -15,8 +15,8 @@ See [Java SE JDK](https://hub.docker.com/_/microsoft-java-jdk) on Docker Hub for
 * `https://repos.azul.com/azure-only/zulu/apt`
 
 ## Quick Reference
-* [Azul Zulu JVM for Azure FAQ](https://assets.azul.com/files/Zulu-for-Azure-FAQ.pdf)
-* [Azul Zulu JVM for Azure](https://www.azul.com/downloads/azure-only/zulu/)
+* [Azul Zulu for Azure - Enterprise Edition FAQ](https://assets.azul.com/files/Zulu-for-Azure-FAQ.pdf)
+* [Azul Zulu for Azure - Enterprise Edition](https://www.azul.com/downloads/azure-only/zulu/)
 
 ## Support
 For support or general questions [Microsoft Azure Support](https://support.microsoft.com/en-us/help/4026305/sql-contact-microsoft-azure-support)
diff --git a/README.zulu-jre-headless.md b/README.zulu-jre-headless.md
index 2aa5697d..6527ea67 100644
--- a/README.zulu-jre-headless.md
+++ b/README.zulu-jre-headless.md
@@ -15,8 +15,8 @@ See [Java SE Headless JRE](https://hub.docker.com/_/microsoft-java-jre-headless)
 * `https://repos.azul.com/azure-only/zulu/apt`
 
 ## Quick Reference
-* [Azul Zulu JVM for Azure FAQ](https://assets.azul.com/files/Zulu-for-Azure-FAQ.pdf)
-* [Azul Zulu JVM for Azure](https://www.azul.com/downloads/azure-only/zulu/)
+* [Azul Zulu for Azure - Enterprise Edition FAQ](https://assets.azul.com/files/Zulu-for-Azure-FAQ.pdf)
+* [Azul Zulu for Azure - Enterprise Edition](https://www.azul.com/downloads/azure-only/zulu/)
 
 ## Support
 For support or general questions [Microsoft Azure Support](https://support.microsoft.com/en-us/help/4026305/sql-contact-microsoft-azure-support)
diff --git a/README.zulu-jre.md b/README.zulu-jre.md
index 784d2867..23f118e2 100644
--- a/README.zulu-jre.md
+++ b/README.zulu-jre.md
@@ -15,8 +15,8 @@ See [Java SE JRE](https://hub.docker.com/_/microsoft-java-jre) on Docker Hub for
 * `https://repos.azul.com/azure-only/zulu/apt`
 
 ## Quick Reference
-* [Azul Zulu JVM for Azure FAQ](https://assets.azul.com/files/Zulu-for-Azure-FAQ.pdf)
-* [Azul Zulu JVM for Azure](https://www.azul.com/downloads/azure-only/zulu/)
+* [Azul Zulu for Azure - Enterprise Edition FAQ](https://assets.azul.com/files/Zulu-for-Azure-FAQ.pdf)
+* [Azul Zulu for Azure - Enterprise Edition](https://www.azul.com/downloads/azure-only/zulu/)
 
 ## Support
 For support or general questions [Microsoft Azure Support](https://support.microsoft.com/en-us/help/4026305/sql-contact-microsoft-azure-support)
diff --git a/README.zulu-maven.md b/README.zulu-maven.md
index cd7b475a..717b0614 100644
--- a/README.zulu-maven.md
+++ b/README.zulu-maven.md
@@ -15,8 +15,8 @@ See [Java SE JDK And Maven](https://hub.docker.com/_/microsoft-java-maven) on Do
 * `https://repos.azul.com/azure-only/zulu/apt`
 
 ## Quick Reference
-* [Azul Zulu JVM for Azure FAQ](https://assets.azul.com/files/Zulu-for-Azure-FAQ.pdf)
-* [Azul Zulu JVM for Azure](https://www.azul.com/downloads/azure-only/zulu/)
+* [Azul Zulu for Azure - Enterprise Edition FAQ](https://assets.azul.com/files/Zulu-for-Azure-FAQ.pdf)
+* [Azul Zulu for Azure - Enterprise Edition](https://www.azul.com/downloads/azure-only/zulu/)
 
 ## Support
 For support or general questions [Microsoft Azure Support](https://support.microsoft.com/en-us/help/4026305/sql-contact-microsoft-azure-support)

From 1068d338244e8c7c5f490d38c1485a794f7fb9e2 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 21 Jan 2020 08:13:59 -0600
Subject: [PATCH 023/264] Update README.zulu-jdk.md

---
 README.zulu-jdk.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.zulu-jdk.md b/README.zulu-jdk.md
index 61411178..d69cbb4e 100644
--- a/README.zulu-jdk.md
+++ b/README.zulu-jdk.md
@@ -11,7 +11,7 @@ docker run --rm -it mcr.microsoft.com/java/jdk:tag
 See [Java SE JDK](https://hub.docker.com/_/microsoft-java-jdk) on Docker Hub for more information.
 
 ## Featured Repos
-* `https://repos.azul.com/azure-only/zulu/yum`
+https:\//repos.azul.com/azure-only/zulu/yum
 * `https://repos.azul.com/azure-only/zulu/apt`
 
 ## Quick Reference

From ed68d538baf511d543f66c78cc9f3511a63063fc Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 21 Jan 2020 08:14:56 -0600
Subject: [PATCH 024/264] Update README.zulu-jdk.md

---
 README.zulu-jdk.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.zulu-jdk.md b/README.zulu-jdk.md
index d69cbb4e..12c5e272 100644
--- a/README.zulu-jdk.md
+++ b/README.zulu-jdk.md
@@ -11,7 +11,7 @@ docker run --rm -it mcr.microsoft.com/java/jdk:tag
 See [Java SE JDK](https://hub.docker.com/_/microsoft-java-jdk) on Docker Hub for more information.
 
 ## Featured Repos
-https:\//repos.azul.com/azure-only/zulu/yum
+https://<i><i>repos.azul.com/azure-only/zulu/yum
 * `https://repos.azul.com/azure-only/zulu/apt`
 
 ## Quick Reference

From 1a73f7922267278d5cbd820d2ed33b41e1bbc757 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 21 Jan 2020 08:17:07 -0600
Subject: [PATCH 025/264] Update README.zulu-jdk.md

---
 README.zulu-jdk.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.zulu-jdk.md b/README.zulu-jdk.md
index 12c5e272..ed86c1a8 100644
--- a/README.zulu-jdk.md
+++ b/README.zulu-jdk.md
@@ -11,8 +11,8 @@ docker run --rm -it mcr.microsoft.com/java/jdk:tag
 See [Java SE JDK](https://hub.docker.com/_/microsoft-java-jdk) on Docker Hub for more information.
 
 ## Featured Repos
-https://<i><i>repos.azul.com/azure-only/zulu/yum
-* `https://repos.azul.com/azure-only/zulu/apt`
+https://<i></i>repos.azul.com/azure-only/zulu/yum
+https://<i></i>repos.azul.com/azure-only/zulu/apt
 
 ## Quick Reference
 * [Azul Zulu for Azure - Enterprise Edition FAQ](https://assets.azul.com/files/Zulu-for-Azure-FAQ.pdf)

From d0b2f32b075231c1247493b99a5971385cc4d251 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 21 Jan 2020 08:17:40 -0600
Subject: [PATCH 026/264] Update README.zulu-jdk.md

---
 README.zulu-jdk.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.zulu-jdk.md b/README.zulu-jdk.md
index ed86c1a8..371e330b 100644
--- a/README.zulu-jdk.md
+++ b/README.zulu-jdk.md
@@ -11,7 +11,7 @@ docker run --rm -it mcr.microsoft.com/java/jdk:tag
 See [Java SE JDK](https://hub.docker.com/_/microsoft-java-jdk) on Docker Hub for more information.
 
 ## Featured Repos
-https://<i></i>repos.azul.com/azure-only/zulu/yum
+https://<i></i>repos.azul.com/azure-only/zulu/yum<br>
 https://<i></i>repos.azul.com/azure-only/zulu/apt
 
 ## Quick Reference

From 18ad83ea3953a9c6c08c70e37f4a3720901df9d4 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 21 Jan 2020 08:27:40 -0600
Subject: [PATCH 027/264] Update README.zulu-jdk.md

---
 README.zulu-jdk.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.zulu-jdk.md b/README.zulu-jdk.md
index 371e330b..337fdfdf 100644
--- a/README.zulu-jdk.md
+++ b/README.zulu-jdk.md
@@ -11,8 +11,8 @@ docker run --rm -it mcr.microsoft.com/java/jdk:tag
 See [Java SE JDK](https://hub.docker.com/_/microsoft-java-jdk) on Docker Hub for more information.
 
 ## Featured Repos
-https://<i></i>repos.azul.com/azure-only/zulu/yum<br>
-https://<i></i>repos.azul.com/azure-only/zulu/apt
+https\://repos.azul.com/azure-only/zulu/yum<br>
+https\://repos.azul.com/azure-only/zulu/apt
 
 ## Quick Reference
 * [Azul Zulu for Azure - Enterprise Edition FAQ](https://assets.azul.com/files/Zulu-for-Azure-FAQ.pdf)

From a44e6d6ca87b488cf41b33b6fa584186b6245504 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 21 Jan 2020 08:30:07 -0600
Subject: [PATCH 028/264] Update README.zulu-jdk.md

---
 README.zulu-jdk.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.zulu-jdk.md b/README.zulu-jdk.md
index 337fdfdf..30f16056 100644
--- a/README.zulu-jdk.md
+++ b/README.zulu-jdk.md
@@ -11,8 +11,8 @@ docker run --rm -it mcr.microsoft.com/java/jdk:tag
 See [Java SE JDK](https://hub.docker.com/_/microsoft-java-jdk) on Docker Hub for more information.
 
 ## Featured Repos
-https\://repos.azul.com/azure-only/zulu/yum<br>
-https\://repos.azul.com/azure-only/zulu/apt
+https://<span></span>repos.azul.com/azure-only/zulu/yum<br>
+https://<span></span>repos.azul.com/azure-only/zulu/apt
 
 ## Quick Reference
 * [Azul Zulu for Azure - Enterprise Edition FAQ](https://assets.azul.com/files/Zulu-for-Azure-FAQ.pdf)

From ff9b80763d73ba9375561cd8eb3d52c6a2ac4404 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 21 Jan 2020 08:32:48 -0600
Subject: [PATCH 029/264] Force yum and apt repos to be plain text instead of
 hyperlink

---
 README.zulu-jre-headless.md | 4 ++--
 README.zulu-jre.md          | 4 ++--
 README.zulu-maven.md        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.zulu-jre-headless.md b/README.zulu-jre-headless.md
index 6527ea67..1beb8499 100644
--- a/README.zulu-jre-headless.md
+++ b/README.zulu-jre-headless.md
@@ -11,8 +11,8 @@ docker run --rm -it mcr.microsoft.com/java/jre-headless:tag
 See [Java SE Headless JRE](https://hub.docker.com/_/microsoft-java-jre-headless) on Docker Hub for more information.
 
 ## Featured Repos
-* `https://repos.azul.com/azure-only/zulu/yum`
-* `https://repos.azul.com/azure-only/zulu/apt`
+https://<span></span>repos.azul.com/azure-only/zulu/yum<br>
+https://<span></span>repos.azul.com/azure-only/zulu/apt
 
 ## Quick Reference
 * [Azul Zulu for Azure - Enterprise Edition FAQ](https://assets.azul.com/files/Zulu-for-Azure-FAQ.pdf)
diff --git a/README.zulu-jre.md b/README.zulu-jre.md
index 23f118e2..b2add3d3 100644
--- a/README.zulu-jre.md
+++ b/README.zulu-jre.md
@@ -11,8 +11,8 @@ docker run --rm -it mcr.microsoft.com/java/jre:tag
 See [Java SE JRE](https://hub.docker.com/_/microsoft-java-jre) on Docker Hub for more information.
 
 ## Featured Repos
-* `https://repos.azul.com/azure-only/zulu/yum`
-* `https://repos.azul.com/azure-only/zulu/apt`
+https://<span></span>repos.azul.com/azure-only/zulu/yum<br>
+https://<span></span>repos.azul.com/azure-only/zulu/apt
 
 ## Quick Reference
 * [Azul Zulu for Azure - Enterprise Edition FAQ](https://assets.azul.com/files/Zulu-for-Azure-FAQ.pdf)
diff --git a/README.zulu-maven.md b/README.zulu-maven.md
index 717b0614..bbf8393c 100644
--- a/README.zulu-maven.md
+++ b/README.zulu-maven.md
@@ -11,8 +11,8 @@ docker run --rm -it mcr.microsoft.com/java/maven:tag
 See [Java SE JDK And Maven](https://hub.docker.com/_/microsoft-java-maven) on Docker Hub for more information.
 
 ## Featured Repos
-* `https://repos.azul.com/azure-only/zulu/yum`
-* `https://repos.azul.com/azure-only/zulu/apt`
+https://<span></span>repos.azul.com/azure-only/zulu/yum<br>
+https://<span></span>repos.azul.com/azure-only/zulu/apt
 
 ## Quick Reference
 * [Azul Zulu for Azure - Enterprise Edition FAQ](https://assets.azul.com/files/Zulu-for-Azure-FAQ.pdf)

From 0468852529deeb3bbb42dd1bfb2882988061bafa Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 23 Jan 2020 11:47:35 -0600
Subject: [PATCH 030/264] New January 2020 PSU Dockerfiles

---
 docker/alpine/Dockerfile.zulu-8u242-jdk                | 2 +-
 docker/alpine/Dockerfile.zulu-8u242-jre                | 2 +-
 docker/alpine/Dockerfile.zulu-8u242-jre-headless       | 2 +-
 docker/alpine/Dockerfile.zulu-8u242-jre-headless-tools | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker/alpine/Dockerfile.zulu-8u242-jdk b/docker/alpine/Dockerfile.zulu-8u242-jdk
index acdbc8da..d095897e 100644
--- a/docker/alpine/Dockerfile.zulu-8u242-jdk
+++ b/docker/alpine/Dockerfile.zulu-8u242-jdk
@@ -11,7 +11,7 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-ARG ZULU_DIR=zulu-8-azure-jdk_8.44.0.9-8.0.242-linux_musl_x64
+ARG ZULU_DIR=zulu-8-azure-jdk_8.44.0.11-8.0.242-linux_musl_x64
 
 RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
diff --git a/docker/alpine/Dockerfile.zulu-8u242-jre b/docker/alpine/Dockerfile.zulu-8u242-jre
index d22fe468..11c3163d 100644
--- a/docker/alpine/Dockerfile.zulu-8u242-jre
+++ b/docker/alpine/Dockerfile.zulu-8u242-jre
@@ -11,7 +11,7 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-ARG ZULU_DIR=zulu-8-azure-jre_8.44.0.9-8.0.242-linux_musl_x64
+ARG ZULU_DIR=zulu-8-azure-jre_8.44.0.11-8.0.242-linux_musl_x64
 
 RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
diff --git a/docker/alpine/Dockerfile.zulu-8u242-jre-headless b/docker/alpine/Dockerfile.zulu-8u242-jre-headless
index de74ce7c..087e12ce 100644
--- a/docker/alpine/Dockerfile.zulu-8u242-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-8u242-jre-headless
@@ -11,7 +11,7 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-ARG ZULU_DIR=zulu-8-azure-jre-headless_8.44.0.9-8.0.242-linux_musl_x64
+ARG ZULU_DIR=zulu-8-azure-jre-headless_8.44.0.11-8.0.242-linux_musl_x64
 
 RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
diff --git a/docker/alpine/Dockerfile.zulu-8u242-jre-headless-tools b/docker/alpine/Dockerfile.zulu-8u242-jre-headless-tools
index 159d7576..5b1ba4af 100644
--- a/docker/alpine/Dockerfile.zulu-8u242-jre-headless-tools
+++ b/docker/alpine/Dockerfile.zulu-8u242-jre-headless-tools
@@ -11,7 +11,7 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-ARG ZULU_DIR=zulu-8-azure-jre-headless-tools_8.44.0.9-8.0.242-linux_musl_x64
+ARG ZULU_DIR=zulu-8-azure-jre-headless-tools_8.44.0.11-8.0.242-linux_musl_x64
 RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
     BIN_DIR=/usr/bin && \

From c02e45c257e05dc2d91b4c1906c0610f1bc09fa6 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 23 Jan 2020 11:48:19 -0600
Subject: [PATCH 031/264] New January 2020 PSU Dockerfiles

---
 docker/centos/Dockerfile.zulu-8u242-jdk          | 2 +-
 docker/centos/Dockerfile.zulu-8u242-jre          | 2 +-
 docker/centos/Dockerfile.zulu-8u242-jre-headless | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/centos/Dockerfile.zulu-8u242-jdk b/docker/centos/Dockerfile.zulu-8u242-jdk
index 015df9c2..903f298a 100644
--- a/docker/centos/Dockerfile.zulu-8u242-jdk
+++ b/docker/centos/Dockerfile.zulu-8u242-jdk
@@ -10,6 +10,6 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
-    yum -q -y install zulu-8-azure-jdk-8.44.0.9
+    yum -q -y install zulu-8-azure-jdk-8.44.0.11
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure
diff --git a/docker/centos/Dockerfile.zulu-8u242-jre b/docker/centos/Dockerfile.zulu-8u242-jre
index 3c3ff956..b516ee02 100644
--- a/docker/centos/Dockerfile.zulu-8u242-jre
+++ b/docker/centos/Dockerfile.zulu-8u242-jre
@@ -10,6 +10,6 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
-    yum -q -y install zulu-8-azure-jre-8.44.0.9
+    yum -q -y install zulu-8-azure-jre-8.44.0.11
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure
diff --git a/docker/centos/Dockerfile.zulu-8u242-jre-headless b/docker/centos/Dockerfile.zulu-8u242-jre-headless
index 5bb52e76..89b0b4c9 100644
--- a/docker/centos/Dockerfile.zulu-8u242-jre-headless
+++ b/docker/centos/Dockerfile.zulu-8u242-jre-headless
@@ -10,6 +10,6 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
-    yum -q -y install zulu-8-azure-jre-headless-8.44.0.9
+    yum -q -y install zulu-8-azure-jre-headless-8.44.0.11
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure

From fc464b94f5019de2e88710df6c815350b3c8b902 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 23 Jan 2020 11:48:53 -0600
Subject: [PATCH 032/264] New January 2020 PSU Dockerfiles

---
 docker/debian8/Dockerfile.zulu-8u242-jdk          | 2 +-
 docker/debian8/Dockerfile.zulu-8u242-jre          | 2 +-
 docker/debian8/Dockerfile.zulu-8u242-jre-headless | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/debian8/Dockerfile.zulu-8u242-jdk b/docker/debian8/Dockerfile.zulu-8u242-jdk
index c7d3cd22..620532e1 100644
--- a/docker/debian8/Dockerfile.zulu-8u242-jdk
+++ b/docker/debian8/Dockerfile.zulu-8u242-jdk
@@ -14,7 +14,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jdk=8.44.0.9 && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jdk=8.44.0.11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-8u242-jre b/docker/debian8/Dockerfile.zulu-8u242-jre
index ef3c4960..2c2039a6 100644
--- a/docker/debian8/Dockerfile.zulu-8u242-jre
+++ b/docker/debian8/Dockerfile.zulu-8u242-jre
@@ -12,7 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jre=8.44.0.9 && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jre=8.44.0.11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-8u242-jre-headless b/docker/debian8/Dockerfile.zulu-8u242-jre-headless
index 47871afd..274b2fb9 100644
--- a/docker/debian8/Dockerfile.zulu-8u242-jre-headless
+++ b/docker/debian8/Dockerfile.zulu-8u242-jre-headless
@@ -12,7 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jre-headless=8.44.0.9 && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jre-headless=8.44.0.11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64

From 9c58a6e128afebf2b829528119e2da404e0d2bb0 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 23 Jan 2020 11:49:35 -0600
Subject: [PATCH 033/264] New January 2020 PSU Dockerfiles

---
 docker/debian9/Dockerfile.zulu-8u242-jdk          | 2 +-
 docker/debian9/Dockerfile.zulu-8u242-jre          | 2 +-
 docker/debian9/Dockerfile.zulu-8u242-jre-headless | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/debian9/Dockerfile.zulu-8u242-jdk b/docker/debian9/Dockerfile.zulu-8u242-jdk
index a3e600b0..f3eb30ee 100644
--- a/docker/debian9/Dockerfile.zulu-8u242-jdk
+++ b/docker/debian9/Dockerfile.zulu-8u242-jdk
@@ -12,7 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jdk=8.44.0.9 && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jdk=8.44.0.11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u242-jre b/docker/debian9/Dockerfile.zulu-8u242-jre
index 6948daf9..948b59d9 100644
--- a/docker/debian9/Dockerfile.zulu-8u242-jre
+++ b/docker/debian9/Dockerfile.zulu-8u242-jre
@@ -12,7 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jre=8.44.0.9 && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jre=8.44.0.11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u242-jre-headless b/docker/debian9/Dockerfile.zulu-8u242-jre-headless
index b856b394..887b9e74 100644
--- a/docker/debian9/Dockerfile.zulu-8u242-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-8u242-jre-headless
@@ -12,7 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jre-headless=8.44.0.9 && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jre-headless=8.44.0.11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64

From 597e832064f80529217003680e814a046593caa4 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 23 Jan 2020 11:50:16 -0600
Subject: [PATCH 034/264] New January 2020 PSU Dockerfiles

---
 docker/ubuntu/Dockerfile.zulu-8u242-jdk          | 2 +-
 docker/ubuntu/Dockerfile.zulu-8u242-jre          | 2 +-
 docker/ubuntu/Dockerfile.zulu-8u242-jre-headless | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/ubuntu/Dockerfile.zulu-8u242-jdk b/docker/ubuntu/Dockerfile.zulu-8u242-jdk
index 57e4564a..473e11fe 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u242-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-8u242-jdk
@@ -12,7 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jdk=8.44.0.9 && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jdk=8.44.0.11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u242-jre b/docker/ubuntu/Dockerfile.zulu-8u242-jre
index d66ae065..8adfbbd9 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u242-jre
+++ b/docker/ubuntu/Dockerfile.zulu-8u242-jre
@@ -12,7 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jre=8.44.0.9 && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jre=8.44.0.11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u242-jre-headless b/docker/ubuntu/Dockerfile.zulu-8u242-jre-headless
index bfd7a9a8..4fb0d7bf 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u242-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-8u242-jre-headless
@@ -12,7 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jre-headless=8.44.0.9 && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jre-headless=8.44.0.11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64

From 7d01d6d62a89938f33f1104725bf403226db018d Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 23 Jan 2020 11:50:47 -0600
Subject: [PATCH 035/264] New January 2020 PSU Dockerfiles

---
 docker/windowsservercore/Dockerfile.zulu-8u242-jdk | 2 +-
 docker/windowsservercore/Dockerfile.zulu-8u242-jre | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/windowsservercore/Dockerfile.zulu-8u242-jdk b/docker/windowsservercore/Dockerfile.zulu-8u242-jdk
index 21a366f8..8df12d60 100644
--- a/docker/windowsservercore/Dockerfile.zulu-8u242-jdk
+++ b/docker/windowsservercore/Dockerfile.zulu-8u242-jdk
@@ -7,7 +7,7 @@
 FROM microsoft/windowsservercore:ltsc2016
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN setx PACKAGE zulu-8-azure-jdk_8.44.0.9-8.0.242-win_x64.msi && \
+RUN setx PACKAGE zulu-8-azure-jdk_8.44.0.11-8.0.242-win_x64.msi && \
     setx PACKAGE_DIR zulu-8/8u242 && \
     setx /m JAVA_HOME "C:\Program Files\zulu\zulu-8"
 
diff --git a/docker/windowsservercore/Dockerfile.zulu-8u242-jre b/docker/windowsservercore/Dockerfile.zulu-8u242-jre
index d9393004..ffeb59a0 100644
--- a/docker/windowsservercore/Dockerfile.zulu-8u242-jre
+++ b/docker/windowsservercore/Dockerfile.zulu-8u242-jre
@@ -7,7 +7,7 @@
 FROM microsoft/windowsservercore:ltsc2016
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN setx PACKAGE zulu-8-azure-jre_8.44.0.9-8.0.242-win_x64.msi && \
+RUN setx PACKAGE zulu-8-azure-jre_8.44.0.11-8.0.242-win_x64.msi && \
     setx PACKAGE_DIR zulu-8/8u242 && \
     setx /m JAVA_HOME "C:\Program Files\zulu\zulu-8"
 

From d5e3cbde3022f8ef9116e67bf50cc8626c8ee355 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 12 Mar 2020 17:21:26 -0500
Subject: [PATCH 036/264] Changed to Ubuntu 19.10 (eoan). Added apt-get
 dist-upgrade command.

---
 docker/ubuntu/Dockerfile.zulu-8u232-jdk          | 3 ++-
 docker/ubuntu/Dockerfile.zulu-8u232-jre          | 3 ++-
 docker/ubuntu/Dockerfile.zulu-8u232-jre-headless | 3 ++-
 docker/ubuntu/Dockerfile.zulu-8u242-jdk          | 3 ++-
 docker/ubuntu/Dockerfile.zulu-8u242-jre          | 3 ++-
 docker/ubuntu/Dockerfile.zulu-8u242-jre-headless | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/docker/ubuntu/Dockerfile.zulu-8u232-jdk b/docker/ubuntu/Dockerfile.zulu-8u232-jdk
index 24c33d03..c2b00a7f 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u232-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-8u232-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:bionic
+FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -q update && \
@@ -12,6 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
+    apt-get -y dist-upgrade && \
     apt-get -y --no-install-recommends install zulu-8-azure-jdk=8.42.0.23 && \
     rm -rf /var/lib/apt/lists/*
 
diff --git a/docker/ubuntu/Dockerfile.zulu-8u232-jre b/docker/ubuntu/Dockerfile.zulu-8u232-jre
index 6591539e..0a23fee9 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u232-jre
+++ b/docker/ubuntu/Dockerfile.zulu-8u232-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:bionic
+FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -q update && \
@@ -12,6 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
+    apt-get -y dist-upgrade && \
     apt-get -y --no-install-recommends install zulu-8-azure-jre=8.42.0.23 && \
     rm -rf /var/lib/apt/lists/*
 
diff --git a/docker/ubuntu/Dockerfile.zulu-8u232-jre-headless b/docker/ubuntu/Dockerfile.zulu-8u232-jre-headless
index 88ffecea..7b64b503 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u232-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-8u232-jre-headless
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:bionic
+FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -q update && \
@@ -12,6 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
+    apt-get -y dist-upgrade && \
     apt-get -y --no-install-recommends install zulu-8-azure-jre-headless=8.42.0.23 && \
     rm -rf /var/lib/apt/lists/*
 
diff --git a/docker/ubuntu/Dockerfile.zulu-8u242-jdk b/docker/ubuntu/Dockerfile.zulu-8u242-jdk
index 473e11fe..d1ddc677 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u242-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-8u242-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:bionic
+FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -q update && \
@@ -12,6 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
+    apt-get -y dist-upgrade && \
     apt-get -y --no-install-recommends install zulu-8-azure-jdk=8.44.0.11 && \
     rm -rf /var/lib/apt/lists/*
 
diff --git a/docker/ubuntu/Dockerfile.zulu-8u242-jre b/docker/ubuntu/Dockerfile.zulu-8u242-jre
index 8adfbbd9..7e1c9bd1 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u242-jre
+++ b/docker/ubuntu/Dockerfile.zulu-8u242-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:bionic
+FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -q update && \
@@ -12,6 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
+    apt-get -y dist-upgrade && \
     apt-get -y --no-install-recommends install zulu-8-azure-jre=8.44.0.11 && \
     rm -rf /var/lib/apt/lists/*
 
diff --git a/docker/ubuntu/Dockerfile.zulu-8u242-jre-headless b/docker/ubuntu/Dockerfile.zulu-8u242-jre-headless
index 4fb0d7bf..2ba4cfca 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u242-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-8u242-jre-headless
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:bionic
+FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -q update && \
@@ -12,6 +12,7 @@ RUN apt-get -q update && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -q update && \
+    apt-get -y dist-upgrade && \
     apt-get -y --no-install-recommends install zulu-8-azure-jre-headless=8.44.0.11 && \
     rm -rf /var/lib/apt/lists/*
 

From bcc87f2f0868b56b987b44c204daed9fd7e35afa Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 12 Mar 2020 17:24:48 -0500
Subject: [PATCH 037/264] Create ubuntu-18.04

---
 docker/ubuntu-18.04 | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docker/ubuntu-18.04

diff --git a/docker/ubuntu-18.04 b/docker/ubuntu-18.04
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/docker/ubuntu-18.04
@@ -0,0 +1 @@
+

From 328c07e0f01824a6780770f7c0b4f56de8442668 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 12 Mar 2020 17:25:05 -0500
Subject: [PATCH 038/264] Delete ubuntu-18.04

---
 docker/ubuntu-18.04 | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 docker/ubuntu-18.04

diff --git a/docker/ubuntu-18.04 b/docker/ubuntu-18.04
deleted file mode 100644
index 8b137891..00000000
--- a/docker/ubuntu-18.04
+++ /dev/null
@@ -1 +0,0 @@
-

From 19c4d4fc17999cfa845256074ae04aa5749a022a Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 12 Mar 2020 17:26:34 -0500
Subject: [PATCH 039/264] Create tmp

---
 docker/ubuntu-18.04/tmp | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docker/ubuntu-18.04/tmp

diff --git a/docker/ubuntu-18.04/tmp b/docker/ubuntu-18.04/tmp
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/docker/ubuntu-18.04/tmp
@@ -0,0 +1 @@
+

From 66433d7219d1591854f8a85b1d18a3b555bfa0cd Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 12 Mar 2020 17:26:50 -0500
Subject: [PATCH 040/264] Delete tmp

---
 docker/ubuntu-18.04/tmp | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 docker/ubuntu-18.04/tmp

diff --git a/docker/ubuntu-18.04/tmp b/docker/ubuntu-18.04/tmp
deleted file mode 100644
index 8b137891..00000000
--- a/docker/ubuntu-18.04/tmp
+++ /dev/null
@@ -1 +0,0 @@
-

From 99b14e74de6d08f15a01e32479a9504068f07ccb Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 12 Mar 2020 17:27:15 -0500
Subject: [PATCH 041/264] Create tmp

---
 docker/ubuntu-18.04/tmp | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docker/ubuntu-18.04/tmp

diff --git a/docker/ubuntu-18.04/tmp b/docker/ubuntu-18.04/tmp
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/docker/ubuntu-18.04/tmp
@@ -0,0 +1 @@
+

From 75aa80766854403d924a143366f2b61114cbb678 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 12 Mar 2020 17:28:15 -0500
Subject: [PATCH 042/264] Added apt-get dist-upgrade command

---
 docker/ubuntu-18.04/Dockerfile.zulu-8u232-jdk | 19 ++++++++++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-8u232-jre | 19 ++++++++++++++++++
 .../Dockerfile.zulu-8u232-jre-headless        | 19 ++++++++++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-8u242-jdk | 20 +++++++++++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-8u242-jre | 19 ++++++++++++++++++
 .../Dockerfile.zulu-8u242-jre-headless        | 19 ++++++++++++++++++
 6 files changed, 115 insertions(+)
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u232-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u232-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u232-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u242-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u242-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u242-jre-headless

diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u232-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-8u232-jdk
new file mode 100644
index 00000000..b2b24cfa
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u232-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y dist-upgrade && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jdk=8.42.0.23 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u232-jre b/docker/ubuntu-18.04/Dockerfile.zulu-8u232-jre
new file mode 100644
index 00000000..ce836229
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u232-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y dist-upgrade && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jre=8.42.0.23 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u232-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-8u232-jre-headless
new file mode 100644
index 00000000..24e9d829
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u232-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y dist-upgrade && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jre-headless=8.42.0.23 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u242-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-8u242-jdk
new file mode 100644
index 00000000..e305c168
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u242-jdk
@@ -0,0 +1,20 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+#FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y dist-upgrade && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jdk=8.44.0.11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u242-jre b/docker/ubuntu-18.04/Dockerfile.zulu-8u242-jre
new file mode 100644
index 00000000..902a9048
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u242-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y dist-upgrade && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jre=8.44.0.11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u242-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-8u242-jre-headless
new file mode 100644
index 00000000..8bbf8160
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u242-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -q update && \
+    apt-get -y dist-upgrade && \
+    apt-get -y --no-install-recommends install zulu-8-azure-jre-headless=8.44.0.11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64

From d6333fb485b9ece2805ccad6d867eb056a9a5617 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 12 Mar 2020 17:28:36 -0500
Subject: [PATCH 043/264] Delete tmp

---
 docker/ubuntu-18.04/tmp | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 docker/ubuntu-18.04/tmp

diff --git a/docker/ubuntu-18.04/tmp b/docker/ubuntu-18.04/tmp
deleted file mode 100644
index 8b137891..00000000
--- a/docker/ubuntu-18.04/tmp
+++ /dev/null
@@ -1 +0,0 @@
-

From 3b9b69222dee9049bb48810564fe702a659fd1bb Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 18 Mar 2020 12:32:29 -0500
Subject: [PATCH 044/264] Added Dockerfiles for Zulu 14

---
 docker/centos/Dockerfile.zulu-14u0-jdk | 16 ++++++++++++++++
 docker/centos/Dockerfile.zulu-14u0-jre | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 docker/centos/Dockerfile.zulu-14u0-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-14u0-jre

diff --git a/docker/centos/Dockerfile.zulu-14u0-jdk b/docker/centos/Dockerfile.zulu-14u0-jdk
new file mode 100644
index 00000000..f38343a0
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-14u0-jdk
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-14-azure-jdk-14.27+1
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-14-azure
diff --git a/docker/centos/Dockerfile.zulu-14u0-jre b/docker/centos/Dockerfile.zulu-14u0-jre
new file mode 100644
index 00000000..ecce111b
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-14u0-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-14-azure-jre-14.27+1
+
+ENV JAVA_HOME=/usr/lib/jvm/jre-14-azure

From 6a0b87626d1a82e60ed3f022be0869455e046c24 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 18 Mar 2020 12:33:09 -0500
Subject: [PATCH 045/264] Added Dockerfiles for Zulu 14

---
 docker/debian8/Dockerfile.zulu-14u0-jdk | 19 +++++++++++++++++++
 docker/debian8/Dockerfile.zulu-14u0-jre | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 docker/debian8/Dockerfile.zulu-14u0-jdk
 create mode 100644 docker/debian8/Dockerfile.zulu-14u0-jre

diff --git a/docker/debian8/Dockerfile.zulu-14u0-jdk b/docker/debian8/Dockerfile.zulu-14u0-jdk
new file mode 100644
index 00000000..27d6d564
--- /dev/null
+++ b/docker/debian8/Dockerfile.zulu-14u0-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:jessie
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-14-azure-jdk=14.27+1 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-14-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-14u0-jre b/docker/debian8/Dockerfile.zulu-14u0-jre
new file mode 100644
index 00000000..3ca038ca
--- /dev/null
+++ b/docker/debian8/Dockerfile.zulu-14u0-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:jessie
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-14-azure-jre=14.27+1 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-14-azure-amd64

From b52412f3c514dfa35a97ac70b5f25bf28d4a3204 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 18 Mar 2020 12:33:46 -0500
Subject: [PATCH 046/264] Added Dockerfiles for Zulu 14

---
 docker/debian9/Dockerfile.zulu-14u0-jdk | 19 +++++++++++++++++++
 docker/debian9/Dockerfile.zulu-14u0-jre | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 docker/debian9/Dockerfile.zulu-14u0-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-14u0-jre

diff --git a/docker/debian9/Dockerfile.zulu-14u0-jdk b/docker/debian9/Dockerfile.zulu-14u0-jdk
new file mode 100644
index 00000000..ecb134e0
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-14u0-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-14-azure-jdk=14.27+1 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-14-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-14u0-jre b/docker/debian9/Dockerfile.zulu-14u0-jre
new file mode 100644
index 00000000..24f2ddd6
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-14u0-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-14-azure-jre=14.27+1 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-14-azure-amd64

From 63ab27e61d29ce6f2fcf6302311a31dd1311a78c Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 18 Mar 2020 12:34:21 -0500
Subject: [PATCH 047/264] Added Dockerfiles for Zulu 14

---
 docker/ubuntu-18.04/Dockerfile.zulu-14u0-jdk | 19 +++++++++++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-14u0-jre | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-14u0-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-14u0-jre

diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-14u0-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-14u0-jdk
new file mode 100644
index 00000000..b23b10d4
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-14u0-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-14-azure-jdk=14.27+1 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-14-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-14u0-jre b/docker/ubuntu-18.04/Dockerfile.zulu-14u0-jre
new file mode 100644
index 00000000..0c859842
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-14u0-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-14-azure-jre=14.27+1 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-14-azure-amd64

From 69a390b11c83ca0358ee71f7f570adf5f9414a9c Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 18 Mar 2020 12:34:51 -0500
Subject: [PATCH 048/264] Added Dockerfiles for Zulu 14

---
 docker/ubuntu/Dockerfile.zulu-14u0-jdk | 19 +++++++++++++++++++
 docker/ubuntu/Dockerfile.zulu-14u0-jre | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 docker/ubuntu/Dockerfile.zulu-14u0-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-14u0-jre

diff --git a/docker/ubuntu/Dockerfile.zulu-14u0-jdk b/docker/ubuntu/Dockerfile.zulu-14u0-jdk
new file mode 100644
index 00000000..d242ff91
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-14u0-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-14-azure-jdk=14.27+1 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-14-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-14u0-jre b/docker/ubuntu/Dockerfile.zulu-14u0-jre
new file mode 100644
index 00000000..ccdf83ed
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-14u0-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-14-azure-jre=14.27+1 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-14-azure-amd64

From cdead62dd6d634b7b6ce3b22ac458f0dc3d2b86b Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 18 Mar 2020 12:35:25 -0500
Subject: [PATCH 049/264] Added Dockerfiles for Zulu 14

---
 .../Dockerfile.zulu-14u0-jdk                  | 19 +++++++++++++++++++
 .../Dockerfile.zulu-14u0-jre                  | 19 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-14u0-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-14u0-jre

diff --git a/docker/windowsservercore/Dockerfile.zulu-14u0-jdk b/docker/windowsservercore/Dockerfile.zulu-14u0-jdk
new file mode 100644
index 00000000..24941295
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-14u0-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-14-azure-jdk_14.27.1-14-win_x64.msi && \
+    setx PACKAGE_DIR zulu-14/14 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-14"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
+
+RUN java -version
+
diff --git a/docker/windowsservercore/Dockerfile.zulu-14u0-jre b/docker/windowsservercore/Dockerfile.zulu-14u0-jre
new file mode 100644
index 00000000..c8773646
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-14u0-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-14-azure-jre_14.27.1-14-win_x64.msi && \
+    setx PACKAGE_DIR zulu-14/14 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-14"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
+
+RUN java -version
+

From 1f1fd41eed68a1c0025075fcd842bdb7efaaeb78 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 20 Mar 2020 08:39:02 -0500
Subject: [PATCH 050/264] Create tmp

---
 docker/debian10/tmp | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docker/debian10/tmp

diff --git a/docker/debian10/tmp b/docker/debian10/tmp
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/docker/debian10/tmp
@@ -0,0 +1 @@
+

From 6934537eed577a80f6fb7f778d22f946f7a5de78 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 20 Mar 2020 08:41:25 -0500
Subject: [PATCH 051/264] Added Dockerfiles for Zulu 8u242

---
 docker/debian10/Dockerfile.zulu-8u242-jdk     | 19 +++++++++++++++++++
 docker/debian10/Dockerfile.zulu-8u242-jre     | 19 +++++++++++++++++++
 .../Dockerfile.zulu-8u242-jre-headless        | 19 +++++++++++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 docker/debian10/Dockerfile.zulu-8u242-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-8u242-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-8u242-jre-headless

diff --git a/docker/debian10/Dockerfile.zulu-8u242-jdk b/docker/debian10/Dockerfile.zulu-8u242-jdk
new file mode 100644
index 00000000..b0cf54c1
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u242-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.44.0.11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u242-jre b/docker/debian10/Dockerfile.zulu-8u242-jre
new file mode 100644
index 00000000..ad1c7552
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u242-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.44.0.11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u242-jre-headless b/docker/debian10/Dockerfile.zulu-8u242-jre-headless
new file mode 100644
index 00000000..d6f2152e
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u242-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.44.0.11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64

From a9cb619365a555a103b525da8f260a68eb9f01c7 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 20 Mar 2020 08:41:41 -0500
Subject: [PATCH 052/264] Delete tmp

---
 docker/debian10/tmp | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 docker/debian10/tmp

diff --git a/docker/debian10/tmp b/docker/debian10/tmp
deleted file mode 100644
index 8b137891..00000000
--- a/docker/debian10/tmp
+++ /dev/null
@@ -1 +0,0 @@
-

From 722f08443a9c36e260c3a617c3bb9cba76b6a7c1 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 24 Mar 2020 10:05:44 -0500
Subject: [PATCH 053/264] Added -qq option

---
 docker/ubuntu-18.04/Dockerfile.zulu-8u232-jdk         | 10 +++++-----
 docker/ubuntu-18.04/Dockerfile.zulu-8u232-jre         | 10 +++++-----
 .../ubuntu-18.04/Dockerfile.zulu-8u232-jre-headless   | 10 +++++-----
 docker/ubuntu-18.04/Dockerfile.zulu-8u242-jdk         | 11 +++++------
 docker/ubuntu-18.04/Dockerfile.zulu-8u242-jre         | 10 +++++-----
 .../ubuntu-18.04/Dockerfile.zulu-8u242-jre-headless   | 10 +++++-----
 6 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u232-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-8u232-jdk
index b2b24cfa..0b5374ce 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-8u232-jdk
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u232-jdk
@@ -7,13 +7,13 @@
 FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y dist-upgrade && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jdk=8.42.0.23 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.42.0.23 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u232-jre b/docker/ubuntu-18.04/Dockerfile.zulu-8u232-jre
index ce836229..5e304bc7 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-8u232-jre
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u232-jre
@@ -7,13 +7,13 @@
 FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y dist-upgrade && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jre=8.42.0.23 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.42.0.23 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u232-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-8u232-jre-headless
index 24e9d829..8a71136b 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-8u232-jre-headless
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u232-jre-headless
@@ -7,13 +7,13 @@
 FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y dist-upgrade && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jre-headless=8.42.0.23 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.42.0.23 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u242-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-8u242-jdk
index e305c168..8d7412b2 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-8u242-jdk
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u242-jdk
@@ -5,16 +5,15 @@
 # and are not intended to be used for any other purpose.
 
 FROM ubuntu:bionic
-#FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y dist-upgrade && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jdk=8.44.0.11 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.44.0.11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u242-jre b/docker/ubuntu-18.04/Dockerfile.zulu-8u242-jre
index 902a9048..c294f33d 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-8u242-jre
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u242-jre
@@ -7,13 +7,13 @@
 FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y dist-upgrade && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jre=8.44.0.11 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.44.0.11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u242-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-8u242-jre-headless
index 8bbf8160..71234bae 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-8u242-jre-headless
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u242-jre-headless
@@ -7,13 +7,13 @@
 FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y dist-upgrade && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jre-headless=8.44.0.11 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.44.0.11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64

From 0a1518929ddc1d4b8c58cf843bbde7df9b45d7e6 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 24 Mar 2020 10:07:29 -0500
Subject: [PATCH 054/264] Added Dockerfiles for Zulu 11

---
 docker/debian10/Dockerfile.zulu-11u6-jdk      | 19 +++++++++++++++++++
 docker/debian10/Dockerfile.zulu-11u6-jre      | 19 +++++++++++++++++++
 .../Dockerfile.zulu-11u6-jre-headless         | 19 +++++++++++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 docker/debian10/Dockerfile.zulu-11u6-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-11u6-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-11u6-jre-headless

diff --git a/docker/debian10/Dockerfile.zulu-11u6-jdk b/docker/debian10/Dockerfile.zulu-11u6-jdk
new file mode 100644
index 00000000..32bd2ee6
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u6-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.37+17 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u6-jre b/docker/debian10/Dockerfile.zulu-11u6-jre
new file mode 100644
index 00000000..a11fe7e3
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u6-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.37+17 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u6-jre-headless b/docker/debian10/Dockerfile.zulu-11u6-jre-headless
new file mode 100644
index 00000000..86170f00
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u6-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.37+17 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64

From be776455add4848378f1f6d81767cc660f25e30f Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 24 Mar 2020 16:09:16 -0500
Subject: [PATCH 055/264] Added the apk upgrade command

---
 docker/alpine/Dockerfile.zulu-11u5-jdk                 | 2 ++
 docker/alpine/Dockerfile.zulu-11u5-jre                 | 2 ++
 docker/alpine/Dockerfile.zulu-11u5-jre-headless        | 2 ++
 docker/alpine/Dockerfile.zulu-11u5-jre-headless-tools  | 2 ++
 docker/alpine/Dockerfile.zulu-11u6-jdk                 | 2 ++
 docker/alpine/Dockerfile.zulu-11u6-jre                 | 2 ++
 docker/alpine/Dockerfile.zulu-11u6-jre-headless        | 2 ++
 docker/alpine/Dockerfile.zulu-11u6-jre-headless-tools  | 2 ++
 docker/alpine/Dockerfile.zulu-13u1-jdk                 | 2 ++
 docker/alpine/Dockerfile.zulu-13u1-jre                 | 2 ++
 docker/alpine/Dockerfile.zulu-13u1-jre-headless        | 2 ++
 docker/alpine/Dockerfile.zulu-13u1-jre-headless-tools  | 2 ++
 docker/alpine/Dockerfile.zulu-13u2-jdk                 | 2 ++
 docker/alpine/Dockerfile.zulu-13u2-jre                 | 2 ++
 docker/alpine/Dockerfile.zulu-13u2-jre-headless        | 2 ++
 docker/alpine/Dockerfile.zulu-13u2-jre-headless-tools  | 2 ++
 docker/alpine/Dockerfile.zulu-7u242-jdk                | 3 ++-
 docker/alpine/Dockerfile.zulu-7u242-jre                | 3 ++-
 docker/alpine/Dockerfile.zulu-7u242-jre-headless       | 3 ++-
 docker/alpine/Dockerfile.zulu-7u252-jdk                | 3 ++-
 docker/alpine/Dockerfile.zulu-7u252-jre                | 3 ++-
 docker/alpine/Dockerfile.zulu-7u252-jre-headless       | 3 ++-
 docker/alpine/Dockerfile.zulu-8u232-jdk                | 2 ++
 docker/alpine/Dockerfile.zulu-8u232-jre                | 2 ++
 docker/alpine/Dockerfile.zulu-8u232-jre-headless       | 2 ++
 docker/alpine/Dockerfile.zulu-8u232-jre-headless-tools | 2 ++
 docker/alpine/Dockerfile.zulu-8u242-jdk                | 2 ++
 docker/alpine/Dockerfile.zulu-8u242-jre                | 2 ++
 docker/alpine/Dockerfile.zulu-8u242-jre-headless       | 2 ++
 docker/alpine/Dockerfile.zulu-8u242-jre-headless-tools | 2 ++
 30 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/docker/alpine/Dockerfile.zulu-11u5-jdk b/docker/alpine/Dockerfile.zulu-11u5-jdk
index c9900c1d..652f6cb5 100644
--- a/docker/alpine/Dockerfile.zulu-11u5-jdk
+++ b/docker/alpine/Dockerfile.zulu-11u5-jdk
@@ -18,6 +18,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.5/$ZULU_PACK && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u5-jre b/docker/alpine/Dockerfile.zulu-11u5-jre
index 5dba2853..d69fb00d 100644
--- a/docker/alpine/Dockerfile.zulu-11u5-jre
+++ b/docker/alpine/Dockerfile.zulu-11u5-jre
@@ -18,6 +18,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.5/$ZULU_PACK && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u5-jre-headless b/docker/alpine/Dockerfile.zulu-11u5-jre-headless
index 20734ca3..d81c4869 100644
--- a/docker/alpine/Dockerfile.zulu-11u5-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-11u5-jre-headless
@@ -18,6 +18,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.5/$ZULU_PACK && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u5-jre-headless-tools b/docker/alpine/Dockerfile.zulu-11u5-jre-headless-tools
index 8b2f2437..1dfe6719 100644
--- a/docker/alpine/Dockerfile.zulu-11u5-jre-headless-tools
+++ b/docker/alpine/Dockerfile.zulu-11u5-jre-headless-tools
@@ -18,6 +18,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.5/$ZULU_PACK && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u6-jdk b/docker/alpine/Dockerfile.zulu-11u6-jdk
index 5d68ad82..7941a34d 100644
--- a/docker/alpine/Dockerfile.zulu-11u6-jdk
+++ b/docker/alpine/Dockerfile.zulu-11u6-jdk
@@ -18,6 +18,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.6/$ZULU_PACK && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u6-jre b/docker/alpine/Dockerfile.zulu-11u6-jre
index d85dab87..d9cd27f7 100644
--- a/docker/alpine/Dockerfile.zulu-11u6-jre
+++ b/docker/alpine/Dockerfile.zulu-11u6-jre
@@ -18,6 +18,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.6/$ZULU_PACK && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u6-jre-headless b/docker/alpine/Dockerfile.zulu-11u6-jre-headless
index 0c0b4e93..881bb51e 100644
--- a/docker/alpine/Dockerfile.zulu-11u6-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-11u6-jre-headless
@@ -18,6 +18,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.6/$ZULU_PACK && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u6-jre-headless-tools b/docker/alpine/Dockerfile.zulu-11u6-jre-headless-tools
index 7cc4cc2c..827bdb54 100644
--- a/docker/alpine/Dockerfile.zulu-11u6-jre-headless-tools
+++ b/docker/alpine/Dockerfile.zulu-11u6-jre-headless-tools
@@ -18,6 +18,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.6/$ZULU_PACK && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-13u1-jdk b/docker/alpine/Dockerfile.zulu-13u1-jdk
index b2157737..b1a23f64 100644
--- a/docker/alpine/Dockerfile.zulu-13u1-jdk
+++ b/docker/alpine/Dockerfile.zulu-13u1-jdk
@@ -18,6 +18,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.1/$ZULU_PACK && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-13u1-jre b/docker/alpine/Dockerfile.zulu-13u1-jre
index bc741be3..81cbe8de 100644
--- a/docker/alpine/Dockerfile.zulu-13u1-jre
+++ b/docker/alpine/Dockerfile.zulu-13u1-jre
@@ -18,6 +18,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.1/$ZULU_PACK && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-13u1-jre-headless b/docker/alpine/Dockerfile.zulu-13u1-jre-headless
index 15648fa2..789d9f32 100644
--- a/docker/alpine/Dockerfile.zulu-13u1-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-13u1-jre-headless
@@ -18,6 +18,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.1/$ZULU_PACK && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-13u1-jre-headless-tools b/docker/alpine/Dockerfile.zulu-13u1-jre-headless-tools
index 0843d602..3c88cb06 100644
--- a/docker/alpine/Dockerfile.zulu-13u1-jre-headless-tools
+++ b/docker/alpine/Dockerfile.zulu-13u1-jre-headless-tools
@@ -18,6 +18,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.1/$ZULU_PACK && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-13u2-jdk b/docker/alpine/Dockerfile.zulu-13u2-jdk
index ef715bde..24d6735a 100644
--- a/docker/alpine/Dockerfile.zulu-13u2-jdk
+++ b/docker/alpine/Dockerfile.zulu-13u2-jdk
@@ -18,6 +18,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.2/$ZULU_PACK && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-13u2-jre b/docker/alpine/Dockerfile.zulu-13u2-jre
index 01fc57bd..0594de2d 100644
--- a/docker/alpine/Dockerfile.zulu-13u2-jre
+++ b/docker/alpine/Dockerfile.zulu-13u2-jre
@@ -18,6 +18,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.2/$ZULU_PACK && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-13u2-jre-headless b/docker/alpine/Dockerfile.zulu-13u2-jre-headless
index 48789ec2..c75e4f58 100644
--- a/docker/alpine/Dockerfile.zulu-13u2-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-13u2-jre-headless
@@ -18,6 +18,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.2/$ZULU_PACK && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-13u2-jre-headless-tools b/docker/alpine/Dockerfile.zulu-13u2-jre-headless-tools
index ec10b185..ab2f29e0 100644
--- a/docker/alpine/Dockerfile.zulu-13u2-jre-headless-tools
+++ b/docker/alpine/Dockerfile.zulu-13u2-jre-headless-tools
@@ -18,6 +18,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.2/$ZULU_PACK && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u242-jdk b/docker/alpine/Dockerfile.zulu-7u242-jdk
index 3c0a7940..33d36d3d 100644
--- a/docker/alpine/Dockerfile.zulu-7u242-jdk
+++ b/docker/alpine/Dockerfile.zulu-7u242-jdk
@@ -17,7 +17,6 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
-    apk update && \
     apk --no-cache add binutils ca-certificates wget && \
     wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
     wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
@@ -29,6 +28,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
     rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u242/$ZULU_PACK && \
     rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u242-jre b/docker/alpine/Dockerfile.zulu-7u242-jre
index 3837817d..e50df2ff 100644
--- a/docker/alpine/Dockerfile.zulu-7u242-jre
+++ b/docker/alpine/Dockerfile.zulu-7u242-jre
@@ -17,7 +17,6 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
-    apk update && \
     apk --no-cache add binutils ca-certificates wget && \
     wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
     wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
@@ -29,6 +28,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
     rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u242/$ZULU_PACK && \
     rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u242-jre-headless b/docker/alpine/Dockerfile.zulu-7u242-jre-headless
index da5d5b42..95490206 100644
--- a/docker/alpine/Dockerfile.zulu-7u242-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-7u242-jre-headless
@@ -17,7 +17,6 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
-    apk update && \
     apk --no-cache add binutils ca-certificates wget && \
     wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
     wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
@@ -29,6 +28,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
     rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u242/$ZULU_PACK && \
     rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u252-jdk b/docker/alpine/Dockerfile.zulu-7u252-jdk
index 79adbae6..eab197af 100644
--- a/docker/alpine/Dockerfile.zulu-7u252-jdk
+++ b/docker/alpine/Dockerfile.zulu-7u252-jdk
@@ -17,7 +17,6 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
-    apk update && \
     apk --no-cache add binutils ca-certificates wget && \
     wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
     wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
@@ -29,6 +28,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
     rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u252/$ZULU_PACK && \
     rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u252-jre b/docker/alpine/Dockerfile.zulu-7u252-jre
index 84f05154..f4b90119 100644
--- a/docker/alpine/Dockerfile.zulu-7u252-jre
+++ b/docker/alpine/Dockerfile.zulu-7u252-jre
@@ -17,7 +17,6 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
-    apk update && \
     apk --no-cache add binutils ca-certificates wget && \
     wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
     wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
@@ -29,6 +28,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
     rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u252/$ZULU_PACK && \
     rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u252-jre-headless b/docker/alpine/Dockerfile.zulu-7u252-jre-headless
index 7ce4b1d0..97ce1f40 100644
--- a/docker/alpine/Dockerfile.zulu-7u252-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-7u252-jre-headless
@@ -17,7 +17,6 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
-    apk update && \
     apk --no-cache add binutils ca-certificates wget && \
     wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
     wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
@@ -29,6 +28,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
     rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u252/$ZULU_PACK && \
     rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u232-jdk b/docker/alpine/Dockerfile.zulu-8u232-jdk
index fd93a2d9..031900a7 100644
--- a/docker/alpine/Dockerfile.zulu-8u232-jdk
+++ b/docker/alpine/Dockerfile.zulu-8u232-jdk
@@ -18,6 +18,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u232/$ZULU_PACK && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u232-jre b/docker/alpine/Dockerfile.zulu-8u232-jre
index a73d86e5..fd586322 100644
--- a/docker/alpine/Dockerfile.zulu-8u232-jre
+++ b/docker/alpine/Dockerfile.zulu-8u232-jre
@@ -18,6 +18,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u232/$ZULU_PACK && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u232-jre-headless b/docker/alpine/Dockerfile.zulu-8u232-jre-headless
index b2838917..dd555097 100644
--- a/docker/alpine/Dockerfile.zulu-8u232-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-8u232-jre-headless
@@ -18,6 +18,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u232/$ZULU_PACK && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u232-jre-headless-tools b/docker/alpine/Dockerfile.zulu-8u232-jre-headless-tools
index a6a37545..68b2fd0a 100644
--- a/docker/alpine/Dockerfile.zulu-8u232-jre-headless-tools
+++ b/docker/alpine/Dockerfile.zulu-8u232-jre-headless-tools
@@ -17,6 +17,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u232/$ZULU_PACK && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u242-jdk b/docker/alpine/Dockerfile.zulu-8u242-jdk
index d095897e..99342c85 100644
--- a/docker/alpine/Dockerfile.zulu-8u242-jdk
+++ b/docker/alpine/Dockerfile.zulu-8u242-jdk
@@ -18,6 +18,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u242/$ZULU_PACK && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u242-jre b/docker/alpine/Dockerfile.zulu-8u242-jre
index 11c3163d..cda3341a 100644
--- a/docker/alpine/Dockerfile.zulu-8u242-jre
+++ b/docker/alpine/Dockerfile.zulu-8u242-jre
@@ -18,6 +18,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u242/$ZULU_PACK && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u242-jre-headless b/docker/alpine/Dockerfile.zulu-8u242-jre-headless
index 087e12ce..1bccaf7b 100644
--- a/docker/alpine/Dockerfile.zulu-8u242-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-8u242-jre-headless
@@ -18,6 +18,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u242/$ZULU_PACK && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u242-jre-headless-tools b/docker/alpine/Dockerfile.zulu-8u242-jre-headless-tools
index 5b1ba4af..e54b2026 100644
--- a/docker/alpine/Dockerfile.zulu-8u242-jre-headless-tools
+++ b/docker/alpine/Dockerfile.zulu-8u242-jre-headless-tools
@@ -17,6 +17,8 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u242/$ZULU_PACK && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \

From 358a12218de60a056ce822bc9d9bad7903a73cca Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 25 Mar 2020 10:13:15 -0500
Subject: [PATCH 056/264] Added yum upgrade command

---
 docker/centos/Dockerfile.zulu-11u5-jdk           | 1 +
 docker/centos/Dockerfile.zulu-11u5-jre           | 1 +
 docker/centos/Dockerfile.zulu-11u5-jre-headless  | 1 +
 docker/centos/Dockerfile.zulu-11u6-jdk           | 1 +
 docker/centos/Dockerfile.zulu-11u6-jre           | 1 +
 docker/centos/Dockerfile.zulu-11u6-jre-headless  | 1 +
 docker/centos/Dockerfile.zulu-13u1-jdk           | 1 +
 docker/centos/Dockerfile.zulu-13u1-jre           | 1 +
 docker/centos/Dockerfile.zulu-13u1-jre-headless  | 1 +
 docker/centos/Dockerfile.zulu-13u2-jdk           | 1 +
 docker/centos/Dockerfile.zulu-13u2-jre           | 1 +
 docker/centos/Dockerfile.zulu-13u2-jre-headless  | 1 +
 docker/centos/Dockerfile.zulu-7u242-jdk          | 1 +
 docker/centos/Dockerfile.zulu-7u242-jre          | 1 +
 docker/centos/Dockerfile.zulu-7u242-jre-headless | 1 +
 docker/centos/Dockerfile.zulu-7u252-jdk          | 1 +
 docker/centos/Dockerfile.zulu-7u252-jre          | 1 +
 docker/centos/Dockerfile.zulu-7u252-jre-headless | 1 +
 docker/centos/Dockerfile.zulu-8u232-jdk          | 1 +
 docker/centos/Dockerfile.zulu-8u232-jre          | 1 +
 docker/centos/Dockerfile.zulu-8u232-jre-headless | 1 +
 docker/centos/Dockerfile.zulu-8u242-jdk          | 1 +
 docker/centos/Dockerfile.zulu-8u242-jre          | 1 +
 docker/centos/Dockerfile.zulu-8u242-jre-headless | 1 +
 24 files changed, 24 insertions(+)

diff --git a/docker/centos/Dockerfile.zulu-11u5-jdk b/docker/centos/Dockerfile.zulu-11u5-jdk
index 6bd3e74f..e962651e 100644
--- a/docker/centos/Dockerfile.zulu-11u5-jdk
+++ b/docker/centos/Dockerfile.zulu-11u5-jdk
@@ -10,6 +10,7 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
+    yum -q -y upgrade && \
     yum -q -y install zulu-11-azure-jdk-11.35+15
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure
diff --git a/docker/centos/Dockerfile.zulu-11u5-jre b/docker/centos/Dockerfile.zulu-11u5-jre
index ec224781..2c055a11 100644
--- a/docker/centos/Dockerfile.zulu-11u5-jre
+++ b/docker/centos/Dockerfile.zulu-11u5-jre
@@ -10,6 +10,7 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
+    yum -q -y upgrade && \
     yum -q -y install zulu-11-azure-jre-11.35+15
 
 ENV JAVA_HOME=/usr/lib/jvm/jre-11-azure
diff --git a/docker/centos/Dockerfile.zulu-11u5-jre-headless b/docker/centos/Dockerfile.zulu-11u5-jre-headless
index dc0cf2d1..0e2d39fe 100644
--- a/docker/centos/Dockerfile.zulu-11u5-jre-headless
+++ b/docker/centos/Dockerfile.zulu-11u5-jre-headless
@@ -10,6 +10,7 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
+    yum -q -y upgrade && \
     yum -q -y install zulu-11-azure-jre-headless-11.35+15
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure
diff --git a/docker/centos/Dockerfile.zulu-11u6-jdk b/docker/centos/Dockerfile.zulu-11u6-jdk
index 6cec3b06..5231d3d9 100644
--- a/docker/centos/Dockerfile.zulu-11u6-jdk
+++ b/docker/centos/Dockerfile.zulu-11u6-jdk
@@ -10,6 +10,7 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
+    yum -q -y upgrade && \
     yum -q -y install zulu-11-azure-jdk-11.37+17
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure
diff --git a/docker/centos/Dockerfile.zulu-11u6-jre b/docker/centos/Dockerfile.zulu-11u6-jre
index 726b1222..e6ad7dbc 100644
--- a/docker/centos/Dockerfile.zulu-11u6-jre
+++ b/docker/centos/Dockerfile.zulu-11u6-jre
@@ -10,6 +10,7 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
+    yum -q -y upgrade && \
     yum -q -y install zulu-11-azure-jre-11.37+17
 
 ENV JAVA_HOME=/usr/lib/jvm/jre-11-azure
diff --git a/docker/centos/Dockerfile.zulu-11u6-jre-headless b/docker/centos/Dockerfile.zulu-11u6-jre-headless
index 37c5bdba..8df35621 100644
--- a/docker/centos/Dockerfile.zulu-11u6-jre-headless
+++ b/docker/centos/Dockerfile.zulu-11u6-jre-headless
@@ -10,6 +10,7 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
+    yum -q -y upgrade && \
     yum -q -y install zulu-11-azure-jre-headless-11.37+17
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure
diff --git a/docker/centos/Dockerfile.zulu-13u1-jdk b/docker/centos/Dockerfile.zulu-13u1-jdk
index 023ce1ae..6738e5fc 100644
--- a/docker/centos/Dockerfile.zulu-13u1-jdk
+++ b/docker/centos/Dockerfile.zulu-13u1-jdk
@@ -10,6 +10,7 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
+    yum -q -y upgrade && \
     yum -q -y install zulu-13-azure-jdk-13.28+11
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure
diff --git a/docker/centos/Dockerfile.zulu-13u1-jre b/docker/centos/Dockerfile.zulu-13u1-jre
index ae767d17..100254d9 100644
--- a/docker/centos/Dockerfile.zulu-13u1-jre
+++ b/docker/centos/Dockerfile.zulu-13u1-jre
@@ -10,6 +10,7 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
+    yum -q -y upgrade && \
     yum -q -y install zulu-13-azure-jre-13.28+11
 
 ENV JAVA_HOME=/usr/lib/jvm/jre-13-azure
diff --git a/docker/centos/Dockerfile.zulu-13u1-jre-headless b/docker/centos/Dockerfile.zulu-13u1-jre-headless
index a7a5e64e..9c554d8d 100644
--- a/docker/centos/Dockerfile.zulu-13u1-jre-headless
+++ b/docker/centos/Dockerfile.zulu-13u1-jre-headless
@@ -10,6 +10,7 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
+    yum -q -y upgrade && \
     yum -q -y install zulu-13-azure-jre-headless-13.28+11
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure
diff --git a/docker/centos/Dockerfile.zulu-13u2-jdk b/docker/centos/Dockerfile.zulu-13u2-jdk
index b0a5cd6f..986274ba 100644
--- a/docker/centos/Dockerfile.zulu-13u2-jdk
+++ b/docker/centos/Dockerfile.zulu-13u2-jdk
@@ -10,6 +10,7 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
+    yum -q -y upgrade && \
     yum -q -y install zulu-13-azure-jdk-13.29+9
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure
diff --git a/docker/centos/Dockerfile.zulu-13u2-jre b/docker/centos/Dockerfile.zulu-13u2-jre
index 0d2c09ce..ae1ae190 100644
--- a/docker/centos/Dockerfile.zulu-13u2-jre
+++ b/docker/centos/Dockerfile.zulu-13u2-jre
@@ -10,6 +10,7 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
+    yum -q -y upgrade && \
     yum -q -y install zulu-13-azure-jre-13.29+9
 
 ENV JAVA_HOME=/usr/lib/jvm/jre-13-azure
diff --git a/docker/centos/Dockerfile.zulu-13u2-jre-headless b/docker/centos/Dockerfile.zulu-13u2-jre-headless
index 6a465f50..404f6697 100644
--- a/docker/centos/Dockerfile.zulu-13u2-jre-headless
+++ b/docker/centos/Dockerfile.zulu-13u2-jre-headless
@@ -10,6 +10,7 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
+    yum -q -y upgrade && \
     yum -q -y install zulu-13-azure-jre-headless-13.29+9
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure
diff --git a/docker/centos/Dockerfile.zulu-7u242-jdk b/docker/centos/Dockerfile.zulu-7u242-jdk
index b865934c..12035cb4 100644
--- a/docker/centos/Dockerfile.zulu-7u242-jdk
+++ b/docker/centos/Dockerfile.zulu-7u242-jdk
@@ -10,6 +10,7 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
+    yum -q -y upgrade && \
     yum -q -y install zulu-7-azure-jdk-7.34.0.5
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure
diff --git a/docker/centos/Dockerfile.zulu-7u242-jre b/docker/centos/Dockerfile.zulu-7u242-jre
index b92eb517..5ec080a2 100644
--- a/docker/centos/Dockerfile.zulu-7u242-jre
+++ b/docker/centos/Dockerfile.zulu-7u242-jre
@@ -10,6 +10,7 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
+    yum -q -y upgrade && \
     yum -q -y install zulu-7-azure-jre-7.34.0.5
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure
diff --git a/docker/centos/Dockerfile.zulu-7u242-jre-headless b/docker/centos/Dockerfile.zulu-7u242-jre-headless
index d4325200..0f7d2d5c 100644
--- a/docker/centos/Dockerfile.zulu-7u242-jre-headless
+++ b/docker/centos/Dockerfile.zulu-7u242-jre-headless
@@ -10,6 +10,7 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
+    yum -q -y upgrade && \
     yum -q -y install zulu-7-azure-jre-headless-7.34.0.5
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure
diff --git a/docker/centos/Dockerfile.zulu-7u252-jdk b/docker/centos/Dockerfile.zulu-7u252-jdk
index 2257b972..e0d68ed4 100644
--- a/docker/centos/Dockerfile.zulu-7u252-jdk
+++ b/docker/centos/Dockerfile.zulu-7u252-jdk
@@ -10,6 +10,7 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
+    yum -q -y upgrade && \
     yum -q -y install zulu-7-azure-jdk-7.36.0.5
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure
diff --git a/docker/centos/Dockerfile.zulu-7u252-jre b/docker/centos/Dockerfile.zulu-7u252-jre
index 3c4ad1a7..7e25a0df 100644
--- a/docker/centos/Dockerfile.zulu-7u252-jre
+++ b/docker/centos/Dockerfile.zulu-7u252-jre
@@ -10,6 +10,7 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
+    yum -q -y upgrade && \
     yum -q -y install zulu-7-azure-jre-7.36.0.5
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure
diff --git a/docker/centos/Dockerfile.zulu-7u252-jre-headless b/docker/centos/Dockerfile.zulu-7u252-jre-headless
index 758160dc..7cccf9c3 100644
--- a/docker/centos/Dockerfile.zulu-7u252-jre-headless
+++ b/docker/centos/Dockerfile.zulu-7u252-jre-headless
@@ -10,6 +10,7 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
+    yum -q -y upgrade && \
     yum -q -y install zulu-7-azure-jre-headless-7.36.0.5
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure
diff --git a/docker/centos/Dockerfile.zulu-8u232-jdk b/docker/centos/Dockerfile.zulu-8u232-jdk
index 0ed494e0..d8ba2be1 100644
--- a/docker/centos/Dockerfile.zulu-8u232-jdk
+++ b/docker/centos/Dockerfile.zulu-8u232-jdk
@@ -10,6 +10,7 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
+    yum -q -y upgrade && \
     yum -q -y install zulu-8-azure-jdk-8.42.0.23
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure
diff --git a/docker/centos/Dockerfile.zulu-8u232-jre b/docker/centos/Dockerfile.zulu-8u232-jre
index 8ca7a18c..7b9ec6aa 100644
--- a/docker/centos/Dockerfile.zulu-8u232-jre
+++ b/docker/centos/Dockerfile.zulu-8u232-jre
@@ -10,6 +10,7 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
+    yum -q -y upgrade && \
     yum -q -y install zulu-8-azure-jre-8.42.0.23
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure
diff --git a/docker/centos/Dockerfile.zulu-8u232-jre-headless b/docker/centos/Dockerfile.zulu-8u232-jre-headless
index c45a68ae..8cb95a4a 100644
--- a/docker/centos/Dockerfile.zulu-8u232-jre-headless
+++ b/docker/centos/Dockerfile.zulu-8u232-jre-headless
@@ -10,6 +10,7 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
+    yum -q -y upgrade && \
     yum -q -y install zulu-8-azure-jre-headless-8.42.0.23
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure
diff --git a/docker/centos/Dockerfile.zulu-8u242-jdk b/docker/centos/Dockerfile.zulu-8u242-jdk
index 903f298a..1b61958e 100644
--- a/docker/centos/Dockerfile.zulu-8u242-jdk
+++ b/docker/centos/Dockerfile.zulu-8u242-jdk
@@ -10,6 +10,7 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
+    yum -q -y upgrade && \
     yum -q -y install zulu-8-azure-jdk-8.44.0.11
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure
diff --git a/docker/centos/Dockerfile.zulu-8u242-jre b/docker/centos/Dockerfile.zulu-8u242-jre
index b516ee02..7e109e0d 100644
--- a/docker/centos/Dockerfile.zulu-8u242-jre
+++ b/docker/centos/Dockerfile.zulu-8u242-jre
@@ -10,6 +10,7 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
+    yum -q -y upgrade && \
     yum -q -y install zulu-8-azure-jre-8.44.0.11
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure
diff --git a/docker/centos/Dockerfile.zulu-8u242-jre-headless b/docker/centos/Dockerfile.zulu-8u242-jre-headless
index 89b0b4c9..4345aa4d 100644
--- a/docker/centos/Dockerfile.zulu-8u242-jre-headless
+++ b/docker/centos/Dockerfile.zulu-8u242-jre-headless
@@ -10,6 +10,7 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
+    yum -q -y upgrade && \
     yum -q -y install zulu-8-azure-jre-headless-8.44.0.11
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure

From 72402dbfbb9bf4e04f71c59eb324bcfe8e6f5bcd Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 25 Mar 2020 11:16:13 -0500
Subject: [PATCH 057/264] Added apt-get dist-upgrade command

---
 docker/debian8/Dockerfile.zulu-11u5-jdk           |  9 +++++----
 docker/debian8/Dockerfile.zulu-11u5-jre           |  9 +++++----
 docker/debian8/Dockerfile.zulu-11u5-jre-headless  |  9 +++++----
 docker/debian8/Dockerfile.zulu-11u6-jdk           |  9 +++++----
 docker/debian8/Dockerfile.zulu-11u6-jre           |  9 +++++----
 docker/debian8/Dockerfile.zulu-11u6-jre-headless  |  9 +++++----
 docker/debian8/Dockerfile.zulu-13u1-jdk           |  9 +++++----
 docker/debian8/Dockerfile.zulu-13u1-jre           |  9 +++++----
 docker/debian8/Dockerfile.zulu-13u1-jre-headless  |  9 +++++----
 docker/debian8/Dockerfile.zulu-13u2-jdk           |  9 +++++----
 docker/debian8/Dockerfile.zulu-13u2-jre           |  9 +++++----
 docker/debian8/Dockerfile.zulu-13u2-jre-headless  |  9 +++++----
 docker/debian8/Dockerfile.zulu-7u242-jdk          |  9 +++++----
 docker/debian8/Dockerfile.zulu-7u242-jre          |  9 +++++----
 docker/debian8/Dockerfile.zulu-7u242-jre-headless |  9 +++++----
 docker/debian8/Dockerfile.zulu-7u252-jdk          |  9 +++++----
 docker/debian8/Dockerfile.zulu-7u252-jre          |  9 +++++----
 docker/debian8/Dockerfile.zulu-7u252-jre-headless |  9 +++++----
 docker/debian8/Dockerfile.zulu-8u232-jdk          | 11 +++++------
 docker/debian8/Dockerfile.zulu-8u232-jre          |  9 +++++----
 docker/debian8/Dockerfile.zulu-8u232-jre-headless |  9 +++++----
 docker/debian8/Dockerfile.zulu-8u242-jdk          | 11 +++++------
 docker/debian8/Dockerfile.zulu-8u242-jre          |  9 +++++----
 docker/debian8/Dockerfile.zulu-8u242-jre-headless |  9 +++++----
 24 files changed, 120 insertions(+), 100 deletions(-)

diff --git a/docker/debian8/Dockerfile.zulu-11u5-jdk b/docker/debian8/Dockerfile.zulu-11u5-jdk
index e44fb69e..fb5ac705 100644
--- a/docker/debian8/Dockerfile.zulu-11u5-jdk
+++ b/docker/debian8/Dockerfile.zulu-11u5-jdk
@@ -7,12 +7,13 @@
 FROM debian:jessie
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-11-azure-jdk=11.35+15 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.35+15 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-11u5-jre b/docker/debian8/Dockerfile.zulu-11u5-jre
index 90d97495..c99021b2 100644
--- a/docker/debian8/Dockerfile.zulu-11u5-jre
+++ b/docker/debian8/Dockerfile.zulu-11u5-jre
@@ -7,12 +7,13 @@
 FROM debian:jessie
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-11-azure-jre=11.35+15 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.35+15 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-11u5-jre-headless b/docker/debian8/Dockerfile.zulu-11u5-jre-headless
index 54040e4e..9eb8d475 100644
--- a/docker/debian8/Dockerfile.zulu-11u5-jre-headless
+++ b/docker/debian8/Dockerfile.zulu-11u5-jre-headless
@@ -7,12 +7,13 @@
 FROM debian:jessie
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-11-azure-jre-headless=11.35+15 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.35+15 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-11u6-jdk b/docker/debian8/Dockerfile.zulu-11u6-jdk
index 55b61fa4..569f5e9a 100644
--- a/docker/debian8/Dockerfile.zulu-11u6-jdk
+++ b/docker/debian8/Dockerfile.zulu-11u6-jdk
@@ -7,12 +7,13 @@
 FROM debian:jessie
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-11-azure-jdk=11.37+17 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.37+17 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-11u6-jre b/docker/debian8/Dockerfile.zulu-11u6-jre
index 80d12340..1bbb6a66 100644
--- a/docker/debian8/Dockerfile.zulu-11u6-jre
+++ b/docker/debian8/Dockerfile.zulu-11u6-jre
@@ -7,12 +7,13 @@
 FROM debian:jessie
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-11-azure-jre=11.37+17 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.37+17 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-11u6-jre-headless b/docker/debian8/Dockerfile.zulu-11u6-jre-headless
index 167a1c4b..8a9406cd 100644
--- a/docker/debian8/Dockerfile.zulu-11u6-jre-headless
+++ b/docker/debian8/Dockerfile.zulu-11u6-jre-headless
@@ -7,12 +7,13 @@
 FROM debian:jessie
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-11-azure-jre-headless=11.37+17 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.37+17 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-13u1-jdk b/docker/debian8/Dockerfile.zulu-13u1-jdk
index bb09f6bc..05669021 100644
--- a/docker/debian8/Dockerfile.zulu-13u1-jdk
+++ b/docker/debian8/Dockerfile.zulu-13u1-jdk
@@ -7,12 +7,13 @@
 FROM debian:jessie
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-13-azure-jdk=13.28+11 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.28+11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-13u1-jre b/docker/debian8/Dockerfile.zulu-13u1-jre
index 372cb095..a737c0d0 100644
--- a/docker/debian8/Dockerfile.zulu-13u1-jre
+++ b/docker/debian8/Dockerfile.zulu-13u1-jre
@@ -7,12 +7,13 @@
 FROM debian:jessie
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-13-azure-jre=13.28+11 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.28+11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-13u1-jre-headless b/docker/debian8/Dockerfile.zulu-13u1-jre-headless
index 7620c984..d4ac5892 100644
--- a/docker/debian8/Dockerfile.zulu-13u1-jre-headless
+++ b/docker/debian8/Dockerfile.zulu-13u1-jre-headless
@@ -7,12 +7,13 @@
 FROM debian:jessie
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-13-azure-jre-headless=13.28+11 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.28+11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-13u2-jdk b/docker/debian8/Dockerfile.zulu-13u2-jdk
index d905279c..4729eec3 100644
--- a/docker/debian8/Dockerfile.zulu-13u2-jdk
+++ b/docker/debian8/Dockerfile.zulu-13u2-jdk
@@ -7,12 +7,13 @@
 FROM debian:jessie
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-13-azure-jdk=13.29+9 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.29+9 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-13u2-jre b/docker/debian8/Dockerfile.zulu-13u2-jre
index 3fa7df53..169c2c49 100644
--- a/docker/debian8/Dockerfile.zulu-13u2-jre
+++ b/docker/debian8/Dockerfile.zulu-13u2-jre
@@ -7,12 +7,13 @@
 FROM debian:jessie
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-13-azure-jre=13.29+9 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.29+9 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-13u2-jre-headless b/docker/debian8/Dockerfile.zulu-13u2-jre-headless
index d96dd461..676f8c6c 100644
--- a/docker/debian8/Dockerfile.zulu-13u2-jre-headless
+++ b/docker/debian8/Dockerfile.zulu-13u2-jre-headless
@@ -7,12 +7,13 @@
 FROM debian:jessie
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-13-azure-jre-headless=13.29+9 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.29+9 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-7u242-jdk b/docker/debian8/Dockerfile.zulu-7u242-jdk
index 17e85b2a..1bd9af3a 100644
--- a/docker/debian8/Dockerfile.zulu-7u242-jdk
+++ b/docker/debian8/Dockerfile.zulu-7u242-jdk
@@ -7,12 +7,13 @@
 FROM debian:jessie
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-7-azure-jdk=7.34.0.5 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.34.0.5 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-7u242-jre b/docker/debian8/Dockerfile.zulu-7u242-jre
index 1809d0db..c5e5b8cb 100644
--- a/docker/debian8/Dockerfile.zulu-7u242-jre
+++ b/docker/debian8/Dockerfile.zulu-7u242-jre
@@ -7,12 +7,13 @@
 FROM debian:jessie
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-7-azure-jre=7.34.0.5 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.34.0.5 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-7u242-jre-headless b/docker/debian8/Dockerfile.zulu-7u242-jre-headless
index 55264319..f9368e75 100644
--- a/docker/debian8/Dockerfile.zulu-7u242-jre-headless
+++ b/docker/debian8/Dockerfile.zulu-7u242-jre-headless
@@ -7,12 +7,13 @@
 FROM debian:jessie
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-7-azure-jre-headless=7.34.0.5 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.34.0.5 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-7u252-jdk b/docker/debian8/Dockerfile.zulu-7u252-jdk
index 9e9d4339..1d2b1628 100644
--- a/docker/debian8/Dockerfile.zulu-7u252-jdk
+++ b/docker/debian8/Dockerfile.zulu-7u252-jdk
@@ -7,12 +7,13 @@
 FROM debian:jessie
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-7-azure-jdk=7.36.0.5 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.36.0.5 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-7u252-jre b/docker/debian8/Dockerfile.zulu-7u252-jre
index 2ecf8474..1644a26d 100644
--- a/docker/debian8/Dockerfile.zulu-7u252-jre
+++ b/docker/debian8/Dockerfile.zulu-7u252-jre
@@ -7,12 +7,13 @@
 FROM debian:jessie
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-7-azure-jre=7.36.0.5 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.36.0.5 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-7u252-jre-headless b/docker/debian8/Dockerfile.zulu-7u252-jre-headless
index cb9f67f7..c7cfe7a9 100644
--- a/docker/debian8/Dockerfile.zulu-7u252-jre-headless
+++ b/docker/debian8/Dockerfile.zulu-7u252-jre-headless
@@ -7,12 +7,13 @@
 FROM debian:jessie
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-7-azure-jre-headless=7.36.0.5 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.36.0.5 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-8u232-jdk b/docker/debian8/Dockerfile.zulu-8u232-jdk
index 8f4de8d4..080ff957 100644
--- a/docker/debian8/Dockerfile.zulu-8u232-jdk
+++ b/docker/debian8/Dockerfile.zulu-8u232-jdk
@@ -7,14 +7,13 @@
 FROM debian:jessie
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list
-
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jdk=8.42.0.23 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.42.0.23 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-8u232-jre b/docker/debian8/Dockerfile.zulu-8u232-jre
index f9d699e3..24e6722f 100644
--- a/docker/debian8/Dockerfile.zulu-8u232-jre
+++ b/docker/debian8/Dockerfile.zulu-8u232-jre
@@ -7,12 +7,13 @@
 FROM debian:jessie
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jre=8.42.0.23 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.42.0.23 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-8u232-jre-headless b/docker/debian8/Dockerfile.zulu-8u232-jre-headless
index 7768dd0b..3cd7e465 100644
--- a/docker/debian8/Dockerfile.zulu-8u232-jre-headless
+++ b/docker/debian8/Dockerfile.zulu-8u232-jre-headless
@@ -7,12 +7,13 @@
 FROM debian:jessie
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jre-headless=8.42.0.23 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.42.0.23 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-8u242-jdk b/docker/debian8/Dockerfile.zulu-8u242-jdk
index 620532e1..f2755f48 100644
--- a/docker/debian8/Dockerfile.zulu-8u242-jdk
+++ b/docker/debian8/Dockerfile.zulu-8u242-jdk
@@ -7,14 +7,13 @@
 FROM debian:jessie
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN printf "deb http://archive.debian.org/debian/ jessie main\ndeb-src http://archive.debian.org/debian/ jessie main\ndeb http://security.debian.org jessie/updates main\ndeb-src http://security.debian.org jessie/updates main" > /etc/apt/sources.list
-
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jdk=8.44.0.11 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.44.0.11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-8u242-jre b/docker/debian8/Dockerfile.zulu-8u242-jre
index 2c2039a6..bd72f320 100644
--- a/docker/debian8/Dockerfile.zulu-8u242-jre
+++ b/docker/debian8/Dockerfile.zulu-8u242-jre
@@ -7,12 +7,13 @@
 FROM debian:jessie
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jre=8.44.0.11 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.44.0.11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian8/Dockerfile.zulu-8u242-jre-headless b/docker/debian8/Dockerfile.zulu-8u242-jre-headless
index 274b2fb9..2e3d0e5d 100644
--- a/docker/debian8/Dockerfile.zulu-8u242-jre-headless
+++ b/docker/debian8/Dockerfile.zulu-8u242-jre-headless
@@ -7,12 +7,13 @@
 FROM debian:jessie
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jre-headless=8.44.0.11 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.44.0.11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64

From e92058a5f050d146bdc7615d482e3950dbed8be8 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 25 Mar 2020 13:18:50 -0500
Subject: [PATCH 058/264] Added the apt-get dist-upgrade command

---
 docker/debian9/Dockerfile.zulu-11u5-jdk           | 9 +++++----
 docker/debian9/Dockerfile.zulu-11u5-jre           | 9 +++++----
 docker/debian9/Dockerfile.zulu-11u5-jre-headless  | 9 +++++----
 docker/debian9/Dockerfile.zulu-11u6-jdk           | 9 +++++----
 docker/debian9/Dockerfile.zulu-11u6-jre           | 9 +++++----
 docker/debian9/Dockerfile.zulu-11u6-jre-headless  | 9 +++++----
 docker/debian9/Dockerfile.zulu-13u1-jdk           | 9 +++++----
 docker/debian9/Dockerfile.zulu-13u1-jre           | 9 +++++----
 docker/debian9/Dockerfile.zulu-13u1-jre-headless  | 9 +++++----
 docker/debian9/Dockerfile.zulu-13u2-jdk           | 9 +++++----
 docker/debian9/Dockerfile.zulu-13u2-jre           | 9 +++++----
 docker/debian9/Dockerfile.zulu-13u2-jre-headless  | 9 +++++----
 docker/debian9/Dockerfile.zulu-7u242-jdk          | 9 +++++----
 docker/debian9/Dockerfile.zulu-7u242-jre          | 9 +++++----
 docker/debian9/Dockerfile.zulu-7u242-jre-headless | 9 +++++----
 docker/debian9/Dockerfile.zulu-7u252-jdk          | 9 +++++----
 docker/debian9/Dockerfile.zulu-7u252-jre          | 9 +++++----
 docker/debian9/Dockerfile.zulu-7u252-jre-headless | 9 +++++----
 docker/debian9/Dockerfile.zulu-8u232-jdk          | 9 +++++----
 docker/debian9/Dockerfile.zulu-8u232-jre          | 9 +++++----
 docker/debian9/Dockerfile.zulu-8u232-jre-headless | 9 +++++----
 docker/debian9/Dockerfile.zulu-8u242-jdk          | 9 +++++----
 docker/debian9/Dockerfile.zulu-8u242-jre          | 9 +++++----
 docker/debian9/Dockerfile.zulu-8u242-jre-headless | 9 +++++----
 24 files changed, 120 insertions(+), 96 deletions(-)

diff --git a/docker/debian9/Dockerfile.zulu-11u5-jdk b/docker/debian9/Dockerfile.zulu-11u5-jdk
index e9df98f6..c9d302a3 100644
--- a/docker/debian9/Dockerfile.zulu-11u5-jdk
+++ b/docker/debian9/Dockerfile.zulu-11u5-jdk
@@ -7,12 +7,13 @@
 FROM debian:stretch
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-11-azure-jdk=11.35+15 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.35+15 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u5-jre b/docker/debian9/Dockerfile.zulu-11u5-jre
index 5553f841..863b0409 100644
--- a/docker/debian9/Dockerfile.zulu-11u5-jre
+++ b/docker/debian9/Dockerfile.zulu-11u5-jre
@@ -7,12 +7,13 @@
 FROM debian:stretch
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-11-azure-jre=11.35+15 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.35+15 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u5-jre-headless b/docker/debian9/Dockerfile.zulu-11u5-jre-headless
index 25641fd6..98816a43 100644
--- a/docker/debian9/Dockerfile.zulu-11u5-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-11u5-jre-headless
@@ -7,12 +7,13 @@
 FROM debian:stretch
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-11-azure-jre-headless=11.35+15 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.35+15 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u6-jdk b/docker/debian9/Dockerfile.zulu-11u6-jdk
index b1d3cd33..ab814055 100644
--- a/docker/debian9/Dockerfile.zulu-11u6-jdk
+++ b/docker/debian9/Dockerfile.zulu-11u6-jdk
@@ -7,12 +7,13 @@
 FROM debian:stretch
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-11-azure-jdk=11.37+17 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.37+17 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u6-jre b/docker/debian9/Dockerfile.zulu-11u6-jre
index 2dfb8ac3..106b6491 100644
--- a/docker/debian9/Dockerfile.zulu-11u6-jre
+++ b/docker/debian9/Dockerfile.zulu-11u6-jre
@@ -7,12 +7,13 @@
 FROM debian:stretch
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-11-azure-jre=11.37+17 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.37+17 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u6-jre-headless b/docker/debian9/Dockerfile.zulu-11u6-jre-headless
index 73d0fbdf..c58b42e3 100644
--- a/docker/debian9/Dockerfile.zulu-11u6-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-11u6-jre-headless
@@ -7,12 +7,13 @@
 FROM debian:stretch
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-11-azure-jre-headless=11.37+17 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.37+17 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u1-jdk b/docker/debian9/Dockerfile.zulu-13u1-jdk
index a50a2725..fe263ddb 100644
--- a/docker/debian9/Dockerfile.zulu-13u1-jdk
+++ b/docker/debian9/Dockerfile.zulu-13u1-jdk
@@ -7,12 +7,13 @@
 FROM debian:stretch
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-13-azure-jdk=13.28+11 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.28+11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u1-jre b/docker/debian9/Dockerfile.zulu-13u1-jre
index 193df393..2d9bfad4 100644
--- a/docker/debian9/Dockerfile.zulu-13u1-jre
+++ b/docker/debian9/Dockerfile.zulu-13u1-jre
@@ -7,12 +7,13 @@
 FROM debian:stretch
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-13-azure-jre=13.28+11 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.28+11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u1-jre-headless b/docker/debian9/Dockerfile.zulu-13u1-jre-headless
index 2b149416..13ab9a8f 100644
--- a/docker/debian9/Dockerfile.zulu-13u1-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-13u1-jre-headless
@@ -7,12 +7,13 @@
 FROM debian:stretch
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-13-azure-jre-headless=13.28+11 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.28+11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u2-jdk b/docker/debian9/Dockerfile.zulu-13u2-jdk
index af768ba9..84a516c6 100644
--- a/docker/debian9/Dockerfile.zulu-13u2-jdk
+++ b/docker/debian9/Dockerfile.zulu-13u2-jdk
@@ -7,12 +7,13 @@
 FROM debian:stretch
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-13-azure-jdk=13.29+9 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.29+9 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u2-jre b/docker/debian9/Dockerfile.zulu-13u2-jre
index 1ecef845..6b6f560e 100644
--- a/docker/debian9/Dockerfile.zulu-13u2-jre
+++ b/docker/debian9/Dockerfile.zulu-13u2-jre
@@ -7,12 +7,13 @@
 FROM debian:stretch
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-13-azure-jre=13.29+9 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.29+9 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u2-jre-headless b/docker/debian9/Dockerfile.zulu-13u2-jre-headless
index a8e22fad..e385a1c3 100644
--- a/docker/debian9/Dockerfile.zulu-13u2-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-13u2-jre-headless
@@ -7,12 +7,13 @@
 FROM debian:stretch
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-13-azure-jre-headless=13.29+9 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.29+9 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u242-jdk b/docker/debian9/Dockerfile.zulu-7u242-jdk
index 6a985140..1bcb78cc 100644
--- a/docker/debian9/Dockerfile.zulu-7u242-jdk
+++ b/docker/debian9/Dockerfile.zulu-7u242-jdk
@@ -7,12 +7,13 @@
 FROM debian:stretch
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-7-azure-jdk=7.34.0.5 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.34.0.5 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u242-jre b/docker/debian9/Dockerfile.zulu-7u242-jre
index 1417ac6e..6dcc8cf9 100644
--- a/docker/debian9/Dockerfile.zulu-7u242-jre
+++ b/docker/debian9/Dockerfile.zulu-7u242-jre
@@ -7,12 +7,13 @@
 FROM debian:stretch
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-7-azure-jre=7.34.0.5 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.34.0.5 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u242-jre-headless b/docker/debian9/Dockerfile.zulu-7u242-jre-headless
index 48be6d43..afda0042 100644
--- a/docker/debian9/Dockerfile.zulu-7u242-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-7u242-jre-headless
@@ -7,12 +7,13 @@
 FROM debian:stretch
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-7-azure-jre-headless=7.34.0.5 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.34.0.5 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u252-jdk b/docker/debian9/Dockerfile.zulu-7u252-jdk
index 7e98fb0e..f00da4ba 100644
--- a/docker/debian9/Dockerfile.zulu-7u252-jdk
+++ b/docker/debian9/Dockerfile.zulu-7u252-jdk
@@ -7,12 +7,13 @@
 FROM debian:stretch
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-7-azure-jdk=7.36.0.5 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.36.0.5 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u252-jre b/docker/debian9/Dockerfile.zulu-7u252-jre
index 78d57232..3a36265e 100644
--- a/docker/debian9/Dockerfile.zulu-7u252-jre
+++ b/docker/debian9/Dockerfile.zulu-7u252-jre
@@ -7,12 +7,13 @@
 FROM debian:stretch
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-7-azure-jre=7.36.0.5 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.36.0.5 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u252-jre-headless b/docker/debian9/Dockerfile.zulu-7u252-jre-headless
index efc322ab..4f6c6f9a 100644
--- a/docker/debian9/Dockerfile.zulu-7u252-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-7u252-jre-headless
@@ -7,12 +7,13 @@
 FROM debian:stretch
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-7-azure-jre-headless=7.36.0.5 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.36.0.5 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u232-jdk b/docker/debian9/Dockerfile.zulu-8u232-jdk
index dd30ddd8..c1d9c8ac 100644
--- a/docker/debian9/Dockerfile.zulu-8u232-jdk
+++ b/docker/debian9/Dockerfile.zulu-8u232-jdk
@@ -7,12 +7,13 @@
 FROM debian:stretch
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jdk=8.42.0.23 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.42.0.23 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u232-jre b/docker/debian9/Dockerfile.zulu-8u232-jre
index 017d0cd2..fed865ec 100644
--- a/docker/debian9/Dockerfile.zulu-8u232-jre
+++ b/docker/debian9/Dockerfile.zulu-8u232-jre
@@ -7,12 +7,13 @@
 FROM debian:stretch
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jre=8.42.0.23 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.42.0.23 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u232-jre-headless b/docker/debian9/Dockerfile.zulu-8u232-jre-headless
index cbacf470..0a4bd56b 100644
--- a/docker/debian9/Dockerfile.zulu-8u232-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-8u232-jre-headless
@@ -7,12 +7,13 @@
 FROM debian:stretch
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jre-headless=8.42.0.23 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.42.0.23 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u242-jdk b/docker/debian9/Dockerfile.zulu-8u242-jdk
index f3eb30ee..480316e9 100644
--- a/docker/debian9/Dockerfile.zulu-8u242-jdk
+++ b/docker/debian9/Dockerfile.zulu-8u242-jdk
@@ -7,12 +7,13 @@
 FROM debian:stretch
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jdk=8.44.0.11 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.44.0.11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u242-jre b/docker/debian9/Dockerfile.zulu-8u242-jre
index 948b59d9..fc66ea7f 100644
--- a/docker/debian9/Dockerfile.zulu-8u242-jre
+++ b/docker/debian9/Dockerfile.zulu-8u242-jre
@@ -7,12 +7,13 @@
 FROM debian:stretch
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jre=8.44.0.11 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.44.0.11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u242-jre-headless b/docker/debian9/Dockerfile.zulu-8u242-jre-headless
index 887b9e74..02ed1d6f 100644
--- a/docker/debian9/Dockerfile.zulu-8u242-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-8u242-jre-headless
@@ -7,12 +7,13 @@
 FROM debian:stretch
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jre-headless=8.44.0.11 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.44.0.11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64

From 9f6abed675314863737a6454c111a2c102734e5e Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 25 Mar 2020 16:36:50 -0500
Subject: [PATCH 059/264] Added apt-get dist-upgrade command

---
 docker/ubuntu/Dockerfile.zulu-11u5-jdk           |  9 +++++----
 docker/ubuntu/Dockerfile.zulu-11u5-jre           |  9 +++++----
 docker/ubuntu/Dockerfile.zulu-11u5-jre-headless  |  9 +++++----
 docker/ubuntu/Dockerfile.zulu-11u6-jdk           |  9 +++++----
 docker/ubuntu/Dockerfile.zulu-11u6-jre           |  9 +++++----
 docker/ubuntu/Dockerfile.zulu-11u6-jre-headless  |  9 +++++----
 docker/ubuntu/Dockerfile.zulu-13u1-jdk           |  9 +++++----
 docker/ubuntu/Dockerfile.zulu-13u1-jre           |  9 +++++----
 docker/ubuntu/Dockerfile.zulu-13u1-jre-headless  |  9 +++++----
 docker/ubuntu/Dockerfile.zulu-13u2-jdk           |  9 +++++----
 docker/ubuntu/Dockerfile.zulu-13u2-jre           |  9 +++++----
 docker/ubuntu/Dockerfile.zulu-13u2-jre-headless  |  9 +++++----
 docker/ubuntu/Dockerfile.zulu-7u242-jdk          |  9 +++++----
 docker/ubuntu/Dockerfile.zulu-7u242-jre          |  9 +++++----
 docker/ubuntu/Dockerfile.zulu-7u242-jre-headless |  9 +++++----
 docker/ubuntu/Dockerfile.zulu-7u252-jdk          |  9 +++++----
 docker/ubuntu/Dockerfile.zulu-7u252-jre          |  9 +++++----
 docker/ubuntu/Dockerfile.zulu-7u252-jre-headless |  9 +++++----
 docker/ubuntu/Dockerfile.zulu-8u232-jdk          | 10 +++++-----
 docker/ubuntu/Dockerfile.zulu-8u232-jre          | 10 +++++-----
 docker/ubuntu/Dockerfile.zulu-8u232-jre-headless | 10 +++++-----
 docker/ubuntu/Dockerfile.zulu-8u242-jdk          | 10 +++++-----
 docker/ubuntu/Dockerfile.zulu-8u242-jre          | 10 +++++-----
 docker/ubuntu/Dockerfile.zulu-8u242-jre-headless | 10 +++++-----
 24 files changed, 120 insertions(+), 102 deletions(-)

diff --git a/docker/ubuntu/Dockerfile.zulu-11u5-jdk b/docker/ubuntu/Dockerfile.zulu-11u5-jdk
index cbe9da86..4c57f3d8 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u5-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-11u5-jdk
@@ -7,12 +7,13 @@
 FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-11-azure-jdk=11.35+15 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.35+15 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u5-jre b/docker/ubuntu/Dockerfile.zulu-11u5-jre
index 674485ac..6b936196 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u5-jre
+++ b/docker/ubuntu/Dockerfile.zulu-11u5-jre
@@ -7,12 +7,13 @@
 FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-11-azure-jre=11.35+15 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.35+15 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u5-jre-headless b/docker/ubuntu/Dockerfile.zulu-11u5-jre-headless
index f8675bfb..6372e66c 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u5-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-11u5-jre-headless
@@ -7,12 +7,13 @@
 FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-11-azure-jre-headless=11.35+15 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.35+15 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u6-jdk b/docker/ubuntu/Dockerfile.zulu-11u6-jdk
index 60f29680..d4128087 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u6-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-11u6-jdk
@@ -7,12 +7,13 @@
 FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-11-azure-jdk=11.37+17 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.37+17 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u6-jre b/docker/ubuntu/Dockerfile.zulu-11u6-jre
index 079b1a53..c407f838 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u6-jre
+++ b/docker/ubuntu/Dockerfile.zulu-11u6-jre
@@ -7,12 +7,13 @@
 FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-11-azure-jre=11.37+17 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.37+17 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u6-jre-headless b/docker/ubuntu/Dockerfile.zulu-11u6-jre-headless
index c7e13410..90db1dca 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u6-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-11u6-jre-headless
@@ -7,12 +7,13 @@
 FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-11-azure-jre-headless=11.37+17 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.37+17 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u1-jdk b/docker/ubuntu/Dockerfile.zulu-13u1-jdk
index 5de30883..b40fa81a 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u1-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-13u1-jdk
@@ -7,12 +7,13 @@
 FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-13-azure-jdk=13.28+11 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.28+11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u1-jre b/docker/ubuntu/Dockerfile.zulu-13u1-jre
index 0156903b..2b882aa8 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u1-jre
+++ b/docker/ubuntu/Dockerfile.zulu-13u1-jre
@@ -7,12 +7,13 @@
 FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-13-azure-jre=13.28+11 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.28+11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u1-jre-headless b/docker/ubuntu/Dockerfile.zulu-13u1-jre-headless
index 8428e613..6c4cef36 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u1-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-13u1-jre-headless
@@ -7,12 +7,13 @@
 FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-13-azure-jre-headless=13.28+11 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.28+11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u2-jdk b/docker/ubuntu/Dockerfile.zulu-13u2-jdk
index aa288abe..655d00a3 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u2-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-13u2-jdk
@@ -7,12 +7,13 @@
 FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-13-azure-jdk=13.29+9 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.29+9 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u2-jre b/docker/ubuntu/Dockerfile.zulu-13u2-jre
index 7aa70154..f839e935 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u2-jre
+++ b/docker/ubuntu/Dockerfile.zulu-13u2-jre
@@ -7,12 +7,13 @@
 FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-13-azure-jre=13.29+9 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.29+9 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u2-jre-headless b/docker/ubuntu/Dockerfile.zulu-13u2-jre-headless
index 2c329224..50767780 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u2-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-13u2-jre-headless
@@ -7,12 +7,13 @@
 FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-13-azure-jre-headless=13.29+9 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.29+9 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u242-jdk b/docker/ubuntu/Dockerfile.zulu-7u242-jdk
index 6d9f4fcd..2aee2270 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u242-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-7u242-jdk
@@ -7,12 +7,13 @@
 FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-7-azure-jdk=7.34.0.5 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.34.0.5 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u242-jre b/docker/ubuntu/Dockerfile.zulu-7u242-jre
index c78b6e5f..bd90195f 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u242-jre
+++ b/docker/ubuntu/Dockerfile.zulu-7u242-jre
@@ -7,12 +7,13 @@
 FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-7-azure-jre=7.34.0.5 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.34.0.5 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u242-jre-headless b/docker/ubuntu/Dockerfile.zulu-7u242-jre-headless
index ce5cc759..8ea6ddf6 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u242-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-7u242-jre-headless
@@ -7,12 +7,13 @@
 FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-7-azure-jre-headless=7.34.0.5 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.34.0.5 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u252-jdk b/docker/ubuntu/Dockerfile.zulu-7u252-jdk
index 1284fe32..4f500235 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u252-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-7u252-jdk
@@ -7,12 +7,13 @@
 FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-7-azure-jdk=7.36.0.5 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.36.0.5 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u252-jre b/docker/ubuntu/Dockerfile.zulu-7u252-jre
index b5c947b0..03933a47 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u252-jre
+++ b/docker/ubuntu/Dockerfile.zulu-7u252-jre
@@ -7,12 +7,13 @@
 FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-7-azure-jre=7.36.0.5 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.36.0.5 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u252-jre-headless b/docker/ubuntu/Dockerfile.zulu-7u252-jre-headless
index 1902e0f2..258e74d5 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u252-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-7u252-jre-headless
@@ -7,12 +7,13 @@
 FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y --no-install-recommends install zulu-7-azure-jre-headless=7.36.0.5 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.36.0.5 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u232-jdk b/docker/ubuntu/Dockerfile.zulu-8u232-jdk
index c2b00a7f..18763a31 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u232-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-8u232-jdk
@@ -7,13 +7,13 @@
 FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y dist-upgrade && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jdk=8.42.0.23 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.42.0.23 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u232-jre b/docker/ubuntu/Dockerfile.zulu-8u232-jre
index 0a23fee9..52f3a5fd 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u232-jre
+++ b/docker/ubuntu/Dockerfile.zulu-8u232-jre
@@ -7,13 +7,13 @@
 FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y dist-upgrade && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jre=8.42.0.23 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.42.0.23 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u232-jre-headless b/docker/ubuntu/Dockerfile.zulu-8u232-jre-headless
index 7b64b503..99b82924 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u232-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-8u232-jre-headless
@@ -7,13 +7,13 @@
 FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y dist-upgrade && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jre-headless=8.42.0.23 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.42.0.23 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u242-jdk b/docker/ubuntu/Dockerfile.zulu-8u242-jdk
index d1ddc677..98c127d0 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u242-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-8u242-jdk
@@ -7,13 +7,13 @@
 FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y dist-upgrade && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jdk=8.44.0.11 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.44.0.11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u242-jre b/docker/ubuntu/Dockerfile.zulu-8u242-jre
index 7e1c9bd1..e98cf467 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u242-jre
+++ b/docker/ubuntu/Dockerfile.zulu-8u242-jre
@@ -7,13 +7,13 @@
 FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y dist-upgrade && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jre=8.44.0.11 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.44.0.11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u242-jre-headless b/docker/ubuntu/Dockerfile.zulu-8u242-jre-headless
index 2ba4cfca..c53684a6 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u242-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-8u242-jre-headless
@@ -7,13 +7,13 @@
 FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install gnupg software-properties-common && \
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
     apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -q update && \
-    apt-get -y dist-upgrade && \
-    apt-get -y --no-install-recommends install zulu-8-azure-jre-headless=8.44.0.11 && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.44.0.11 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64

From 6da96c9d89bd550a256e4c2bd662539cb7308496 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 26 Mar 2020 13:39:28 -0500
Subject: [PATCH 060/264] Added -q to all wget commands

---
 docker/alpine/Dockerfile.zulu-7u242-jdk       | 10 +++++-----
 docker/alpine/Dockerfile.zulu-7u242-jre       | 10 +++++-----
 .../alpine/Dockerfile.zulu-7u242-jre-headless | 10 +++++-----
 docker/alpine/Dockerfile.zulu-7u252-jdk       | 10 +++++-----
 docker/alpine/Dockerfile.zulu-7u252-jre       | 10 +++++-----
 .../alpine/Dockerfile.zulu-7u252-jre-headless | 19 ++++++++++---------
 6 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/docker/alpine/Dockerfile.zulu-7u242-jdk b/docker/alpine/Dockerfile.zulu-7u242-jdk
index 33d36d3d..ca132d4d 100644
--- a/docker/alpine/Dockerfile.zulu-7u242-jdk
+++ b/docker/alpine/Dockerfile.zulu-7u242-jdk
@@ -17,12 +17,12 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
-    apk --no-cache add binutils ca-certificates wget && \
+    apk --no-cache add binutils ca-certificates wget -q && \
     wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
-    wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
     apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
-    wget -O gcc-libs.tar.xz https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
-    wget -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    wget -q -O gcc-libs.tar.xz https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -q -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
     tar -xJf gcc-libs.tar.xz -C /tmp && \
     tar -xJf zlib.tar.xz -C /tmp && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
@@ -31,7 +31,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk update && \
     apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u242/$ZULU_PACK && \
-    rm /root/.wget-hsts && \
+    rm /root/.wget -q-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u242-jre b/docker/alpine/Dockerfile.zulu-7u242-jre
index e50df2ff..c0c7d279 100644
--- a/docker/alpine/Dockerfile.zulu-7u242-jre
+++ b/docker/alpine/Dockerfile.zulu-7u242-jre
@@ -17,12 +17,12 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
-    apk --no-cache add binutils ca-certificates wget && \
+    apk --no-cache add binutils ca-certificates wget -q && \
     wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
-    wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
     apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
-    wget -O gcc-libs.tar.xz https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
-    wget -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    wget -q -O gcc-libs.tar.xz https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -q -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
     tar -xJf gcc-libs.tar.xz -C /tmp && \
     tar -xJf zlib.tar.xz -C /tmp && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
@@ -31,7 +31,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk update && \
     apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u242/$ZULU_PACK && \
-    rm /root/.wget-hsts && \
+    rm /root/.wget -q-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u242-jre-headless b/docker/alpine/Dockerfile.zulu-7u242-jre-headless
index 95490206..281199e3 100644
--- a/docker/alpine/Dockerfile.zulu-7u242-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-7u242-jre-headless
@@ -17,12 +17,12 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
-    apk --no-cache add binutils ca-certificates wget && \
+    apk --no-cache add binutils ca-certificates wget -q && \
     wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
-    wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
     apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
-    wget -O gcc-libs.tar.xz https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
-    wget -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    wget -q -O gcc-libs.tar.xz https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -q -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
     tar -xJf gcc-libs.tar.xz -C /tmp && \
     tar -xJf zlib.tar.xz -C /tmp && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
@@ -31,7 +31,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk update && \
     apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u242/$ZULU_PACK && \
-    rm /root/.wget-hsts && \
+    rm /root/.wget -q-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u252-jdk b/docker/alpine/Dockerfile.zulu-7u252-jdk
index eab197af..5d140528 100644
--- a/docker/alpine/Dockerfile.zulu-7u252-jdk
+++ b/docker/alpine/Dockerfile.zulu-7u252-jdk
@@ -17,12 +17,12 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
-    apk --no-cache add binutils ca-certificates wget && \
+    apk --no-cache add binutils ca-certificates wget -q && \
     wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
-    wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
     apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
-    wget -O gcc-libs.tar.xz https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
-    wget -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    wget -q -O gcc-libs.tar.xz https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -q -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
     tar -xJf gcc-libs.tar.xz -C /tmp && \
     tar -xJf zlib.tar.xz -C /tmp && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
@@ -31,7 +31,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk update && \
     apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u252/$ZULU_PACK && \
-    rm /root/.wget-hsts && \
+    rm /root/.wget -q-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u252-jre b/docker/alpine/Dockerfile.zulu-7u252-jre
index f4b90119..70c95ea7 100644
--- a/docker/alpine/Dockerfile.zulu-7u252-jre
+++ b/docker/alpine/Dockerfile.zulu-7u252-jre
@@ -17,12 +17,12 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
-    apk --no-cache add binutils ca-certificates wget && \
+    apk --no-cache add binutils ca-certificates wget -q && \
     wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
-    wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
     apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
-    wget -O gcc-libs.tar.xz https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
-    wget -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    wget -q -O gcc-libs.tar.xz https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -q -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
     tar -xJf gcc-libs.tar.xz -C /tmp && \
     tar -xJf zlib.tar.xz -C /tmp && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
@@ -31,7 +31,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk update && \
     apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u252/$ZULU_PACK && \
-    rm /root/.wget-hsts && \
+    rm /root/.wget -q-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u252-jre-headless b/docker/alpine/Dockerfile.zulu-7u252-jre-headless
index 97ce1f40..6849d6eb 100644
--- a/docker/alpine/Dockerfile.zulu-7u252-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-7u252-jre-headless
@@ -17,21 +17,22 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
-    apk --no-cache add binutils ca-certificates wget && \
+    apk --no-cache add binutils ca-certificates wget -q && \
     wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
-    wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
     apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
-    wget -O gcc-libs.tar.xz https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
-    wget -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
-    tar -xJf gcc-libs.tar.xz -C /tmp && \
+    wget -q -O gcc-libs.tar.xz https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -q -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+#    tar -xJf gcc-libs.tar.xz -C /tmp && \
     tar -xJf zlib.tar.xz -C /tmp && \
-    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
-    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
-    rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
+    mv /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+#    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+#    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
+#    rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
     apk update && \
     apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u252/$ZULU_PACK && \
-    rm /root/.wget-hsts && \
+    rm /root/.wget -q-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \

From 5e940f872fbd3afa30e266628c9ac45da5a134b6 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 26 Mar 2020 18:34:38 -0500
Subject: [PATCH 061/264] Fixed syntax error and getting of gcc-libs and zliob

---
 docker/alpine/Dockerfile.zulu-7u242-jdk       | 16 +++++++-------
 docker/alpine/Dockerfile.zulu-7u242-jre       | 16 +++++++-------
 .../alpine/Dockerfile.zulu-7u242-jre-headless | 16 +++++++-------
 docker/alpine/Dockerfile.zulu-7u252-jdk       | 16 +++++++-------
 docker/alpine/Dockerfile.zulu-7u252-jre       | 16 +++++++-------
 .../alpine/Dockerfile.zulu-7u252-jre-headless | 21 ++++++++++---------
 6 files changed, 56 insertions(+), 45 deletions(-)

diff --git a/docker/alpine/Dockerfile.zulu-7u242-jdk b/docker/alpine/Dockerfile.zulu-7u242-jdk
index ca132d4d..561a6cb3 100644
--- a/docker/alpine/Dockerfile.zulu-7u242-jdk
+++ b/docker/alpine/Dockerfile.zulu-7u242-jdk
@@ -13,7 +13,9 @@ ENV LC_ALL en_US.UTF-8
 
 ARG ZULU_DIR=zulu-7-azure-jdk_7.34.0.5-7.0.242-linux_x64
 
-RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+RUN GCC_LIBS_PACK=gcc-libs-9.2.0-3-x86_64.pkg.tar.xz && \
+    ZLIB_PACK=zlib-1:1.2.11-3-x86_64.pkg.tar.xz && \
+    ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
@@ -21,17 +23,17 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
     wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
     apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
-    wget -q -O gcc-libs.tar.xz https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
-    wget -q -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
-    tar -xJf gcc-libs.tar.xz -C /tmp && \
-    tar -xJf zlib.tar.xz -C /tmp && \
+    wget -q https://archive.archlinux.org/packages/g/gcc-libs/$GCC_LIBS_PACK && \
+    wget -q https://archive.archlinux.org/packages/z/zlib/$ZLIB_PACK && \
+    tar -Jxf ${GCC_LIBS_PACK} -C /tmp && \
+    tar -Jxf ${ZLIB_PACK} -C /tmp && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
-    rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
+    rm -rf {GCC_LIBS_PACK} ${ZLIB_PACK} /tmp/usr && \
     apk update && \
     apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u242/$ZULU_PACK && \
-    rm /root/.wget -q-hsts && \
+    rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u242-jre b/docker/alpine/Dockerfile.zulu-7u242-jre
index c0c7d279..af9607d2 100644
--- a/docker/alpine/Dockerfile.zulu-7u242-jre
+++ b/docker/alpine/Dockerfile.zulu-7u242-jre
@@ -13,7 +13,9 @@ ENV LC_ALL en_US.UTF-8
 
 ARG ZULU_DIR=zulu-7-azure-jre_7.34.0.5-7.0.242-linux_x64
 
-RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+RUN GCC_LIBS_PACK=gcc-libs-9.2.0-3-x86_64.pkg.tar.xz && \
+    ZLIB_PACK=zlib-1:1.2.11-3-x86_64.pkg.tar.xz && \
+    ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
@@ -21,17 +23,17 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
     wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
     apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
-    wget -q -O gcc-libs.tar.xz https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
-    wget -q -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
-    tar -xJf gcc-libs.tar.xz -C /tmp && \
-    tar -xJf zlib.tar.xz -C /tmp && \
+    wget -q https://archive.archlinux.org/packages/g/gcc-libs/$GCC_LIBS_PACK && \
+    wget -q https://archive.archlinux.org/packages/z/zlib/$ZLIB_PACK && \
+    tar -Jxf ${GCC_LIBS_PACK} -C /tmp && \
+    tar -Jxf ${ZLIB_PACK} -C /tmp && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
-    rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
+    rm -rf {GCC_LIBS_PACK} ${ZLIB_PACK} /tmp/usr && \
     apk update && \
     apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u242/$ZULU_PACK && \
-    rm /root/.wget -q-hsts && \
+    rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u242-jre-headless b/docker/alpine/Dockerfile.zulu-7u242-jre-headless
index 281199e3..0f84da58 100644
--- a/docker/alpine/Dockerfile.zulu-7u242-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-7u242-jre-headless
@@ -13,7 +13,9 @@ ENV LC_ALL en_US.UTF-8
 
 ARG ZULU_DIR=zulu-7-azure-jre-headless_7.34.0.5-7.0.242-linux_x64
 
-RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+RUN GCC_LIBS_PACK=gcc-libs-9.2.0-3-x86_64.pkg.tar.xz && \
+    ZLIB_PACK=zlib-1:1.2.11-3-x86_64.pkg.tar.xz && \
+    ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
@@ -21,17 +23,17 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
     wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
     apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
-    wget -q -O gcc-libs.tar.xz https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
-    wget -q -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
-    tar -xJf gcc-libs.tar.xz -C /tmp && \
-    tar -xJf zlib.tar.xz -C /tmp && \
+    wget -q https://archive.archlinux.org/packages/g/gcc-libs/$GCC_LIBS_PACK && \
+    wget -q https://archive.archlinux.org/packages/z/zlib/$ZLIB_PACK && \
+    tar -Jxf ${GCC_LIBS_PACK} -C /tmp && \
+    tar -Jxf ${ZLIB_PACK} -C /tmp && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
-    rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
+    rm -rf {GCC_LIBS_PACK} ${ZLIB_PACK} /tmp/usr && \
     apk update && \
     apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u242/$ZULU_PACK && \
-    rm /root/.wget -q-hsts && \
+    rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u252-jdk b/docker/alpine/Dockerfile.zulu-7u252-jdk
index 5d140528..e1741e86 100644
--- a/docker/alpine/Dockerfile.zulu-7u252-jdk
+++ b/docker/alpine/Dockerfile.zulu-7u252-jdk
@@ -13,7 +13,9 @@ ENV LC_ALL en_US.UTF-8
 
 ARG ZULU_DIR=zulu-7-azure-jdk_7.36.0.5-7.0.252-linux_x64
 
-RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+RUN GCC_LIBS_PACK=gcc-libs-9.2.0-4-x86_64.pkg.tar.xz && \
+    ZLIB_PACK=zlib-1:1.2.11-4-x86_64.pkg.tar.xz && \
+    ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
@@ -21,17 +23,17 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
     wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
     apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
-    wget -q -O gcc-libs.tar.xz https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
-    wget -q -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
-    tar -xJf gcc-libs.tar.xz -C /tmp && \
-    tar -xJf zlib.tar.xz -C /tmp && \
+    wget -q https://archive.archlinux.org/packages/g/gcc-libs/$GCC_LIBS_PACK && \
+    wget -q https://archive.archlinux.org/packages/z/zlib/$ZLIB_PACK && \
+    tar -Jxf ${GCC_LIBS_PACK} -C /tmp && \
+    tar -Jxf ${ZLIB_PACK} -C /tmp && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
-    rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
+    rm -rf {GCC_LIBS_PACK} ${ZLIB_PACK} /tmp/usr && \
     apk update && \
     apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u252/$ZULU_PACK && \
-    rm /root/.wget -q-hsts && \
+    rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u252-jre b/docker/alpine/Dockerfile.zulu-7u252-jre
index 70c95ea7..d5012c21 100644
--- a/docker/alpine/Dockerfile.zulu-7u252-jre
+++ b/docker/alpine/Dockerfile.zulu-7u252-jre
@@ -13,7 +13,9 @@ ENV LC_ALL en_US.UTF-8
 
 ARG ZULU_DIR=zulu-7-azure-jre_7.36.0.5-7.0.252-linux_x64
 
-RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+RUN GCC_LIBS_PACK=gcc-libs-9.2.0-4-x86_64.pkg.tar.xz && \
+    ZLIB_PACK=zlib-1:1.2.11-4-x86_64.pkg.tar.xz && \
+    ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
@@ -21,17 +23,17 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
     wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
     apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
-    wget -q -O gcc-libs.tar.xz https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
-    wget -q -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
-    tar -xJf gcc-libs.tar.xz -C /tmp && \
-    tar -xJf zlib.tar.xz -C /tmp && \
+    wget -q https://archive.archlinux.org/packages/g/gcc-libs/$GCC_LIBS_PACK && \
+    wget -q https://archive.archlinux.org/packages/z/zlib/$ZLIB_PACK && \
+    tar -Jxf ${GCC_LIBS_PACK} -C /tmp && \
+    tar -Jxf ${ZLIB_PACK} -C /tmp && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
-    rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
+    rm -rf {GCC_LIBS_PACK} ${ZLIB_PACK} /tmp/usr && \
     apk update && \
     apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u252/$ZULU_PACK && \
-    rm /root/.wget -q-hsts && \
+    rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u252-jre-headless b/docker/alpine/Dockerfile.zulu-7u252-jre-headless
index 6849d6eb..f6fd371d 100644
--- a/docker/alpine/Dockerfile.zulu-7u252-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-7u252-jre-headless
@@ -13,7 +13,9 @@ ENV LC_ALL en_US.UTF-8
 
 ARG ZULU_DIR=zulu-7-azure-jre-headless_7.36.0.5-7.0.252-linux_x64
 
-RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+RUN GCC_LIBS_PACK=gcc-libs-9.2.0-4-x86_64.pkg.tar.xz && \
+    ZLIB_PACK=zlib-1:1.2.11-4-x86_64.pkg.tar.xz && \
+    ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
@@ -21,18 +23,17 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
     wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
     apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
-    wget -q -O gcc-libs.tar.xz https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
-    wget -q -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
-#    tar -xJf gcc-libs.tar.xz -C /tmp && \
-    tar -xJf zlib.tar.xz -C /tmp && \
-    mv /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
-#    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
-#    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
-#    rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
+    wget -q https://archive.archlinux.org/packages/g/gcc-libs/$GCC_LIBS_PACK && \
+    wget -q https://archive.archlinux.org/packages/z/zlib/$ZLIB_PACK && \
+    tar -Jxf ${GCC_LIBS_PACK} -C /tmp && \
+    tar -Jxf ${ZLIB_PACK} -C /tmp && \
+    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
+    rm -rf {GCC_LIBS_PACK} ${ZLIB_PACK} /tmp/usr && \
     apk update && \
     apk upgrade && \
     wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u252/$ZULU_PACK && \
-    rm /root/.wget -q-hsts && \
+    rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \

From c4e0857df67d0fb97cd36a82177b6df1d33a98a6 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 27 Mar 2020 12:18:23 -0500
Subject: [PATCH 062/264] Fixed errors

---
 docker/alpine/Dockerfile.zulu-7u242-jdk          | 2 +-
 docker/alpine/Dockerfile.zulu-7u242-jre          | 2 +-
 docker/alpine/Dockerfile.zulu-7u242-jre-headless | 2 +-
 docker/alpine/Dockerfile.zulu-7u252-jdk          | 2 +-
 docker/alpine/Dockerfile.zulu-7u252-jre          | 2 +-
 docker/alpine/Dockerfile.zulu-7u252-jre-headless | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker/alpine/Dockerfile.zulu-7u242-jdk b/docker/alpine/Dockerfile.zulu-7u242-jdk
index 561a6cb3..be67bd24 100644
--- a/docker/alpine/Dockerfile.zulu-7u242-jdk
+++ b/docker/alpine/Dockerfile.zulu-7u242-jdk
@@ -19,7 +19,7 @@ RUN GCC_LIBS_PACK=gcc-libs-9.2.0-3-x86_64.pkg.tar.xz && \
     INSTALL_DIR=/usr/lib/jvm && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
-    apk --no-cache add binutils ca-certificates wget -q && \
+    apk --no-cache add binutils ca-certificates wget && \
     wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
     wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
     apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
diff --git a/docker/alpine/Dockerfile.zulu-7u242-jre b/docker/alpine/Dockerfile.zulu-7u242-jre
index af9607d2..a8d34ff7 100644
--- a/docker/alpine/Dockerfile.zulu-7u242-jre
+++ b/docker/alpine/Dockerfile.zulu-7u242-jre
@@ -19,7 +19,7 @@ RUN GCC_LIBS_PACK=gcc-libs-9.2.0-3-x86_64.pkg.tar.xz && \
     INSTALL_DIR=/usr/lib/jvm && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
-    apk --no-cache add binutils ca-certificates wget -q && \
+    apk --no-cache add binutils ca-certificates wget && \
     wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
     wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
     apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
diff --git a/docker/alpine/Dockerfile.zulu-7u242-jre-headless b/docker/alpine/Dockerfile.zulu-7u242-jre-headless
index 0f84da58..6995856b 100644
--- a/docker/alpine/Dockerfile.zulu-7u242-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-7u242-jre-headless
@@ -19,7 +19,7 @@ RUN GCC_LIBS_PACK=gcc-libs-9.2.0-3-x86_64.pkg.tar.xz && \
     INSTALL_DIR=/usr/lib/jvm && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
-    apk --no-cache add binutils ca-certificates wget -q && \
+    apk --no-cache add binutils ca-certificates wget && \
     wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
     wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
     apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
diff --git a/docker/alpine/Dockerfile.zulu-7u252-jdk b/docker/alpine/Dockerfile.zulu-7u252-jdk
index e1741e86..8a63de6d 100644
--- a/docker/alpine/Dockerfile.zulu-7u252-jdk
+++ b/docker/alpine/Dockerfile.zulu-7u252-jdk
@@ -19,7 +19,7 @@ RUN GCC_LIBS_PACK=gcc-libs-9.2.0-4-x86_64.pkg.tar.xz && \
     INSTALL_DIR=/usr/lib/jvm && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
-    apk --no-cache add binutils ca-certificates wget -q && \
+    apk --no-cache add binutils ca-certificates wget && \
     wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
     wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
     apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
diff --git a/docker/alpine/Dockerfile.zulu-7u252-jre b/docker/alpine/Dockerfile.zulu-7u252-jre
index d5012c21..a9247052 100644
--- a/docker/alpine/Dockerfile.zulu-7u252-jre
+++ b/docker/alpine/Dockerfile.zulu-7u252-jre
@@ -19,7 +19,7 @@ RUN GCC_LIBS_PACK=gcc-libs-9.2.0-4-x86_64.pkg.tar.xz && \
     INSTALL_DIR=/usr/lib/jvm && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
-    apk --no-cache add binutils ca-certificates wget -q && \
+    apk --no-cache add binutils ca-certificates wget && \
     wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
     wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
     apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
diff --git a/docker/alpine/Dockerfile.zulu-7u252-jre-headless b/docker/alpine/Dockerfile.zulu-7u252-jre-headless
index f6fd371d..2b7d977c 100644
--- a/docker/alpine/Dockerfile.zulu-7u252-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-7u252-jre-headless
@@ -19,7 +19,7 @@ RUN GCC_LIBS_PACK=gcc-libs-9.2.0-4-x86_64.pkg.tar.xz && \
     INSTALL_DIR=/usr/lib/jvm && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
-    apk --no-cache add binutils ca-certificates wget -q && \
+    apk --no-cache add binutils ca-certificates wget && \
     wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
     wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
     apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \

From a0c970b119297c9fdb97d2b625b12576ef4e42b0 Mon Sep 17 00:00:00 2001
From: Stanislav Drozdov <sdrozdov@azulsystems.com>
Date: Wed, 15 Apr 2020 00:38:59 +0300
Subject: [PATCH 063/264] New April release 2020 Dockerfiles

---
 docker/alpine/Dockerfile.zulu-11u7-jdk        | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-11u7-jre        | 32 ++++++++++++++
 .../alpine/Dockerfile.zulu-11u7-jre-headless  | 32 ++++++++++++++
 .../Dockerfile.zulu-11u7-jre-headless-tools   | 30 +++++++++++++
 docker/alpine/Dockerfile.zulu-13u3-jdk        | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-13u3-jre        | 30 +++++++++++++
 .../alpine/Dockerfile.zulu-13u3-jre-headless  | 30 +++++++++++++
 .../Dockerfile.zulu-13u3-jre-headless-tools   | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-7u262-jdk       | 42 +++++++++++++++++++
 docker/alpine/Dockerfile.zulu-7u262-jre       | 42 +++++++++++++++++++
 .../alpine/Dockerfile.zulu-7u262-jre-headless | 42 +++++++++++++++++++
 docker/alpine/Dockerfile.zulu-8u252-jdk       | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-8u252-jre       | 32 ++++++++++++++
 .../alpine/Dockerfile.zulu-8u252-jre-headless | 32 ++++++++++++++
 .../Dockerfile.zulu-8u252-jre-headless-tools  | 32 ++++++++++++++
 docker/centos/Dockerfile.zulu-11u7-jdk        | 17 ++++++++
 docker/centos/Dockerfile.zulu-11u7-jre        | 17 ++++++++
 .../centos/Dockerfile.zulu-11u7-jre-headless  | 16 +++++++
 docker/centos/Dockerfile.zulu-13u3-jdk        | 17 ++++++++
 docker/centos/Dockerfile.zulu-13u3-jre        | 17 ++++++++
 .../centos/Dockerfile.zulu-13u3-jre-headless  | 16 +++++++
 docker/centos/Dockerfile.zulu-14u1-jdk        | 17 ++++++++
 docker/centos/Dockerfile.zulu-14u1-jre        | 17 ++++++++
 docker/centos/Dockerfile.zulu-7u262-jdk       | 17 ++++++++
 docker/centos/Dockerfile.zulu-7u262-jre       | 17 ++++++++
 .../centos/Dockerfile.zulu-7u262-jre-headless | 16 +++++++
 docker/centos/Dockerfile.zulu-8u252-jdk       | 17 ++++++++
 docker/centos/Dockerfile.zulu-8u252-jre       | 17 ++++++++
 .../centos/Dockerfile.zulu-8u252-jre-headless | 16 +++++++
 docker/debian10/Dockerfile.zulu-11u7-jdk      | 19 +++++++++
 docker/debian10/Dockerfile.zulu-11u7-jre      | 19 +++++++++
 .../Dockerfile.zulu-11u7-jre-headless         | 19 +++++++++
 docker/debian10/Dockerfile.zulu-13u3-jdk      | 19 +++++++++
 docker/debian10/Dockerfile.zulu-13u3-jre      | 19 +++++++++
 .../Dockerfile.zulu-13u3-jre-headless         | 19 +++++++++
 docker/debian10/Dockerfile.zulu-14u1-jdk      | 19 +++++++++
 docker/debian10/Dockerfile.zulu-14u1-jre      | 19 +++++++++
 docker/debian10/Dockerfile.zulu-7u262-jdk     | 19 +++++++++
 docker/debian10/Dockerfile.zulu-7u262-jre     | 19 +++++++++
 .../Dockerfile.zulu-7u262-jre-headless        | 19 +++++++++
 docker/debian10/Dockerfile.zulu-8u252-jdk     | 19 +++++++++
 docker/debian10/Dockerfile.zulu-8u252-jre     | 19 +++++++++
 .../Dockerfile.zulu-8u252-jre-headless        | 19 +++++++++
 docker/debian9/Dockerfile.zulu-11u7-jdk       | 19 +++++++++
 docker/debian9/Dockerfile.zulu-11u7-jre       | 19 +++++++++
 .../debian9/Dockerfile.zulu-11u7-jre-headless | 19 +++++++++
 docker/debian9/Dockerfile.zulu-13u3-jdk       | 19 +++++++++
 docker/debian9/Dockerfile.zulu-13u3-jre       | 19 +++++++++
 .../debian9/Dockerfile.zulu-13u3-jre-headless | 19 +++++++++
 docker/debian9/Dockerfile.zulu-14u1-jdk       | 19 +++++++++
 docker/debian9/Dockerfile.zulu-14u1-jre       | 19 +++++++++
 docker/debian9/Dockerfile.zulu-7u262-jdk      | 19 +++++++++
 docker/debian9/Dockerfile.zulu-7u262-jre      | 19 +++++++++
 .../Dockerfile.zulu-7u262-jre-headless        | 19 +++++++++
 docker/debian9/Dockerfile.zulu-8u252-jdk      | 19 +++++++++
 docker/debian9/Dockerfile.zulu-8u252-jre      | 19 +++++++++
 .../Dockerfile.zulu-8u252-jre-headless        | 19 +++++++++
 docker/maven/Dockerfile.zulu-8u252-jdk-maven  | 31 ++++++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-11u7-jdk  | 19 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-11u7-jre  | 19 +++++++++
 .../Dockerfile.zulu-11u7-jre-headless         | 19 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-13u3-jdk  | 19 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-13u3-jre  | 19 +++++++++
 .../Dockerfile.zulu-13u3-jre-headless         | 19 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-14u1-jdk  | 19 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-14u1-jre  | 19 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-7u262-jdk | 19 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-7u262-jre | 19 +++++++++
 .../Dockerfile.zulu-7u262-jre-headless        | 19 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-8u252-jdk | 19 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-8u252-jre | 19 +++++++++
 .../Dockerfile.zulu-8u252-jre-headless        | 19 +++++++++
 docker/ubuntu/Dockerfile.zulu-11u7-jdk        | 19 +++++++++
 docker/ubuntu/Dockerfile.zulu-11u7-jre        | 19 +++++++++
 .../ubuntu/Dockerfile.zulu-11u7-jre-headless  | 19 +++++++++
 docker/ubuntu/Dockerfile.zulu-13u3-jdk        | 19 +++++++++
 docker/ubuntu/Dockerfile.zulu-13u3-jre        | 19 +++++++++
 .../ubuntu/Dockerfile.zulu-13u3-jre-headless  | 19 +++++++++
 docker/ubuntu/Dockerfile.zulu-14u1-jdk        | 19 +++++++++
 docker/ubuntu/Dockerfile.zulu-14u1-jre        | 19 +++++++++
 docker/ubuntu/Dockerfile.zulu-7u262-jdk       | 19 +++++++++
 docker/ubuntu/Dockerfile.zulu-7u262-jre       | 19 +++++++++
 .../ubuntu/Dockerfile.zulu-7u262-jre-headless | 19 +++++++++
 docker/ubuntu/Dockerfile.zulu-8u252-jdk       | 19 +++++++++
 docker/ubuntu/Dockerfile.zulu-8u252-jre       | 19 +++++++++
 .../ubuntu/Dockerfile.zulu-8u252-jre-headless | 19 +++++++++
 .../Dockerfile.zulu-11u7-jdk                  | 16 +++++++
 .../Dockerfile.zulu-11u7-jre                  | 16 +++++++
 .../Dockerfile.zulu-13u3-jdk                  | 16 +++++++
 .../Dockerfile.zulu-13u3-jre                  | 16 +++++++
 .../Dockerfile.zulu-14u1-jdk                  | 16 +++++++
 .../Dockerfile.zulu-14u1-jre                  | 16 +++++++
 .../Dockerfile.zulu-7u262-jdk                 | 16 +++++++
 .../Dockerfile.zulu-7u262-jre                 | 16 +++++++
 .../Dockerfile.zulu-8u252-jdk                 | 16 +++++++
 .../Dockerfile.zulu-8u252-jre                 | 16 +++++++
 96 files changed, 1993 insertions(+)
 create mode 100644 docker/alpine/Dockerfile.zulu-11u7-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-11u7-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-11u7-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-11u7-jre-headless-tools
 create mode 100644 docker/alpine/Dockerfile.zulu-13u3-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-13u3-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-13u3-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-13u3-jre-headless-tools
 create mode 100644 docker/alpine/Dockerfile.zulu-7u262-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-7u262-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-7u262-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-8u252-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-8u252-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-8u252-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-8u252-jre-headless-tools
 create mode 100644 docker/centos/Dockerfile.zulu-11u7-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-11u7-jre
 create mode 100644 docker/centos/Dockerfile.zulu-11u7-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-13u3-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-13u3-jre
 create mode 100644 docker/centos/Dockerfile.zulu-13u3-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-14u1-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-14u1-jre
 create mode 100644 docker/centos/Dockerfile.zulu-7u262-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-7u262-jre
 create mode 100644 docker/centos/Dockerfile.zulu-7u262-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-8u252-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-8u252-jre
 create mode 100644 docker/centos/Dockerfile.zulu-8u252-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-11u7-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-11u7-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-11u7-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-13u3-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-13u3-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-13u3-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-14u1-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-14u1-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-7u262-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-7u262-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-7u262-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-8u252-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-8u252-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-8u252-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-11u7-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-11u7-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-11u7-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-13u3-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-13u3-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-13u3-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-14u1-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-14u1-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-7u262-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-7u262-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-7u262-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-8u252-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-8u252-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-8u252-jre-headless
 create mode 100644 docker/maven/Dockerfile.zulu-8u252-jdk-maven
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-11u7-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-11u7-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-11u7-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-13u3-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-13u3-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-13u3-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-14u1-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-14u1-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u262-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u262-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u262-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u252-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u252-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u252-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u7-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u7-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u7-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-13u3-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-13u3-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-13u3-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-14u1-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-14u1-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-7u262-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-7u262-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-7u262-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u252-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u252-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u252-jre-headless
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-11u7-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-11u7-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-13u3-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-13u3-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-14u1-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-14u1-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-7u262-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-7u262-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-8u252-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-8u252-jre

diff --git a/docker/alpine/Dockerfile.zulu-11u7-jdk b/docker/alpine/Dockerfile.zulu-11u7-jdk
new file mode 100644
index 00000000..235de041
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u7-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jdk_11.39.15-11.0.7-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.7/zulu-11-azure-jdk_11.39.15-11.0.7-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-11u7-jre b/docker/alpine/Dockerfile.zulu-11u7-jre
new file mode 100644
index 00000000..9628f086
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u7-jre
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jre_11.39.15-11.0.7-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.7/zulu-11-azure-jre_11.39.15-11.0.7-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-11u7-jre-headless b/docker/alpine/Dockerfile.zulu-11u7-jre-headless
new file mode 100644
index 00000000..fbd3e2ee
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u7-jre-headless
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jre-headless_11.39.15-11.0.7-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.7/zulu-11-azure-jre-headless_11.39.15-11.0.7-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-11u7-jre-headless-tools b/docker/alpine/Dockerfile.zulu-11u7-jre-headless-tools
new file mode 100644
index 00000000..c347dacf
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u7-jre-headless-tools
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jre-headless-tools_11.39.15-11.0.7-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.7/zulu-11-azure-jre-headless-tools_11.39.15-11.0.7-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-13u3-jdk b/docker/alpine/Dockerfile.zulu-13u3-jdk
new file mode 100644
index 00000000..e7bc5767
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u3-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jdk_13.31.11-13.0.3-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.3/zulu-13-azure-jdk_13.31.11-13.0.3-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-13u3-jre b/docker/alpine/Dockerfile.zulu-13u3-jre
new file mode 100644
index 00000000..dd3e29ce
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u3-jre
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jre_13.31.11-13.0.3-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.3/zulu-13-azure-jre_13.31.11-13.0.3-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-13u3-jre-headless b/docker/alpine/Dockerfile.zulu-13u3-jre-headless
new file mode 100644
index 00000000..1ce61242
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u3-jre-headless
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jre-headless_13.31.11-13.0.3-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.3/zulu-13-azure-jre-headless_13.31.11-13.0.3-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-13u3-jre-headless-tools b/docker/alpine/Dockerfile.zulu-13u3-jre-headless-tools
new file mode 100644
index 00000000..e3849078
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u3-jre-headless-tools
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jre-headless-tools_13.31.11-13.0.3-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.3/zulu-13-azure-jre-headless-tools_13.31.11-13.0.3-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-7u262-jdk b/docker/alpine/Dockerfile.zulu-7u262-jdk
new file mode 100644
index 00000000..a4755262
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-7u262-jdk
@@ -0,0 +1,42 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-7-azure-jdk_7.38.0.11-7.0.262-linux_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add binutils ca-certificates wget zstd tar && \
+    apk update && \
+    apk upgrade && \
+    wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+    wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
+    wget -O gcc-libs.tar.zst https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    tar -I zstd -xf gcc-libs.tar.zst -C /tmp && \
+    tar -xJf zlib.tar.xz -C /tmp && \
+    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
+    rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u262/zulu-7-azure-jdk_7.38.0.11-7.0.262-linux_x64.tar.gz && rm /root/.wget-hsts && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-7u262-jre b/docker/alpine/Dockerfile.zulu-7u262-jre
new file mode 100644
index 00000000..9d44e862
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-7u262-jre
@@ -0,0 +1,42 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-7-azure-jre_7.38.0.11-7.0.262-linux_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add binutils ca-certificates wget zstd tar && \
+    apk update && \
+    apk upgrade && \
+    wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+    wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
+    wget -O gcc-libs.tar.zst https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    tar -I zstd -xf gcc-libs.tar.zst -C /tmp && \
+    tar -xJf zlib.tar.xz -C /tmp && \
+    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
+    rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u262/zulu-7-azure-jre_7.38.0.11-7.0.262-linux_x64.tar.gz && rm /root/.wget-hsts && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-7u262-jre-headless b/docker/alpine/Dockerfile.zulu-7u262-jre-headless
new file mode 100644
index 00000000..316d6f10
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-7u262-jre-headless
@@ -0,0 +1,42 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-7-azure-jre-headless_7.38.0.11-7.0.262-linux_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add binutils ca-certificates wget zstd tar && \
+    apk update && \
+    apk upgrade && \
+    wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+    wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
+    wget -O gcc-libs.tar.zst https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    tar -I zstd -xf gcc-libs.tar.zst -C /tmp && \
+    tar -xJf zlib.tar.xz -C /tmp && \
+    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
+    rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u262/zulu-7-azure-jre-headless_7.38.0.11-7.0.262-linux_x64.tar.gz && rm /root/.wget-hsts && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u252-jdk b/docker/alpine/Dockerfile.zulu-8u252-jdk
new file mode 100644
index 00000000..1b8b4cba
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u252-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jdk_8.46.0.19-8.0.252-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u252/zulu-8-azure-jdk_8.46.0.19-8.0.252-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u252-jre b/docker/alpine/Dockerfile.zulu-8u252-jre
new file mode 100644
index 00000000..23aad2b4
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u252-jre
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre_8.46.0.19-8.0.252-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u252/zulu-8-azure-jre_8.46.0.19-8.0.252-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u252-jre-headless b/docker/alpine/Dockerfile.zulu-8u252-jre-headless
new file mode 100644
index 00000000..2c09a96f
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u252-jre-headless
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre-headless_8.46.0.19-8.0.252-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u252/zulu-8-azure-jre-headless_8.46.0.19-8.0.252-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u252-jre-headless-tools b/docker/alpine/Dockerfile.zulu-8u252-jre-headless-tools
new file mode 100644
index 00000000..80223ca2
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u252-jre-headless-tools
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre-headless-tools_8.46.0.19-8.0.252-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u252/zulu-8-azure-jre-headless-tools_8.46.0.19-8.0.252-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/centos/Dockerfile.zulu-11u7-jdk b/docker/centos/Dockerfile.zulu-11u7-jdk
new file mode 100644
index 00000000..d9fa321d
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u7-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-11-azure-jdk-11.39.15
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure
+
diff --git a/docker/centos/Dockerfile.zulu-11u7-jre b/docker/centos/Dockerfile.zulu-11u7-jre
new file mode 100644
index 00000000..75e43a56
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u7-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-11-azure-jre-11.39.15
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure
+
diff --git a/docker/centos/Dockerfile.zulu-11u7-jre-headless b/docker/centos/Dockerfile.zulu-11u7-jre-headless
new file mode 100644
index 00000000..3deaea14
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u7-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-11-azure-jre-headless-11.39.15
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure
diff --git a/docker/centos/Dockerfile.zulu-13u3-jdk b/docker/centos/Dockerfile.zulu-13u3-jdk
new file mode 100644
index 00000000..948ae264
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-13u3-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-13-azure-jdk-13.31.11
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure
+
diff --git a/docker/centos/Dockerfile.zulu-13u3-jre b/docker/centos/Dockerfile.zulu-13u3-jre
new file mode 100644
index 00000000..742a63cb
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-13u3-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-13-azure-jre-13.31.11
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure
+
diff --git a/docker/centos/Dockerfile.zulu-13u3-jre-headless b/docker/centos/Dockerfile.zulu-13u3-jre-headless
new file mode 100644
index 00000000..2ca8d6f8
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-13u3-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-13-azure-jre-headless-13.31.11
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure
diff --git a/docker/centos/Dockerfile.zulu-14u1-jdk b/docker/centos/Dockerfile.zulu-14u1-jdk
new file mode 100644
index 00000000..e91ac4e6
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-14u1-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-14-azure-jdk-14.28.21
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-14-azure
+
diff --git a/docker/centos/Dockerfile.zulu-14u1-jre b/docker/centos/Dockerfile.zulu-14u1-jre
new file mode 100644
index 00000000..3363bf56
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-14u1-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-14-azure-jre-14.28.21
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-14-azure
+
diff --git a/docker/centos/Dockerfile.zulu-7u262-jdk b/docker/centos/Dockerfile.zulu-7u262-jdk
new file mode 100644
index 00000000..a54997c3
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-7u262-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-7-azure-jdk-7.38.0.11
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure
+
diff --git a/docker/centos/Dockerfile.zulu-7u262-jre b/docker/centos/Dockerfile.zulu-7u262-jre
new file mode 100644
index 00000000..d450d1f8
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-7u262-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-7-azure-jre-7.38.0.11
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure
+
diff --git a/docker/centos/Dockerfile.zulu-7u262-jre-headless b/docker/centos/Dockerfile.zulu-7u262-jre-headless
new file mode 100644
index 00000000..587cf46d
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-7u262-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-7-azure-jre-headless-7.38.0.11
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure
diff --git a/docker/centos/Dockerfile.zulu-8u252-jdk b/docker/centos/Dockerfile.zulu-8u252-jdk
new file mode 100644
index 00000000..d44dcf71
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u252-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-8-azure-jdk-8.46.0.19
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure
+
diff --git a/docker/centos/Dockerfile.zulu-8u252-jre b/docker/centos/Dockerfile.zulu-8u252-jre
new file mode 100644
index 00000000..014c9838
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u252-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-8-azure-jre-8.46.0.19
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure
+
diff --git a/docker/centos/Dockerfile.zulu-8u252-jre-headless b/docker/centos/Dockerfile.zulu-8u252-jre-headless
new file mode 100644
index 00000000..84db73c3
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u252-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-8-azure-jre-headless-8.46.0.19
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure
diff --git a/docker/debian10/Dockerfile.zulu-11u7-jdk b/docker/debian10/Dockerfile.zulu-11u7-jdk
new file mode 100644
index 00000000..177b0ec9
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u7-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.39+15 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u7-jre b/docker/debian10/Dockerfile.zulu-11u7-jre
new file mode 100644
index 00000000..30ed38ed
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u7-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.39+15 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u7-jre-headless b/docker/debian10/Dockerfile.zulu-11u7-jre-headless
new file mode 100644
index 00000000..cad19974
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u7-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.39+15 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-13u3-jdk b/docker/debian10/Dockerfile.zulu-13u3-jdk
new file mode 100644
index 00000000..90266c47
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-13u3-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.31+11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-13u3-jre b/docker/debian10/Dockerfile.zulu-13u3-jre
new file mode 100644
index 00000000..461ddeb8
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-13u3-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.31+11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-13u3-jre-headless b/docker/debian10/Dockerfile.zulu-13u3-jre-headless
new file mode 100644
index 00000000..2b44e778
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-13u3-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.31+11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-14u1-jdk b/docker/debian10/Dockerfile.zulu-14u1-jdk
new file mode 100644
index 00000000..7668c195
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-14u1-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-14-azure-jdk=14.28+21 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-14-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-14u1-jre b/docker/debian10/Dockerfile.zulu-14u1-jre
new file mode 100644
index 00000000..7229dc4b
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-14u1-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-14-azure-jre=14.28+21 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-14-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u262-jdk b/docker/debian10/Dockerfile.zulu-7u262-jdk
new file mode 100644
index 00000000..57498a5c
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-7u262-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.38.0.11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u262-jre b/docker/debian10/Dockerfile.zulu-7u262-jre
new file mode 100644
index 00000000..665a9169
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-7u262-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.38.0.11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u262-jre-headless b/docker/debian10/Dockerfile.zulu-7u262-jre-headless
new file mode 100644
index 00000000..43e4c714
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-7u262-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.38.0.11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u252-jdk b/docker/debian10/Dockerfile.zulu-8u252-jdk
new file mode 100644
index 00000000..f6e8cee9
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u252-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.46.0.19 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u252-jre b/docker/debian10/Dockerfile.zulu-8u252-jre
new file mode 100644
index 00000000..2fd24c5c
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u252-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.46.0.19 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u252-jre-headless b/docker/debian10/Dockerfile.zulu-8u252-jre-headless
new file mode 100644
index 00000000..8a8526d7
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u252-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.46.0.19 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u7-jdk b/docker/debian9/Dockerfile.zulu-11u7-jdk
new file mode 100644
index 00000000..5d584a03
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u7-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.39+15 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u7-jre b/docker/debian9/Dockerfile.zulu-11u7-jre
new file mode 100644
index 00000000..0d47e904
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u7-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.39+15 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u7-jre-headless b/docker/debian9/Dockerfile.zulu-11u7-jre-headless
new file mode 100644
index 00000000..5448cb19
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u7-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.39+15 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u3-jdk b/docker/debian9/Dockerfile.zulu-13u3-jdk
new file mode 100644
index 00000000..0c585f95
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-13u3-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.31+11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u3-jre b/docker/debian9/Dockerfile.zulu-13u3-jre
new file mode 100644
index 00000000..a5fc88ee
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-13u3-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.31+11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u3-jre-headless b/docker/debian9/Dockerfile.zulu-13u3-jre-headless
new file mode 100644
index 00000000..1983299a
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-13u3-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.31+11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-14u1-jdk b/docker/debian9/Dockerfile.zulu-14u1-jdk
new file mode 100644
index 00000000..dc3979c5
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-14u1-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-14-azure-jdk=14.28+21 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-14-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-14u1-jre b/docker/debian9/Dockerfile.zulu-14u1-jre
new file mode 100644
index 00000000..fa7aeede
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-14u1-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-14-azure-jre=14.28+21 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-14-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u262-jdk b/docker/debian9/Dockerfile.zulu-7u262-jdk
new file mode 100644
index 00000000..3bf47bfa
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-7u262-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.38.0.11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u262-jre b/docker/debian9/Dockerfile.zulu-7u262-jre
new file mode 100644
index 00000000..3d379e82
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-7u262-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.38.0.11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u262-jre-headless b/docker/debian9/Dockerfile.zulu-7u262-jre-headless
new file mode 100644
index 00000000..83b594af
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-7u262-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.38.0.11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u252-jdk b/docker/debian9/Dockerfile.zulu-8u252-jdk
new file mode 100644
index 00000000..716e70ba
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u252-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.46.0.19 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u252-jre b/docker/debian9/Dockerfile.zulu-8u252-jre
new file mode 100644
index 00000000..6c7f5dda
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u252-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.46.0.19 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u252-jre-headless b/docker/debian9/Dockerfile.zulu-8u252-jre-headless
new file mode 100644
index 00000000..539d06ac
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u252-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.46.0.19 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/maven/Dockerfile.zulu-8u252-jdk-maven b/docker/maven/Dockerfile.zulu-8u252-jdk-maven
new file mode 100644
index 00000000..12f52856
--- /dev/null
+++ b/docker/maven/Dockerfile.zulu-8u252-jdk-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u252-zulu-debian9
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u7-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-11u7-jdk
new file mode 100644
index 00000000..325a4096
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u7-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.39+15 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u7-jre b/docker/ubuntu-18.04/Dockerfile.zulu-11u7-jre
new file mode 100644
index 00000000..67fde592
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u7-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.39+15 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u7-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-11u7-jre-headless
new file mode 100644
index 00000000..a75cb784
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u7-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.39+15 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u3-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-13u3-jdk
new file mode 100644
index 00000000..30baf756
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u3-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.31+11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u3-jre b/docker/ubuntu-18.04/Dockerfile.zulu-13u3-jre
new file mode 100644
index 00000000..4e0b5f8d
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u3-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.31+11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u3-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-13u3-jre-headless
new file mode 100644
index 00000000..e2ad321c
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u3-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.31+11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-14u1-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-14u1-jdk
new file mode 100644
index 00000000..41b4c16e
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-14u1-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-14-azure-jdk=14.28+21 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-14-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-14u1-jre b/docker/ubuntu-18.04/Dockerfile.zulu-14u1-jre
new file mode 100644
index 00000000..be16c795
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-14u1-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-14-azure-jre=14.28+21 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-14-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u262-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-7u262-jdk
new file mode 100644
index 00000000..59e9b9e7
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u262-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.38.0.11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u262-jre b/docker/ubuntu-18.04/Dockerfile.zulu-7u262-jre
new file mode 100644
index 00000000..f8421662
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u262-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.38.0.11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u262-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-7u262-jre-headless
new file mode 100644
index 00000000..a0936509
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u262-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.38.0.11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u252-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-8u252-jdk
new file mode 100644
index 00000000..7482879c
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u252-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.46.0.19 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u252-jre b/docker/ubuntu-18.04/Dockerfile.zulu-8u252-jre
new file mode 100644
index 00000000..36c6823f
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u252-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.46.0.19 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u252-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-8u252-jre-headless
new file mode 100644
index 00000000..a434d95a
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u252-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.46.0.19 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u7-jdk b/docker/ubuntu/Dockerfile.zulu-11u7-jdk
new file mode 100644
index 00000000..3a56b712
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u7-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.39+15 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u7-jre b/docker/ubuntu/Dockerfile.zulu-11u7-jre
new file mode 100644
index 00000000..80b0380e
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u7-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.39+15 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u7-jre-headless b/docker/ubuntu/Dockerfile.zulu-11u7-jre-headless
new file mode 100644
index 00000000..d3e56178
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u7-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.39+15 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u3-jdk b/docker/ubuntu/Dockerfile.zulu-13u3-jdk
new file mode 100644
index 00000000..7df74e64
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-13u3-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.31+11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u3-jre b/docker/ubuntu/Dockerfile.zulu-13u3-jre
new file mode 100644
index 00000000..3009d0a1
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-13u3-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.31+11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u3-jre-headless b/docker/ubuntu/Dockerfile.zulu-13u3-jre-headless
new file mode 100644
index 00000000..2bbabd18
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-13u3-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.31+11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-14u1-jdk b/docker/ubuntu/Dockerfile.zulu-14u1-jdk
new file mode 100644
index 00000000..0112d2fe
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-14u1-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-14-azure-jdk=14.28+21 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-14-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-14u1-jre b/docker/ubuntu/Dockerfile.zulu-14u1-jre
new file mode 100644
index 00000000..d4da66e9
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-14u1-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-14-azure-jre=14.28+21 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-14-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u262-jdk b/docker/ubuntu/Dockerfile.zulu-7u262-jdk
new file mode 100644
index 00000000..019ffd7f
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-7u262-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.38.0.11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u262-jre b/docker/ubuntu/Dockerfile.zulu-7u262-jre
new file mode 100644
index 00000000..10d957cf
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-7u262-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.38.0.11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u262-jre-headless b/docker/ubuntu/Dockerfile.zulu-7u262-jre-headless
new file mode 100644
index 00000000..d90ccbae
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-7u262-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.38.0.11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u252-jdk b/docker/ubuntu/Dockerfile.zulu-8u252-jdk
new file mode 100644
index 00000000..d1a8992f
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u252-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.46.0.19 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u252-jre b/docker/ubuntu/Dockerfile.zulu-8u252-jre
new file mode 100644
index 00000000..1dc4327a
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u252-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.46.0.19 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u252-jre-headless b/docker/ubuntu/Dockerfile.zulu-8u252-jre-headless
new file mode 100644
index 00000000..ee247078
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u252-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.46.0.19 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/windowsservercore/Dockerfile.zulu-11u7-jdk b/docker/windowsservercore/Dockerfile.zulu-11u7-jdk
new file mode 100644
index 00000000..200aa190
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-11u7-jdk
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-11-azure-jdk_11.39.15-11.0.7-win_x64.msi && \
+    setx PACKAGE_DIR zulu-11/11.0.7 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-11"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-11u7-jre b/docker/windowsservercore/Dockerfile.zulu-11u7-jre
new file mode 100644
index 00000000..06709c40
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-11u7-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-11-azure-jre_11.39.15-11.0.7-win_x64.msi && \
+    setx PACKAGE_DIR zulu-11/11.0.7 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-11"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-13u3-jdk b/docker/windowsservercore/Dockerfile.zulu-13u3-jdk
new file mode 100644
index 00000000..2b9d07b3
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-13u3-jdk
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-13-azure-jdk_13.31.11-13.0.3-win_x64.msi && \
+    setx PACKAGE_DIR zulu-13/13.0.3 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-13"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-13u3-jre b/docker/windowsservercore/Dockerfile.zulu-13u3-jre
new file mode 100644
index 00000000..5e2873e9
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-13u3-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-13-azure-jre_13.31.11-13.0.3-win_x64.msi && \
+    setx PACKAGE_DIR zulu-13/13.0.3 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-13"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-14u1-jdk b/docker/windowsservercore/Dockerfile.zulu-14u1-jdk
new file mode 100644
index 00000000..fe344db2
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-14u1-jdk
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-14-azure-jdk_14.28.21-14.0.1-win_x64.msi && \
+    setx PACKAGE_DIR zulu-14/14.0.1 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-14"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-14u1-jre b/docker/windowsservercore/Dockerfile.zulu-14u1-jre
new file mode 100644
index 00000000..146dfde4
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-14u1-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-14-azure-jre_14.28.21-14.0.1-win_x64.msi && \
+    setx PACKAGE_DIR zulu-14/14.0.1 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-14"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-7u262-jdk b/docker/windowsservercore/Dockerfile.zulu-7u262-jdk
new file mode 100644
index 00000000..f218799b
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-7u262-jdk
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-7-azure-jdk_7.38.0.11-7.0.262-win_x64.msi && \
+    setx PACKAGE_DIR zulu-7/7u262 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-7"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-7u262-jre b/docker/windowsservercore/Dockerfile.zulu-7u262-jre
new file mode 100644
index 00000000..f15d4a4f
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-7u262-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-7-azure-jre_7.38.0.11-7.0.262-win_x64.msi && \
+    setx PACKAGE_DIR zulu-7/7u262 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-7"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-8u252-jdk b/docker/windowsservercore/Dockerfile.zulu-8u252-jdk
new file mode 100644
index 00000000..18f0ca68
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-8u252-jdk
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-8-azure-jdk_8.46.0.19-8.0.252-win_x64.msi && \
+    setx PACKAGE_DIR zulu-8/8u252 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-8"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-8u252-jre b/docker/windowsservercore/Dockerfile.zulu-8u252-jre
new file mode 100644
index 00000000..feb39342
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-8u252-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-8-azure-jre_8.46.0.19-8.0.252-win_x64.msi && \
+    setx PACKAGE_DIR zulu-8/8u252 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-8"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%

From 30b5aaa24aa9d4dfdb8ff97380ca26165ca2472c Mon Sep 17 00:00:00 2001
From: Stanislav Drozdov <sdrozdov@azul.com>
Date: Sat, 25 Apr 2020 22:08:50 +0300
Subject: [PATCH 064/264] add Dockerfiles for Ubuntu 20.04 release

---
 docker/ubuntu-20.04/Dockerfile.zulu-11u7-jdk  | 19 +++++++++++++++++++
 docker/ubuntu-20.04/Dockerfile.zulu-11u7-jre  | 19 +++++++++++++++++++
 .../Dockerfile.zulu-11u7-jre-headless         | 19 +++++++++++++++++++
 docker/ubuntu-20.04/Dockerfile.zulu-13u3-jdk  | 19 +++++++++++++++++++
 docker/ubuntu-20.04/Dockerfile.zulu-13u3-jre  | 19 +++++++++++++++++++
 .../Dockerfile.zulu-13u3-jre-headless         | 19 +++++++++++++++++++
 docker/ubuntu-20.04/Dockerfile.zulu-14u1-jdk  | 19 +++++++++++++++++++
 docker/ubuntu-20.04/Dockerfile.zulu-14u1-jre  | 19 +++++++++++++++++++
 docker/ubuntu-20.04/Dockerfile.zulu-7u262-jdk | 19 +++++++++++++++++++
 docker/ubuntu-20.04/Dockerfile.zulu-7u262-jre | 19 +++++++++++++++++++
 .../Dockerfile.zulu-7u262-jre-headless        | 19 +++++++++++++++++++
 docker/ubuntu-20.04/Dockerfile.zulu-8u252-jdk | 19 +++++++++++++++++++
 docker/ubuntu-20.04/Dockerfile.zulu-8u252-jre | 19 +++++++++++++++++++
 .../Dockerfile.zulu-8u252-jre-headless        | 19 +++++++++++++++++++
 14 files changed, 266 insertions(+)
 create mode 100644 docker/ubuntu-20.04/Dockerfile.zulu-11u7-jdk
 create mode 100644 docker/ubuntu-20.04/Dockerfile.zulu-11u7-jre
 create mode 100644 docker/ubuntu-20.04/Dockerfile.zulu-11u7-jre-headless
 create mode 100644 docker/ubuntu-20.04/Dockerfile.zulu-13u3-jdk
 create mode 100644 docker/ubuntu-20.04/Dockerfile.zulu-13u3-jre
 create mode 100644 docker/ubuntu-20.04/Dockerfile.zulu-13u3-jre-headless
 create mode 100644 docker/ubuntu-20.04/Dockerfile.zulu-14u1-jdk
 create mode 100644 docker/ubuntu-20.04/Dockerfile.zulu-14u1-jre
 create mode 100644 docker/ubuntu-20.04/Dockerfile.zulu-7u262-jdk
 create mode 100644 docker/ubuntu-20.04/Dockerfile.zulu-7u262-jre
 create mode 100644 docker/ubuntu-20.04/Dockerfile.zulu-7u262-jre-headless
 create mode 100644 docker/ubuntu-20.04/Dockerfile.zulu-8u252-jdk
 create mode 100644 docker/ubuntu-20.04/Dockerfile.zulu-8u252-jre
 create mode 100644 docker/ubuntu-20.04/Dockerfile.zulu-8u252-jre-headless

diff --git a/docker/ubuntu-20.04/Dockerfile.zulu-11u7-jdk b/docker/ubuntu-20.04/Dockerfile.zulu-11u7-jdk
new file mode 100644
index 00000000..009d91be
--- /dev/null
+++ b/docker/ubuntu-20.04/Dockerfile.zulu-11u7-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.39+15 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu-20.04/Dockerfile.zulu-11u7-jre b/docker/ubuntu-20.04/Dockerfile.zulu-11u7-jre
new file mode 100644
index 00000000..d87e36b0
--- /dev/null
+++ b/docker/ubuntu-20.04/Dockerfile.zulu-11u7-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.39+15 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu-20.04/Dockerfile.zulu-11u7-jre-headless b/docker/ubuntu-20.04/Dockerfile.zulu-11u7-jre-headless
new file mode 100644
index 00000000..3bd16f96
--- /dev/null
+++ b/docker/ubuntu-20.04/Dockerfile.zulu-11u7-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.39+15 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu-20.04/Dockerfile.zulu-13u3-jdk b/docker/ubuntu-20.04/Dockerfile.zulu-13u3-jdk
new file mode 100644
index 00000000..234cd199
--- /dev/null
+++ b/docker/ubuntu-20.04/Dockerfile.zulu-13u3-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.31+11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu-20.04/Dockerfile.zulu-13u3-jre b/docker/ubuntu-20.04/Dockerfile.zulu-13u3-jre
new file mode 100644
index 00000000..18f18987
--- /dev/null
+++ b/docker/ubuntu-20.04/Dockerfile.zulu-13u3-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.31+11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu-20.04/Dockerfile.zulu-13u3-jre-headless b/docker/ubuntu-20.04/Dockerfile.zulu-13u3-jre-headless
new file mode 100644
index 00000000..870db755
--- /dev/null
+++ b/docker/ubuntu-20.04/Dockerfile.zulu-13u3-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.31+11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu-20.04/Dockerfile.zulu-14u1-jdk b/docker/ubuntu-20.04/Dockerfile.zulu-14u1-jdk
new file mode 100644
index 00000000..23401fec
--- /dev/null
+++ b/docker/ubuntu-20.04/Dockerfile.zulu-14u1-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-14-azure-jdk=14.28+21 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-14-azure-amd64
diff --git a/docker/ubuntu-20.04/Dockerfile.zulu-14u1-jre b/docker/ubuntu-20.04/Dockerfile.zulu-14u1-jre
new file mode 100644
index 00000000..92b38cc2
--- /dev/null
+++ b/docker/ubuntu-20.04/Dockerfile.zulu-14u1-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-14-azure-jre=14.28+21 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-14-azure-amd64
diff --git a/docker/ubuntu-20.04/Dockerfile.zulu-7u262-jdk b/docker/ubuntu-20.04/Dockerfile.zulu-7u262-jdk
new file mode 100644
index 00000000..e7b91972
--- /dev/null
+++ b/docker/ubuntu-20.04/Dockerfile.zulu-7u262-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.38.0.11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu-20.04/Dockerfile.zulu-7u262-jre b/docker/ubuntu-20.04/Dockerfile.zulu-7u262-jre
new file mode 100644
index 00000000..25b72735
--- /dev/null
+++ b/docker/ubuntu-20.04/Dockerfile.zulu-7u262-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.38.0.11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu-20.04/Dockerfile.zulu-7u262-jre-headless b/docker/ubuntu-20.04/Dockerfile.zulu-7u262-jre-headless
new file mode 100644
index 00000000..c97fde90
--- /dev/null
+++ b/docker/ubuntu-20.04/Dockerfile.zulu-7u262-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.38.0.11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu-20.04/Dockerfile.zulu-8u252-jdk b/docker/ubuntu-20.04/Dockerfile.zulu-8u252-jdk
new file mode 100644
index 00000000..03c8fadd
--- /dev/null
+++ b/docker/ubuntu-20.04/Dockerfile.zulu-8u252-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.46.0.19 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu-20.04/Dockerfile.zulu-8u252-jre b/docker/ubuntu-20.04/Dockerfile.zulu-8u252-jre
new file mode 100644
index 00000000..bfaee156
--- /dev/null
+++ b/docker/ubuntu-20.04/Dockerfile.zulu-8u252-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.46.0.19 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu-20.04/Dockerfile.zulu-8u252-jre-headless b/docker/ubuntu-20.04/Dockerfile.zulu-8u252-jre-headless
new file mode 100644
index 00000000..76f3ecac
--- /dev/null
+++ b/docker/ubuntu-20.04/Dockerfile.zulu-8u252-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.46.0.19 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64

From 232bf1a7a88a39cf2305528bf6c5f29dd4d28781 Mon Sep 17 00:00:00 2001
From: Stanislav Drozdov <sdrozdov@azul.com>
Date: Sat, 25 Apr 2020 22:59:01 +0300
Subject: [PATCH 065/264] switch latest to focal

---
 docker/{ubuntu-20.04 => ubuntu-19.10}/Dockerfile.zulu-11u7-jdk  | 2 +-
 docker/{ubuntu-20.04 => ubuntu-19.10}/Dockerfile.zulu-11u7-jre  | 2 +-
 .../Dockerfile.zulu-11u7-jre-headless                           | 2 +-
 docker/{ubuntu-20.04 => ubuntu-19.10}/Dockerfile.zulu-13u3-jdk  | 2 +-
 docker/{ubuntu-20.04 => ubuntu-19.10}/Dockerfile.zulu-13u3-jre  | 2 +-
 .../Dockerfile.zulu-13u3-jre-headless                           | 2 +-
 docker/{ubuntu-20.04 => ubuntu-19.10}/Dockerfile.zulu-14u1-jdk  | 2 +-
 docker/{ubuntu-20.04 => ubuntu-19.10}/Dockerfile.zulu-14u1-jre  | 2 +-
 docker/{ubuntu-20.04 => ubuntu-19.10}/Dockerfile.zulu-7u262-jdk | 2 +-
 docker/{ubuntu-20.04 => ubuntu-19.10}/Dockerfile.zulu-7u262-jre | 2 +-
 .../Dockerfile.zulu-7u262-jre-headless                          | 2 +-
 docker/{ubuntu-20.04 => ubuntu-19.10}/Dockerfile.zulu-8u252-jdk | 2 +-
 docker/{ubuntu-20.04 => ubuntu-19.10}/Dockerfile.zulu-8u252-jre | 2 +-
 .../Dockerfile.zulu-8u252-jre-headless                          | 2 +-
 docker/ubuntu/Dockerfile.zulu-11u7-jdk                          | 2 +-
 docker/ubuntu/Dockerfile.zulu-11u7-jre                          | 2 +-
 docker/ubuntu/Dockerfile.zulu-11u7-jre-headless                 | 2 +-
 docker/ubuntu/Dockerfile.zulu-13u3-jdk                          | 2 +-
 docker/ubuntu/Dockerfile.zulu-13u3-jre                          | 2 +-
 docker/ubuntu/Dockerfile.zulu-13u3-jre-headless                 | 2 +-
 docker/ubuntu/Dockerfile.zulu-14u1-jdk                          | 2 +-
 docker/ubuntu/Dockerfile.zulu-14u1-jre                          | 2 +-
 docker/ubuntu/Dockerfile.zulu-7u262-jdk                         | 2 +-
 docker/ubuntu/Dockerfile.zulu-7u262-jre                         | 2 +-
 docker/ubuntu/Dockerfile.zulu-7u262-jre-headless                | 2 +-
 docker/ubuntu/Dockerfile.zulu-8u252-jdk                         | 2 +-
 docker/ubuntu/Dockerfile.zulu-8u252-jre                         | 2 +-
 docker/ubuntu/Dockerfile.zulu-8u252-jre-headless                | 2 +-
 28 files changed, 28 insertions(+), 28 deletions(-)
 rename docker/{ubuntu-20.04 => ubuntu-19.10}/Dockerfile.zulu-11u7-jdk (97%)
 rename docker/{ubuntu-20.04 => ubuntu-19.10}/Dockerfile.zulu-11u7-jre (97%)
 rename docker/{ubuntu-20.04 => ubuntu-19.10}/Dockerfile.zulu-11u7-jre-headless (98%)
 rename docker/{ubuntu-20.04 => ubuntu-19.10}/Dockerfile.zulu-13u3-jdk (97%)
 rename docker/{ubuntu-20.04 => ubuntu-19.10}/Dockerfile.zulu-13u3-jre (97%)
 rename docker/{ubuntu-20.04 => ubuntu-19.10}/Dockerfile.zulu-13u3-jre-headless (98%)
 rename docker/{ubuntu-20.04 => ubuntu-19.10}/Dockerfile.zulu-14u1-jdk (97%)
 rename docker/{ubuntu-20.04 => ubuntu-19.10}/Dockerfile.zulu-14u1-jre (97%)
 rename docker/{ubuntu-20.04 => ubuntu-19.10}/Dockerfile.zulu-7u262-jdk (97%)
 rename docker/{ubuntu-20.04 => ubuntu-19.10}/Dockerfile.zulu-7u262-jre (97%)
 rename docker/{ubuntu-20.04 => ubuntu-19.10}/Dockerfile.zulu-7u262-jre-headless (98%)
 rename docker/{ubuntu-20.04 => ubuntu-19.10}/Dockerfile.zulu-8u252-jdk (97%)
 rename docker/{ubuntu-20.04 => ubuntu-19.10}/Dockerfile.zulu-8u252-jre (97%)
 rename docker/{ubuntu-20.04 => ubuntu-19.10}/Dockerfile.zulu-8u252-jre-headless (98%)

diff --git a/docker/ubuntu-20.04/Dockerfile.zulu-11u7-jdk b/docker/ubuntu-19.10/Dockerfile.zulu-11u7-jdk
similarity index 97%
rename from docker/ubuntu-20.04/Dockerfile.zulu-11u7-jdk
rename to docker/ubuntu-19.10/Dockerfile.zulu-11u7-jdk
index 009d91be..3a56b712 100644
--- a/docker/ubuntu-20.04/Dockerfile.zulu-11u7-jdk
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-11u7-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu-20.04/Dockerfile.zulu-11u7-jre b/docker/ubuntu-19.10/Dockerfile.zulu-11u7-jre
similarity index 97%
rename from docker/ubuntu-20.04/Dockerfile.zulu-11u7-jre
rename to docker/ubuntu-19.10/Dockerfile.zulu-11u7-jre
index d87e36b0..80b0380e 100644
--- a/docker/ubuntu-20.04/Dockerfile.zulu-11u7-jre
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-11u7-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu-20.04/Dockerfile.zulu-11u7-jre-headless b/docker/ubuntu-19.10/Dockerfile.zulu-11u7-jre-headless
similarity index 98%
rename from docker/ubuntu-20.04/Dockerfile.zulu-11u7-jre-headless
rename to docker/ubuntu-19.10/Dockerfile.zulu-11u7-jre-headless
index 3bd16f96..d3e56178 100644
--- a/docker/ubuntu-20.04/Dockerfile.zulu-11u7-jre-headless
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-11u7-jre-headless
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu-20.04/Dockerfile.zulu-13u3-jdk b/docker/ubuntu-19.10/Dockerfile.zulu-13u3-jdk
similarity index 97%
rename from docker/ubuntu-20.04/Dockerfile.zulu-13u3-jdk
rename to docker/ubuntu-19.10/Dockerfile.zulu-13u3-jdk
index 234cd199..7df74e64 100644
--- a/docker/ubuntu-20.04/Dockerfile.zulu-13u3-jdk
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-13u3-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu-20.04/Dockerfile.zulu-13u3-jre b/docker/ubuntu-19.10/Dockerfile.zulu-13u3-jre
similarity index 97%
rename from docker/ubuntu-20.04/Dockerfile.zulu-13u3-jre
rename to docker/ubuntu-19.10/Dockerfile.zulu-13u3-jre
index 18f18987..3009d0a1 100644
--- a/docker/ubuntu-20.04/Dockerfile.zulu-13u3-jre
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-13u3-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu-20.04/Dockerfile.zulu-13u3-jre-headless b/docker/ubuntu-19.10/Dockerfile.zulu-13u3-jre-headless
similarity index 98%
rename from docker/ubuntu-20.04/Dockerfile.zulu-13u3-jre-headless
rename to docker/ubuntu-19.10/Dockerfile.zulu-13u3-jre-headless
index 870db755..2bbabd18 100644
--- a/docker/ubuntu-20.04/Dockerfile.zulu-13u3-jre-headless
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-13u3-jre-headless
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu-20.04/Dockerfile.zulu-14u1-jdk b/docker/ubuntu-19.10/Dockerfile.zulu-14u1-jdk
similarity index 97%
rename from docker/ubuntu-20.04/Dockerfile.zulu-14u1-jdk
rename to docker/ubuntu-19.10/Dockerfile.zulu-14u1-jdk
index 23401fec..0112d2fe 100644
--- a/docker/ubuntu-20.04/Dockerfile.zulu-14u1-jdk
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-14u1-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu-20.04/Dockerfile.zulu-14u1-jre b/docker/ubuntu-19.10/Dockerfile.zulu-14u1-jre
similarity index 97%
rename from docker/ubuntu-20.04/Dockerfile.zulu-14u1-jre
rename to docker/ubuntu-19.10/Dockerfile.zulu-14u1-jre
index 92b38cc2..d4da66e9 100644
--- a/docker/ubuntu-20.04/Dockerfile.zulu-14u1-jre
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-14u1-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu-20.04/Dockerfile.zulu-7u262-jdk b/docker/ubuntu-19.10/Dockerfile.zulu-7u262-jdk
similarity index 97%
rename from docker/ubuntu-20.04/Dockerfile.zulu-7u262-jdk
rename to docker/ubuntu-19.10/Dockerfile.zulu-7u262-jdk
index e7b91972..019ffd7f 100644
--- a/docker/ubuntu-20.04/Dockerfile.zulu-7u262-jdk
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-7u262-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu-20.04/Dockerfile.zulu-7u262-jre b/docker/ubuntu-19.10/Dockerfile.zulu-7u262-jre
similarity index 97%
rename from docker/ubuntu-20.04/Dockerfile.zulu-7u262-jre
rename to docker/ubuntu-19.10/Dockerfile.zulu-7u262-jre
index 25b72735..10d957cf 100644
--- a/docker/ubuntu-20.04/Dockerfile.zulu-7u262-jre
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-7u262-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu-20.04/Dockerfile.zulu-7u262-jre-headless b/docker/ubuntu-19.10/Dockerfile.zulu-7u262-jre-headless
similarity index 98%
rename from docker/ubuntu-20.04/Dockerfile.zulu-7u262-jre-headless
rename to docker/ubuntu-19.10/Dockerfile.zulu-7u262-jre-headless
index c97fde90..d90ccbae 100644
--- a/docker/ubuntu-20.04/Dockerfile.zulu-7u262-jre-headless
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-7u262-jre-headless
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu-20.04/Dockerfile.zulu-8u252-jdk b/docker/ubuntu-19.10/Dockerfile.zulu-8u252-jdk
similarity index 97%
rename from docker/ubuntu-20.04/Dockerfile.zulu-8u252-jdk
rename to docker/ubuntu-19.10/Dockerfile.zulu-8u252-jdk
index 03c8fadd..d1a8992f 100644
--- a/docker/ubuntu-20.04/Dockerfile.zulu-8u252-jdk
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-8u252-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu-20.04/Dockerfile.zulu-8u252-jre b/docker/ubuntu-19.10/Dockerfile.zulu-8u252-jre
similarity index 97%
rename from docker/ubuntu-20.04/Dockerfile.zulu-8u252-jre
rename to docker/ubuntu-19.10/Dockerfile.zulu-8u252-jre
index bfaee156..1dc4327a 100644
--- a/docker/ubuntu-20.04/Dockerfile.zulu-8u252-jre
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-8u252-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu-20.04/Dockerfile.zulu-8u252-jre-headless b/docker/ubuntu-19.10/Dockerfile.zulu-8u252-jre-headless
similarity index 98%
rename from docker/ubuntu-20.04/Dockerfile.zulu-8u252-jre-headless
rename to docker/ubuntu-19.10/Dockerfile.zulu-8u252-jre-headless
index 76f3ecac..ee247078 100644
--- a/docker/ubuntu-20.04/Dockerfile.zulu-8u252-jre-headless
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-8u252-jre-headless
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-11u7-jdk b/docker/ubuntu/Dockerfile.zulu-11u7-jdk
index 3a56b712..009d91be 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u7-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-11u7-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:eoan
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-11u7-jre b/docker/ubuntu/Dockerfile.zulu-11u7-jre
index 80b0380e..d87e36b0 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u7-jre
+++ b/docker/ubuntu/Dockerfile.zulu-11u7-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:eoan
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-11u7-jre-headless b/docker/ubuntu/Dockerfile.zulu-11u7-jre-headless
index d3e56178..3bd16f96 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u7-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-11u7-jre-headless
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:eoan
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-13u3-jdk b/docker/ubuntu/Dockerfile.zulu-13u3-jdk
index 7df74e64..234cd199 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u3-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-13u3-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:eoan
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-13u3-jre b/docker/ubuntu/Dockerfile.zulu-13u3-jre
index 3009d0a1..18f18987 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u3-jre
+++ b/docker/ubuntu/Dockerfile.zulu-13u3-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:eoan
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-13u3-jre-headless b/docker/ubuntu/Dockerfile.zulu-13u3-jre-headless
index 2bbabd18..870db755 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u3-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-13u3-jre-headless
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:eoan
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-14u1-jdk b/docker/ubuntu/Dockerfile.zulu-14u1-jdk
index 0112d2fe..23401fec 100644
--- a/docker/ubuntu/Dockerfile.zulu-14u1-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-14u1-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:eoan
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-14u1-jre b/docker/ubuntu/Dockerfile.zulu-14u1-jre
index d4da66e9..92b38cc2 100644
--- a/docker/ubuntu/Dockerfile.zulu-14u1-jre
+++ b/docker/ubuntu/Dockerfile.zulu-14u1-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:eoan
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-7u262-jdk b/docker/ubuntu/Dockerfile.zulu-7u262-jdk
index 019ffd7f..e7b91972 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u262-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-7u262-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:eoan
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-7u262-jre b/docker/ubuntu/Dockerfile.zulu-7u262-jre
index 10d957cf..25b72735 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u262-jre
+++ b/docker/ubuntu/Dockerfile.zulu-7u262-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:eoan
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-7u262-jre-headless b/docker/ubuntu/Dockerfile.zulu-7u262-jre-headless
index d90ccbae..c97fde90 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u262-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-7u262-jre-headless
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:eoan
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-8u252-jdk b/docker/ubuntu/Dockerfile.zulu-8u252-jdk
index d1a8992f..03c8fadd 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u252-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-8u252-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:eoan
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-8u252-jre b/docker/ubuntu/Dockerfile.zulu-8u252-jre
index 1dc4327a..bfaee156 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u252-jre
+++ b/docker/ubuntu/Dockerfile.zulu-8u252-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:eoan
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-8u252-jre-headless b/docker/ubuntu/Dockerfile.zulu-8u252-jre-headless
index ee247078..76f3ecac 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u252-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-8u252-jre-headless
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:eoan
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \

From 9931cb6c4b6577e37c5498ce9180e2e3c1b254a1 Mon Sep 17 00:00:00 2001
From: Stanislav Drozdov <sdrozdov@azul.com>
Date: Wed, 29 Apr 2020 20:00:22 +0300
Subject: [PATCH 066/264] add focal support for 2 previous releases

---
 docker/ubuntu-18.04/Dockerfile.zulu-11u5-jdk  | 19 +++++++++++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-11u5-jre  | 19 +++++++++++++++++++
 .../Dockerfile.zulu-11u5-jre-headless         | 19 +++++++++++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-13u1-jdk  | 19 +++++++++++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-13u1-jre  | 19 +++++++++++++++++++
 .../Dockerfile.zulu-13u1-jre-headless         | 19 +++++++++++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-7u242-jdk | 19 +++++++++++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-7u242-jre | 19 +++++++++++++++++++
 .../Dockerfile.zulu-7u242-jre-headless        | 19 +++++++++++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-7u252-jdk | 19 +++++++++++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-7u252-jre | 19 +++++++++++++++++++
 .../Dockerfile.zulu-7u252-jre-headless        | 19 +++++++++++++++++++
 docker/ubuntu-19.10/Dockerfile.zulu-11u6-jdk  | 19 +++++++++++++++++++
 docker/ubuntu-19.10/Dockerfile.zulu-11u6-jre  | 19 +++++++++++++++++++
 .../Dockerfile.zulu-11u6-jre-headless         | 19 +++++++++++++++++++
 docker/ubuntu-19.10/Dockerfile.zulu-13u2-jdk  | 19 +++++++++++++++++++
 docker/ubuntu-19.10/Dockerfile.zulu-13u2-jre  | 19 +++++++++++++++++++
 .../Dockerfile.zulu-13u2-jre-headless         | 19 +++++++++++++++++++
 docker/ubuntu-19.10/Dockerfile.zulu-14u0-jdk  | 19 +++++++++++++++++++
 docker/ubuntu-19.10/Dockerfile.zulu-14u0-jre  | 19 +++++++++++++++++++
 docker/ubuntu-19.10/Dockerfile.zulu-8u232-jdk | 19 +++++++++++++++++++
 docker/ubuntu-19.10/Dockerfile.zulu-8u232-jre | 19 +++++++++++++++++++
 .../Dockerfile.zulu-8u232-jre-headless        | 19 +++++++++++++++++++
 docker/ubuntu-19.10/Dockerfile.zulu-8u242-jdk | 19 +++++++++++++++++++
 docker/ubuntu-19.10/Dockerfile.zulu-8u242-jre | 19 +++++++++++++++++++
 .../Dockerfile.zulu-8u242-jre-headless        | 19 +++++++++++++++++++
 docker/ubuntu/Dockerfile.zulu-11u5-jdk        |  2 +-
 docker/ubuntu/Dockerfile.zulu-11u5-jre        |  2 +-
 .../ubuntu/Dockerfile.zulu-11u5-jre-headless  |  2 +-
 docker/ubuntu/Dockerfile.zulu-11u6-jdk        |  2 +-
 docker/ubuntu/Dockerfile.zulu-11u6-jre        |  2 +-
 .../ubuntu/Dockerfile.zulu-11u6-jre-headless  |  2 +-
 docker/ubuntu/Dockerfile.zulu-13u1-jdk        |  2 +-
 docker/ubuntu/Dockerfile.zulu-13u1-jre        |  2 +-
 .../ubuntu/Dockerfile.zulu-13u1-jre-headless  |  2 +-
 docker/ubuntu/Dockerfile.zulu-13u2-jdk        |  2 +-
 docker/ubuntu/Dockerfile.zulu-13u2-jre        |  2 +-
 .../ubuntu/Dockerfile.zulu-13u2-jre-headless  |  2 +-
 docker/ubuntu/Dockerfile.zulu-14u0-jdk        |  2 +-
 docker/ubuntu/Dockerfile.zulu-14u0-jre        |  2 +-
 docker/ubuntu/Dockerfile.zulu-7u242-jdk       |  2 +-
 docker/ubuntu/Dockerfile.zulu-7u242-jre       |  2 +-
 .../ubuntu/Dockerfile.zulu-7u242-jre-headless |  2 +-
 docker/ubuntu/Dockerfile.zulu-7u252-jdk       |  2 +-
 docker/ubuntu/Dockerfile.zulu-7u252-jre       |  2 +-
 .../ubuntu/Dockerfile.zulu-7u252-jre-headless |  2 +-
 docker/ubuntu/Dockerfile.zulu-8u232-jdk       |  2 +-
 docker/ubuntu/Dockerfile.zulu-8u232-jre       |  2 +-
 .../ubuntu/Dockerfile.zulu-8u232-jre-headless |  2 +-
 docker/ubuntu/Dockerfile.zulu-8u242-jdk       |  2 +-
 docker/ubuntu/Dockerfile.zulu-8u242-jre       |  2 +-
 .../ubuntu/Dockerfile.zulu-8u242-jre-headless |  2 +-
 52 files changed, 520 insertions(+), 26 deletions(-)
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-11u5-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-11u5-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-11u5-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-13u1-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-13u1-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-13u1-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u242-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u242-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u242-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u252-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u252-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u252-jre-headless
 create mode 100644 docker/ubuntu-19.10/Dockerfile.zulu-11u6-jdk
 create mode 100644 docker/ubuntu-19.10/Dockerfile.zulu-11u6-jre
 create mode 100644 docker/ubuntu-19.10/Dockerfile.zulu-11u6-jre-headless
 create mode 100644 docker/ubuntu-19.10/Dockerfile.zulu-13u2-jdk
 create mode 100644 docker/ubuntu-19.10/Dockerfile.zulu-13u2-jre
 create mode 100644 docker/ubuntu-19.10/Dockerfile.zulu-13u2-jre-headless
 create mode 100644 docker/ubuntu-19.10/Dockerfile.zulu-14u0-jdk
 create mode 100644 docker/ubuntu-19.10/Dockerfile.zulu-14u0-jre
 create mode 100644 docker/ubuntu-19.10/Dockerfile.zulu-8u232-jdk
 create mode 100644 docker/ubuntu-19.10/Dockerfile.zulu-8u232-jre
 create mode 100644 docker/ubuntu-19.10/Dockerfile.zulu-8u232-jre-headless
 create mode 100644 docker/ubuntu-19.10/Dockerfile.zulu-8u242-jdk
 create mode 100644 docker/ubuntu-19.10/Dockerfile.zulu-8u242-jre
 create mode 100644 docker/ubuntu-19.10/Dockerfile.zulu-8u242-jre-headless

diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u5-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-11u5-jdk
new file mode 100644
index 00000000..4c57f3d8
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u5-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.35+15 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u5-jre b/docker/ubuntu-18.04/Dockerfile.zulu-11u5-jre
new file mode 100644
index 00000000..6b936196
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u5-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.35+15 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u5-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-11u5-jre-headless
new file mode 100644
index 00000000..6372e66c
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u5-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.35+15 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u1-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-13u1-jdk
new file mode 100644
index 00000000..b40fa81a
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u1-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.28+11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u1-jre b/docker/ubuntu-18.04/Dockerfile.zulu-13u1-jre
new file mode 100644
index 00000000..2b882aa8
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u1-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.28+11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u1-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-13u1-jre-headless
new file mode 100644
index 00000000..6c4cef36
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u1-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.28+11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u242-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-7u242-jdk
new file mode 100644
index 00000000..2aee2270
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u242-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.34.0.5 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u242-jre b/docker/ubuntu-18.04/Dockerfile.zulu-7u242-jre
new file mode 100644
index 00000000..bd90195f
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u242-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.34.0.5 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u242-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-7u242-jre-headless
new file mode 100644
index 00000000..8ea6ddf6
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u242-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.34.0.5 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u252-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-7u252-jdk
new file mode 100644
index 00000000..4f500235
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u252-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.36.0.5 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u252-jre b/docker/ubuntu-18.04/Dockerfile.zulu-7u252-jre
new file mode 100644
index 00000000..03933a47
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u252-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.36.0.5 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u252-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-7u252-jre-headless
new file mode 100644
index 00000000..258e74d5
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u252-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.36.0.5 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-11u6-jdk b/docker/ubuntu-19.10/Dockerfile.zulu-11u6-jdk
new file mode 100644
index 00000000..00dd4a5a
--- /dev/null
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-11u6-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.37+17 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-11u6-jre b/docker/ubuntu-19.10/Dockerfile.zulu-11u6-jre
new file mode 100644
index 00000000..3b9cf9c5
--- /dev/null
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-11u6-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.37+17 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-11u6-jre-headless b/docker/ubuntu-19.10/Dockerfile.zulu-11u6-jre-headless
new file mode 100644
index 00000000..6a0aabbf
--- /dev/null
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-11u6-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.37+17 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-13u2-jdk b/docker/ubuntu-19.10/Dockerfile.zulu-13u2-jdk
new file mode 100644
index 00000000..0dd02a0c
--- /dev/null
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-13u2-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.29+9 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-13u2-jre b/docker/ubuntu-19.10/Dockerfile.zulu-13u2-jre
new file mode 100644
index 00000000..bc6df588
--- /dev/null
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-13u2-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.29+9 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-13u2-jre-headless b/docker/ubuntu-19.10/Dockerfile.zulu-13u2-jre-headless
new file mode 100644
index 00000000..6b74cf16
--- /dev/null
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-13u2-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.29+9 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-14u0-jdk b/docker/ubuntu-19.10/Dockerfile.zulu-14u0-jdk
new file mode 100644
index 00000000..d242ff91
--- /dev/null
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-14u0-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-14-azure-jdk=14.27+1 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-14-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-14u0-jre b/docker/ubuntu-19.10/Dockerfile.zulu-14u0-jre
new file mode 100644
index 00000000..ccdf83ed
--- /dev/null
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-14u0-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-14-azure-jre=14.27+1 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-14-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-8u232-jdk b/docker/ubuntu-19.10/Dockerfile.zulu-8u232-jdk
new file mode 100644
index 00000000..18763a31
--- /dev/null
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-8u232-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.42.0.23 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-8u232-jre b/docker/ubuntu-19.10/Dockerfile.zulu-8u232-jre
new file mode 100644
index 00000000..52f3a5fd
--- /dev/null
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-8u232-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.42.0.23 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-8u232-jre-headless b/docker/ubuntu-19.10/Dockerfile.zulu-8u232-jre-headless
new file mode 100644
index 00000000..99b82924
--- /dev/null
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-8u232-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.42.0.23 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-8u242-jdk b/docker/ubuntu-19.10/Dockerfile.zulu-8u242-jdk
new file mode 100644
index 00000000..98c127d0
--- /dev/null
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-8u242-jdk
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.44.0.11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-8u242-jre b/docker/ubuntu-19.10/Dockerfile.zulu-8u242-jre
new file mode 100644
index 00000000..e98cf467
--- /dev/null
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-8u242-jre
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.44.0.11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-8u242-jre-headless b/docker/ubuntu-19.10/Dockerfile.zulu-8u242-jre-headless
new file mode 100644
index 00000000..c53684a6
--- /dev/null
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-8u242-jre-headless
@@ -0,0 +1,19 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:eoan
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.44.0.11 && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u5-jdk b/docker/ubuntu/Dockerfile.zulu-11u5-jdk
index 4c57f3d8..58e5b360 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u5-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-11u5-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:bionic
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-11u5-jre b/docker/ubuntu/Dockerfile.zulu-11u5-jre
index 6b936196..685aae43 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u5-jre
+++ b/docker/ubuntu/Dockerfile.zulu-11u5-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:bionic
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-11u5-jre-headless b/docker/ubuntu/Dockerfile.zulu-11u5-jre-headless
index 6372e66c..657ee3a6 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u5-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-11u5-jre-headless
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:bionic
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-11u6-jdk b/docker/ubuntu/Dockerfile.zulu-11u6-jdk
index d4128087..acd5c75c 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u6-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-11u6-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:bionic
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-11u6-jre b/docker/ubuntu/Dockerfile.zulu-11u6-jre
index c407f838..521727d2 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u6-jre
+++ b/docker/ubuntu/Dockerfile.zulu-11u6-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:bionic
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-11u6-jre-headless b/docker/ubuntu/Dockerfile.zulu-11u6-jre-headless
index 90db1dca..6c0ec1c3 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u6-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-11u6-jre-headless
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:bionic
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-13u1-jdk b/docker/ubuntu/Dockerfile.zulu-13u1-jdk
index b40fa81a..f42a2fa4 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u1-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-13u1-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:bionic
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-13u1-jre b/docker/ubuntu/Dockerfile.zulu-13u1-jre
index 2b882aa8..884de30f 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u1-jre
+++ b/docker/ubuntu/Dockerfile.zulu-13u1-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:bionic
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-13u1-jre-headless b/docker/ubuntu/Dockerfile.zulu-13u1-jre-headless
index 6c4cef36..da447f73 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u1-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-13u1-jre-headless
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:bionic
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-13u2-jdk b/docker/ubuntu/Dockerfile.zulu-13u2-jdk
index 655d00a3..e92ebbc4 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u2-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-13u2-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:bionic
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-13u2-jre b/docker/ubuntu/Dockerfile.zulu-13u2-jre
index f839e935..d03c706d 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u2-jre
+++ b/docker/ubuntu/Dockerfile.zulu-13u2-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:bionic
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-13u2-jre-headless b/docker/ubuntu/Dockerfile.zulu-13u2-jre-headless
index 50767780..f7057fb5 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u2-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-13u2-jre-headless
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:bionic
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-14u0-jdk b/docker/ubuntu/Dockerfile.zulu-14u0-jdk
index d242ff91..819182c2 100644
--- a/docker/ubuntu/Dockerfile.zulu-14u0-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-14u0-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:eoan
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-14u0-jre b/docker/ubuntu/Dockerfile.zulu-14u0-jre
index ccdf83ed..cbcbe79f 100644
--- a/docker/ubuntu/Dockerfile.zulu-14u0-jre
+++ b/docker/ubuntu/Dockerfile.zulu-14u0-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:eoan
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-7u242-jdk b/docker/ubuntu/Dockerfile.zulu-7u242-jdk
index 2aee2270..761c81bb 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u242-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-7u242-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:bionic
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-7u242-jre b/docker/ubuntu/Dockerfile.zulu-7u242-jre
index bd90195f..06b2bb52 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u242-jre
+++ b/docker/ubuntu/Dockerfile.zulu-7u242-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:bionic
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-7u242-jre-headless b/docker/ubuntu/Dockerfile.zulu-7u242-jre-headless
index 8ea6ddf6..ad7a5384 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u242-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-7u242-jre-headless
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:bionic
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-7u252-jdk b/docker/ubuntu/Dockerfile.zulu-7u252-jdk
index 4f500235..f45c6082 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u252-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-7u252-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:bionic
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-7u252-jre b/docker/ubuntu/Dockerfile.zulu-7u252-jre
index 03933a47..86ac9d99 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u252-jre
+++ b/docker/ubuntu/Dockerfile.zulu-7u252-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:bionic
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-7u252-jre-headless b/docker/ubuntu/Dockerfile.zulu-7u252-jre-headless
index 258e74d5..c191b018 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u252-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-7u252-jre-headless
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:bionic
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-8u232-jdk b/docker/ubuntu/Dockerfile.zulu-8u232-jdk
index 18763a31..b4a73a5a 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u232-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-8u232-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:eoan
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-8u232-jre b/docker/ubuntu/Dockerfile.zulu-8u232-jre
index 52f3a5fd..fc0fb932 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u232-jre
+++ b/docker/ubuntu/Dockerfile.zulu-8u232-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:eoan
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-8u232-jre-headless b/docker/ubuntu/Dockerfile.zulu-8u232-jre-headless
index 99b82924..6a355d2b 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u232-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-8u232-jre-headless
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:eoan
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-8u242-jdk b/docker/ubuntu/Dockerfile.zulu-8u242-jdk
index 98c127d0..8b9a872f 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u242-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-8u242-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:eoan
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-8u242-jre b/docker/ubuntu/Dockerfile.zulu-8u242-jre
index e98cf467..3be2f358 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u242-jre
+++ b/docker/ubuntu/Dockerfile.zulu-8u242-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:eoan
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-8u242-jre-headless b/docker/ubuntu/Dockerfile.zulu-8u242-jre-headless
index c53684a6..760bda08 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u242-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-8u242-jre-headless
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:eoan
+FROM ubuntu:focal
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \

From 9786e35059af73dc9bf9755b3d64b9e56d8b026a Mon Sep 17 00:00:00 2001
From: Stanislav Drozdov <sdrozdov@azul.com>
Date: Thu, 30 Apr 2020 12:32:49 +0300
Subject: [PATCH 067/264] Revert "add focal support for 2 previous releases"

This reverts commit 9931cb6c4b6577e37c5498ce9180e2e3c1b254a1.
---
 docker/ubuntu-18.04/Dockerfile.zulu-11u5-jdk  | 19 -------------------
 docker/ubuntu-18.04/Dockerfile.zulu-11u5-jre  | 19 -------------------
 .../Dockerfile.zulu-11u5-jre-headless         | 19 -------------------
 docker/ubuntu-18.04/Dockerfile.zulu-13u1-jdk  | 19 -------------------
 docker/ubuntu-18.04/Dockerfile.zulu-13u1-jre  | 19 -------------------
 .../Dockerfile.zulu-13u1-jre-headless         | 19 -------------------
 docker/ubuntu-18.04/Dockerfile.zulu-7u242-jdk | 19 -------------------
 docker/ubuntu-18.04/Dockerfile.zulu-7u242-jre | 19 -------------------
 .../Dockerfile.zulu-7u242-jre-headless        | 19 -------------------
 docker/ubuntu-18.04/Dockerfile.zulu-7u252-jdk | 19 -------------------
 docker/ubuntu-18.04/Dockerfile.zulu-7u252-jre | 19 -------------------
 .../Dockerfile.zulu-7u252-jre-headless        | 19 -------------------
 docker/ubuntu-19.10/Dockerfile.zulu-11u6-jdk  | 19 -------------------
 docker/ubuntu-19.10/Dockerfile.zulu-11u6-jre  | 19 -------------------
 .../Dockerfile.zulu-11u6-jre-headless         | 19 -------------------
 docker/ubuntu-19.10/Dockerfile.zulu-13u2-jdk  | 19 -------------------
 docker/ubuntu-19.10/Dockerfile.zulu-13u2-jre  | 19 -------------------
 .../Dockerfile.zulu-13u2-jre-headless         | 19 -------------------
 docker/ubuntu-19.10/Dockerfile.zulu-14u0-jdk  | 19 -------------------
 docker/ubuntu-19.10/Dockerfile.zulu-14u0-jre  | 19 -------------------
 docker/ubuntu-19.10/Dockerfile.zulu-8u232-jdk | 19 -------------------
 docker/ubuntu-19.10/Dockerfile.zulu-8u232-jre | 19 -------------------
 .../Dockerfile.zulu-8u232-jre-headless        | 19 -------------------
 docker/ubuntu-19.10/Dockerfile.zulu-8u242-jdk | 19 -------------------
 docker/ubuntu-19.10/Dockerfile.zulu-8u242-jre | 19 -------------------
 .../Dockerfile.zulu-8u242-jre-headless        | 19 -------------------
 docker/ubuntu/Dockerfile.zulu-11u5-jdk        |  2 +-
 docker/ubuntu/Dockerfile.zulu-11u5-jre        |  2 +-
 .../ubuntu/Dockerfile.zulu-11u5-jre-headless  |  2 +-
 docker/ubuntu/Dockerfile.zulu-11u6-jdk        |  2 +-
 docker/ubuntu/Dockerfile.zulu-11u6-jre        |  2 +-
 .../ubuntu/Dockerfile.zulu-11u6-jre-headless  |  2 +-
 docker/ubuntu/Dockerfile.zulu-13u1-jdk        |  2 +-
 docker/ubuntu/Dockerfile.zulu-13u1-jre        |  2 +-
 .../ubuntu/Dockerfile.zulu-13u1-jre-headless  |  2 +-
 docker/ubuntu/Dockerfile.zulu-13u2-jdk        |  2 +-
 docker/ubuntu/Dockerfile.zulu-13u2-jre        |  2 +-
 .../ubuntu/Dockerfile.zulu-13u2-jre-headless  |  2 +-
 docker/ubuntu/Dockerfile.zulu-14u0-jdk        |  2 +-
 docker/ubuntu/Dockerfile.zulu-14u0-jre        |  2 +-
 docker/ubuntu/Dockerfile.zulu-7u242-jdk       |  2 +-
 docker/ubuntu/Dockerfile.zulu-7u242-jre       |  2 +-
 .../ubuntu/Dockerfile.zulu-7u242-jre-headless |  2 +-
 docker/ubuntu/Dockerfile.zulu-7u252-jdk       |  2 +-
 docker/ubuntu/Dockerfile.zulu-7u252-jre       |  2 +-
 .../ubuntu/Dockerfile.zulu-7u252-jre-headless |  2 +-
 docker/ubuntu/Dockerfile.zulu-8u232-jdk       |  2 +-
 docker/ubuntu/Dockerfile.zulu-8u232-jre       |  2 +-
 .../ubuntu/Dockerfile.zulu-8u232-jre-headless |  2 +-
 docker/ubuntu/Dockerfile.zulu-8u242-jdk       |  2 +-
 docker/ubuntu/Dockerfile.zulu-8u242-jre       |  2 +-
 .../ubuntu/Dockerfile.zulu-8u242-jre-headless |  2 +-
 52 files changed, 26 insertions(+), 520 deletions(-)
 delete mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-11u5-jdk
 delete mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-11u5-jre
 delete mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-11u5-jre-headless
 delete mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-13u1-jdk
 delete mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-13u1-jre
 delete mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-13u1-jre-headless
 delete mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u242-jdk
 delete mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u242-jre
 delete mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u242-jre-headless
 delete mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u252-jdk
 delete mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u252-jre
 delete mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u252-jre-headless
 delete mode 100644 docker/ubuntu-19.10/Dockerfile.zulu-11u6-jdk
 delete mode 100644 docker/ubuntu-19.10/Dockerfile.zulu-11u6-jre
 delete mode 100644 docker/ubuntu-19.10/Dockerfile.zulu-11u6-jre-headless
 delete mode 100644 docker/ubuntu-19.10/Dockerfile.zulu-13u2-jdk
 delete mode 100644 docker/ubuntu-19.10/Dockerfile.zulu-13u2-jre
 delete mode 100644 docker/ubuntu-19.10/Dockerfile.zulu-13u2-jre-headless
 delete mode 100644 docker/ubuntu-19.10/Dockerfile.zulu-14u0-jdk
 delete mode 100644 docker/ubuntu-19.10/Dockerfile.zulu-14u0-jre
 delete mode 100644 docker/ubuntu-19.10/Dockerfile.zulu-8u232-jdk
 delete mode 100644 docker/ubuntu-19.10/Dockerfile.zulu-8u232-jre
 delete mode 100644 docker/ubuntu-19.10/Dockerfile.zulu-8u232-jre-headless
 delete mode 100644 docker/ubuntu-19.10/Dockerfile.zulu-8u242-jdk
 delete mode 100644 docker/ubuntu-19.10/Dockerfile.zulu-8u242-jre
 delete mode 100644 docker/ubuntu-19.10/Dockerfile.zulu-8u242-jre-headless

diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u5-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-11u5-jdk
deleted file mode 100644
index 4c57f3d8..00000000
--- a/docker/ubuntu-18.04/Dockerfile.zulu-11u5-jdk
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM ubuntu:bionic
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
-    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -qq update && \
-    apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.35+15 && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u5-jre b/docker/ubuntu-18.04/Dockerfile.zulu-11u5-jre
deleted file mode 100644
index 6b936196..00000000
--- a/docker/ubuntu-18.04/Dockerfile.zulu-11u5-jre
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM ubuntu:bionic
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
-    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -qq update && \
-    apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.35+15 && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u5-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-11u5-jre-headless
deleted file mode 100644
index 6372e66c..00000000
--- a/docker/ubuntu-18.04/Dockerfile.zulu-11u5-jre-headless
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM ubuntu:bionic
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
-    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -qq update && \
-    apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.35+15 && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u1-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-13u1-jdk
deleted file mode 100644
index b40fa81a..00000000
--- a/docker/ubuntu-18.04/Dockerfile.zulu-13u1-jdk
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM ubuntu:bionic
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
-    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -qq update && \
-    apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.28+11 && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u1-jre b/docker/ubuntu-18.04/Dockerfile.zulu-13u1-jre
deleted file mode 100644
index 2b882aa8..00000000
--- a/docker/ubuntu-18.04/Dockerfile.zulu-13u1-jre
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM ubuntu:bionic
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
-    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -qq update && \
-    apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.28+11 && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u1-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-13u1-jre-headless
deleted file mode 100644
index 6c4cef36..00000000
--- a/docker/ubuntu-18.04/Dockerfile.zulu-13u1-jre-headless
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM ubuntu:bionic
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
-    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -qq update && \
-    apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.28+11 && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u242-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-7u242-jdk
deleted file mode 100644
index 2aee2270..00000000
--- a/docker/ubuntu-18.04/Dockerfile.zulu-7u242-jdk
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM ubuntu:bionic
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
-    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -qq update && \
-    apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.34.0.5 && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u242-jre b/docker/ubuntu-18.04/Dockerfile.zulu-7u242-jre
deleted file mode 100644
index bd90195f..00000000
--- a/docker/ubuntu-18.04/Dockerfile.zulu-7u242-jre
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM ubuntu:bionic
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
-    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -qq update && \
-    apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.34.0.5 && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u242-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-7u242-jre-headless
deleted file mode 100644
index 8ea6ddf6..00000000
--- a/docker/ubuntu-18.04/Dockerfile.zulu-7u242-jre-headless
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM ubuntu:bionic
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
-    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -qq update && \
-    apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.34.0.5 && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u252-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-7u252-jdk
deleted file mode 100644
index 4f500235..00000000
--- a/docker/ubuntu-18.04/Dockerfile.zulu-7u252-jdk
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM ubuntu:bionic
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
-    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -qq update && \
-    apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.36.0.5 && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u252-jre b/docker/ubuntu-18.04/Dockerfile.zulu-7u252-jre
deleted file mode 100644
index 03933a47..00000000
--- a/docker/ubuntu-18.04/Dockerfile.zulu-7u252-jre
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM ubuntu:bionic
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
-    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -qq update && \
-    apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.36.0.5 && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u252-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-7u252-jre-headless
deleted file mode 100644
index 258e74d5..00000000
--- a/docker/ubuntu-18.04/Dockerfile.zulu-7u252-jre-headless
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM ubuntu:bionic
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
-    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -qq update && \
-    apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.36.0.5 && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-11u6-jdk b/docker/ubuntu-19.10/Dockerfile.zulu-11u6-jdk
deleted file mode 100644
index 00dd4a5a..00000000
--- a/docker/ubuntu-19.10/Dockerfile.zulu-11u6-jdk
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM ubuntu:eoan
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
-    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -qq update && \
-    apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.37+17 && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-11u6-jre b/docker/ubuntu-19.10/Dockerfile.zulu-11u6-jre
deleted file mode 100644
index 3b9cf9c5..00000000
--- a/docker/ubuntu-19.10/Dockerfile.zulu-11u6-jre
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM ubuntu:eoan
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
-    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -qq update && \
-    apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.37+17 && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-11u6-jre-headless b/docker/ubuntu-19.10/Dockerfile.zulu-11u6-jre-headless
deleted file mode 100644
index 6a0aabbf..00000000
--- a/docker/ubuntu-19.10/Dockerfile.zulu-11u6-jre-headless
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM ubuntu:eoan
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
-    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -qq update && \
-    apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.37+17 && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-13u2-jdk b/docker/ubuntu-19.10/Dockerfile.zulu-13u2-jdk
deleted file mode 100644
index 0dd02a0c..00000000
--- a/docker/ubuntu-19.10/Dockerfile.zulu-13u2-jdk
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM ubuntu:eoan
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
-    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -qq update && \
-    apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.29+9 && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-13u2-jre b/docker/ubuntu-19.10/Dockerfile.zulu-13u2-jre
deleted file mode 100644
index bc6df588..00000000
--- a/docker/ubuntu-19.10/Dockerfile.zulu-13u2-jre
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM ubuntu:eoan
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
-    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -qq update && \
-    apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.29+9 && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-13u2-jre-headless b/docker/ubuntu-19.10/Dockerfile.zulu-13u2-jre-headless
deleted file mode 100644
index 6b74cf16..00000000
--- a/docker/ubuntu-19.10/Dockerfile.zulu-13u2-jre-headless
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM ubuntu:eoan
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
-    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -qq update && \
-    apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.29+9 && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-14u0-jdk b/docker/ubuntu-19.10/Dockerfile.zulu-14u0-jdk
deleted file mode 100644
index d242ff91..00000000
--- a/docker/ubuntu-19.10/Dockerfile.zulu-14u0-jdk
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM ubuntu:eoan
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
-    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -qq update && \
-    apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-14-azure-jdk=14.27+1 && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV JAVA_HOME=/usr/lib/jvm/zulu-14-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-14u0-jre b/docker/ubuntu-19.10/Dockerfile.zulu-14u0-jre
deleted file mode 100644
index ccdf83ed..00000000
--- a/docker/ubuntu-19.10/Dockerfile.zulu-14u0-jre
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM ubuntu:eoan
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
-    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -qq update && \
-    apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-14-azure-jre=14.27+1 && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV JAVA_HOME=/usr/lib/jvm/zre-14-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-8u232-jdk b/docker/ubuntu-19.10/Dockerfile.zulu-8u232-jdk
deleted file mode 100644
index 18763a31..00000000
--- a/docker/ubuntu-19.10/Dockerfile.zulu-8u232-jdk
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM ubuntu:eoan
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
-    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -qq update && \
-    apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.42.0.23 && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-8u232-jre b/docker/ubuntu-19.10/Dockerfile.zulu-8u232-jre
deleted file mode 100644
index 52f3a5fd..00000000
--- a/docker/ubuntu-19.10/Dockerfile.zulu-8u232-jre
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM ubuntu:eoan
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
-    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -qq update && \
-    apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.42.0.23 && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-8u232-jre-headless b/docker/ubuntu-19.10/Dockerfile.zulu-8u232-jre-headless
deleted file mode 100644
index 99b82924..00000000
--- a/docker/ubuntu-19.10/Dockerfile.zulu-8u232-jre-headless
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM ubuntu:eoan
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
-    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -qq update && \
-    apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.42.0.23 && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-8u242-jdk b/docker/ubuntu-19.10/Dockerfile.zulu-8u242-jdk
deleted file mode 100644
index 98c127d0..00000000
--- a/docker/ubuntu-19.10/Dockerfile.zulu-8u242-jdk
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM ubuntu:eoan
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
-    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -qq update && \
-    apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.44.0.11 && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-8u242-jre b/docker/ubuntu-19.10/Dockerfile.zulu-8u242-jre
deleted file mode 100644
index e98cf467..00000000
--- a/docker/ubuntu-19.10/Dockerfile.zulu-8u242-jre
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM ubuntu:eoan
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
-    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -qq update && \
-    apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.44.0.11 && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-8u242-jre-headless b/docker/ubuntu-19.10/Dockerfile.zulu-8u242-jre-headless
deleted file mode 100644
index c53684a6..00000000
--- a/docker/ubuntu-19.10/Dockerfile.zulu-8u242-jre-headless
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM ubuntu:eoan
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
-    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
-    apt-get -qq update && \
-    apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.44.0.11 && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u5-jdk b/docker/ubuntu/Dockerfile.zulu-11u5-jdk
index 58e5b360..4c57f3d8 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u5-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-11u5-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-11u5-jre b/docker/ubuntu/Dockerfile.zulu-11u5-jre
index 685aae43..6b936196 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u5-jre
+++ b/docker/ubuntu/Dockerfile.zulu-11u5-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-11u5-jre-headless b/docker/ubuntu/Dockerfile.zulu-11u5-jre-headless
index 657ee3a6..6372e66c 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u5-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-11u5-jre-headless
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-11u6-jdk b/docker/ubuntu/Dockerfile.zulu-11u6-jdk
index acd5c75c..d4128087 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u6-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-11u6-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-11u6-jre b/docker/ubuntu/Dockerfile.zulu-11u6-jre
index 521727d2..c407f838 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u6-jre
+++ b/docker/ubuntu/Dockerfile.zulu-11u6-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-11u6-jre-headless b/docker/ubuntu/Dockerfile.zulu-11u6-jre-headless
index 6c0ec1c3..90db1dca 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u6-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-11u6-jre-headless
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-13u1-jdk b/docker/ubuntu/Dockerfile.zulu-13u1-jdk
index f42a2fa4..b40fa81a 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u1-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-13u1-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-13u1-jre b/docker/ubuntu/Dockerfile.zulu-13u1-jre
index 884de30f..2b882aa8 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u1-jre
+++ b/docker/ubuntu/Dockerfile.zulu-13u1-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-13u1-jre-headless b/docker/ubuntu/Dockerfile.zulu-13u1-jre-headless
index da447f73..6c4cef36 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u1-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-13u1-jre-headless
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-13u2-jdk b/docker/ubuntu/Dockerfile.zulu-13u2-jdk
index e92ebbc4..655d00a3 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u2-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-13u2-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-13u2-jre b/docker/ubuntu/Dockerfile.zulu-13u2-jre
index d03c706d..f839e935 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u2-jre
+++ b/docker/ubuntu/Dockerfile.zulu-13u2-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-13u2-jre-headless b/docker/ubuntu/Dockerfile.zulu-13u2-jre-headless
index f7057fb5..50767780 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u2-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-13u2-jre-headless
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-14u0-jdk b/docker/ubuntu/Dockerfile.zulu-14u0-jdk
index 819182c2..d242ff91 100644
--- a/docker/ubuntu/Dockerfile.zulu-14u0-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-14u0-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-14u0-jre b/docker/ubuntu/Dockerfile.zulu-14u0-jre
index cbcbe79f..ccdf83ed 100644
--- a/docker/ubuntu/Dockerfile.zulu-14u0-jre
+++ b/docker/ubuntu/Dockerfile.zulu-14u0-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-7u242-jdk b/docker/ubuntu/Dockerfile.zulu-7u242-jdk
index 761c81bb..2aee2270 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u242-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-7u242-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-7u242-jre b/docker/ubuntu/Dockerfile.zulu-7u242-jre
index 06b2bb52..bd90195f 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u242-jre
+++ b/docker/ubuntu/Dockerfile.zulu-7u242-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-7u242-jre-headless b/docker/ubuntu/Dockerfile.zulu-7u242-jre-headless
index ad7a5384..8ea6ddf6 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u242-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-7u242-jre-headless
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-7u252-jdk b/docker/ubuntu/Dockerfile.zulu-7u252-jdk
index f45c6082..4f500235 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u252-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-7u252-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-7u252-jre b/docker/ubuntu/Dockerfile.zulu-7u252-jre
index 86ac9d99..03933a47 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u252-jre
+++ b/docker/ubuntu/Dockerfile.zulu-7u252-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-7u252-jre-headless b/docker/ubuntu/Dockerfile.zulu-7u252-jre-headless
index c191b018..258e74d5 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u252-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-7u252-jre-headless
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:bionic
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-8u232-jdk b/docker/ubuntu/Dockerfile.zulu-8u232-jdk
index b4a73a5a..18763a31 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u232-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-8u232-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-8u232-jre b/docker/ubuntu/Dockerfile.zulu-8u232-jre
index fc0fb932..52f3a5fd 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u232-jre
+++ b/docker/ubuntu/Dockerfile.zulu-8u232-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-8u232-jre-headless b/docker/ubuntu/Dockerfile.zulu-8u232-jre-headless
index 6a355d2b..99b82924 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u232-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-8u232-jre-headless
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-8u242-jdk b/docker/ubuntu/Dockerfile.zulu-8u242-jdk
index 8b9a872f..98c127d0 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u242-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-8u242-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-8u242-jre b/docker/ubuntu/Dockerfile.zulu-8u242-jre
index 3be2f358..e98cf467 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u242-jre
+++ b/docker/ubuntu/Dockerfile.zulu-8u242-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \
diff --git a/docker/ubuntu/Dockerfile.zulu-8u242-jre-headless b/docker/ubuntu/Dockerfile.zulu-8u242-jre-headless
index 760bda08..c53684a6 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u242-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-8u242-jre-headless
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM ubuntu:focal
+FROM ubuntu:eoan
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN apt-get -qq update && \

From 68768dfa309a6649550b4a0acfe22a4215c4ed1e Mon Sep 17 00:00:00 2001
From: Stanislav Drozdov <sdrozdov@azul.com>
Date: Fri, 1 May 2020 01:23:25 +0300
Subject: [PATCH 068/264] JAVA_HOME fixes for CentOS builds

---
 docker/centos/Dockerfile.zulu-11u5-jre | 2 +-
 docker/centos/Dockerfile.zulu-11u6-jre | 2 +-
 docker/centos/Dockerfile.zulu-13u1-jre | 2 +-
 docker/centos/Dockerfile.zulu-13u2-jre | 2 +-
 docker/centos/Dockerfile.zulu-14u0-jre | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker/centos/Dockerfile.zulu-11u5-jre b/docker/centos/Dockerfile.zulu-11u5-jre
index 2c055a11..18f33259 100644
--- a/docker/centos/Dockerfile.zulu-11u5-jre
+++ b/docker/centos/Dockerfile.zulu-11u5-jre
@@ -13,4 +13,4 @@ RUN rpm --import http://repos.azul.com/azul-repo.key && \
     yum -q -y upgrade && \
     yum -q -y install zulu-11-azure-jre-11.35+15
 
-ENV JAVA_HOME=/usr/lib/jvm/jre-11-azure
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure
diff --git a/docker/centos/Dockerfile.zulu-11u6-jre b/docker/centos/Dockerfile.zulu-11u6-jre
index e6ad7dbc..5095d986 100644
--- a/docker/centos/Dockerfile.zulu-11u6-jre
+++ b/docker/centos/Dockerfile.zulu-11u6-jre
@@ -13,4 +13,4 @@ RUN rpm --import http://repos.azul.com/azul-repo.key && \
     yum -q -y upgrade && \
     yum -q -y install zulu-11-azure-jre-11.37+17
 
-ENV JAVA_HOME=/usr/lib/jvm/jre-11-azure
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure
diff --git a/docker/centos/Dockerfile.zulu-13u1-jre b/docker/centos/Dockerfile.zulu-13u1-jre
index 100254d9..348c4124 100644
--- a/docker/centos/Dockerfile.zulu-13u1-jre
+++ b/docker/centos/Dockerfile.zulu-13u1-jre
@@ -13,4 +13,4 @@ RUN rpm --import http://repos.azul.com/azul-repo.key && \
     yum -q -y upgrade && \
     yum -q -y install zulu-13-azure-jre-13.28+11
 
-ENV JAVA_HOME=/usr/lib/jvm/jre-13-azure
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure
diff --git a/docker/centos/Dockerfile.zulu-13u2-jre b/docker/centos/Dockerfile.zulu-13u2-jre
index ae1ae190..e023818a 100644
--- a/docker/centos/Dockerfile.zulu-13u2-jre
+++ b/docker/centos/Dockerfile.zulu-13u2-jre
@@ -13,4 +13,4 @@ RUN rpm --import http://repos.azul.com/azul-repo.key && \
     yum -q -y upgrade && \
     yum -q -y install zulu-13-azure-jre-13.29+9
 
-ENV JAVA_HOME=/usr/lib/jvm/jre-13-azure
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure
diff --git a/docker/centos/Dockerfile.zulu-14u0-jre b/docker/centos/Dockerfile.zulu-14u0-jre
index ecce111b..4f1e4db4 100644
--- a/docker/centos/Dockerfile.zulu-14u0-jre
+++ b/docker/centos/Dockerfile.zulu-14u0-jre
@@ -13,4 +13,4 @@ RUN rpm --import http://repos.azul.com/azul-repo.key && \
     yum -q -y upgrade && \
     yum -q -y install zulu-14-azure-jre-14.27+1
 
-ENV JAVA_HOME=/usr/lib/jvm/jre-14-azure
+ENV JAVA_HOME=/usr/lib/jvm/zre-14-azure

From 2d4f73b58dd484d756a2fd53b2803fc79e7eeeec Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 6 May 2020 16:31:10 -0500
Subject: [PATCH 069/264] Added Dockerfile.zulu-11u7-jdk-maven

---
 docker/maven/Dockerfile.zulu-11u7-jdk-maven | 30 +++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 docker/maven/Dockerfile.zulu-11u7-jdk-maven

diff --git a/docker/maven/Dockerfile.zulu-11u7-jdk-maven b/docker/maven/Dockerfile.zulu-11u7-jdk-maven
new file mode 100644
index 00000000..c022506a
--- /dev/null
+++ b/docker/maven/Dockerfile.zulu-11u7-jdk-maven
@@ -0,0 +1,30 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+ 
+FROM mcr.microsoft.com/java/jdk:11u7-zulu-debian9
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+ 
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+ 
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+ 
+ENV MAVEN_HOME /usr/share/maven
+ 
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+ 
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]

From e6a71eefd7127554538471021a6f04e3d03d76ac Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 7 May 2020 13:44:34 -0500
Subject: [PATCH 070/264] Added Dockerfiles for Maven

---
 docker/debian9/Dockerfile.zulu-11u7-jdk-maven | 30 ++++++++++++++
 .../debian9/Dockerfile.zulu-8u192-jdk-maven   | 31 +++++++++++++++
 .../debian9/Dockerfile.zulu-8u202-jdk-maven   | 31 +++++++++++++++
 .../debian9/Dockerfile.zulu-8u212-jdk-maven   | 31 +++++++++++++++
 .../debian9/Dockerfile.zulu-8u222-jdk-maven   | 31 +++++++++++++++
 .../debian9/Dockerfile.zulu-8u232-jdk-maven   | 31 +++++++++++++++
 .../debian9/Dockerfile.zulu-8u242-jdk-maven   | 31 +++++++++++++++
 .../debian9/Dockerfile.zulu-8u252-jdk-maven   | 31 +++++++++++++++
 docker/debian9/mvn-entrypoint.sh              | 39 +++++++++++++++++++
 docker/debian9/settings-docker.xml            |  6 +++
 10 files changed, 292 insertions(+)
 create mode 100644 docker/debian9/Dockerfile.zulu-11u7-jdk-maven
 create mode 100644 docker/debian9/Dockerfile.zulu-8u192-jdk-maven
 create mode 100644 docker/debian9/Dockerfile.zulu-8u202-jdk-maven
 create mode 100644 docker/debian9/Dockerfile.zulu-8u212-jdk-maven
 create mode 100644 docker/debian9/Dockerfile.zulu-8u222-jdk-maven
 create mode 100644 docker/debian9/Dockerfile.zulu-8u232-jdk-maven
 create mode 100644 docker/debian9/Dockerfile.zulu-8u242-jdk-maven
 create mode 100644 docker/debian9/Dockerfile.zulu-8u252-jdk-maven
 create mode 100644 docker/debian9/mvn-entrypoint.sh
 create mode 100644 docker/debian9/settings-docker.xml

diff --git a/docker/debian9/Dockerfile.zulu-11u7-jdk-maven b/docker/debian9/Dockerfile.zulu-11u7-jdk-maven
new file mode 100644
index 00000000..c022506a
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u7-jdk-maven
@@ -0,0 +1,30 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+ 
+FROM mcr.microsoft.com/java/jdk:11u7-zulu-debian9
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+ 
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+ 
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+ 
+ENV MAVEN_HOME /usr/share/maven
+ 
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+ 
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian9/Dockerfile.zulu-8u192-jdk-maven b/docker/debian9/Dockerfile.zulu-8u192-jdk-maven
new file mode 100644
index 00000000..bd139bd5
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u192-jdk-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+ 
+FROM mcr.microsoft.com/java/jdk:8u192-zulu-debian9
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+ 
+ARG MAVEN_VERSION=3.6.0
+ARG USER_HOME_DIR="/root"
+ARG SHA=fae9c12b570c3ba18116a4e26ea524b29f7279c17cbaadc3326ca72927368924d9131d11b9e851b8dc9162228b6fdea955446be41207a5cfc61283dd8a561d2f
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+ 
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+ 
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+ 
+COPY mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY settings-docker.xml /usr/share/maven/ref/
+ 
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian9/Dockerfile.zulu-8u202-jdk-maven b/docker/debian9/Dockerfile.zulu-8u202-jdk-maven
new file mode 100644
index 00000000..7d12c129
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u202-jdk-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+ 
+FROM mcr.microsoft.com/java/jdk:8u202-zulu-debian9
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+ 
+ARG MAVEN_VERSION=3.6.0
+ARG USER_HOME_DIR="/root"
+ARG SHA=fae9c12b570c3ba18116a4e26ea524b29f7279c17cbaadc3326ca72927368924d9131d11b9e851b8dc9162228b6fdea955446be41207a5cfc61283dd8a561d2f
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+ 
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+ 
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+ 
+COPY mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY settings-docker.xml /usr/share/maven/ref/
+ 
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian9/Dockerfile.zulu-8u212-jdk-maven b/docker/debian9/Dockerfile.zulu-8u212-jdk-maven
new file mode 100644
index 00000000..82f073f7
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u212-jdk-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+ 
+FROM mcr.microsoft.com/java/jdk:8u212-zulu-debian9
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+ 
+ARG MAVEN_VERSION=3.6.0
+ARG USER_HOME_DIR="/root"
+ARG SHA=fae9c12b570c3ba18116a4e26ea524b29f7279c17cbaadc3326ca72927368924d9131d11b9e851b8dc9162228b6fdea955446be41207a5cfc61283dd8a561d2f
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+ 
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+ 
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+ 
+COPY mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY settings-docker.xml /usr/share/maven/ref/
+ 
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian9/Dockerfile.zulu-8u222-jdk-maven b/docker/debian9/Dockerfile.zulu-8u222-jdk-maven
new file mode 100644
index 00000000..ba6b5ca2
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u222-jdk-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+ 
+FROM mcr.microsoft.com/java/jdk:8u222-zulu-debian9
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+ 
+ARG MAVEN_VERSION=3.6.0
+ARG USER_HOME_DIR="/root"
+ARG SHA=fae9c12b570c3ba18116a4e26ea524b29f7279c17cbaadc3326ca72927368924d9131d11b9e851b8dc9162228b6fdea955446be41207a5cfc61283dd8a561d2f
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+ 
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+ 
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+ 
+COPY debian9/maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY debian9/maven/settings-docker.xml /usr/share/maven/ref/
+ 
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian9/Dockerfile.zulu-8u232-jdk-maven b/docker/debian9/Dockerfile.zulu-8u232-jdk-maven
new file mode 100644
index 00000000..45f7e599
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u232-jdk-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+ 
+FROM mcr.microsoft.com/java/jdk:8u232-zulu-debian9
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+ 
+ARG MAVEN_VERSION=3.6.2
+ARG USER_HOME_DIR="/root"
+ARG SHA=d941423d115cd021514bfd06c453658b1b3e39e6240969caf4315ab7119a77299713f14b620fb2571a264f8dff2473d8af3cb47b05acf0036fc2553199a5c1ee
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+ 
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+ 
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+ 
+COPY October/debian9/maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY October/debian9/maven/settings-docker.xml /usr/share/maven/ref/
+ 
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian9/Dockerfile.zulu-8u242-jdk-maven b/docker/debian9/Dockerfile.zulu-8u242-jdk-maven
new file mode 100644
index 00000000..0141c65d
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u242-jdk-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+ 
+FROM mcr.microsoft.com/java/jdk:8u242-zulu-debian9
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+ 
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+ 
+RUN apt-get -q update && \
+    apt-get -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+ 
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+ 
+COPY October/debian9/maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY October/debian9/maven/settings-docker.xml /usr/share/maven/ref/
+ 
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian9/Dockerfile.zulu-8u252-jdk-maven b/docker/debian9/Dockerfile.zulu-8u252-jdk-maven
new file mode 100644
index 00000000..12f52856
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u252-jdk-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u252-zulu-debian9
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian9/mvn-entrypoint.sh b/docker/debian9/mvn-entrypoint.sh
new file mode 100644
index 00000000..b20bda41
--- /dev/null
+++ b/docker/debian9/mvn-entrypoint.sh
@@ -0,0 +1,39 @@
+#! /bin/bash -eu
+
+set -o pipefail
+
+# Copy files from /usr/share/maven/ref into ${MAVEN_CONFIG}
+# So the initial ~/.m2 is set with expected content.
+# Don't override, as this is just a reference setup
+copy_reference_file() {
+  local root="${1}"
+  local f="${2%/}"
+  local logfile="${3}"
+  local rel="${f/${root}/}" # path relative to /usr/share/maven/ref/
+  echo "$f" >> "$logfile"
+  echo " $f -> $rel" >> "$logfile"
+  if [[ ! -e ${MAVEN_CONFIG}/${rel} || $f = *.override ]]
+  then
+    echo "copy $rel to ${MAVEN_CONFIG}" >> "$logfile"
+    mkdir -p "${MAVEN_CONFIG}/$(dirname "${rel}")"
+    cp -r "${f}" "${MAVEN_CONFIG}/${rel}";
+  fi;
+}
+
+copy_reference_files() {
+  local log="$MAVEN_CONFIG/copy_reference_file.log"
+
+  if (sh -c "mkdir -p \"$MAVEN_CONFIG\" && touch \"${log}\"" > /dev/null 2>&1)
+  then
+      echo "--- Copying files at $(date)" >> "$log"
+      find /usr/share/maven/ref/ -type f -exec bash -eu -c 'copy_reference_file /usr/share/maven/ref/ "$1" "$2"' _ {} "$log" \;
+  else
+    echo "Can not write to ${log}. Wrong volume permissions? Carrying on ..."
+  fi
+}
+
+export -f copy_reference_file
+copy_reference_files
+unset MAVEN_CONFIG
+
+exec "$@"
diff --git a/docker/debian9/settings-docker.xml b/docker/debian9/settings-docker.xml
new file mode 100644
index 00000000..586c587c
--- /dev/null
+++ b/docker/debian9/settings-docker.xml
@@ -0,0 +1,6 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                      https://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <localRepository>/usr/share/maven/ref/repository</localRepository>
+</settings>

From dc7fc635155b2b679757edb3d255fa8f056d0664 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 7 May 2020 13:45:43 -0500
Subject: [PATCH 071/264] Added Dockerfiles for Maven

---
 .../debian10/Dockerfile.zulu-11u7-jdk-maven   | 30 ++++++++++++++
 .../debian10/Dockerfile.zulu-8u252-jdk-maven  | 30 ++++++++++++++
 docker/debian10/mvn-entrypoint.sh             | 39 +++++++++++++++++++
 docker/debian10/settings-docker.xml           |  6 +++
 4 files changed, 105 insertions(+)
 create mode 100644 docker/debian10/Dockerfile.zulu-11u7-jdk-maven
 create mode 100644 docker/debian10/Dockerfile.zulu-8u252-jdk-maven
 create mode 100644 docker/debian10/mvn-entrypoint.sh
 create mode 100644 docker/debian10/settings-docker.xml

diff --git a/docker/debian10/Dockerfile.zulu-11u7-jdk-maven b/docker/debian10/Dockerfile.zulu-11u7-jdk-maven
new file mode 100644
index 00000000..c71507e2
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u7-jdk-maven
@@ -0,0 +1,30 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+ 
+FROM mcr.microsoft.com/java/jdk:11u7-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+ 
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+ 
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+ 
+ENV MAVEN_HOME /usr/share/maven
+ 
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+ 
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian10/Dockerfile.zulu-8u252-jdk-maven b/docker/debian10/Dockerfile.zulu-8u252-jdk-maven
new file mode 100644
index 00000000..98b59e91
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u252-jdk-maven
@@ -0,0 +1,30 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+ 
+FROM mcr.microsoft.com/java/jdk:8u252-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+ 
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+ 
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+ 
+ENV MAVEN_HOME /usr/share/maven
+ 
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+ 
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian10/mvn-entrypoint.sh b/docker/debian10/mvn-entrypoint.sh
new file mode 100644
index 00000000..b20bda41
--- /dev/null
+++ b/docker/debian10/mvn-entrypoint.sh
@@ -0,0 +1,39 @@
+#! /bin/bash -eu
+
+set -o pipefail
+
+# Copy files from /usr/share/maven/ref into ${MAVEN_CONFIG}
+# So the initial ~/.m2 is set with expected content.
+# Don't override, as this is just a reference setup
+copy_reference_file() {
+  local root="${1}"
+  local f="${2%/}"
+  local logfile="${3}"
+  local rel="${f/${root}/}" # path relative to /usr/share/maven/ref/
+  echo "$f" >> "$logfile"
+  echo " $f -> $rel" >> "$logfile"
+  if [[ ! -e ${MAVEN_CONFIG}/${rel} || $f = *.override ]]
+  then
+    echo "copy $rel to ${MAVEN_CONFIG}" >> "$logfile"
+    mkdir -p "${MAVEN_CONFIG}/$(dirname "${rel}")"
+    cp -r "${f}" "${MAVEN_CONFIG}/${rel}";
+  fi;
+}
+
+copy_reference_files() {
+  local log="$MAVEN_CONFIG/copy_reference_file.log"
+
+  if (sh -c "mkdir -p \"$MAVEN_CONFIG\" && touch \"${log}\"" > /dev/null 2>&1)
+  then
+      echo "--- Copying files at $(date)" >> "$log"
+      find /usr/share/maven/ref/ -type f -exec bash -eu -c 'copy_reference_file /usr/share/maven/ref/ "$1" "$2"' _ {} "$log" \;
+  else
+    echo "Can not write to ${log}. Wrong volume permissions? Carrying on ..."
+  fi
+}
+
+export -f copy_reference_file
+copy_reference_files
+unset MAVEN_CONFIG
+
+exec "$@"
diff --git a/docker/debian10/settings-docker.xml b/docker/debian10/settings-docker.xml
new file mode 100644
index 00000000..586c587c
--- /dev/null
+++ b/docker/debian10/settings-docker.xml
@@ -0,0 +1,6 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                      https://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <localRepository>/usr/share/maven/ref/repository</localRepository>
+</settings>

From e285a812dfe9a6686a45077d05115377119d214a Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 8 May 2020 10:36:23 -0500
Subject: [PATCH 072/264] Delete settings-docker.xml

---
 docker/maven/settings-docker.xml | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 docker/maven/settings-docker.xml

diff --git a/docker/maven/settings-docker.xml b/docker/maven/settings-docker.xml
deleted file mode 100644
index 586c587c..00000000
--- a/docker/maven/settings-docker.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                      https://maven.apache.org/xsd/settings-1.0.0.xsd">
-  <localRepository>/usr/share/maven/ref/repository</localRepository>
-</settings>

From 44ed2136b8cf3b5820b3cba309c6000828373ec5 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 8 May 2020 10:36:30 -0500
Subject: [PATCH 073/264] Delete mvn-entrypoint.sh

---
 docker/maven/mvn-entrypoint.sh | 39 ----------------------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 docker/maven/mvn-entrypoint.sh

diff --git a/docker/maven/mvn-entrypoint.sh b/docker/maven/mvn-entrypoint.sh
deleted file mode 100644
index b20bda41..00000000
--- a/docker/maven/mvn-entrypoint.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/bash -eu
-
-set -o pipefail
-
-# Copy files from /usr/share/maven/ref into ${MAVEN_CONFIG}
-# So the initial ~/.m2 is set with expected content.
-# Don't override, as this is just a reference setup
-copy_reference_file() {
-  local root="${1}"
-  local f="${2%/}"
-  local logfile="${3}"
-  local rel="${f/${root}/}" # path relative to /usr/share/maven/ref/
-  echo "$f" >> "$logfile"
-  echo " $f -> $rel" >> "$logfile"
-  if [[ ! -e ${MAVEN_CONFIG}/${rel} || $f = *.override ]]
-  then
-    echo "copy $rel to ${MAVEN_CONFIG}" >> "$logfile"
-    mkdir -p "${MAVEN_CONFIG}/$(dirname "${rel}")"
-    cp -r "${f}" "${MAVEN_CONFIG}/${rel}";
-  fi;
-}
-
-copy_reference_files() {
-  local log="$MAVEN_CONFIG/copy_reference_file.log"
-
-  if (sh -c "mkdir -p \"$MAVEN_CONFIG\" && touch \"${log}\"" > /dev/null 2>&1)
-  then
-      echo "--- Copying files at $(date)" >> "$log"
-      find /usr/share/maven/ref/ -type f -exec bash -eu -c 'copy_reference_file /usr/share/maven/ref/ "$1" "$2"' _ {} "$log" \;
-  else
-    echo "Can not write to ${log}. Wrong volume permissions? Carrying on ..."
-  fi
-}
-
-export -f copy_reference_file
-copy_reference_files
-unset MAVEN_CONFIG
-
-exec "$@"

From 87f1e5a0817046d78ae04ced43db916f4872650c Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 8 May 2020 10:36:38 -0500
Subject: [PATCH 074/264] Delete Dockerfile.zulu-8u252-jdk-maven

---
 docker/maven/Dockerfile.zulu-8u252-jdk-maven | 31 --------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 docker/maven/Dockerfile.zulu-8u252-jdk-maven

diff --git a/docker/maven/Dockerfile.zulu-8u252-jdk-maven b/docker/maven/Dockerfile.zulu-8u252-jdk-maven
deleted file mode 100644
index 12f52856..00000000
--- a/docker/maven/Dockerfile.zulu-8u252-jdk-maven
+++ /dev/null
@@ -1,31 +0,0 @@
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM mcr.microsoft.com/java/jdk:8u252-zulu-debian9
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-ARG MAVEN_VERSION=3.6.3
-ARG USER_HOME_DIR="/root"
-ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
-ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install curl && \
-    mkdir -p /usr/share/maven /usr/share/maven/ref && \
-    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
-    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
-    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
-    rm -f /tmp/apache-maven.tar.gz && \
-    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV MAVEN_HOME /usr/share/maven
-ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
-
-COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY Maven/settings-docker.xml /usr/share/maven/ref/
-
-ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
-CMD ["mvn"]

From bf74e3d9354b87296c6710d49c0d3bd35ef41504 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 8 May 2020 10:36:45 -0500
Subject: [PATCH 075/264] Delete Dockerfile.zulu-8u242-jdk-maven

---
 docker/maven/Dockerfile.zulu-8u242-jdk-maven | 31 --------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 docker/maven/Dockerfile.zulu-8u242-jdk-maven

diff --git a/docker/maven/Dockerfile.zulu-8u242-jdk-maven b/docker/maven/Dockerfile.zulu-8u242-jdk-maven
deleted file mode 100644
index 0141c65d..00000000
--- a/docker/maven/Dockerfile.zulu-8u242-jdk-maven
+++ /dev/null
@@ -1,31 +0,0 @@
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
- 
-FROM mcr.microsoft.com/java/jdk:8u242-zulu-debian9
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
- 
-ARG MAVEN_VERSION=3.6.3
-ARG USER_HOME_DIR="/root"
-ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
-ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
- 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install curl && \
-    mkdir -p /usr/share/maven /usr/share/maven/ref && \
-    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
-    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
-    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
-    rm -f /tmp/apache-maven.tar.gz && \
-    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
-    rm -rf /var/lib/apt/lists/*
- 
-ENV MAVEN_HOME /usr/share/maven
-ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
- 
-COPY October/debian9/maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY October/debian9/maven/settings-docker.xml /usr/share/maven/ref/
- 
-ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
-CMD ["mvn"]

From 5b9176ab4c2584e205e306697b38b23d2d722ed7 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 8 May 2020 10:36:52 -0500
Subject: [PATCH 076/264] Delete Dockerfile.zulu-8u232-jdk-maven

---
 docker/maven/Dockerfile.zulu-8u232-jdk-maven | 31 --------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 docker/maven/Dockerfile.zulu-8u232-jdk-maven

diff --git a/docker/maven/Dockerfile.zulu-8u232-jdk-maven b/docker/maven/Dockerfile.zulu-8u232-jdk-maven
deleted file mode 100644
index 45f7e599..00000000
--- a/docker/maven/Dockerfile.zulu-8u232-jdk-maven
+++ /dev/null
@@ -1,31 +0,0 @@
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
- 
-FROM mcr.microsoft.com/java/jdk:8u232-zulu-debian9
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
- 
-ARG MAVEN_VERSION=3.6.2
-ARG USER_HOME_DIR="/root"
-ARG SHA=d941423d115cd021514bfd06c453658b1b3e39e6240969caf4315ab7119a77299713f14b620fb2571a264f8dff2473d8af3cb47b05acf0036fc2553199a5c1ee
-ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
- 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install curl && \
-    mkdir -p /usr/share/maven /usr/share/maven/ref && \
-    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
-    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
-    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
-    rm -f /tmp/apache-maven.tar.gz && \
-    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
-    rm -rf /var/lib/apt/lists/*
- 
-ENV MAVEN_HOME /usr/share/maven
-ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
- 
-COPY October/debian9/maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY October/debian9/maven/settings-docker.xml /usr/share/maven/ref/
- 
-ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
-CMD ["mvn"]

From c94d33151d95edfb813d13b1cd2ce6ef9c8874b2 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 8 May 2020 10:36:59 -0500
Subject: [PATCH 077/264] Delete Dockerfile.zulu-8u222-jdk-maven

---
 docker/maven/Dockerfile.zulu-8u222-jdk-maven | 31 --------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 docker/maven/Dockerfile.zulu-8u222-jdk-maven

diff --git a/docker/maven/Dockerfile.zulu-8u222-jdk-maven b/docker/maven/Dockerfile.zulu-8u222-jdk-maven
deleted file mode 100644
index ba6b5ca2..00000000
--- a/docker/maven/Dockerfile.zulu-8u222-jdk-maven
+++ /dev/null
@@ -1,31 +0,0 @@
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
- 
-FROM mcr.microsoft.com/java/jdk:8u222-zulu-debian9
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
- 
-ARG MAVEN_VERSION=3.6.0
-ARG USER_HOME_DIR="/root"
-ARG SHA=fae9c12b570c3ba18116a4e26ea524b29f7279c17cbaadc3326ca72927368924d9131d11b9e851b8dc9162228b6fdea955446be41207a5cfc61283dd8a561d2f
-ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
- 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install curl && \
-    mkdir -p /usr/share/maven /usr/share/maven/ref && \
-    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
-    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
-    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
-    rm -f /tmp/apache-maven.tar.gz && \
-    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
-    rm -rf /var/lib/apt/lists/*
- 
-ENV MAVEN_HOME /usr/share/maven
-ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
- 
-COPY debian9/maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY debian9/maven/settings-docker.xml /usr/share/maven/ref/
- 
-ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
-CMD ["mvn"]

From 2dd2de9421d44a9e7670b00d5172e874a6c5d78e Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 8 May 2020 10:37:07 -0500
Subject: [PATCH 078/264] Delete Dockerfile.zulu-8u212-jdk-maven

---
 docker/maven/Dockerfile.zulu-8u212-jdk-maven | 31 --------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 docker/maven/Dockerfile.zulu-8u212-jdk-maven

diff --git a/docker/maven/Dockerfile.zulu-8u212-jdk-maven b/docker/maven/Dockerfile.zulu-8u212-jdk-maven
deleted file mode 100644
index 82f073f7..00000000
--- a/docker/maven/Dockerfile.zulu-8u212-jdk-maven
+++ /dev/null
@@ -1,31 +0,0 @@
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
- 
-FROM mcr.microsoft.com/java/jdk:8u212-zulu-debian9
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
- 
-ARG MAVEN_VERSION=3.6.0
-ARG USER_HOME_DIR="/root"
-ARG SHA=fae9c12b570c3ba18116a4e26ea524b29f7279c17cbaadc3326ca72927368924d9131d11b9e851b8dc9162228b6fdea955446be41207a5cfc61283dd8a561d2f
-ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
- 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install curl && \
-    mkdir -p /usr/share/maven /usr/share/maven/ref && \
-    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
-    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
-    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
-    rm -f /tmp/apache-maven.tar.gz && \
-    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
-    rm -rf /var/lib/apt/lists/*
- 
-ENV MAVEN_HOME /usr/share/maven
-ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
- 
-COPY mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY settings-docker.xml /usr/share/maven/ref/
- 
-ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
-CMD ["mvn"]

From bf8a807ad67d5abead67d1c04a006c5a11383ebc Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 8 May 2020 10:37:14 -0500
Subject: [PATCH 079/264] Delete Dockerfile.zulu-8u202-jdk-maven

---
 docker/maven/Dockerfile.zulu-8u202-jdk-maven | 31 --------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 docker/maven/Dockerfile.zulu-8u202-jdk-maven

diff --git a/docker/maven/Dockerfile.zulu-8u202-jdk-maven b/docker/maven/Dockerfile.zulu-8u202-jdk-maven
deleted file mode 100644
index 7d12c129..00000000
--- a/docker/maven/Dockerfile.zulu-8u202-jdk-maven
+++ /dev/null
@@ -1,31 +0,0 @@
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
- 
-FROM mcr.microsoft.com/java/jdk:8u202-zulu-debian9
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
- 
-ARG MAVEN_VERSION=3.6.0
-ARG USER_HOME_DIR="/root"
-ARG SHA=fae9c12b570c3ba18116a4e26ea524b29f7279c17cbaadc3326ca72927368924d9131d11b9e851b8dc9162228b6fdea955446be41207a5cfc61283dd8a561d2f
-ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
- 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install curl && \
-    mkdir -p /usr/share/maven /usr/share/maven/ref && \
-    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
-    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
-    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
-    rm -f /tmp/apache-maven.tar.gz && \
-    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
-    rm -rf /var/lib/apt/lists/*
- 
-ENV MAVEN_HOME /usr/share/maven
-ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
- 
-COPY mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY settings-docker.xml /usr/share/maven/ref/
- 
-ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
-CMD ["mvn"]

From b48ed7a6af2896f1f9bda21a547c6f0fa28b1ea6 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 8 May 2020 10:37:20 -0500
Subject: [PATCH 080/264] Delete Dockerfile.zulu-8u192-jdk-maven

---
 docker/maven/Dockerfile.zulu-8u192-jdk-maven | 31 --------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 docker/maven/Dockerfile.zulu-8u192-jdk-maven

diff --git a/docker/maven/Dockerfile.zulu-8u192-jdk-maven b/docker/maven/Dockerfile.zulu-8u192-jdk-maven
deleted file mode 100644
index bd139bd5..00000000
--- a/docker/maven/Dockerfile.zulu-8u192-jdk-maven
+++ /dev/null
@@ -1,31 +0,0 @@
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
- 
-FROM mcr.microsoft.com/java/jdk:8u192-zulu-debian9
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
- 
-ARG MAVEN_VERSION=3.6.0
-ARG USER_HOME_DIR="/root"
-ARG SHA=fae9c12b570c3ba18116a4e26ea524b29f7279c17cbaadc3326ca72927368924d9131d11b9e851b8dc9162228b6fdea955446be41207a5cfc61283dd8a561d2f
-ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
- 
-RUN apt-get -q update && \
-    apt-get -y --no-install-recommends install curl && \
-    mkdir -p /usr/share/maven /usr/share/maven/ref && \
-    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
-    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
-    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
-    rm -f /tmp/apache-maven.tar.gz && \
-    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
-    rm -rf /var/lib/apt/lists/*
- 
-ENV MAVEN_HOME /usr/share/maven
-ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
- 
-COPY mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY settings-docker.xml /usr/share/maven/ref/
- 
-ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
-CMD ["mvn"]

From 4bcc7e2685c37714bc692d5191936b2c6b2930ef Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 8 May 2020 10:37:28 -0500
Subject: [PATCH 081/264] Delete Dockerfile.zulu-11u7-jdk-maven

---
 docker/maven/Dockerfile.zulu-11u7-jdk-maven | 30 ---------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 docker/maven/Dockerfile.zulu-11u7-jdk-maven

diff --git a/docker/maven/Dockerfile.zulu-11u7-jdk-maven b/docker/maven/Dockerfile.zulu-11u7-jdk-maven
deleted file mode 100644
index c022506a..00000000
--- a/docker/maven/Dockerfile.zulu-11u7-jdk-maven
+++ /dev/null
@@ -1,30 +0,0 @@
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
- 
-FROM mcr.microsoft.com/java/jdk:11u7-zulu-debian9
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
- 
-ARG MAVEN_VERSION=3.6.3
-ARG USER_HOME_DIR="/root"
-ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
-ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
- 
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install curl && \
-    mkdir -p /usr/share/maven /usr/share/maven/ref && \
-    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
-    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
-    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
-    rm -f /tmp/apache-maven.tar.gz && \
-    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
-    rm -rf /var/lib/apt/lists/*
- 
-ENV MAVEN_HOME /usr/share/maven
- 
-COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY Maven/settings-docker.xml /usr/share/maven/ref/
- 
-ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
-CMD ["mvn"]

From 069a6e0729be3792b7683e22b16a76b1177e11f3 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 28 May 2020 08:18:32 -0500
Subject: [PATCH 082/264] Some cleanup

---
 docker/alpine/Dockerfile.zulu-11u1-jdk                 | 4 ++--
 docker/alpine/Dockerfile.zulu-11u1-jre                 | 4 ++--
 docker/alpine/Dockerfile.zulu-11u1-jre-headless        | 4 ++--
 docker/alpine/Dockerfile.zulu-11u2-jdk                 | 2 +-
 docker/alpine/Dockerfile.zulu-11u2-jre                 | 2 +-
 docker/alpine/Dockerfile.zulu-11u2-jre-headless        | 2 +-
 docker/alpine/Dockerfile.zulu-11u2-jre-headless-tools  | 2 +-
 docker/alpine/Dockerfile.zulu-11u3-jdk                 | 2 +-
 docker/alpine/Dockerfile.zulu-11u3-jre                 | 2 +-
 docker/alpine/Dockerfile.zulu-11u3-jre-headless        | 2 +-
 docker/alpine/Dockerfile.zulu-11u4-jdk                 | 2 +-
 docker/alpine/Dockerfile.zulu-11u4-jre                 | 2 +-
 docker/alpine/Dockerfile.zulu-11u4-jre-headless        | 2 +-
 docker/alpine/Dockerfile.zulu-11u4-jre-headless-tools  | 2 +-
 docker/alpine/Dockerfile.zulu-11u5-jdk                 | 2 +-
 docker/alpine/Dockerfile.zulu-11u5-jre                 | 2 +-
 docker/alpine/Dockerfile.zulu-11u5-jre-headless        | 2 +-
 docker/alpine/Dockerfile.zulu-11u5-jre-headless-tools  | 2 +-
 docker/alpine/Dockerfile.zulu-11u6-jdk                 | 2 +-
 docker/alpine/Dockerfile.zulu-11u6-jre                 | 2 +-
 docker/alpine/Dockerfile.zulu-11u6-jre-headless        | 2 +-
 docker/alpine/Dockerfile.zulu-11u6-jre-headless-tools  | 2 +-
 docker/alpine/Dockerfile.zulu-11u7-jdk                 | 4 ++--
 docker/alpine/Dockerfile.zulu-11u7-jre                 | 4 ++--
 docker/alpine/Dockerfile.zulu-11u7-jre-headless        | 4 ++--
 docker/alpine/Dockerfile.zulu-11u7-jre-headless-tools  | 4 ++--
 docker/alpine/Dockerfile.zulu-13u1-jdk                 | 2 +-
 docker/alpine/Dockerfile.zulu-13u1-jre                 | 2 +-
 docker/alpine/Dockerfile.zulu-13u1-jre-headless        | 2 +-
 docker/alpine/Dockerfile.zulu-13u1-jre-headless-tools  | 2 +-
 docker/alpine/Dockerfile.zulu-13u2-jdk                 | 2 +-
 docker/alpine/Dockerfile.zulu-13u2-jre                 | 2 +-
 docker/alpine/Dockerfile.zulu-13u2-jre-headless        | 2 +-
 docker/alpine/Dockerfile.zulu-13u2-jre-headless-tools  | 2 +-
 docker/alpine/Dockerfile.zulu-13u3-jdk                 | 4 ++--
 docker/alpine/Dockerfile.zulu-13u3-jre                 | 4 ++--
 docker/alpine/Dockerfile.zulu-13u3-jre-headless        | 4 ++--
 docker/alpine/Dockerfile.zulu-13u3-jre-headless-tools  | 4 ++--
 docker/alpine/Dockerfile.zulu-7u191-jdk                | 2 +-
 docker/alpine/Dockerfile.zulu-7u191-jre                | 2 +-
 docker/alpine/Dockerfile.zulu-7u191-jre-headless       | 2 +-
 docker/alpine/Dockerfile.zulu-7u201-jdk                | 2 +-
 docker/alpine/Dockerfile.zulu-7u201-jre                | 2 +-
 docker/alpine/Dockerfile.zulu-7u201-jre-headless       | 2 +-
 docker/alpine/Dockerfile.zulu-7u211-jdk                | 2 +-
 docker/alpine/Dockerfile.zulu-7u211-jre                | 2 +-
 docker/alpine/Dockerfile.zulu-7u211-jre-headless       | 2 +-
 docker/alpine/Dockerfile.zulu-7u222-jdk                | 2 +-
 docker/alpine/Dockerfile.zulu-7u222-jre                | 2 +-
 docker/alpine/Dockerfile.zulu-7u222-jre-headless       | 2 +-
 docker/alpine/Dockerfile.zulu-7u232-jdk                | 2 +-
 docker/alpine/Dockerfile.zulu-7u232-jre                | 2 +-
 docker/alpine/Dockerfile.zulu-7u232-jre-headless       | 2 +-
 docker/alpine/Dockerfile.zulu-7u242-jdk                | 2 +-
 docker/alpine/Dockerfile.zulu-7u242-jre                | 2 +-
 docker/alpine/Dockerfile.zulu-7u242-jre-headless       | 2 +-
 docker/alpine/Dockerfile.zulu-7u252-jdk                | 2 +-
 docker/alpine/Dockerfile.zulu-7u252-jre                | 2 +-
 docker/alpine/Dockerfile.zulu-7u252-jre-headless       | 2 +-
 docker/alpine/Dockerfile.zulu-7u262-jdk                | 4 ++--
 docker/alpine/Dockerfile.zulu-7u262-jre                | 4 ++--
 docker/alpine/Dockerfile.zulu-7u262-jre-headless       | 4 ++--
 docker/alpine/Dockerfile.zulu-8u181-jdk                | 2 +-
 docker/alpine/Dockerfile.zulu-8u181-jre                | 2 +-
 docker/alpine/Dockerfile.zulu-8u181-jre-headless       | 2 +-
 docker/alpine/Dockerfile.zulu-8u192-jdk                | 2 +-
 docker/alpine/Dockerfile.zulu-8u192-jre                | 2 +-
 docker/alpine/Dockerfile.zulu-8u192-jre-headless       | 2 +-
 docker/alpine/Dockerfile.zulu-8u202-jdk                | 2 +-
 docker/alpine/Dockerfile.zulu-8u202-jre                | 2 +-
 docker/alpine/Dockerfile.zulu-8u202-jre-headless       | 2 +-
 docker/alpine/Dockerfile.zulu-8u212-jdk                | 2 +-
 docker/alpine/Dockerfile.zulu-8u212-jre                | 2 +-
 docker/alpine/Dockerfile.zulu-8u212-jre-headless       | 2 +-
 docker/alpine/Dockerfile.zulu-8u222-jdk                | 2 +-
 docker/alpine/Dockerfile.zulu-8u222-jre                | 2 +-
 docker/alpine/Dockerfile.zulu-8u222-jre-headless       | 2 +-
 docker/alpine/Dockerfile.zulu-8u222-jre-headless-tools | 2 +-
 docker/alpine/Dockerfile.zulu-8u232-jdk                | 2 +-
 docker/alpine/Dockerfile.zulu-8u232-jre                | 2 +-
 docker/alpine/Dockerfile.zulu-8u232-jre-headless       | 2 +-
 docker/alpine/Dockerfile.zulu-8u232-jre-headless-tools | 2 +-
 docker/alpine/Dockerfile.zulu-8u242-jdk                | 2 +-
 docker/alpine/Dockerfile.zulu-8u242-jre                | 2 +-
 docker/alpine/Dockerfile.zulu-8u242-jre-headless       | 2 +-
 docker/alpine/Dockerfile.zulu-8u242-jre-headless-tools | 2 +-
 docker/alpine/Dockerfile.zulu-8u252-jdk                | 4 ++--
 docker/alpine/Dockerfile.zulu-8u252-jre                | 4 ++--
 docker/alpine/Dockerfile.zulu-8u252-jre-headless       | 4 ++--
 docker/alpine/Dockerfile.zulu-8u252-jre-headless-tools | 4 ++--
 90 files changed, 108 insertions(+), 108 deletions(-)

diff --git a/docker/alpine/Dockerfile.zulu-11u1-jdk b/docker/alpine/Dockerfile.zulu-11u1-jdk
index f127ba9a..3cb907c6 100644
--- a/docker/alpine/Dockerfile.zulu-11u1-jdk
+++ b/docker/alpine/Dockerfile.zulu-11u1-jdk
@@ -11,13 +11,13 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-RUN ZULU_PACK=zulu-8-azure-jdk_11.2.3-11.0.1-linux_musl_x64.tar.gz && \
+RUN ZULU_PACK=zulu-11-azure-jdk_11.2.3-11.0.1-linux_musl_x64.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     ZULU_DIR=$( basename ${ZULU_PACK} .tar.gz ) && \
     apk --no-cache add binutils ca-certificates libgcc libstdc++ ttf-dejavu wget && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.1/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.1/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u1-jre b/docker/alpine/Dockerfile.zulu-11u1-jre
index e0cfce6a..08e390b7 100644
--- a/docker/alpine/Dockerfile.zulu-11u1-jre
+++ b/docker/alpine/Dockerfile.zulu-11u1-jre
@@ -11,13 +11,13 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-RUN ZULU_PACK=zulu-8-azure-jre_11.2.3-11.0.1-linux_musl_x64.tar.gz && \
+RUN ZULU_PACK=zulu-11-azure-jre_11.2.3-11.0.1-linux_musl_x64.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     ZULU_DIR=$( basename ${ZULU_PACK} .tar.gz ) && \
     apk --no-cache add binutils ca-certificates libgcc libstdc++ ttf-dejavu wget && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.1/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.1/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u1-jre-headless b/docker/alpine/Dockerfile.zulu-11u1-jre-headless
index b8efdc66..3f6ef2cf 100644
--- a/docker/alpine/Dockerfile.zulu-11u1-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-11u1-jre-headless
@@ -11,13 +11,13 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-RUN ZULU_PACK=zulu-8-azure-jre-headless_11.2.3-11.0.1-linux_musl_x64.tar.gz && \
+RUN ZULU_PACK=zulu-11-azure-jre-headless_11.2.3-11.0.1-linux_musl_x64.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     ZULU_DIR=$( basename ${ZULU_PACK} .tar.gz ) && \
     apk --no-cache add binutils ca-certificates libgcc libstdc++ ttf-dejavu wget && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.1/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.1/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u2-jdk b/docker/alpine/Dockerfile.zulu-11u2-jdk
index 853f144c..4c7d5ba7 100644
--- a/docker/alpine/Dockerfile.zulu-11u2-jdk
+++ b/docker/alpine/Dockerfile.zulu-11u2-jdk
@@ -17,7 +17,7 @@ RUN ZULU_PACK=zulu-11-azure-jdk_11.29.3-11.0.2-linux_musl_x64.tar.gz && \
     MAN_DIR=/usr/share/man/man1 && \
     ZULU_DIR=$( basename ${ZULU_PACK} .tar.gz ) && \
     apk --no-cache add binutils ca-certificates libgcc libstdc++ ttf-dejavu wget && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.2/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.2/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u2-jre b/docker/alpine/Dockerfile.zulu-11u2-jre
index a50db06c..f5f6f147 100644
--- a/docker/alpine/Dockerfile.zulu-11u2-jre
+++ b/docker/alpine/Dockerfile.zulu-11u2-jre
@@ -17,7 +17,7 @@ RUN ZULU_PACK=zulu-11-azure-jre_11.29.3-11.0.2-linux_musl_x64.tar.gz && \
     MAN_DIR=/usr/share/man/man1 && \
     ZULU_DIR=$( basename ${ZULU_PACK} .tar.gz ) && \
     apk --no-cache add binutils ca-certificates libgcc libstdc++ ttf-dejavu wget && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.2/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.2/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u2-jre-headless b/docker/alpine/Dockerfile.zulu-11u2-jre-headless
index 6bda2efa..f191eb76 100644
--- a/docker/alpine/Dockerfile.zulu-11u2-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-11u2-jre-headless
@@ -17,7 +17,7 @@ RUN ZULU_PACK=zulu-11-azure-jre-headless_11.29.3-11.0.2-linux_musl_x64.tar.gz &&
     MAN_DIR=/usr/share/man/man1 && \
     ZULU_DIR=$( basename ${ZULU_PACK} .tar.gz ) && \
     apk --no-cache add binutils ca-certificates libgcc libstdc++ ttf-dejavu wget && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.2/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.2/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u2-jre-headless-tools b/docker/alpine/Dockerfile.zulu-11u2-jre-headless-tools
index 5861af4c..72f7b3c0 100644
--- a/docker/alpine/Dockerfile.zulu-11u2-jre-headless-tools
+++ b/docker/alpine/Dockerfile.zulu-11u2-jre-headless-tools
@@ -9,7 +9,7 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN ZULU_PACK=zulu-11-azure-jre-headless_11.29.3-11.0.2-linux_musl_x64.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.2/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.2/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     JDK_DIR=${INSTALL_DIR}/zulu-11-azure-jdk_11.29.3-11.0.2-linux_musl_x64 && \
diff --git a/docker/alpine/Dockerfile.zulu-11u3-jdk b/docker/alpine/Dockerfile.zulu-11u3-jdk
index cd65b802..00f25470 100644
--- a/docker/alpine/Dockerfile.zulu-11u3-jdk
+++ b/docker/alpine/Dockerfile.zulu-11u3-jdk
@@ -17,7 +17,7 @@ RUN ZULU_PACK=zulu-11-azure-jdk_11.31.11-11.0.3-linux_musl_x64.tar.gz && \
     MAN_DIR=/usr/share/man/man1 && \
     ZULU_DIR=$( basename ${ZULU_PACK} .tar.gz ) && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.3/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.3/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u3-jre b/docker/alpine/Dockerfile.zulu-11u3-jre
index 7a3726eb..35aec48c 100644
--- a/docker/alpine/Dockerfile.zulu-11u3-jre
+++ b/docker/alpine/Dockerfile.zulu-11u3-jre
@@ -17,7 +17,7 @@ RUN ZULU_PACK=zulu-11-azure-jre_11.31.11-11.0.3-linux_musl_x64.tar.gz && \
     MAN_DIR=/usr/share/man/man1 && \
     ZULU_DIR=$( basename ${ZULU_PACK} .tar.gz ) && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.3/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.3/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u3-jre-headless b/docker/alpine/Dockerfile.zulu-11u3-jre-headless
index 93c668a8..c428ec15 100644
--- a/docker/alpine/Dockerfile.zulu-11u3-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-11u3-jre-headless
@@ -17,7 +17,7 @@ RUN ZULU_PACK=zulu-11-azure-jre-headless_11.31.11-11.0.3-linux_musl_x64.tar.gz &
     MAN_DIR=/usr/share/man/man1 && \
     ZULU_DIR=$( basename ${ZULU_PACK} .tar.gz ) && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.3/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.3/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u4-jdk b/docker/alpine/Dockerfile.zulu-11u4-jdk
index 21ce1853..41ecbb35 100644
--- a/docker/alpine/Dockerfile.zulu-11u4-jdk
+++ b/docker/alpine/Dockerfile.zulu-11u4-jdk
@@ -18,7 +18,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.4/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.4/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u4-jre b/docker/alpine/Dockerfile.zulu-11u4-jre
index c57c4782..8adaefef 100644
--- a/docker/alpine/Dockerfile.zulu-11u4-jre
+++ b/docker/alpine/Dockerfile.zulu-11u4-jre
@@ -18,7 +18,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.4/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.4/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u4-jre-headless b/docker/alpine/Dockerfile.zulu-11u4-jre-headless
index 00cc90fb..f0ceb9f8 100644
--- a/docker/alpine/Dockerfile.zulu-11u4-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-11u4-jre-headless
@@ -18,7 +18,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.4/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.4/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u4-jre-headless-tools b/docker/alpine/Dockerfile.zulu-11u4-jre-headless-tools
index 383e6ecc..ac844567 100644
--- a/docker/alpine/Dockerfile.zulu-11u4-jre-headless-tools
+++ b/docker/alpine/Dockerfile.zulu-11u4-jre-headless-tools
@@ -18,7 +18,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.4/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.4/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u5-jdk b/docker/alpine/Dockerfile.zulu-11u5-jdk
index 652f6cb5..caae3ef6 100644
--- a/docker/alpine/Dockerfile.zulu-11u5-jdk
+++ b/docker/alpine/Dockerfile.zulu-11u5-jdk
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.5/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.5/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u5-jre b/docker/alpine/Dockerfile.zulu-11u5-jre
index d69fb00d..ef564634 100644
--- a/docker/alpine/Dockerfile.zulu-11u5-jre
+++ b/docker/alpine/Dockerfile.zulu-11u5-jre
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.5/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.5/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u5-jre-headless b/docker/alpine/Dockerfile.zulu-11u5-jre-headless
index d81c4869..d13b72e2 100644
--- a/docker/alpine/Dockerfile.zulu-11u5-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-11u5-jre-headless
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.5/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.5/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u5-jre-headless-tools b/docker/alpine/Dockerfile.zulu-11u5-jre-headless-tools
index 1dfe6719..24b47d18 100644
--- a/docker/alpine/Dockerfile.zulu-11u5-jre-headless-tools
+++ b/docker/alpine/Dockerfile.zulu-11u5-jre-headless-tools
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.5/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.5/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u6-jdk b/docker/alpine/Dockerfile.zulu-11u6-jdk
index 7941a34d..b435946d 100644
--- a/docker/alpine/Dockerfile.zulu-11u6-jdk
+++ b/docker/alpine/Dockerfile.zulu-11u6-jdk
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.6/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.6/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u6-jre b/docker/alpine/Dockerfile.zulu-11u6-jre
index d9cd27f7..342e0c30 100644
--- a/docker/alpine/Dockerfile.zulu-11u6-jre
+++ b/docker/alpine/Dockerfile.zulu-11u6-jre
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.6/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.6/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u6-jre-headless b/docker/alpine/Dockerfile.zulu-11u6-jre-headless
index 881bb51e..8e958545 100644
--- a/docker/alpine/Dockerfile.zulu-11u6-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-11u6-jre-headless
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.6/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.6/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u6-jre-headless-tools b/docker/alpine/Dockerfile.zulu-11u6-jre-headless-tools
index 827bdb54..d3a4a751 100644
--- a/docker/alpine/Dockerfile.zulu-11u6-jre-headless-tools
+++ b/docker/alpine/Dockerfile.zulu-11u6-jre-headless-tools
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.6/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.6/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u7-jdk b/docker/alpine/Dockerfile.zulu-11u7-jdk
index 235de041..baeea387 100644
--- a/docker/alpine/Dockerfile.zulu-11u7-jdk
+++ b/docker/alpine/Dockerfile.zulu-11u7-jdk
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.7/zulu-11-azure-jdk_11.39.15-11.0.7-linux_musl_x64.tar.gz && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.7/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
@@ -29,4 +29,4 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     cd ${MAN_DIR} && \
     find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
 
-ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-11u7-jre b/docker/alpine/Dockerfile.zulu-11u7-jre
index 9628f086..4ee17b5e 100644
--- a/docker/alpine/Dockerfile.zulu-11u7-jre
+++ b/docker/alpine/Dockerfile.zulu-11u7-jre
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.7/zulu-11-azure-jre_11.39.15-11.0.7-linux_musl_x64.tar.gz && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.7/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
@@ -29,4 +29,4 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     cd ${MAN_DIR} && \
     find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
 
-ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-11u7-jre-headless b/docker/alpine/Dockerfile.zulu-11u7-jre-headless
index fbd3e2ee..e55e70ea 100644
--- a/docker/alpine/Dockerfile.zulu-11u7-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-11u7-jre-headless
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.7/zulu-11-azure-jre-headless_11.39.15-11.0.7-linux_musl_x64.tar.gz && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.7/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
@@ -29,4 +29,4 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     cd ${MAN_DIR} && \
     find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
 
-ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-11u7-jre-headless-tools b/docker/alpine/Dockerfile.zulu-11u7-jre-headless-tools
index c347dacf..888db979 100644
--- a/docker/alpine/Dockerfile.zulu-11u7-jre-headless-tools
+++ b/docker/alpine/Dockerfile.zulu-11u7-jre-headless-tools
@@ -20,11 +20,11 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.7/zulu-11-azure-jre-headless-tools_11.39.15-11.0.7-linux_musl_x64.tar.gz && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.7/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
     find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
     
 
-ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-13u1-jdk b/docker/alpine/Dockerfile.zulu-13u1-jdk
index b1a23f64..6e14747e 100644
--- a/docker/alpine/Dockerfile.zulu-13u1-jdk
+++ b/docker/alpine/Dockerfile.zulu-13u1-jdk
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.1/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.1/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-13u1-jre b/docker/alpine/Dockerfile.zulu-13u1-jre
index 81cbe8de..081435f5 100644
--- a/docker/alpine/Dockerfile.zulu-13u1-jre
+++ b/docker/alpine/Dockerfile.zulu-13u1-jre
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.1/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.1/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-13u1-jre-headless b/docker/alpine/Dockerfile.zulu-13u1-jre-headless
index 789d9f32..4fb4696d 100644
--- a/docker/alpine/Dockerfile.zulu-13u1-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-13u1-jre-headless
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.1/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.1/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-13u1-jre-headless-tools b/docker/alpine/Dockerfile.zulu-13u1-jre-headless-tools
index 3c88cb06..644647af 100644
--- a/docker/alpine/Dockerfile.zulu-13u1-jre-headless-tools
+++ b/docker/alpine/Dockerfile.zulu-13u1-jre-headless-tools
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.1/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.1/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-13u2-jdk b/docker/alpine/Dockerfile.zulu-13u2-jdk
index 24d6735a..32b4624b 100644
--- a/docker/alpine/Dockerfile.zulu-13u2-jdk
+++ b/docker/alpine/Dockerfile.zulu-13u2-jdk
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.2/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.2/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-13u2-jre b/docker/alpine/Dockerfile.zulu-13u2-jre
index 0594de2d..671691be 100644
--- a/docker/alpine/Dockerfile.zulu-13u2-jre
+++ b/docker/alpine/Dockerfile.zulu-13u2-jre
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.2/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.2/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-13u2-jre-headless b/docker/alpine/Dockerfile.zulu-13u2-jre-headless
index c75e4f58..0018b93a 100644
--- a/docker/alpine/Dockerfile.zulu-13u2-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-13u2-jre-headless
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.2/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.2/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-13u2-jre-headless-tools b/docker/alpine/Dockerfile.zulu-13u2-jre-headless-tools
index ab2f29e0..bb78e0ea 100644
--- a/docker/alpine/Dockerfile.zulu-13u2-jre-headless-tools
+++ b/docker/alpine/Dockerfile.zulu-13u2-jre-headless-tools
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.2/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.2/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-13u3-jdk b/docker/alpine/Dockerfile.zulu-13u3-jdk
index e7bc5767..ef3a4420 100644
--- a/docker/alpine/Dockerfile.zulu-13u3-jdk
+++ b/docker/alpine/Dockerfile.zulu-13u3-jdk
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.3/zulu-13-azure-jdk_13.31.11-13.0.3-linux_musl_x64.tar.gz && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.3/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
@@ -29,4 +29,4 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     cd ${MAN_DIR} && \
     find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
 
-ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-13u3-jre b/docker/alpine/Dockerfile.zulu-13u3-jre
index dd3e29ce..5a6cc488 100644
--- a/docker/alpine/Dockerfile.zulu-13u3-jre
+++ b/docker/alpine/Dockerfile.zulu-13u3-jre
@@ -20,11 +20,11 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.3/zulu-13-azure-jre_13.31.11-13.0.3-linux_musl_x64.tar.gz && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.3/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
     find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
     
 
-ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-13u3-jre-headless b/docker/alpine/Dockerfile.zulu-13u3-jre-headless
index 1ce61242..2bebbb31 100644
--- a/docker/alpine/Dockerfile.zulu-13u3-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-13u3-jre-headless
@@ -20,11 +20,11 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.3/zulu-13-azure-jre-headless_13.31.11-13.0.3-linux_musl_x64.tar.gz && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.3/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
     find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
     
 
-ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-13u3-jre-headless-tools b/docker/alpine/Dockerfile.zulu-13u3-jre-headless-tools
index e3849078..4b4bc9a5 100644
--- a/docker/alpine/Dockerfile.zulu-13u3-jre-headless-tools
+++ b/docker/alpine/Dockerfile.zulu-13u3-jre-headless-tools
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.3/zulu-13-azure-jre-headless-tools_13.31.11-13.0.3-linux_musl_x64.tar.gz && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.3/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
@@ -29,4 +29,4 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     cd ${MAN_DIR} && \
     find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
 
-ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-7u191-jdk b/docker/alpine/Dockerfile.zulu-7u191-jdk
index 076b70d5..0b2fb7de 100644
--- a/docker/alpine/Dockerfile.zulu-7u191-jdk
+++ b/docker/alpine/Dockerfile.zulu-7u191-jdk
@@ -27,7 +27,7 @@ RUN ZULU_PACK=zulu-7-azure-jdk_7.24.0.2-7.0.191-linux_x64.tar.gz && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
     rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u191/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u191/${ZULU_PACK} && \
     rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u191-jre b/docker/alpine/Dockerfile.zulu-7u191-jre
index 8c867e81..27ce1421 100644
--- a/docker/alpine/Dockerfile.zulu-7u191-jre
+++ b/docker/alpine/Dockerfile.zulu-7u191-jre
@@ -27,7 +27,7 @@ RUN ZULU_PACK=zulu-7-azure-jre_7.24.0.2-7.0.191-linux_x64.tar.gz && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
     rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u191/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u191/${ZULU_PACK} && \
     rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u191-jre-headless b/docker/alpine/Dockerfile.zulu-7u191-jre-headless
index 398206ac..a3e85d31 100644
--- a/docker/alpine/Dockerfile.zulu-7u191-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-7u191-jre-headless
@@ -27,7 +27,7 @@ RUN ZULU_PACK=zulu-7-azure-jre-headless_7.24.0.2-7.0.191-linux_x64.tar.gz && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
     rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u191/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u191/${ZULU_PACK} && \
     rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u201-jdk b/docker/alpine/Dockerfile.zulu-7u201-jdk
index 56d71672..44275dea 100644
--- a/docker/alpine/Dockerfile.zulu-7u201-jdk
+++ b/docker/alpine/Dockerfile.zulu-7u201-jdk
@@ -27,7 +27,7 @@ RUN ZULU_PACK=zulu-7-azure-jdk_7.25.0.5-7.0.201-linux_x64.tar.gz && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
     rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u201/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u201/${ZULU_PACK} && \
     rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u201-jre b/docker/alpine/Dockerfile.zulu-7u201-jre
index e70af592..4b540b25 100644
--- a/docker/alpine/Dockerfile.zulu-7u201-jre
+++ b/docker/alpine/Dockerfile.zulu-7u201-jre
@@ -27,7 +27,7 @@ RUN ZULU_PACK=zulu-7-azure-jre_7.25.0.5-7.0.201-linux_x64.tar.gz && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
     rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u201/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u201/${ZULU_PACK} && \
     rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u201-jre-headless b/docker/alpine/Dockerfile.zulu-7u201-jre-headless
index 23a720bf..ce503f5a 100644
--- a/docker/alpine/Dockerfile.zulu-7u201-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-7u201-jre-headless
@@ -27,7 +27,7 @@ RUN ZULU_PACK=zulu-7-azure-jre-headless_7.25.0.5-7.0.201-linux_x64.tar.gz && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
     rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u201/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u201/${ZULU_PACK} && \
     rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u211-jdk b/docker/alpine/Dockerfile.zulu-7u211-jdk
index 2412b52e..f37c5c73 100644
--- a/docker/alpine/Dockerfile.zulu-7u211-jdk
+++ b/docker/alpine/Dockerfile.zulu-7u211-jdk
@@ -27,7 +27,7 @@ RUN ZULU_PACK=zulu-7-azure-jdk_7.27.0.1-7.0.211-linux_x64.tar.gz && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
     rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u211/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u211/${ZULU_PACK} && \
     rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u211-jre b/docker/alpine/Dockerfile.zulu-7u211-jre
index 4aa3bcd7..eb2ddadc 100644
--- a/docker/alpine/Dockerfile.zulu-7u211-jre
+++ b/docker/alpine/Dockerfile.zulu-7u211-jre
@@ -27,7 +27,7 @@ RUN ZULU_PACK=zulu-7-azure-jre_7.27.0.1-7.0.211-linux_x64.tar.gz && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
     rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u211/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u211/${ZULU_PACK} && \
     rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u211-jre-headless b/docker/alpine/Dockerfile.zulu-7u211-jre-headless
index 50171207..69a28d21 100644
--- a/docker/alpine/Dockerfile.zulu-7u211-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-7u211-jre-headless
@@ -27,7 +27,7 @@ RUN ZULU_PACK=zulu-7-azure-jre-headless_7.27.0.1-7.0.211-linux_x64.tar.gz && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
     rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u211/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u211/${ZULU_PACK} && \
     rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u222-jdk b/docker/alpine/Dockerfile.zulu-7u222-jdk
index 70bb85eb..02034811 100644
--- a/docker/alpine/Dockerfile.zulu-7u222-jdk
+++ b/docker/alpine/Dockerfile.zulu-7u222-jdk
@@ -28,7 +28,7 @@ RUN ZULU_PACK=zulu-7-azure-jdk_7.29.0.5-7.0.222-linux_x64.tar.gz && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
     rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u222/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u222/${ZULU_PACK} && \
     rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u222-jre b/docker/alpine/Dockerfile.zulu-7u222-jre
index 1c7d42a6..73f14de1 100644
--- a/docker/alpine/Dockerfile.zulu-7u222-jre
+++ b/docker/alpine/Dockerfile.zulu-7u222-jre
@@ -28,7 +28,7 @@ RUN ZULU_PACK=zulu-7-azure-jre_7.29.0.5-7.0.222-linux_x64.tar.gz && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
     rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u222/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u222/${ZULU_PACK} && \
     rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u222-jre-headless b/docker/alpine/Dockerfile.zulu-7u222-jre-headless
index f321683d..d0f68245 100644
--- a/docker/alpine/Dockerfile.zulu-7u222-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-7u222-jre-headless
@@ -28,7 +28,7 @@ RUN ZULU_PACK=zulu-7-azure-jre-headless_7.29.0.5-7.0.222-linux_x64.tar.gz && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
     rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u222/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u222/${ZULU_PACK} && \
     rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u232-jdk b/docker/alpine/Dockerfile.zulu-7u232-jdk
index e788f069..fee8dc58 100644
--- a/docker/alpine/Dockerfile.zulu-7u232-jdk
+++ b/docker/alpine/Dockerfile.zulu-7u232-jdk
@@ -29,7 +29,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
     rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u232/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u232/${ZULU_PACK} && \
     rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u232-jre b/docker/alpine/Dockerfile.zulu-7u232-jre
index ec2099e5..30665168 100644
--- a/docker/alpine/Dockerfile.zulu-7u232-jre
+++ b/docker/alpine/Dockerfile.zulu-7u232-jre
@@ -29,7 +29,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
     rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u232/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u232/${ZULU_PACK} && \
     rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u232-jre-headless b/docker/alpine/Dockerfile.zulu-7u232-jre-headless
index 52af46b6..e90bca40 100644
--- a/docker/alpine/Dockerfile.zulu-7u232-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-7u232-jre-headless
@@ -29,7 +29,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
     rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u232/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u232/${ZULU_PACK} && \
     rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u242-jdk b/docker/alpine/Dockerfile.zulu-7u242-jdk
index be67bd24..48632ee6 100644
--- a/docker/alpine/Dockerfile.zulu-7u242-jdk
+++ b/docker/alpine/Dockerfile.zulu-7u242-jdk
@@ -32,7 +32,7 @@ RUN GCC_LIBS_PACK=gcc-libs-9.2.0-3-x86_64.pkg.tar.xz && \
     rm -rf {GCC_LIBS_PACK} ${ZLIB_PACK} /tmp/usr && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u242/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u242/${ZULU_PACK} && \
     rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u242-jre b/docker/alpine/Dockerfile.zulu-7u242-jre
index a8d34ff7..57bd4701 100644
--- a/docker/alpine/Dockerfile.zulu-7u242-jre
+++ b/docker/alpine/Dockerfile.zulu-7u242-jre
@@ -32,7 +32,7 @@ RUN GCC_LIBS_PACK=gcc-libs-9.2.0-3-x86_64.pkg.tar.xz && \
     rm -rf {GCC_LIBS_PACK} ${ZLIB_PACK} /tmp/usr && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u242/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u242/${ZULU_PACK} && \
     rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u242-jre-headless b/docker/alpine/Dockerfile.zulu-7u242-jre-headless
index 6995856b..dca2858b 100644
--- a/docker/alpine/Dockerfile.zulu-7u242-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-7u242-jre-headless
@@ -32,7 +32,7 @@ RUN GCC_LIBS_PACK=gcc-libs-9.2.0-3-x86_64.pkg.tar.xz && \
     rm -rf {GCC_LIBS_PACK} ${ZLIB_PACK} /tmp/usr && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u242/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u242/${ZULU_PACK} && \
     rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u252-jdk b/docker/alpine/Dockerfile.zulu-7u252-jdk
index 8a63de6d..ba3bcce2 100644
--- a/docker/alpine/Dockerfile.zulu-7u252-jdk
+++ b/docker/alpine/Dockerfile.zulu-7u252-jdk
@@ -32,7 +32,7 @@ RUN GCC_LIBS_PACK=gcc-libs-9.2.0-4-x86_64.pkg.tar.xz && \
     rm -rf {GCC_LIBS_PACK} ${ZLIB_PACK} /tmp/usr && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u252/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u252/${ZULU_PACK} && \
     rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u252-jre b/docker/alpine/Dockerfile.zulu-7u252-jre
index a9247052..6d08b88e 100644
--- a/docker/alpine/Dockerfile.zulu-7u252-jre
+++ b/docker/alpine/Dockerfile.zulu-7u252-jre
@@ -32,7 +32,7 @@ RUN GCC_LIBS_PACK=gcc-libs-9.2.0-4-x86_64.pkg.tar.xz && \
     rm -rf {GCC_LIBS_PACK} ${ZLIB_PACK} /tmp/usr && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u252/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u252/${ZULU_PACK} && \
     rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u252-jre-headless b/docker/alpine/Dockerfile.zulu-7u252-jre-headless
index 2b7d977c..d600cb18 100644
--- a/docker/alpine/Dockerfile.zulu-7u252-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-7u252-jre-headless
@@ -32,7 +32,7 @@ RUN GCC_LIBS_PACK=gcc-libs-9.2.0-4-x86_64.pkg.tar.xz && \
     rm -rf {GCC_LIBS_PACK} ${ZLIB_PACK} /tmp/usr && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u252/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-7/7u252/${ZULU_PACK} && \
     rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u262-jdk b/docker/alpine/Dockerfile.zulu-7u262-jdk
index a4755262..a7d7b77b 100644
--- a/docker/alpine/Dockerfile.zulu-7u262-jdk
+++ b/docker/alpine/Dockerfile.zulu-7u262-jdk
@@ -30,7 +30,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
     rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u262/zulu-7-azure-jdk_7.38.0.11-7.0.262-linux_x64.tar.gz && rm /root/.wget-hsts && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u262/${ZULU_PACK} && rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
@@ -39,4 +39,4 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     cd ${MAN_DIR} && \
     find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
 
-ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-7u262-jre b/docker/alpine/Dockerfile.zulu-7u262-jre
index 9d44e862..d1fa66cb 100644
--- a/docker/alpine/Dockerfile.zulu-7u262-jre
+++ b/docker/alpine/Dockerfile.zulu-7u262-jre
@@ -30,7 +30,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
     rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u262/zulu-7-azure-jre_7.38.0.11-7.0.262-linux_x64.tar.gz && rm /root/.wget-hsts && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u262/${ZULU_PACK} && rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
@@ -39,4 +39,4 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     cd ${MAN_DIR} && \
     find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
 
-ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-7u262-jre-headless b/docker/alpine/Dockerfile.zulu-7u262-jre-headless
index 316d6f10..f08c9a97 100644
--- a/docker/alpine/Dockerfile.zulu-7u262-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-7u262-jre-headless
@@ -30,7 +30,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
     rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u262/zulu-7-azure-jre-headless_7.38.0.11-7.0.262-linux_x64.tar.gz && rm /root/.wget-hsts && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u262/${ZULU_PACK} && rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
@@ -39,4 +39,4 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     cd ${MAN_DIR} && \
     find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
 
-ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-8u181-jdk b/docker/alpine/Dockerfile.zulu-8u181-jdk
index e8a8f158..24ab548f 100644
--- a/docker/alpine/Dockerfile.zulu-8u181-jdk
+++ b/docker/alpine/Dockerfile.zulu-8u181-jdk
@@ -17,7 +17,7 @@ RUN ZULU_PACK=zulu-8-azure-jdk_8.31.0.1-8.0.181-linux_musl_x64.tar.gz && \
     MAN_DIR=/usr/share/man/man1 && \
     ZULU_DIR=$( basename ${ZULU_PACK} .tar.gz ) && \
     apk --no-cache add binutils ca-certificates libgcc libstdc++ ttf-dejavu wget && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u181/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u181/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u181-jre b/docker/alpine/Dockerfile.zulu-8u181-jre
index afacce0c..fbee3036 100644
--- a/docker/alpine/Dockerfile.zulu-8u181-jre
+++ b/docker/alpine/Dockerfile.zulu-8u181-jre
@@ -27,7 +27,7 @@ RUN ZULU_PACK=zulu-8-azure-jre_8.31.0.2-8.0.181-linux_x64.tar.gz && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
     rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u181/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u181/${ZULU_PACK} && \
     rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u181-jre-headless b/docker/alpine/Dockerfile.zulu-8u181-jre-headless
index 3a0657cb..1ef8c00d 100644
--- a/docker/alpine/Dockerfile.zulu-8u181-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-8u181-jre-headless
@@ -27,7 +27,7 @@ RUN ZULU_PACK=zulu-8-azure-jre-headless_8.31.0.2-8.0.181-linux_x64.tar.gz && \
     mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
     strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
     rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u181/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u181/${ZULU_PACK} && \
     rm /root/.wget-hsts && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u192-jdk b/docker/alpine/Dockerfile.zulu-8u192-jdk
index 8aea95ce..db1b0561 100644
--- a/docker/alpine/Dockerfile.zulu-8u192-jdk
+++ b/docker/alpine/Dockerfile.zulu-8u192-jdk
@@ -17,7 +17,7 @@ RUN ZULU_PACK=zulu-8-azure-jdk_8.33.0.1-8.0.192-linux_musl_x64.tar.gz && \
     MAN_DIR=/usr/share/man/man1 && \
     ZULU_DIR=$( basename ${ZULU_PACK} .tar.gz ) && \
     apk --no-cache add binutils ca-certificates libgcc libstdc++ ttf-dejavu wget && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u192/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u192/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u192-jre b/docker/alpine/Dockerfile.zulu-8u192-jre
index d9584e29..2e47707a 100644
--- a/docker/alpine/Dockerfile.zulu-8u192-jre
+++ b/docker/alpine/Dockerfile.zulu-8u192-jre
@@ -17,7 +17,7 @@ RUN ZULU_PACK=zulu-8-azure-jre_8.33.0.1-8.0.192-linux_musl_x64.tar.gz && \
     MAN_DIR=/usr/share/man/man1 && \
     ZULU_DIR=$( basename ${ZULU_PACK} .tar.gz ) && \
     apk --no-cache add binutils ca-certificates libgcc libstdc++ ttf-dejavu wget && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u192/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u192/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u192-jre-headless b/docker/alpine/Dockerfile.zulu-8u192-jre-headless
index d613f3f5..90a71e82 100644
--- a/docker/alpine/Dockerfile.zulu-8u192-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-8u192-jre-headless
@@ -17,7 +17,7 @@ RUN ZULU_PACK=zulu-8-azure-jre-headless_8.33.0.1-8.0.192-linux_musl_x64.tar.gz &
     MAN_DIR=/usr/share/man/man1 && \
     ZULU_DIR=$( basename ${ZULU_PACK} .tar.gz ) && \
     apk --no-cache add binutils ca-certificates libgcc libstdc++ ttf-dejavu wget && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u192/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u192/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u202-jdk b/docker/alpine/Dockerfile.zulu-8u202-jdk
index e645eae5..bfa58d15 100644
--- a/docker/alpine/Dockerfile.zulu-8u202-jdk
+++ b/docker/alpine/Dockerfile.zulu-8u202-jdk
@@ -17,7 +17,7 @@ RUN ZULU_PACK=zulu-8-azure-jdk_8.36.0.1-8.0.202-linux_musl_x64.tar.gz && \
     MAN_DIR=/usr/share/man/man1 && \
     ZULU_DIR=$( basename ${ZULU_PACK} .tar.gz ) && \
     apk --no-cache add binutils ca-certificates libgcc libstdc++ ttf-dejavu wget && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u202/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u202/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u202-jre b/docker/alpine/Dockerfile.zulu-8u202-jre
index 0f06fc03..4829a6ea 100644
--- a/docker/alpine/Dockerfile.zulu-8u202-jre
+++ b/docker/alpine/Dockerfile.zulu-8u202-jre
@@ -17,7 +17,7 @@ RUN ZULU_PACK=zulu-8-azure-jre_8.36.0.1-8.0.202-linux_musl_x64.tar.gz && \
     MAN_DIR=/usr/share/man/man1 && \
     ZULU_DIR=$( basename ${ZULU_PACK} .tar.gz ) && \
     apk --no-cache add binutils ca-certificates libgcc libstdc++ ttf-dejavu wget && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u202/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u202/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u202-jre-headless b/docker/alpine/Dockerfile.zulu-8u202-jre-headless
index d8a7044a..dbe9766c 100644
--- a/docker/alpine/Dockerfile.zulu-8u202-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-8u202-jre-headless
@@ -17,7 +17,7 @@ RUN ZULU_PACK=zulu-8-azure-jre-headless_8.36.0.1-8.0.202-linux_musl_x64.tar.gz &
     MAN_DIR=/usr/share/man/man1 && \
     ZULU_DIR=$( basename ${ZULU_PACK} .tar.gz ) && \
     apk --no-cache add binutils ca-certificates libgcc libstdc++ ttf-dejavu wget && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u202/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u202/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u212-jdk b/docker/alpine/Dockerfile.zulu-8u212-jdk
index 006d5bd2..8180abb0 100644
--- a/docker/alpine/Dockerfile.zulu-8u212-jdk
+++ b/docker/alpine/Dockerfile.zulu-8u212-jdk
@@ -17,7 +17,7 @@ RUN ZULU_PACK=zulu-8-azure-jdk_8.38.0.13-8.0.212-linux_musl_x64.tar.gz && \
     MAN_DIR=/usr/share/man/man1 && \
     ZULU_DIR=$( basename ${ZULU_PACK} .tar.gz ) && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u212/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u212/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u212-jre b/docker/alpine/Dockerfile.zulu-8u212-jre
index 3c0d6b92..7ba06196 100644
--- a/docker/alpine/Dockerfile.zulu-8u212-jre
+++ b/docker/alpine/Dockerfile.zulu-8u212-jre
@@ -17,7 +17,7 @@ RUN ZULU_PACK=zulu-8-azure-jre_8.38.0.13-8.0.212-linux_musl_x64.tar.gz && \
     MAN_DIR=/usr/share/man/man1 && \
     ZULU_DIR=$( basename ${ZULU_PACK} .tar.gz ) && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u212/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u212/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u212-jre-headless b/docker/alpine/Dockerfile.zulu-8u212-jre-headless
index 6888b94c..69e630d0 100644
--- a/docker/alpine/Dockerfile.zulu-8u212-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-8u212-jre-headless
@@ -17,7 +17,7 @@ RUN ZULU_PACK=zulu-8-azure-jre-headless_8.38.0.13-8.0.212-linux_musl_x64.tar.gz
     MAN_DIR=/usr/share/man/man1 && \
     ZULU_DIR=$( basename ${ZULU_PACK} .tar.gz ) && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u212/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u212/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u222-jdk b/docker/alpine/Dockerfile.zulu-8u222-jdk
index 6016b37d..8224778a 100644
--- a/docker/alpine/Dockerfile.zulu-8u222-jdk
+++ b/docker/alpine/Dockerfile.zulu-8u222-jdk
@@ -18,7 +18,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u222/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u222/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u222-jre b/docker/alpine/Dockerfile.zulu-8u222-jre
index 8b90ec57..ab6e98ea 100644
--- a/docker/alpine/Dockerfile.zulu-8u222-jre
+++ b/docker/alpine/Dockerfile.zulu-8u222-jre
@@ -18,7 +18,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u222/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u222/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u222-jre-headless b/docker/alpine/Dockerfile.zulu-8u222-jre-headless
index be4be6f6..000e58e6 100644
--- a/docker/alpine/Dockerfile.zulu-8u222-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-8u222-jre-headless
@@ -17,7 +17,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u222/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u222/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u222-jre-headless-tools b/docker/alpine/Dockerfile.zulu-8u222-jre-headless-tools
index 24d45836..3905e737 100644
--- a/docker/alpine/Dockerfile.zulu-8u222-jre-headless-tools
+++ b/docker/alpine/Dockerfile.zulu-8u222-jre-headless-tools
@@ -17,7 +17,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     BIN_DIR=/usr/bin && \
     MAN_DIR=/usr/share/man/man1 && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u222/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u222/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u232-jdk b/docker/alpine/Dockerfile.zulu-8u232-jdk
index 031900a7..3955a975 100644
--- a/docker/alpine/Dockerfile.zulu-8u232-jdk
+++ b/docker/alpine/Dockerfile.zulu-8u232-jdk
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u232/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u232/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u232-jre b/docker/alpine/Dockerfile.zulu-8u232-jre
index fd586322..d147cfbf 100644
--- a/docker/alpine/Dockerfile.zulu-8u232-jre
+++ b/docker/alpine/Dockerfile.zulu-8u232-jre
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u232/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u232/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u232-jre-headless b/docker/alpine/Dockerfile.zulu-8u232-jre-headless
index dd555097..beaea5bf 100644
--- a/docker/alpine/Dockerfile.zulu-8u232-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-8u232-jre-headless
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u232/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u232/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u232-jre-headless-tools b/docker/alpine/Dockerfile.zulu-8u232-jre-headless-tools
index 68b2fd0a..fe008a68 100644
--- a/docker/alpine/Dockerfile.zulu-8u232-jre-headless-tools
+++ b/docker/alpine/Dockerfile.zulu-8u232-jre-headless-tools
@@ -19,7 +19,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u232/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u232/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u242-jdk b/docker/alpine/Dockerfile.zulu-8u242-jdk
index 99342c85..93760cff 100644
--- a/docker/alpine/Dockerfile.zulu-8u242-jdk
+++ b/docker/alpine/Dockerfile.zulu-8u242-jdk
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u242/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u242/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u242-jre b/docker/alpine/Dockerfile.zulu-8u242-jre
index cda3341a..af30ae2d 100644
--- a/docker/alpine/Dockerfile.zulu-8u242-jre
+++ b/docker/alpine/Dockerfile.zulu-8u242-jre
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u242/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u242/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u242-jre-headless b/docker/alpine/Dockerfile.zulu-8u242-jre-headless
index 1bccaf7b..d8cc7703 100644
--- a/docker/alpine/Dockerfile.zulu-8u242-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-8u242-jre-headless
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u242/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u242/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u242-jre-headless-tools b/docker/alpine/Dockerfile.zulu-8u242-jre-headless-tools
index e54b2026..63708390 100644
--- a/docker/alpine/Dockerfile.zulu-8u242-jre-headless-tools
+++ b/docker/alpine/Dockerfile.zulu-8u242-jre-headless-tools
@@ -19,7 +19,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u242/$ZULU_PACK && \
+    wget -q http://repos.azul.com/azure-only/zulu/packages/zulu-8/8u242/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-8u252-jdk b/docker/alpine/Dockerfile.zulu-8u252-jdk
index 1b8b4cba..52432053 100644
--- a/docker/alpine/Dockerfile.zulu-8u252-jdk
+++ b/docker/alpine/Dockerfile.zulu-8u252-jdk
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u252/zulu-8-azure-jdk_8.46.0.19-8.0.252-linux_musl_x64.tar.gz && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u252/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
@@ -29,4 +29,4 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     cd ${MAN_DIR} && \
     find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
 
-ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-8u252-jre b/docker/alpine/Dockerfile.zulu-8u252-jre
index 23aad2b4..73d400b2 100644
--- a/docker/alpine/Dockerfile.zulu-8u252-jre
+++ b/docker/alpine/Dockerfile.zulu-8u252-jre
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u252/zulu-8-azure-jre_8.46.0.19-8.0.252-linux_musl_x64.tar.gz && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u252/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
@@ -29,4 +29,4 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     cd ${MAN_DIR} && \
     find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
 
-ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-8u252-jre-headless b/docker/alpine/Dockerfile.zulu-8u252-jre-headless
index 2c09a96f..033c8999 100644
--- a/docker/alpine/Dockerfile.zulu-8u252-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-8u252-jre-headless
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u252/zulu-8-azure-jre-headless_8.46.0.19-8.0.252-linux_musl_x64.tar.gz && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u252/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
@@ -29,4 +29,4 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     cd ${MAN_DIR} && \
     find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
 
-ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-8u252-jre-headless-tools b/docker/alpine/Dockerfile.zulu-8u252-jre-headless-tools
index 80223ca2..2de6f50b 100644
--- a/docker/alpine/Dockerfile.zulu-8u252-jre-headless-tools
+++ b/docker/alpine/Dockerfile.zulu-8u252-jre-headless-tools
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u252/zulu-8-azure-jre-headless-tools_8.46.0.19-8.0.252-linux_musl_x64.tar.gz && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u252/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
@@ -29,4 +29,4 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     cd ${MAN_DIR} && \
     find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
 
-ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}

From 61c744dc1e9618bc6569365f46995dbfc561e726 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 11 Jun 2020 09:13:03 -0500
Subject: [PATCH 083/264] Added commands to reduce the image size

---
 docker/ubuntu/Dockerfile.zulu-11u7-jdk           | 2 ++
 docker/ubuntu/Dockerfile.zulu-11u7-jre           | 2 ++
 docker/ubuntu/Dockerfile.zulu-11u7-jre-headless  | 2 ++
 docker/ubuntu/Dockerfile.zulu-13u3-jdk           | 2 ++
 docker/ubuntu/Dockerfile.zulu-13u3-jre           | 2 ++
 docker/ubuntu/Dockerfile.zulu-13u3-jre-headless  | 2 ++
 docker/ubuntu/Dockerfile.zulu-14u1-jdk           | 2 ++
 docker/ubuntu/Dockerfile.zulu-14u1-jre           | 2 ++
 docker/ubuntu/Dockerfile.zulu-7u262-jdk          | 2 ++
 docker/ubuntu/Dockerfile.zulu-7u262-jre          | 2 ++
 docker/ubuntu/Dockerfile.zulu-7u262-jre-headless | 2 ++
 docker/ubuntu/Dockerfile.zulu-8u252-jdk          | 2 ++
 docker/ubuntu/Dockerfile.zulu-8u252-jre          | 2 ++
 docker/ubuntu/Dockerfile.zulu-8u252-jre-headless | 2 ++
 14 files changed, 28 insertions(+)

diff --git a/docker/ubuntu/Dockerfile.zulu-11u7-jdk b/docker/ubuntu/Dockerfile.zulu-11u7-jdk
index 009d91be..337b76f1 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u7-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-11u7-jdk
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.39+15 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u7-jre b/docker/ubuntu/Dockerfile.zulu-11u7-jre
index d87e36b0..6e8c35c3 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u7-jre
+++ b/docker/ubuntu/Dockerfile.zulu-11u7-jre
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.39+15 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u7-jre-headless b/docker/ubuntu/Dockerfile.zulu-11u7-jre-headless
index 3bd16f96..c2b1cb82 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u7-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-11u7-jre-headless
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.39+15 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u3-jdk b/docker/ubuntu/Dockerfile.zulu-13u3-jdk
index 234cd199..351eaadc 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u3-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-13u3-jdk
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.31+11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u3-jre b/docker/ubuntu/Dockerfile.zulu-13u3-jre
index 18f18987..92e28537 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u3-jre
+++ b/docker/ubuntu/Dockerfile.zulu-13u3-jre
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.31+11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u3-jre-headless b/docker/ubuntu/Dockerfile.zulu-13u3-jre-headless
index 870db755..88fd8022 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u3-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-13u3-jre-headless
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.31+11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-14u1-jdk b/docker/ubuntu/Dockerfile.zulu-14u1-jdk
index 23401fec..f57390ed 100644
--- a/docker/ubuntu/Dockerfile.zulu-14u1-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-14u1-jdk
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-14-azure-jdk=14.28+21 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-14-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-14u1-jre b/docker/ubuntu/Dockerfile.zulu-14u1-jre
index 92b38cc2..053591dd 100644
--- a/docker/ubuntu/Dockerfile.zulu-14u1-jre
+++ b/docker/ubuntu/Dockerfile.zulu-14u1-jre
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-14-azure-jre=14.28+21 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-14-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u262-jdk b/docker/ubuntu/Dockerfile.zulu-7u262-jdk
index e7b91972..eecbeb5c 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u262-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-7u262-jdk
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.38.0.11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u262-jre b/docker/ubuntu/Dockerfile.zulu-7u262-jre
index 25b72735..18603f73 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u262-jre
+++ b/docker/ubuntu/Dockerfile.zulu-7u262-jre
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.38.0.11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u262-jre-headless b/docker/ubuntu/Dockerfile.zulu-7u262-jre-headless
index c97fde90..71e9731e 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u262-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-7u262-jre-headless
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.38.0.11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u252-jdk b/docker/ubuntu/Dockerfile.zulu-8u252-jdk
index 03c8fadd..538fb3fd 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u252-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-8u252-jdk
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.46.0.19 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u252-jre b/docker/ubuntu/Dockerfile.zulu-8u252-jre
index bfaee156..0ff0cf9d 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u252-jre
+++ b/docker/ubuntu/Dockerfile.zulu-8u252-jre
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.46.0.19 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u252-jre-headless b/docker/ubuntu/Dockerfile.zulu-8u252-jre-headless
index 76f3ecac..f16a64dc 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u252-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-8u252-jre-headless
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.46.0.19 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64

From 09ba0d691ed7b9ac49c6f1a1daea7269b7deff77 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 11 Jun 2020 09:15:38 -0500
Subject: [PATCH 084/264] Added commands to reduce the image size

---
 docker/ubuntu-19.10/Dockerfile.zulu-11u7-jdk           | 2 ++
 docker/ubuntu-19.10/Dockerfile.zulu-11u7-jre           | 2 ++
 docker/ubuntu-19.10/Dockerfile.zulu-11u7-jre-headless  | 2 ++
 docker/ubuntu-19.10/Dockerfile.zulu-13u3-jdk           | 2 ++
 docker/ubuntu-19.10/Dockerfile.zulu-13u3-jre           | 2 ++
 docker/ubuntu-19.10/Dockerfile.zulu-13u3-jre-headless  | 2 ++
 docker/ubuntu-19.10/Dockerfile.zulu-14u1-jdk           | 2 ++
 docker/ubuntu-19.10/Dockerfile.zulu-14u1-jre           | 2 ++
 docker/ubuntu-19.10/Dockerfile.zulu-7u262-jdk          | 2 ++
 docker/ubuntu-19.10/Dockerfile.zulu-7u262-jre          | 2 ++
 docker/ubuntu-19.10/Dockerfile.zulu-7u262-jre-headless | 2 ++
 docker/ubuntu-19.10/Dockerfile.zulu-8u252-jdk          | 2 ++
 docker/ubuntu-19.10/Dockerfile.zulu-8u252-jre          | 2 ++
 docker/ubuntu-19.10/Dockerfile.zulu-8u252-jre-headless | 2 ++
 14 files changed, 28 insertions(+)

diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-11u7-jdk b/docker/ubuntu-19.10/Dockerfile.zulu-11u7-jdk
index 3a56b712..d10effe8 100644
--- a/docker/ubuntu-19.10/Dockerfile.zulu-11u7-jdk
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-11u7-jdk
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.39+15 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-11u7-jre b/docker/ubuntu-19.10/Dockerfile.zulu-11u7-jre
index 80b0380e..456a4465 100644
--- a/docker/ubuntu-19.10/Dockerfile.zulu-11u7-jre
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-11u7-jre
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.39+15 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-11u7-jre-headless b/docker/ubuntu-19.10/Dockerfile.zulu-11u7-jre-headless
index d3e56178..ff99bef5 100644
--- a/docker/ubuntu-19.10/Dockerfile.zulu-11u7-jre-headless
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-11u7-jre-headless
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.39+15 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-13u3-jdk b/docker/ubuntu-19.10/Dockerfile.zulu-13u3-jdk
index 7df74e64..cdd39bd2 100644
--- a/docker/ubuntu-19.10/Dockerfile.zulu-13u3-jdk
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-13u3-jdk
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.31+11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-13u3-jre b/docker/ubuntu-19.10/Dockerfile.zulu-13u3-jre
index 3009d0a1..eed29acc 100644
--- a/docker/ubuntu-19.10/Dockerfile.zulu-13u3-jre
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-13u3-jre
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.31+11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-13u3-jre-headless b/docker/ubuntu-19.10/Dockerfile.zulu-13u3-jre-headless
index 2bbabd18..b9cf4237 100644
--- a/docker/ubuntu-19.10/Dockerfile.zulu-13u3-jre-headless
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-13u3-jre-headless
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.31+11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-14u1-jdk b/docker/ubuntu-19.10/Dockerfile.zulu-14u1-jdk
index 0112d2fe..cbf1fccc 100644
--- a/docker/ubuntu-19.10/Dockerfile.zulu-14u1-jdk
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-14u1-jdk
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-14-azure-jdk=14.28+21 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-14-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-14u1-jre b/docker/ubuntu-19.10/Dockerfile.zulu-14u1-jre
index d4da66e9..3db74424 100644
--- a/docker/ubuntu-19.10/Dockerfile.zulu-14u1-jre
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-14u1-jre
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-14-azure-jre=14.28+21 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-14-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-7u262-jdk b/docker/ubuntu-19.10/Dockerfile.zulu-7u262-jdk
index 019ffd7f..43dd43b2 100644
--- a/docker/ubuntu-19.10/Dockerfile.zulu-7u262-jdk
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-7u262-jdk
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.38.0.11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-7u262-jre b/docker/ubuntu-19.10/Dockerfile.zulu-7u262-jre
index 10d957cf..1dc527cc 100644
--- a/docker/ubuntu-19.10/Dockerfile.zulu-7u262-jre
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-7u262-jre
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.38.0.11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-7u262-jre-headless b/docker/ubuntu-19.10/Dockerfile.zulu-7u262-jre-headless
index d90ccbae..f4abc4b0 100644
--- a/docker/ubuntu-19.10/Dockerfile.zulu-7u262-jre-headless
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-7u262-jre-headless
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.38.0.11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-8u252-jdk b/docker/ubuntu-19.10/Dockerfile.zulu-8u252-jdk
index d1a8992f..c56e3c59 100644
--- a/docker/ubuntu-19.10/Dockerfile.zulu-8u252-jdk
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-8u252-jdk
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.46.0.19 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-8u252-jre b/docker/ubuntu-19.10/Dockerfile.zulu-8u252-jre
index 1dc4327a..6b4bbea2 100644
--- a/docker/ubuntu-19.10/Dockerfile.zulu-8u252-jre
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-8u252-jre
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.46.0.19 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu-19.10/Dockerfile.zulu-8u252-jre-headless b/docker/ubuntu-19.10/Dockerfile.zulu-8u252-jre-headless
index ee247078..248f9da7 100644
--- a/docker/ubuntu-19.10/Dockerfile.zulu-8u252-jre-headless
+++ b/docker/ubuntu-19.10/Dockerfile.zulu-8u252-jre-headless
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.46.0.19 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64

From 1c0918b5ed78d6e072c8766ce15801af284b2dc2 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 11 Jun 2020 09:17:11 -0500
Subject: [PATCH 085/264] Added commands to reduce the image size

---
 docker/ubuntu-18.04/Dockerfile.zulu-11u7-jdk           | 2 ++
 docker/ubuntu-18.04/Dockerfile.zulu-11u7-jre           | 2 ++
 docker/ubuntu-18.04/Dockerfile.zulu-11u7-jre-headless  | 2 ++
 docker/ubuntu-18.04/Dockerfile.zulu-13u3-jdk           | 2 ++
 docker/ubuntu-18.04/Dockerfile.zulu-13u3-jre           | 2 ++
 docker/ubuntu-18.04/Dockerfile.zulu-13u3-jre-headless  | 2 ++
 docker/ubuntu-18.04/Dockerfile.zulu-14u1-jdk           | 2 ++
 docker/ubuntu-18.04/Dockerfile.zulu-14u1-jre           | 2 ++
 docker/ubuntu-18.04/Dockerfile.zulu-7u262-jdk          | 2 ++
 docker/ubuntu-18.04/Dockerfile.zulu-7u262-jre          | 2 ++
 docker/ubuntu-18.04/Dockerfile.zulu-7u262-jre-headless | 2 ++
 docker/ubuntu-18.04/Dockerfile.zulu-8u252-jdk          | 2 ++
 docker/ubuntu-18.04/Dockerfile.zulu-8u252-jre          | 2 ++
 docker/ubuntu-18.04/Dockerfile.zulu-8u252-jre-headless | 2 ++
 14 files changed, 28 insertions(+)

diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u7-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-11u7-jdk
index 325a4096..4e835a7b 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-11u7-jdk
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u7-jdk
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.39+15 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u7-jre b/docker/ubuntu-18.04/Dockerfile.zulu-11u7-jre
index 67fde592..82d3bd40 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-11u7-jre
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u7-jre
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.39+15 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u7-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-11u7-jre-headless
index a75cb784..92c010d2 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-11u7-jre-headless
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u7-jre-headless
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.39+15 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u3-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-13u3-jdk
index 30baf756..17f0b242 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-13u3-jdk
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u3-jdk
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.31+11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u3-jre b/docker/ubuntu-18.04/Dockerfile.zulu-13u3-jre
index 4e0b5f8d..c7b11409 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-13u3-jre
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u3-jre
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.31+11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u3-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-13u3-jre-headless
index e2ad321c..790c3b11 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-13u3-jre-headless
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u3-jre-headless
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.31+11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-14u1-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-14u1-jdk
index 41b4c16e..8e0ec013 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-14u1-jdk
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-14u1-jdk
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-14-azure-jdk=14.28+21 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-14-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-14u1-jre b/docker/ubuntu-18.04/Dockerfile.zulu-14u1-jre
index be16c795..f4987729 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-14u1-jre
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-14u1-jre
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-14-azure-jre=14.28+21 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-14-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u262-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-7u262-jdk
index 59e9b9e7..d9d391df 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-7u262-jdk
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u262-jdk
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.38.0.11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u262-jre b/docker/ubuntu-18.04/Dockerfile.zulu-7u262-jre
index f8421662..c95298bb 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-7u262-jre
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u262-jre
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.38.0.11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u262-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-7u262-jre-headless
index a0936509..d01a6de0 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-7u262-jre-headless
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u262-jre-headless
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.38.0.11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u252-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-8u252-jdk
index 7482879c..be75de47 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-8u252-jdk
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u252-jdk
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.46.0.19 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u252-jre b/docker/ubuntu-18.04/Dockerfile.zulu-8u252-jre
index 36c6823f..b3e5d75e 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-8u252-jre
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u252-jre
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.46.0.19 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u252-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-8u252-jre-headless
index a434d95a..3acdecc2 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-8u252-jre-headless
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u252-jre-headless
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.46.0.19 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64

From 2207689e3b399cb4c6a5c1bfac24614cafa1ffef Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 18 Jun 2020 07:54:21 -0500
Subject: [PATCH 086/264] Added commands to reduce the image size

---
 docker/debian10/Dockerfile.zulu-11u7-jdk           | 2 ++
 docker/debian10/Dockerfile.zulu-11u7-jre           | 2 ++
 docker/debian10/Dockerfile.zulu-11u7-jre-headless  | 2 ++
 docker/debian10/Dockerfile.zulu-13u3-jdk           | 2 ++
 docker/debian10/Dockerfile.zulu-13u3-jre           | 2 ++
 docker/debian10/Dockerfile.zulu-13u3-jre-headless  | 2 ++
 docker/debian10/Dockerfile.zulu-14u1-jdk           | 2 ++
 docker/debian10/Dockerfile.zulu-14u1-jre           | 2 ++
 docker/debian10/Dockerfile.zulu-7u262-jdk          | 2 ++
 docker/debian10/Dockerfile.zulu-7u262-jre          | 2 ++
 docker/debian10/Dockerfile.zulu-7u262-jre-headless | 2 ++
 docker/debian10/Dockerfile.zulu-8u252-jdk          | 2 ++
 docker/debian10/Dockerfile.zulu-8u252-jre          | 2 ++
 docker/debian10/Dockerfile.zulu-8u252-jre-headless | 2 ++
 14 files changed, 28 insertions(+)

diff --git a/docker/debian10/Dockerfile.zulu-11u7-jdk b/docker/debian10/Dockerfile.zulu-11u7-jdk
index 177b0ec9..71b5b44f 100644
--- a/docker/debian10/Dockerfile.zulu-11u7-jdk
+++ b/docker/debian10/Dockerfile.zulu-11u7-jdk
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.39+15 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u7-jre b/docker/debian10/Dockerfile.zulu-11u7-jre
index 30ed38ed..d255c85e 100644
--- a/docker/debian10/Dockerfile.zulu-11u7-jre
+++ b/docker/debian10/Dockerfile.zulu-11u7-jre
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.39+15 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u7-jre-headless b/docker/debian10/Dockerfile.zulu-11u7-jre-headless
index cad19974..f2e50760 100644
--- a/docker/debian10/Dockerfile.zulu-11u7-jre-headless
+++ b/docker/debian10/Dockerfile.zulu-11u7-jre-headless
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.39+15 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-13u3-jdk b/docker/debian10/Dockerfile.zulu-13u3-jdk
index 90266c47..d0cabdfc 100644
--- a/docker/debian10/Dockerfile.zulu-13u3-jdk
+++ b/docker/debian10/Dockerfile.zulu-13u3-jdk
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.31+11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-13u3-jre b/docker/debian10/Dockerfile.zulu-13u3-jre
index 461ddeb8..1f8f3989 100644
--- a/docker/debian10/Dockerfile.zulu-13u3-jre
+++ b/docker/debian10/Dockerfile.zulu-13u3-jre
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.31+11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-13u3-jre-headless b/docker/debian10/Dockerfile.zulu-13u3-jre-headless
index 2b44e778..98f1cc38 100644
--- a/docker/debian10/Dockerfile.zulu-13u3-jre-headless
+++ b/docker/debian10/Dockerfile.zulu-13u3-jre-headless
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.31+11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-14u1-jdk b/docker/debian10/Dockerfile.zulu-14u1-jdk
index 7668c195..c6285249 100644
--- a/docker/debian10/Dockerfile.zulu-14u1-jdk
+++ b/docker/debian10/Dockerfile.zulu-14u1-jdk
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-14-azure-jdk=14.28+21 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-14-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-14u1-jre b/docker/debian10/Dockerfile.zulu-14u1-jre
index 7229dc4b..d9bd259d 100644
--- a/docker/debian10/Dockerfile.zulu-14u1-jre
+++ b/docker/debian10/Dockerfile.zulu-14u1-jre
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-14-azure-jre=14.28+21 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-14-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u262-jdk b/docker/debian10/Dockerfile.zulu-7u262-jdk
index 57498a5c..03cf9c95 100644
--- a/docker/debian10/Dockerfile.zulu-7u262-jdk
+++ b/docker/debian10/Dockerfile.zulu-7u262-jdk
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.38.0.11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u262-jre b/docker/debian10/Dockerfile.zulu-7u262-jre
index 665a9169..6d2b22b5 100644
--- a/docker/debian10/Dockerfile.zulu-7u262-jre
+++ b/docker/debian10/Dockerfile.zulu-7u262-jre
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.38.0.11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u262-jre-headless b/docker/debian10/Dockerfile.zulu-7u262-jre-headless
index 43e4c714..2aebdf76 100644
--- a/docker/debian10/Dockerfile.zulu-7u262-jre-headless
+++ b/docker/debian10/Dockerfile.zulu-7u262-jre-headless
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.38.0.11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u252-jdk b/docker/debian10/Dockerfile.zulu-8u252-jdk
index f6e8cee9..7207cddc 100644
--- a/docker/debian10/Dockerfile.zulu-8u252-jdk
+++ b/docker/debian10/Dockerfile.zulu-8u252-jdk
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.46.0.19 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u252-jre b/docker/debian10/Dockerfile.zulu-8u252-jre
index 2fd24c5c..0abb8b2b 100644
--- a/docker/debian10/Dockerfile.zulu-8u252-jre
+++ b/docker/debian10/Dockerfile.zulu-8u252-jre
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.46.0.19 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u252-jre-headless b/docker/debian10/Dockerfile.zulu-8u252-jre-headless
index 8a8526d7..da18ecfd 100644
--- a/docker/debian10/Dockerfile.zulu-8u252-jre-headless
+++ b/docker/debian10/Dockerfile.zulu-8u252-jre-headless
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.46.0.19 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64

From b8e831fe8d499cf966e570f38915fab9a6860df9 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 18 Jun 2020 07:56:04 -0500
Subject: [PATCH 087/264] Added commands to reduce the image size

---
 docker/debian9/Dockerfile.zulu-11u7-jdk           | 2 ++
 docker/debian9/Dockerfile.zulu-11u7-jre           | 2 ++
 docker/debian9/Dockerfile.zulu-11u7-jre-headless  | 2 ++
 docker/debian9/Dockerfile.zulu-13u3-jdk           | 2 ++
 docker/debian9/Dockerfile.zulu-13u3-jre           | 2 ++
 docker/debian9/Dockerfile.zulu-13u3-jre-headless  | 2 ++
 docker/debian9/Dockerfile.zulu-14u1-jdk           | 2 ++
 docker/debian9/Dockerfile.zulu-14u1-jre           | 2 ++
 docker/debian9/Dockerfile.zulu-7u262-jdk          | 2 ++
 docker/debian9/Dockerfile.zulu-7u262-jre          | 2 ++
 docker/debian9/Dockerfile.zulu-7u262-jre-headless | 2 ++
 docker/debian9/Dockerfile.zulu-8u252-jdk          | 2 ++
 docker/debian9/Dockerfile.zulu-8u252-jre          | 2 ++
 docker/debian9/Dockerfile.zulu-8u252-jre-headless | 2 ++
 14 files changed, 28 insertions(+)

diff --git a/docker/debian9/Dockerfile.zulu-11u7-jdk b/docker/debian9/Dockerfile.zulu-11u7-jdk
index 5d584a03..160e0313 100644
--- a/docker/debian9/Dockerfile.zulu-11u7-jdk
+++ b/docker/debian9/Dockerfile.zulu-11u7-jdk
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.39+15 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u7-jre b/docker/debian9/Dockerfile.zulu-11u7-jre
index 0d47e904..1b01d502 100644
--- a/docker/debian9/Dockerfile.zulu-11u7-jre
+++ b/docker/debian9/Dockerfile.zulu-11u7-jre
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.39+15 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u7-jre-headless b/docker/debian9/Dockerfile.zulu-11u7-jre-headless
index 5448cb19..b07c1cfb 100644
--- a/docker/debian9/Dockerfile.zulu-11u7-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-11u7-jre-headless
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.39+15 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u3-jdk b/docker/debian9/Dockerfile.zulu-13u3-jdk
index 0c585f95..68121f68 100644
--- a/docker/debian9/Dockerfile.zulu-13u3-jdk
+++ b/docker/debian9/Dockerfile.zulu-13u3-jdk
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.31+11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u3-jre b/docker/debian9/Dockerfile.zulu-13u3-jre
index a5fc88ee..fbb742e7 100644
--- a/docker/debian9/Dockerfile.zulu-13u3-jre
+++ b/docker/debian9/Dockerfile.zulu-13u3-jre
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.31+11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u3-jre-headless b/docker/debian9/Dockerfile.zulu-13u3-jre-headless
index 1983299a..7bfa6dfa 100644
--- a/docker/debian9/Dockerfile.zulu-13u3-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-13u3-jre-headless
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.31+11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-14u1-jdk b/docker/debian9/Dockerfile.zulu-14u1-jdk
index dc3979c5..47afde4d 100644
--- a/docker/debian9/Dockerfile.zulu-14u1-jdk
+++ b/docker/debian9/Dockerfile.zulu-14u1-jdk
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-14-azure-jdk=14.28+21 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-14-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-14u1-jre b/docker/debian9/Dockerfile.zulu-14u1-jre
index fa7aeede..97c94673 100644
--- a/docker/debian9/Dockerfile.zulu-14u1-jre
+++ b/docker/debian9/Dockerfile.zulu-14u1-jre
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-14-azure-jre=14.28+21 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-14-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u262-jdk b/docker/debian9/Dockerfile.zulu-7u262-jdk
index 3bf47bfa..e795e64a 100644
--- a/docker/debian9/Dockerfile.zulu-7u262-jdk
+++ b/docker/debian9/Dockerfile.zulu-7u262-jdk
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.38.0.11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u262-jre b/docker/debian9/Dockerfile.zulu-7u262-jre
index 3d379e82..cd121898 100644
--- a/docker/debian9/Dockerfile.zulu-7u262-jre
+++ b/docker/debian9/Dockerfile.zulu-7u262-jre
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.38.0.11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u262-jre-headless b/docker/debian9/Dockerfile.zulu-7u262-jre-headless
index 83b594af..8f9d9c9c 100644
--- a/docker/debian9/Dockerfile.zulu-7u262-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-7u262-jre-headless
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.38.0.11 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u252-jdk b/docker/debian9/Dockerfile.zulu-8u252-jdk
index 716e70ba..4b412b58 100644
--- a/docker/debian9/Dockerfile.zulu-8u252-jdk
+++ b/docker/debian9/Dockerfile.zulu-8u252-jdk
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.46.0.19 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u252-jre b/docker/debian9/Dockerfile.zulu-8u252-jre
index 6c7f5dda..590404d7 100644
--- a/docker/debian9/Dockerfile.zulu-8u252-jre
+++ b/docker/debian9/Dockerfile.zulu-8u252-jre
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.46.0.19 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u252-jre-headless b/docker/debian9/Dockerfile.zulu-8u252-jre-headless
index 539d06ac..991117cb 100644
--- a/docker/debian9/Dockerfile.zulu-8u252-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-8u252-jre-headless
@@ -14,6 +14,8 @@ RUN apt-get -qq update && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.46.0.19 && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64

From fd3f41d32485cbf3d7ff492c004ff2f19b9ed5bd Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 20 Jul 2020 09:13:10 -0500
Subject: [PATCH 088/264] Added Dockerfiles for Zulu 8 & 11 Headless JRE with
 tools

---
 .../Dockerfile.zulu-11u6-jre-headless-tools   | 31 +++++++++++++++++++
 .../Dockerfile.zulu-11u7-jre-headless-tools   | 31 +++++++++++++++++++
 .../Dockerfile.zulu-11u8-jre-headless-tools   | 31 +++++++++++++++++++
 .../Dockerfile.zulu-8u242-jre-headless-tools  | 21 +++++++++++++
 .../Dockerfile.zulu-8u252-jre-headless-tools  | 22 +++++++++++++
 .../Dockerfile.zulu-8u262-jre-headless-tools  | 22 +++++++++++++
 6 files changed, 158 insertions(+)
 create mode 100644 docker/debian10/Dockerfile.zulu-11u6-jre-headless-tools
 create mode 100644 docker/debian10/Dockerfile.zulu-11u7-jre-headless-tools
 create mode 100644 docker/debian10/Dockerfile.zulu-11u8-jre-headless-tools
 create mode 100644 docker/debian10/Dockerfile.zulu-8u242-jre-headless-tools
 create mode 100644 docker/debian10/Dockerfile.zulu-8u252-jre-headless-tools
 create mode 100644 docker/debian10/Dockerfile.zulu-8u262-jre-headless-tools

diff --git a/docker/debian10/Dockerfile.zulu-11u6-jre-headless-tools b/docker/debian10/Dockerfile.zulu-11u6-jre-headless-tools
new file mode 100644
index 00000000..0868b871
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u6-jre-headless-tools
@@ -0,0 +1,31 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u6-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jdk:11u6-zulu-debian10 AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG INSTALL_DIR=/usr/lib/jvm
+ARG JDK_DIR=${INSTALL_DIR}/zulu-11-azure-amd64
+ARG JRE_DIR=${INSTALL_DIR}/zre-hl-11-azure-amd64
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_TOOLS_DIR=${INSTALL_DIR}/zre-hl-tools-11-azure-amd64 && \
+    JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_TOOLS_DIR}
+
+FROM debian:buster
+
+ARG JRE_TOOLS_DIR=/usr/lib/jvm/zre-hl-tools-11-azure-amd64
+COPY --from=stage2 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+
+RUN cd /usr/bin && find ${JRE_TOOLS_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=${JRE_TOOLS_DIR}
diff --git a/docker/debian10/Dockerfile.zulu-11u7-jre-headless-tools b/docker/debian10/Dockerfile.zulu-11u7-jre-headless-tools
new file mode 100644
index 00000000..5e091910
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u7-jre-headless-tools
@@ -0,0 +1,31 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u7-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jdk:11u7-zulu-debian10 AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG INSTALL_DIR=/usr/lib/jvm
+ARG JDK_DIR=${INSTALL_DIR}/zulu-11-azure-amd64
+ARG JRE_DIR=${INSTALL_DIR}/zre-hl-11-azure-amd64
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_TOOLS_DIR=${INSTALL_DIR}/zre-hl-tools-11-azure-amd64 && \
+    JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_TOOLS_DIR}
+
+FROM debian:buster
+
+ARG JRE_TOOLS_DIR=/usr/lib/jvm/zre-hl-tools-11-azure-amd64
+COPY --from=stage2 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+
+RUN cd /usr/bin && find ${JRE_TOOLS_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=${JRE_TOOLS_DIR}
diff --git a/docker/debian10/Dockerfile.zulu-11u8-jre-headless-tools b/docker/debian10/Dockerfile.zulu-11u8-jre-headless-tools
new file mode 100644
index 00000000..143fbe2b
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u8-jre-headless-tools
@@ -0,0 +1,31 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u8-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jdk:11u8-zulu-debian10 AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG INSTALL_DIR=/usr/lib/jvm
+ARG JDK_DIR=${INSTALL_DIR}/zulu-11-azure-amd64
+ARG JRE_DIR=${INSTALL_DIR}/zre-hl-11-azure-amd64
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_TOOLS_DIR=${INSTALL_DIR}/zre-hl-tools-11-azure-amd64 && \
+    JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_TOOLS_DIR}
+
+FROM debian:buster
+
+ARG JRE_TOOLS_DIR=/usr/lib/jvm/zre-hl-tools-11-azure-amd64
+COPY --from=stage2 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+
+RUN cd /usr/bin && find ${JRE_TOOLS_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=${JRE_TOOLS_DIR}
diff --git a/docker/debian10/Dockerfile.zulu-8u242-jre-headless-tools b/docker/debian10/Dockerfile.zulu-8u242-jre-headless-tools
new file mode 100644
index 00000000..fe750d04
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u242-jre-headless-tools
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u242-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u242-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+
+ENV JAVA_HOME=${JRE_DIR}
diff --git a/docker/debian10/Dockerfile.zulu-8u252-jre-headless-tools b/docker/debian10/Dockerfile.zulu-8u252-jre-headless-tools
new file mode 100644
index 00000000..c4e9531e
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u252-jre-headless-tools
@@ -0,0 +1,22 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u252-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u252-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+
+ENV JAVA_HOME=${JRE_DIR}
diff --git a/docker/debian10/Dockerfile.zulu-8u262-jre-headless-tools b/docker/debian10/Dockerfile.zulu-8u262-jre-headless-tools
new file mode 100644
index 00000000..2cc902ae
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u262-jre-headless-tools
@@ -0,0 +1,22 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u262-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u262-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+
+ENV JAVA_HOME=${JRE_DIR}

From d04bec4a132f611891039ac250b2e32e725842ff Mon Sep 17 00:00:00 2001
From: Stanislav Drozdov <sdrozdov@azul.com>
Date: Mon, 20 Jul 2020 20:08:39 +0300
Subject: [PATCH 089/264] New July 2020 release Dockerfiles

---
 docker/alpine/Dockerfile.zulu-11u8-jdk        | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-11u8-jre        | 32 ++++++++++++++
 .../alpine/Dockerfile.zulu-11u8-jre-headless  | 32 ++++++++++++++
 .../Dockerfile.zulu-11u8-jre-headless-tools   | 30 +++++++++++++
 docker/alpine/Dockerfile.zulu-13u4-jdk        | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-13u4-jre        | 30 +++++++++++++
 .../alpine/Dockerfile.zulu-13u4-jre-headless  | 30 +++++++++++++
 .../Dockerfile.zulu-13u4-jre-headless-tools   | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-7u272-jdk       | 42 +++++++++++++++++++
 docker/alpine/Dockerfile.zulu-7u272-jre       | 42 +++++++++++++++++++
 .../alpine/Dockerfile.zulu-7u272-jre-headless | 42 +++++++++++++++++++
 docker/alpine/Dockerfile.zulu-8u262-jdk       | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-8u262-jre       | 32 ++++++++++++++
 .../alpine/Dockerfile.zulu-8u262-jre-headless | 32 ++++++++++++++
 .../Dockerfile.zulu-8u262-jre-headless-tools  | 32 ++++++++++++++
 docker/centos/Dockerfile.zulu-11u8-jdk        | 17 ++++++++
 docker/centos/Dockerfile.zulu-11u8-jre        | 17 ++++++++
 .../centos/Dockerfile.zulu-11u8-jre-headless  | 16 +++++++
 docker/centos/Dockerfile.zulu-13u4-jdk        | 17 ++++++++
 docker/centos/Dockerfile.zulu-13u4-jre        | 17 ++++++++
 .../centos/Dockerfile.zulu-13u4-jre-headless  | 16 +++++++
 docker/centos/Dockerfile.zulu-14u2-jdk        | 17 ++++++++
 docker/centos/Dockerfile.zulu-14u2-jre        | 17 ++++++++
 docker/centos/Dockerfile.zulu-7u272-jdk       | 17 ++++++++
 docker/centos/Dockerfile.zulu-7u272-jre       | 17 ++++++++
 .../centos/Dockerfile.zulu-7u272-jre-headless | 16 +++++++
 docker/centos/Dockerfile.zulu-8u262-jdk       | 17 ++++++++
 docker/centos/Dockerfile.zulu-8u262-jre       | 17 ++++++++
 .../centos/Dockerfile.zulu-8u262-jre-headless | 16 +++++++
 docker/debian10/Dockerfile.zulu-11u8-jdk      | 21 ++++++++++
 docker/debian10/Dockerfile.zulu-11u8-jre      | 21 ++++++++++
 .../Dockerfile.zulu-11u8-jre-headless         | 21 ++++++++++
 docker/debian10/Dockerfile.zulu-13u4-jdk      | 21 ++++++++++
 docker/debian10/Dockerfile.zulu-13u4-jre      | 21 ++++++++++
 .../Dockerfile.zulu-13u4-jre-headless         | 21 ++++++++++
 docker/debian10/Dockerfile.zulu-14u2-jdk      | 21 ++++++++++
 docker/debian10/Dockerfile.zulu-14u2-jre      | 21 ++++++++++
 docker/debian10/Dockerfile.zulu-7u272-jdk     | 21 ++++++++++
 docker/debian10/Dockerfile.zulu-7u272-jre     | 21 ++++++++++
 .../Dockerfile.zulu-7u272-jre-headless        | 21 ++++++++++
 docker/debian10/Dockerfile.zulu-8u262-jdk     | 21 ++++++++++
 docker/debian10/Dockerfile.zulu-8u262-jre     | 21 ++++++++++
 .../Dockerfile.zulu-8u262-jre-headless        | 21 ++++++++++
 docker/debian10/Dockerfile.zulu-8u262-maven   | 31 ++++++++++++++
 docker/debian9/Dockerfile.zulu-11u8-jdk       | 21 ++++++++++
 docker/debian9/Dockerfile.zulu-11u8-jre       | 21 ++++++++++
 .../debian9/Dockerfile.zulu-11u8-jre-headless | 21 ++++++++++
 docker/debian9/Dockerfile.zulu-13u4-jdk       | 21 ++++++++++
 docker/debian9/Dockerfile.zulu-13u4-jre       | 21 ++++++++++
 .../debian9/Dockerfile.zulu-13u4-jre-headless | 21 ++++++++++
 docker/debian9/Dockerfile.zulu-14u2-jdk       | 21 ++++++++++
 docker/debian9/Dockerfile.zulu-14u2-jre       | 21 ++++++++++
 docker/debian9/Dockerfile.zulu-7u272-jdk      | 21 ++++++++++
 docker/debian9/Dockerfile.zulu-7u272-jre      | 21 ++++++++++
 .../Dockerfile.zulu-7u272-jre-headless        | 21 ++++++++++
 docker/debian9/Dockerfile.zulu-8u262-jdk      | 21 ++++++++++
 docker/debian9/Dockerfile.zulu-8u262-jre      | 21 ++++++++++
 .../Dockerfile.zulu-8u262-jre-headless        | 21 ++++++++++
 docker/debian9/Dockerfile.zulu-8u262-maven    | 31 ++++++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-11u8-jdk  | 21 ++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-11u8-jre  | 21 ++++++++++
 .../Dockerfile.zulu-11u8-jre-headless         | 21 ++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-13u4-jdk  | 21 ++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-13u4-jre  | 21 ++++++++++
 .../Dockerfile.zulu-13u4-jre-headless         | 21 ++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-14u2-jdk  | 21 ++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-14u2-jre  | 21 ++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-7u272-jdk | 21 ++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-7u272-jre | 21 ++++++++++
 .../Dockerfile.zulu-7u272-jre-headless        | 21 ++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-8u262-jdk | 21 ++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-8u262-jre | 21 ++++++++++
 .../Dockerfile.zulu-8u262-jre-headless        | 21 ++++++++++
 docker/ubuntu/Dockerfile.zulu-11u8-jdk        | 21 ++++++++++
 docker/ubuntu/Dockerfile.zulu-11u8-jre        | 21 ++++++++++
 .../ubuntu/Dockerfile.zulu-11u8-jre-headless  | 21 ++++++++++
 docker/ubuntu/Dockerfile.zulu-13u4-jdk        | 21 ++++++++++
 docker/ubuntu/Dockerfile.zulu-13u4-jre        | 21 ++++++++++
 .../ubuntu/Dockerfile.zulu-13u4-jre-headless  | 21 ++++++++++
 docker/ubuntu/Dockerfile.zulu-14u2-jdk        | 21 ++++++++++
 docker/ubuntu/Dockerfile.zulu-14u2-jre        | 21 ++++++++++
 docker/ubuntu/Dockerfile.zulu-7u272-jdk       | 21 ++++++++++
 docker/ubuntu/Dockerfile.zulu-7u272-jre       | 21 ++++++++++
 .../ubuntu/Dockerfile.zulu-7u272-jre-headless | 21 ++++++++++
 docker/ubuntu/Dockerfile.zulu-8u262-jdk       | 21 ++++++++++
 docker/ubuntu/Dockerfile.zulu-8u262-jre       | 21 ++++++++++
 .../ubuntu/Dockerfile.zulu-8u262-jre-headless | 21 ++++++++++
 .../Dockerfile.zulu-11u8-jdk                  | 16 +++++++
 .../Dockerfile.zulu-11u8-jre                  | 16 +++++++
 .../Dockerfile.zulu-13u4-jdk                  | 16 +++++++
 .../Dockerfile.zulu-13u4-jre                  | 16 +++++++
 .../Dockerfile.zulu-14u2-jdk                  | 16 +++++++
 .../Dockerfile.zulu-14u2-jre                  | 16 +++++++
 .../Dockerfile.zulu-7u272-jdk                 | 16 +++++++
 .../Dockerfile.zulu-7u272-jre                 | 16 +++++++
 .../Dockerfile.zulu-8u262-jdk                 | 16 +++++++
 .../Dockerfile.zulu-8u262-jre                 | 16 +++++++
 97 files changed, 2136 insertions(+)
 create mode 100644 docker/alpine/Dockerfile.zulu-11u8-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-11u8-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-11u8-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-11u8-jre-headless-tools
 create mode 100644 docker/alpine/Dockerfile.zulu-13u4-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-13u4-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-13u4-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-13u4-jre-headless-tools
 create mode 100644 docker/alpine/Dockerfile.zulu-7u272-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-7u272-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-7u272-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-8u262-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-8u262-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-8u262-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-8u262-jre-headless-tools
 create mode 100644 docker/centos/Dockerfile.zulu-11u8-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-11u8-jre
 create mode 100644 docker/centos/Dockerfile.zulu-11u8-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-13u4-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-13u4-jre
 create mode 100644 docker/centos/Dockerfile.zulu-13u4-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-14u2-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-14u2-jre
 create mode 100644 docker/centos/Dockerfile.zulu-7u272-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-7u272-jre
 create mode 100644 docker/centos/Dockerfile.zulu-7u272-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-8u262-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-8u262-jre
 create mode 100644 docker/centos/Dockerfile.zulu-8u262-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-11u8-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-11u8-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-11u8-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-13u4-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-13u4-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-13u4-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-14u2-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-14u2-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-7u272-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-7u272-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-7u272-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-8u262-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-8u262-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-8u262-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-8u262-maven
 create mode 100644 docker/debian9/Dockerfile.zulu-11u8-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-11u8-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-11u8-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-13u4-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-13u4-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-13u4-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-14u2-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-14u2-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-7u272-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-7u272-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-7u272-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-8u262-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-8u262-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-8u262-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-8u262-maven
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-11u8-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-11u8-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-11u8-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-13u4-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-13u4-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-13u4-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-14u2-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-14u2-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u272-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u272-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u272-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u262-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u262-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u262-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u8-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u8-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u8-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-13u4-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-13u4-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-13u4-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-14u2-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-14u2-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-7u272-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-7u272-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-7u272-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u262-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u262-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u262-jre-headless
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-11u8-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-11u8-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-13u4-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-13u4-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-14u2-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-14u2-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-7u272-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-7u272-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-8u262-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-8u262-jre

diff --git a/docker/alpine/Dockerfile.zulu-11u8-jdk b/docker/alpine/Dockerfile.zulu-11u8-jdk
new file mode 100644
index 00000000..82d67faa
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u8-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jdk_11.41.23-11.0.8-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.8/zulu-11-azure-jdk_11.41.23-11.0.8-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-11u8-jre b/docker/alpine/Dockerfile.zulu-11u8-jre
new file mode 100644
index 00000000..c674533a
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u8-jre
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jre_11.41.23-11.0.8-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.8/zulu-11-azure-jre_11.41.23-11.0.8-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-11u8-jre-headless b/docker/alpine/Dockerfile.zulu-11u8-jre-headless
new file mode 100644
index 00000000..979990cb
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u8-jre-headless
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jre-headless_11.41.23-11.0.8-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.8/zulu-11-azure-jre-headless_11.41.23-11.0.8-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-11u8-jre-headless-tools b/docker/alpine/Dockerfile.zulu-11u8-jre-headless-tools
new file mode 100644
index 00000000..32506ff3
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u8-jre-headless-tools
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jre-headless-tools_11.41.23-11.0.8-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.8/zulu-11-azure-jre-headless-tools_11.41.23-11.0.8-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-13u4-jdk b/docker/alpine/Dockerfile.zulu-13u4-jdk
new file mode 100644
index 00000000..30161982
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u4-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jdk_13.33.25-13.0.4-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.4/zulu-13-azure-jdk_13.33.25-13.0.4-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-13u4-jre b/docker/alpine/Dockerfile.zulu-13u4-jre
new file mode 100644
index 00000000..17cf5264
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u4-jre
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jre_13.33.25-13.0.4-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.4/zulu-13-azure-jre_13.33.25-13.0.4-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-13u4-jre-headless b/docker/alpine/Dockerfile.zulu-13u4-jre-headless
new file mode 100644
index 00000000..35d44c90
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u4-jre-headless
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jre-headless_13.33.25-13.0.4-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.4/zulu-13-azure-jre-headless_13.33.25-13.0.4-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-13u4-jre-headless-tools b/docker/alpine/Dockerfile.zulu-13u4-jre-headless-tools
new file mode 100644
index 00000000..fd90fe89
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u4-jre-headless-tools
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jre-headless-tools_13.33.25-13.0.4-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.4/zulu-13-azure-jre-headless-tools_13.33.25-13.0.4-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-7u272-jdk b/docker/alpine/Dockerfile.zulu-7u272-jdk
new file mode 100644
index 00000000..2ae40fbb
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-7u272-jdk
@@ -0,0 +1,42 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-7-azure-jdk_7.40.0.15-7.0.272-linux_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add binutils ca-certificates wget zstd tar && \
+    apk update && \
+    apk upgrade && \
+    wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+    wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
+    wget -O gcc-libs.tar.zst https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    tar -I zstd -xf gcc-libs.tar.zst -C /tmp && \
+    tar -xJf zlib.tar.xz -C /tmp && \
+    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
+    rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u272/zulu-7-azure-jdk_7.40.0.15-7.0.272-linux_x64.tar.gz && rm /root/.wget-hsts && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-7u272-jre b/docker/alpine/Dockerfile.zulu-7u272-jre
new file mode 100644
index 00000000..af6e02f7
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-7u272-jre
@@ -0,0 +1,42 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-7-azure-jre_7.40.0.15-7.0.272-linux_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add binutils ca-certificates wget zstd tar && \
+    apk update && \
+    apk upgrade && \
+    wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+    wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
+    wget -O gcc-libs.tar.zst https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    tar -I zstd -xf gcc-libs.tar.zst -C /tmp && \
+    tar -xJf zlib.tar.xz -C /tmp && \
+    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
+    rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u272/zulu-7-azure-jre_7.40.0.15-7.0.272-linux_x64.tar.gz && rm /root/.wget-hsts && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-7u272-jre-headless b/docker/alpine/Dockerfile.zulu-7u272-jre-headless
new file mode 100644
index 00000000..2e554a86
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-7u272-jre-headless
@@ -0,0 +1,42 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-7-azure-jre-headless_7.40.0.15-7.0.272-linux_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add binutils ca-certificates wget zstd tar && \
+    apk update && \
+    apk upgrade && \
+    wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+    wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
+    wget -O gcc-libs.tar.zst https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    tar -I zstd -xf gcc-libs.tar.zst -C /tmp && \
+    tar -xJf zlib.tar.xz -C /tmp && \
+    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
+    rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u272/zulu-7-azure-jre-headless_7.40.0.15-7.0.272-linux_x64.tar.gz && rm /root/.wget-hsts && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u262-jdk b/docker/alpine/Dockerfile.zulu-8u262-jdk
new file mode 100644
index 00000000..2a8486d7
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u262-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jdk_8.48.0.49-8.0.262-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u262/zulu-8-azure-jdk_8.48.0.49-8.0.262-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u262-jre b/docker/alpine/Dockerfile.zulu-8u262-jre
new file mode 100644
index 00000000..e01da9be
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u262-jre
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre_8.48.0.49-8.0.262-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u262/zulu-8-azure-jre_8.48.0.49-8.0.262-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u262-jre-headless b/docker/alpine/Dockerfile.zulu-8u262-jre-headless
new file mode 100644
index 00000000..0aacf3d0
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u262-jre-headless
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre-headless_8.48.0.49-8.0.262-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u262/zulu-8-azure-jre-headless_8.48.0.49-8.0.262-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u262-jre-headless-tools b/docker/alpine/Dockerfile.zulu-8u262-jre-headless-tools
new file mode 100644
index 00000000..02785895
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u262-jre-headless-tools
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre-headless-tools_8.48.0.49-8.0.262-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u262/zulu-8-azure-jre-headless-tools_8.48.0.49-8.0.262-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/centos/Dockerfile.zulu-11u8-jdk b/docker/centos/Dockerfile.zulu-11u8-jdk
new file mode 100644
index 00000000..af500310
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u8-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-11-azure-jdk-11.41.23
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure
+
diff --git a/docker/centos/Dockerfile.zulu-11u8-jre b/docker/centos/Dockerfile.zulu-11u8-jre
new file mode 100644
index 00000000..7fa89ccc
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u8-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-11-azure-jre-11.41.23
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure
+
diff --git a/docker/centos/Dockerfile.zulu-11u8-jre-headless b/docker/centos/Dockerfile.zulu-11u8-jre-headless
new file mode 100644
index 00000000..4ccb4e28
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u8-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-11-azure-jre-headless-11.41.23
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure
diff --git a/docker/centos/Dockerfile.zulu-13u4-jdk b/docker/centos/Dockerfile.zulu-13u4-jdk
new file mode 100644
index 00000000..2dfd991e
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-13u4-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-13-azure-jdk-13.33.25
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure
+
diff --git a/docker/centos/Dockerfile.zulu-13u4-jre b/docker/centos/Dockerfile.zulu-13u4-jre
new file mode 100644
index 00000000..e1c90cb7
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-13u4-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-13-azure-jre-13.33.25
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure
+
diff --git a/docker/centos/Dockerfile.zulu-13u4-jre-headless b/docker/centos/Dockerfile.zulu-13u4-jre-headless
new file mode 100644
index 00000000..753f891f
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-13u4-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-13-azure-jre-headless-13.33.25
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure
diff --git a/docker/centos/Dockerfile.zulu-14u2-jdk b/docker/centos/Dockerfile.zulu-14u2-jdk
new file mode 100644
index 00000000..acd9d803
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-14u2-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-14-azure-jdk-14.29.23
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-14-azure
+
diff --git a/docker/centos/Dockerfile.zulu-14u2-jre b/docker/centos/Dockerfile.zulu-14u2-jre
new file mode 100644
index 00000000..7b8343bb
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-14u2-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-14-azure-jre-14.29.23
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-14-azure
+
diff --git a/docker/centos/Dockerfile.zulu-7u272-jdk b/docker/centos/Dockerfile.zulu-7u272-jdk
new file mode 100644
index 00000000..20dd91b6
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-7u272-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-7-azure-jdk-7.40.0.15
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure
+
diff --git a/docker/centos/Dockerfile.zulu-7u272-jre b/docker/centos/Dockerfile.zulu-7u272-jre
new file mode 100644
index 00000000..7dcd78e8
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-7u272-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-7-azure-jre-7.40.0.15
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure
+
diff --git a/docker/centos/Dockerfile.zulu-7u272-jre-headless b/docker/centos/Dockerfile.zulu-7u272-jre-headless
new file mode 100644
index 00000000..1cc74e73
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-7u272-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-7-azure-jre-headless-7.40.0.15
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure
diff --git a/docker/centos/Dockerfile.zulu-8u262-jdk b/docker/centos/Dockerfile.zulu-8u262-jdk
new file mode 100644
index 00000000..515b9f5a
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u262-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-8-azure-jdk-8.48.0.49
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure
+
diff --git a/docker/centos/Dockerfile.zulu-8u262-jre b/docker/centos/Dockerfile.zulu-8u262-jre
new file mode 100644
index 00000000..5e5afbcf
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u262-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-8-azure-jre-8.48.0.49
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure
+
diff --git a/docker/centos/Dockerfile.zulu-8u262-jre-headless b/docker/centos/Dockerfile.zulu-8u262-jre-headless
new file mode 100644
index 00000000..a4d1f132
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u262-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-8-azure-jre-headless-8.48.0.49
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure
diff --git a/docker/debian10/Dockerfile.zulu-11u8-jdk b/docker/debian10/Dockerfile.zulu-11u8-jdk
new file mode 100644
index 00000000..60722165
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u8-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.41+23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u8-jre b/docker/debian10/Dockerfile.zulu-11u8-jre
new file mode 100644
index 00000000..de14eed3
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u8-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.41+23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u8-jre-headless b/docker/debian10/Dockerfile.zulu-11u8-jre-headless
new file mode 100644
index 00000000..53c29edf
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u8-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.41+23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-13u4-jdk b/docker/debian10/Dockerfile.zulu-13u4-jdk
new file mode 100644
index 00000000..5e6ea98a
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-13u4-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.33+25* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-13u4-jre b/docker/debian10/Dockerfile.zulu-13u4-jre
new file mode 100644
index 00000000..f2739c0e
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-13u4-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.33+25* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-13u4-jre-headless b/docker/debian10/Dockerfile.zulu-13u4-jre-headless
new file mode 100644
index 00000000..ea8d8b74
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-13u4-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.33+25* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-14u2-jdk b/docker/debian10/Dockerfile.zulu-14u2-jdk
new file mode 100644
index 00000000..3ce87afa
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-14u2-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-14-azure-jdk=14.29+23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-14-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-14u2-jre b/docker/debian10/Dockerfile.zulu-14u2-jre
new file mode 100644
index 00000000..05deffdb
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-14u2-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-14-azure-jre=14.29+23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-14-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u272-jdk b/docker/debian10/Dockerfile.zulu-7u272-jdk
new file mode 100644
index 00000000..ea89791e
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-7u272-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.40.0.15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u272-jre b/docker/debian10/Dockerfile.zulu-7u272-jre
new file mode 100644
index 00000000..77406a81
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-7u272-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.40.0.15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u272-jre-headless b/docker/debian10/Dockerfile.zulu-7u272-jre-headless
new file mode 100644
index 00000000..6b376089
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-7u272-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.40.0.15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u262-jdk b/docker/debian10/Dockerfile.zulu-8u262-jdk
new file mode 100644
index 00000000..3ffbc564
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u262-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.48.0.49* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u262-jre b/docker/debian10/Dockerfile.zulu-8u262-jre
new file mode 100644
index 00000000..117bf84d
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u262-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.48.0.49* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u262-jre-headless b/docker/debian10/Dockerfile.zulu-8u262-jre-headless
new file mode 100644
index 00000000..a1580929
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u262-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.48.0.49* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u262-maven b/docker/debian10/Dockerfile.zulu-8u262-maven
new file mode 100644
index 00000000..d40fdd60
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u262-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u262-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian9/Dockerfile.zulu-11u8-jdk b/docker/debian9/Dockerfile.zulu-11u8-jdk
new file mode 100644
index 00000000..da753281
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u8-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.41+23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u8-jre b/docker/debian9/Dockerfile.zulu-11u8-jre
new file mode 100644
index 00000000..19ed71a4
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u8-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.41+23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u8-jre-headless b/docker/debian9/Dockerfile.zulu-11u8-jre-headless
new file mode 100644
index 00000000..d345153f
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u8-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.41+23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u4-jdk b/docker/debian9/Dockerfile.zulu-13u4-jdk
new file mode 100644
index 00000000..b41121a8
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-13u4-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.33+25* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u4-jre b/docker/debian9/Dockerfile.zulu-13u4-jre
new file mode 100644
index 00000000..48d7f709
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-13u4-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.33+25* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u4-jre-headless b/docker/debian9/Dockerfile.zulu-13u4-jre-headless
new file mode 100644
index 00000000..1fe1f8d6
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-13u4-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.33+25* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-14u2-jdk b/docker/debian9/Dockerfile.zulu-14u2-jdk
new file mode 100644
index 00000000..88a2d07f
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-14u2-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-14-azure-jdk=14.29+23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-14-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-14u2-jre b/docker/debian9/Dockerfile.zulu-14u2-jre
new file mode 100644
index 00000000..b74732e5
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-14u2-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-14-azure-jre=14.29+23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-14-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u272-jdk b/docker/debian9/Dockerfile.zulu-7u272-jdk
new file mode 100644
index 00000000..db866d11
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-7u272-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.40.0.15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u272-jre b/docker/debian9/Dockerfile.zulu-7u272-jre
new file mode 100644
index 00000000..b0bd933c
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-7u272-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.40.0.15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u272-jre-headless b/docker/debian9/Dockerfile.zulu-7u272-jre-headless
new file mode 100644
index 00000000..f634df0a
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-7u272-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.40.0.15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u262-jdk b/docker/debian9/Dockerfile.zulu-8u262-jdk
new file mode 100644
index 00000000..cca1b19c
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u262-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.48.0.49* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u262-jre b/docker/debian9/Dockerfile.zulu-8u262-jre
new file mode 100644
index 00000000..7b41c4c6
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u262-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.48.0.49* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u262-jre-headless b/docker/debian9/Dockerfile.zulu-8u262-jre-headless
new file mode 100644
index 00000000..f4eeb9cd
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u262-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.48.0.49* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u262-maven b/docker/debian9/Dockerfile.zulu-8u262-maven
new file mode 100644
index 00000000..150d9100
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u262-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u262-zulu-debian9
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u8-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-11u8-jdk
new file mode 100644
index 00000000..7eb8b6a1
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u8-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.41+23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u8-jre b/docker/ubuntu-18.04/Dockerfile.zulu-11u8-jre
new file mode 100644
index 00000000..28bf5703
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u8-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.41+23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u8-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-11u8-jre-headless
new file mode 100644
index 00000000..ad4e3175
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u8-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.41+23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u4-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-13u4-jdk
new file mode 100644
index 00000000..b3eff0f4
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u4-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.33+25* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u4-jre b/docker/ubuntu-18.04/Dockerfile.zulu-13u4-jre
new file mode 100644
index 00000000..6648a84c
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u4-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.33+25* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u4-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-13u4-jre-headless
new file mode 100644
index 00000000..95e853a7
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u4-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.33+25* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-14u2-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-14u2-jdk
new file mode 100644
index 00000000..11f3e833
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-14u2-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-14-azure-jdk=14.29+23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-14-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-14u2-jre b/docker/ubuntu-18.04/Dockerfile.zulu-14u2-jre
new file mode 100644
index 00000000..e78814f5
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-14u2-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-14-azure-jre=14.29+23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-14-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u272-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-7u272-jdk
new file mode 100644
index 00000000..7bb75f54
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u272-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.40.0.15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u272-jre b/docker/ubuntu-18.04/Dockerfile.zulu-7u272-jre
new file mode 100644
index 00000000..a9a46b08
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u272-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.40.0.15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u272-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-7u272-jre-headless
new file mode 100644
index 00000000..0d2fb0f1
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u272-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.40.0.15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u262-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-8u262-jdk
new file mode 100644
index 00000000..32c2575a
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u262-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.48.0.49* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u262-jre b/docker/ubuntu-18.04/Dockerfile.zulu-8u262-jre
new file mode 100644
index 00000000..59129c93
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u262-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.48.0.49* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u262-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-8u262-jre-headless
new file mode 100644
index 00000000..74247bac
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u262-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.48.0.49* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u8-jdk b/docker/ubuntu/Dockerfile.zulu-11u8-jdk
new file mode 100644
index 00000000..ebdee2cb
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u8-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.41+23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u8-jre b/docker/ubuntu/Dockerfile.zulu-11u8-jre
new file mode 100644
index 00000000..9fb7903f
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u8-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.41+23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u8-jre-headless b/docker/ubuntu/Dockerfile.zulu-11u8-jre-headless
new file mode 100644
index 00000000..a7e7900a
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u8-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.41+23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u4-jdk b/docker/ubuntu/Dockerfile.zulu-13u4-jdk
new file mode 100644
index 00000000..897e7811
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-13u4-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.33+25* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u4-jre b/docker/ubuntu/Dockerfile.zulu-13u4-jre
new file mode 100644
index 00000000..6c5b1727
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-13u4-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.33+25* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u4-jre-headless b/docker/ubuntu/Dockerfile.zulu-13u4-jre-headless
new file mode 100644
index 00000000..e7f3e8d2
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-13u4-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.33+25* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-14u2-jdk b/docker/ubuntu/Dockerfile.zulu-14u2-jdk
new file mode 100644
index 00000000..8cfbfc02
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-14u2-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-14-azure-jdk=14.29+23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-14-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-14u2-jre b/docker/ubuntu/Dockerfile.zulu-14u2-jre
new file mode 100644
index 00000000..e7b919eb
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-14u2-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-14-azure-jre=14.29+23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-14-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u272-jdk b/docker/ubuntu/Dockerfile.zulu-7u272-jdk
new file mode 100644
index 00000000..cf6a6441
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-7u272-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.40.0.15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u272-jre b/docker/ubuntu/Dockerfile.zulu-7u272-jre
new file mode 100644
index 00000000..1233ea93
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-7u272-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.40.0.15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u272-jre-headless b/docker/ubuntu/Dockerfile.zulu-7u272-jre-headless
new file mode 100644
index 00000000..ce1846e1
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-7u272-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.40.0.15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u262-jdk b/docker/ubuntu/Dockerfile.zulu-8u262-jdk
new file mode 100644
index 00000000..db86f107
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u262-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.48.0.49* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u262-jre b/docker/ubuntu/Dockerfile.zulu-8u262-jre
new file mode 100644
index 00000000..8e192c2c
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u262-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.48.0.49* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u262-jre-headless b/docker/ubuntu/Dockerfile.zulu-8u262-jre-headless
new file mode 100644
index 00000000..ce03f81e
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u262-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.48.0.49* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/windowsservercore/Dockerfile.zulu-11u8-jdk b/docker/windowsservercore/Dockerfile.zulu-11u8-jdk
new file mode 100644
index 00000000..5c1f0842
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-11u8-jdk
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-11-azure-jdk_11.41.23-11.0.8-win_x64.msi && \
+    setx PACKAGE_DIR zulu-11/11.0.8 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-11"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-11u8-jre b/docker/windowsservercore/Dockerfile.zulu-11u8-jre
new file mode 100644
index 00000000..b73daa90
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-11u8-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-11-azure-jre_11.41.23-11.0.8-win_x64.msi && \
+    setx PACKAGE_DIR zulu-11/11.0.8 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-11"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-13u4-jdk b/docker/windowsservercore/Dockerfile.zulu-13u4-jdk
new file mode 100644
index 00000000..82fdb167
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-13u4-jdk
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-13-azure-jdk_13.33.25-13.0.4-win_x64.msi && \
+    setx PACKAGE_DIR zulu-13/13.0.4 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-13"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-13u4-jre b/docker/windowsservercore/Dockerfile.zulu-13u4-jre
new file mode 100644
index 00000000..3bafcbaa
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-13u4-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-13-azure-jre_13.33.25-13.0.4-win_x64.msi && \
+    setx PACKAGE_DIR zulu-13/13.0.4 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-13"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-14u2-jdk b/docker/windowsservercore/Dockerfile.zulu-14u2-jdk
new file mode 100644
index 00000000..2ec6dba6
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-14u2-jdk
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-14-azure-jdk_14.29.23-14.0.2-win_x64.msi && \
+    setx PACKAGE_DIR zulu-14/14.0.2 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-14"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-14u2-jre b/docker/windowsservercore/Dockerfile.zulu-14u2-jre
new file mode 100644
index 00000000..3a2408f5
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-14u2-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-14-azure-jre_14.29.23-14.0.2-win_x64.msi && \
+    setx PACKAGE_DIR zulu-14/14.0.2 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-14"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-7u272-jdk b/docker/windowsservercore/Dockerfile.zulu-7u272-jdk
new file mode 100644
index 00000000..ffca88d7
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-7u272-jdk
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-7-azure-jdk_7.40.0.15-7.0.272-win_x64.msi && \
+    setx PACKAGE_DIR zulu-7/7u272 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-7"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-7u272-jre b/docker/windowsservercore/Dockerfile.zulu-7u272-jre
new file mode 100644
index 00000000..6e45e878
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-7u272-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-7-azure-jre_7.40.0.15-7.0.272-win_x64.msi && \
+    setx PACKAGE_DIR zulu-7/7u272 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-7"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-8u262-jdk b/docker/windowsservercore/Dockerfile.zulu-8u262-jdk
new file mode 100644
index 00000000..68ed9b1f
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-8u262-jdk
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-8-azure-jdk_8.48.0.49-8.0.262-win_x64.msi && \
+    setx PACKAGE_DIR zulu-8/8u262 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-8"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-8u262-jre b/docker/windowsservercore/Dockerfile.zulu-8u262-jre
new file mode 100644
index 00000000..ea23740c
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-8u262-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-8-azure-jre_8.48.0.49-8.0.262-win_x64.msi && \
+    setx PACKAGE_DIR zulu-8/8u262 && \
+    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-8"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%

From 63a3ecceaea190da11f36c0b162b8ebd8f8cbbb6 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 21 Jul 2020 09:16:41 -0500
Subject: [PATCH 090/264] Added Dockerfile for Zulu 11u8 and Maven

---
 docker/debian9/Dockerfile.zulu-11u8-jdk-maven | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 docker/debian9/Dockerfile.zulu-11u8-jdk-maven

diff --git a/docker/debian9/Dockerfile.zulu-11u8-jdk-maven b/docker/debian9/Dockerfile.zulu-11u8-jdk-maven
new file mode 100644
index 00000000..da593ac4
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u8-jdk-maven
@@ -0,0 +1,30 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+ 
+FROM mcr.microsoft.com/java/jdk:11u8-zulu-debian9
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+ 
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+ 
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+ 
+ENV MAVEN_HOME /usr/share/maven
+ 
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+ 
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]

From 9bbe6f552f304ca99531e8c8a000ead4ff4e3ba0 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 21 Jul 2020 09:17:21 -0500
Subject: [PATCH 091/264] Added Dockerfile for Zulu 11u8 and Maven

---
 .../debian10/Dockerfile.zulu-11u8-jdk-maven   | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 docker/debian10/Dockerfile.zulu-11u8-jdk-maven

diff --git a/docker/debian10/Dockerfile.zulu-11u8-jdk-maven b/docker/debian10/Dockerfile.zulu-11u8-jdk-maven
new file mode 100644
index 00000000..f6d322c1
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u8-jdk-maven
@@ -0,0 +1,30 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+ 
+FROM mcr.microsoft.com/java/jdk:11u8-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+ 
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+ 
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+ 
+ENV MAVEN_HOME /usr/share/maven
+ 
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+ 
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]

From 0b6f8a1c8c8a299fc6655ae337fc3f8332531d3f Mon Sep 17 00:00:00 2001
From: Stanislav Drozdov <sdrozdov@azul.com>
Date: Wed, 29 Jul 2020 13:48:44 +0300
Subject: [PATCH 092/264] fixed JAVA_HOME for windowsservercore

---
 docker/windowsservercore/Dockerfile.zulu-11u8-jre  | 2 +-
 docker/windowsservercore/Dockerfile.zulu-13u4-jre  | 2 +-
 docker/windowsservercore/Dockerfile.zulu-14u2-jre  | 2 +-
 docker/windowsservercore/Dockerfile.zulu-7u272-jre | 2 +-
 docker/windowsservercore/Dockerfile.zulu-8u262-jre | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker/windowsservercore/Dockerfile.zulu-11u8-jre b/docker/windowsservercore/Dockerfile.zulu-11u8-jre
index b73daa90..aed4630b 100644
--- a/docker/windowsservercore/Dockerfile.zulu-11u8-jre
+++ b/docker/windowsservercore/Dockerfile.zulu-11u8-jre
@@ -9,7 +9,7 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN setx PACKAGE zulu-11-azure-jre_11.41.23-11.0.8-win_x64.msi && \
     setx PACKAGE_DIR zulu-11/11.0.8 && \
-    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-11"
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-11-jre"
 
 RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
 RUN msiexec /quiet /i C:\%PACKAGE% && \
diff --git a/docker/windowsservercore/Dockerfile.zulu-13u4-jre b/docker/windowsservercore/Dockerfile.zulu-13u4-jre
index 3bafcbaa..4cd50ca8 100644
--- a/docker/windowsservercore/Dockerfile.zulu-13u4-jre
+++ b/docker/windowsservercore/Dockerfile.zulu-13u4-jre
@@ -9,7 +9,7 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN setx PACKAGE zulu-13-azure-jre_13.33.25-13.0.4-win_x64.msi && \
     setx PACKAGE_DIR zulu-13/13.0.4 && \
-    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-13"
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-13-jre"
 
 RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
 RUN msiexec /quiet /i C:\%PACKAGE% && \
diff --git a/docker/windowsservercore/Dockerfile.zulu-14u2-jre b/docker/windowsservercore/Dockerfile.zulu-14u2-jre
index 3a2408f5..b397257d 100644
--- a/docker/windowsservercore/Dockerfile.zulu-14u2-jre
+++ b/docker/windowsservercore/Dockerfile.zulu-14u2-jre
@@ -9,7 +9,7 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN setx PACKAGE zulu-14-azure-jre_14.29.23-14.0.2-win_x64.msi && \
     setx PACKAGE_DIR zulu-14/14.0.2 && \
-    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-14"
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-14-jre"
 
 RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
 RUN msiexec /quiet /i C:\%PACKAGE% && \
diff --git a/docker/windowsservercore/Dockerfile.zulu-7u272-jre b/docker/windowsservercore/Dockerfile.zulu-7u272-jre
index 6e45e878..bbc132fd 100644
--- a/docker/windowsservercore/Dockerfile.zulu-7u272-jre
+++ b/docker/windowsservercore/Dockerfile.zulu-7u272-jre
@@ -9,7 +9,7 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN setx PACKAGE zulu-7-azure-jre_7.40.0.15-7.0.272-win_x64.msi && \
     setx PACKAGE_DIR zulu-7/7u272 && \
-    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-7"
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-7-jre"
 
 RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
 RUN msiexec /quiet /i C:\%PACKAGE% && \
diff --git a/docker/windowsservercore/Dockerfile.zulu-8u262-jre b/docker/windowsservercore/Dockerfile.zulu-8u262-jre
index ea23740c..0133a12c 100644
--- a/docker/windowsservercore/Dockerfile.zulu-8u262-jre
+++ b/docker/windowsservercore/Dockerfile.zulu-8u262-jre
@@ -7,9 +7,9 @@
 FROM microsoft/windowsservercore:ltsc2016
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN setx PACKAGE zulu-8-azure-jre_8.48.0.49-8.0.262-win_x64.msi && \
+RUN setx PACKAGE zulu-8-azure-jre_8.48.0.51-8.0.262-win_x64.msi && \
     setx PACKAGE_DIR zulu-8/8u262 && \
-    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-8"
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-8-jre"
 
 RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
 RUN msiexec /quiet /i C:\%PACKAGE% && \

From 19437db1e4b4661ef9e68109fb8e25fd8fab04df Mon Sep 17 00:00:00 2001
From: Stanislav Drozdov <sdrozdov@azul.com>
Date: Mon, 10 Aug 2020 14:34:41 +0300
Subject: [PATCH 093/264] added 8u265 dockerfiles

---
 docker/alpine/Dockerfile.zulu-8u265-jdk       | 32 +++++++++++++++++++
 docker/alpine/Dockerfile.zulu-8u265-jre       | 32 +++++++++++++++++++
 .../alpine/Dockerfile.zulu-8u265-jre-headless | 32 +++++++++++++++++++
 .../Dockerfile.zulu-8u265-jre-headless-tools  | 32 +++++++++++++++++++
 docker/centos/Dockerfile.zulu-8u265-jdk       | 17 ++++++++++
 docker/centos/Dockerfile.zulu-8u265-jre       | 17 ++++++++++
 .../centos/Dockerfile.zulu-8u265-jre-headless | 16 ++++++++++
 docker/debian10/Dockerfile.zulu-8u265-jdk     | 21 ++++++++++++
 docker/debian10/Dockerfile.zulu-8u265-jre     | 21 ++++++++++++
 .../Dockerfile.zulu-8u265-jre-headless        | 21 ++++++++++++
 .../Dockerfile.zulu-8u265-jre-headless-tools  | 27 ++++++++++++++++
 docker/debian10/Dockerfile.zulu-8u265-maven   | 31 ++++++++++++++++++
 docker/debian9/Dockerfile.zulu-8u265-jdk      | 21 ++++++++++++
 docker/debian9/Dockerfile.zulu-8u265-jre      | 21 ++++++++++++
 .../Dockerfile.zulu-8u265-jre-headless        | 21 ++++++++++++
 docker/debian9/Dockerfile.zulu-8u265-maven    | 31 ++++++++++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-8u265-jdk | 21 ++++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-8u265-jre | 21 ++++++++++++
 .../Dockerfile.zulu-8u265-jre-headless        | 21 ++++++++++++
 docker/ubuntu/Dockerfile.zulu-8u265-jdk       | 21 ++++++++++++
 docker/ubuntu/Dockerfile.zulu-8u265-jre       | 21 ++++++++++++
 .../ubuntu/Dockerfile.zulu-8u265-jre-headless | 21 ++++++++++++
 .../Dockerfile.zulu-8u265-jdk                 | 16 ++++++++++
 .../Dockerfile.zulu-8u265-jre                 | 16 ++++++++++
 24 files changed, 551 insertions(+)
 create mode 100644 docker/alpine/Dockerfile.zulu-8u265-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-8u265-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-8u265-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-8u265-jre-headless-tools
 create mode 100644 docker/centos/Dockerfile.zulu-8u265-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-8u265-jre
 create mode 100644 docker/centos/Dockerfile.zulu-8u265-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-8u265-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-8u265-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-8u265-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-8u265-jre-headless-tools
 create mode 100644 docker/debian10/Dockerfile.zulu-8u265-maven
 create mode 100644 docker/debian9/Dockerfile.zulu-8u265-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-8u265-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-8u265-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-8u265-maven
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u265-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u265-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u265-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u265-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u265-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u265-jre-headless
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-8u265-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-8u265-jre

diff --git a/docker/alpine/Dockerfile.zulu-8u265-jdk b/docker/alpine/Dockerfile.zulu-8u265-jdk
new file mode 100644
index 00000000..d6fcd607
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u265-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jdk_8.48.0.53-8.0.265-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u265/zulu-8-azure-jdk_8.48.0.53-8.0.265-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u265-jre b/docker/alpine/Dockerfile.zulu-8u265-jre
new file mode 100644
index 00000000..70b8250b
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u265-jre
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre_8.48.0.53-8.0.265-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u265/zulu-8-azure-jre_8.48.0.53-8.0.265-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u265-jre-headless b/docker/alpine/Dockerfile.zulu-8u265-jre-headless
new file mode 100644
index 00000000..a0bb7f57
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u265-jre-headless
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre-headless_8.48.0.53-8.0.265-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u265/zulu-8-azure-jre-headless_8.48.0.53-8.0.265-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u265-jre-headless-tools b/docker/alpine/Dockerfile.zulu-8u265-jre-headless-tools
new file mode 100644
index 00000000..a8dcb570
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u265-jre-headless-tools
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre-headless-tools_8.48.0.53-8.0.265-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u265/zulu-8-azure-jre-headless-tools_8.48.0.53-8.0.265-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/centos/Dockerfile.zulu-8u265-jdk b/docker/centos/Dockerfile.zulu-8u265-jdk
new file mode 100644
index 00000000..59b3500a
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u265-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-8-azure-jdk-8.48.0.53
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure
+
diff --git a/docker/centos/Dockerfile.zulu-8u265-jre b/docker/centos/Dockerfile.zulu-8u265-jre
new file mode 100644
index 00000000..ad7da254
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u265-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-8-azure-jre-8.48.0.53
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure
+
diff --git a/docker/centos/Dockerfile.zulu-8u265-jre-headless b/docker/centos/Dockerfile.zulu-8u265-jre-headless
new file mode 100644
index 00000000..055b316c
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u265-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-8-azure-jre-headless-8.48.0.53
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure
diff --git a/docker/debian10/Dockerfile.zulu-8u265-jdk b/docker/debian10/Dockerfile.zulu-8u265-jdk
new file mode 100644
index 00000000..62993e70
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u265-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.48.0.53* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u265-jre b/docker/debian10/Dockerfile.zulu-8u265-jre
new file mode 100644
index 00000000..c27cba10
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u265-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.48.0.53* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u265-jre-headless b/docker/debian10/Dockerfile.zulu-8u265-jre-headless
new file mode 100644
index 00000000..04fdb01b
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u265-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.48.0.53* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u265-jre-headless-tools b/docker/debian10/Dockerfile.zulu-8u265-jre-headless-tools
new file mode 100644
index 00000000..123314bc
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u265-jre-headless-tools
@@ -0,0 +1,27 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG ZULU_DIR=zulu-8-azure-jre-headless-tools_8.48.0.53-8.0.265-linux_musl_x64
+ARG ZULU_PACK=$ZULU_DIR.tar.gz
+ARG INSTALL_DIR=/usr/lib/jvm
+ARG BIN_DIR=/usr/bin
+ARG MAN_DIR=/usr/share/man/man1
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install ca-certificates curl musl && \
+    mkdir -p ${INSTALL_DIR} && \
+    curl -o /tmp/${ZULU_PACK} https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u265/zulu-8-azure-jre-headless-tools_8.48.0.53-8.0.265-linux_musl_x64.tar.gz && \
+    tar -xf /tmp/${ZULU_PACK} -C ${INSTALL_DIR} && rm -f /tmp/${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \; && \
+    rm -rf /var/lib/apt/lists/* /tmp/*
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-jre-headless-tools_8.48.0.53-8.0.265-linux_musl_x64
diff --git a/docker/debian10/Dockerfile.zulu-8u265-maven b/docker/debian10/Dockerfile.zulu-8u265-maven
new file mode 100644
index 00000000..f62cdeab
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u265-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u265-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian9/Dockerfile.zulu-8u265-jdk b/docker/debian9/Dockerfile.zulu-8u265-jdk
new file mode 100644
index 00000000..a5af72f5
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u265-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.48.0.53* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u265-jre b/docker/debian9/Dockerfile.zulu-8u265-jre
new file mode 100644
index 00000000..c9450773
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u265-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.48.0.53* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u265-jre-headless b/docker/debian9/Dockerfile.zulu-8u265-jre-headless
new file mode 100644
index 00000000..dedef906
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u265-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.48.0.53* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u265-maven b/docker/debian9/Dockerfile.zulu-8u265-maven
new file mode 100644
index 00000000..4feeaf60
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u265-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u265-zulu-debian9
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u265-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-8u265-jdk
new file mode 100644
index 00000000..9e244435
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u265-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.48.0.53* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u265-jre b/docker/ubuntu-18.04/Dockerfile.zulu-8u265-jre
new file mode 100644
index 00000000..63d33333
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u265-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.48.0.53* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u265-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-8u265-jre-headless
new file mode 100644
index 00000000..6325d707
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u265-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.48.0.53* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u265-jdk b/docker/ubuntu/Dockerfile.zulu-8u265-jdk
new file mode 100644
index 00000000..c82adffd
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u265-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.48.0.53* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u265-jre b/docker/ubuntu/Dockerfile.zulu-8u265-jre
new file mode 100644
index 00000000..bc730fc6
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u265-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.48.0.53* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u265-jre-headless b/docker/ubuntu/Dockerfile.zulu-8u265-jre-headless
new file mode 100644
index 00000000..11ef1b3c
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u265-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.48.0.53* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/windowsservercore/Dockerfile.zulu-8u265-jdk b/docker/windowsservercore/Dockerfile.zulu-8u265-jdk
new file mode 100644
index 00000000..8b4996c0
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-8u265-jdk
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-8-azure-jdk_8.48.0.53-8.0.265-win_x64.msi && \
+    setx PACKAGE_DIR zulu-8/8u265 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-8"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-8u265-jre b/docker/windowsservercore/Dockerfile.zulu-8u265-jre
new file mode 100644
index 00000000..78821414
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-8u265-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-8-azure-jre_8.48.0.53-8.0.265-win_x64.msi && \
+    setx PACKAGE_DIR zulu-8/8u265 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-8-jre"
+
+RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%

From da3f35d044731ca5f782b6b58165a70ed44daa43 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 17 Aug 2020 11:11:16 -0500
Subject: [PATCH 094/264] Fixed Dockerfile.zulu-8u265-jre-headless-tools

---
 .../Dockerfile.zulu-8u265-jre-headless-tools  | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/docker/debian10/Dockerfile.zulu-8u265-jre-headless-tools b/docker/debian10/Dockerfile.zulu-8u265-jre-headless-tools
index 123314bc..ebb12557 100644
--- a/docker/debian10/Dockerfile.zulu-8u265-jre-headless-tools
+++ b/docker/debian10/Dockerfile.zulu-8u265-jre-headless-tools
@@ -4,24 +4,19 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM debian:buster
+FROM mcr.microsoft.com/java/jdk:8u265-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u265-zulu-debian10
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-ARG ZULU_DIR=zulu-8-azure-jre-headless-tools_8.48.0.53-8.0.265-linux_musl_x64
-ARG ZULU_PACK=$ZULU_DIR.tar.gz
-ARG INSTALL_DIR=/usr/lib/jvm
-ARG BIN_DIR=/usr/bin
-ARG MAN_DIR=/usr/share/man/man1
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
 
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install ca-certificates curl musl && \
-    mkdir -p ${INSTALL_DIR} && \
-    curl -o /tmp/${ZULU_PACK} https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u265/zulu-8-azure-jre-headless-tools_8.48.0.53-8.0.265-linux_musl_x64.tar.gz && \
-    tar -xf /tmp/${ZULU_PACK} -C ${INSTALL_DIR} && rm -f /tmp/${ZULU_PACK} && \
-    cd ${BIN_DIR} && \
-    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
-    mkdir -p ${MAN_DIR} && \
-    cd ${MAN_DIR} && \
-    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \; && \
-    rm -rf /var/lib/apt/lists/* /tmp/*
-ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-jre-headless-tools_8.48.0.53-8.0.265-linux_musl_x64
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+
+ENV JAVA_HOME=${JRE_DIR}

From 365d1649f50fc27c4bd60be9ca4782e2761bead1 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 1 Sep 2020 08:57:34 -0500
Subject: [PATCH 095/264] Create mvn-entrypoint.sh

---
 docker/debian9/Maven/mvn-entrypoint.sh | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docker/debian9/Maven/mvn-entrypoint.sh

diff --git a/docker/debian9/Maven/mvn-entrypoint.sh b/docker/debian9/Maven/mvn-entrypoint.sh
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/docker/debian9/Maven/mvn-entrypoint.sh
@@ -0,0 +1 @@
+

From d9203608142336be32f72574e7fcd444f1cc8d2a Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 1 Sep 2020 08:58:39 -0500
Subject: [PATCH 096/264] Initial upload

---
 docker/debian9/Maven/mvn-entrypoint.sh   | 38 ++++++++++++++++++++++++
 docker/debian9/Maven/settings-docker.xml |  6 ++++
 2 files changed, 44 insertions(+)
 create mode 100644 docker/debian9/Maven/settings-docker.xml

diff --git a/docker/debian9/Maven/mvn-entrypoint.sh b/docker/debian9/Maven/mvn-entrypoint.sh
index 8b137891..b20bda41 100644
--- a/docker/debian9/Maven/mvn-entrypoint.sh
+++ b/docker/debian9/Maven/mvn-entrypoint.sh
@@ -1 +1,39 @@
+#! /bin/bash -eu
 
+set -o pipefail
+
+# Copy files from /usr/share/maven/ref into ${MAVEN_CONFIG}
+# So the initial ~/.m2 is set with expected content.
+# Don't override, as this is just a reference setup
+copy_reference_file() {
+  local root="${1}"
+  local f="${2%/}"
+  local logfile="${3}"
+  local rel="${f/${root}/}" # path relative to /usr/share/maven/ref/
+  echo "$f" >> "$logfile"
+  echo " $f -> $rel" >> "$logfile"
+  if [[ ! -e ${MAVEN_CONFIG}/${rel} || $f = *.override ]]
+  then
+    echo "copy $rel to ${MAVEN_CONFIG}" >> "$logfile"
+    mkdir -p "${MAVEN_CONFIG}/$(dirname "${rel}")"
+    cp -r "${f}" "${MAVEN_CONFIG}/${rel}";
+  fi;
+}
+
+copy_reference_files() {
+  local log="$MAVEN_CONFIG/copy_reference_file.log"
+
+  if (sh -c "mkdir -p \"$MAVEN_CONFIG\" && touch \"${log}\"" > /dev/null 2>&1)
+  then
+      echo "--- Copying files at $(date)" >> "$log"
+      find /usr/share/maven/ref/ -type f -exec bash -eu -c 'copy_reference_file /usr/share/maven/ref/ "$1" "$2"' _ {} "$log" \;
+  else
+    echo "Can not write to ${log}. Wrong volume permissions? Carrying on ..."
+  fi
+}
+
+export -f copy_reference_file
+copy_reference_files
+unset MAVEN_CONFIG
+
+exec "$@"
diff --git a/docker/debian9/Maven/settings-docker.xml b/docker/debian9/Maven/settings-docker.xml
new file mode 100644
index 00000000..586c587c
--- /dev/null
+++ b/docker/debian9/Maven/settings-docker.xml
@@ -0,0 +1,6 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                      https://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <localRepository>/usr/share/maven/ref/repository</localRepository>
+</settings>

From f4190258b31e6eb8e8f9425aae3b5b2515aa5f72 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 1 Sep 2020 08:59:13 -0500
Subject: [PATCH 097/264] Delete mvn-entrypoint.sh

---
 docker/debian9/mvn-entrypoint.sh | 39 --------------------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 docker/debian9/mvn-entrypoint.sh

diff --git a/docker/debian9/mvn-entrypoint.sh b/docker/debian9/mvn-entrypoint.sh
deleted file mode 100644
index b20bda41..00000000
--- a/docker/debian9/mvn-entrypoint.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/bash -eu
-
-set -o pipefail
-
-# Copy files from /usr/share/maven/ref into ${MAVEN_CONFIG}
-# So the initial ~/.m2 is set with expected content.
-# Don't override, as this is just a reference setup
-copy_reference_file() {
-  local root="${1}"
-  local f="${2%/}"
-  local logfile="${3}"
-  local rel="${f/${root}/}" # path relative to /usr/share/maven/ref/
-  echo "$f" >> "$logfile"
-  echo " $f -> $rel" >> "$logfile"
-  if [[ ! -e ${MAVEN_CONFIG}/${rel} || $f = *.override ]]
-  then
-    echo "copy $rel to ${MAVEN_CONFIG}" >> "$logfile"
-    mkdir -p "${MAVEN_CONFIG}/$(dirname "${rel}")"
-    cp -r "${f}" "${MAVEN_CONFIG}/${rel}";
-  fi;
-}
-
-copy_reference_files() {
-  local log="$MAVEN_CONFIG/copy_reference_file.log"
-
-  if (sh -c "mkdir -p \"$MAVEN_CONFIG\" && touch \"${log}\"" > /dev/null 2>&1)
-  then
-      echo "--- Copying files at $(date)" >> "$log"
-      find /usr/share/maven/ref/ -type f -exec bash -eu -c 'copy_reference_file /usr/share/maven/ref/ "$1" "$2"' _ {} "$log" \;
-  else
-    echo "Can not write to ${log}. Wrong volume permissions? Carrying on ..."
-  fi
-}
-
-export -f copy_reference_file
-copy_reference_files
-unset MAVEN_CONFIG
-
-exec "$@"

From e6dfccca42463ba67ca4f1806c49eea4969631d1 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 1 Sep 2020 08:59:30 -0500
Subject: [PATCH 098/264] Delete settings-docker.xml

---
 docker/debian9/settings-docker.xml | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 docker/debian9/settings-docker.xml

diff --git a/docker/debian9/settings-docker.xml b/docker/debian9/settings-docker.xml
deleted file mode 100644
index 586c587c..00000000
--- a/docker/debian9/settings-docker.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                      https://maven.apache.org/xsd/settings-1.0.0.xsd">
-  <localRepository>/usr/share/maven/ref/repository</localRepository>
-</settings>

From f7598b921cee9de1d661e72274c6b69e02102412 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 1 Sep 2020 09:00:11 -0500
Subject: [PATCH 099/264] Create startup.sh

---
 docker/alpine/Tomcat/startup.sh | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docker/alpine/Tomcat/startup.sh

diff --git a/docker/alpine/Tomcat/startup.sh b/docker/alpine/Tomcat/startup.sh
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/docker/alpine/Tomcat/startup.sh
@@ -0,0 +1 @@
+

From 73901b61a6daa72cf5a036f0f6678d199dd80562 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 1 Sep 2020 09:01:14 -0500
Subject: [PATCH 100/264] Initial upload of Tomcat files

---
 docker/alpine/Tomcat/catalina.properties | 206 +++++++++++++++++++++++
 docker/alpine/Tomcat/logging.properties  |  79 +++++++++
 docker/alpine/Tomcat/server.xml          | 169 +++++++++++++++++++
 docker/alpine/Tomcat/startup.sh          |   5 +
 4 files changed, 459 insertions(+)
 create mode 100644 docker/alpine/Tomcat/catalina.properties
 create mode 100644 docker/alpine/Tomcat/logging.properties
 create mode 100644 docker/alpine/Tomcat/server.xml

diff --git a/docker/alpine/Tomcat/catalina.properties b/docker/alpine/Tomcat/catalina.properties
new file mode 100644
index 00000000..3cbca2fe
--- /dev/null
+++ b/docker/alpine/Tomcat/catalina.properties
@@ -0,0 +1,206 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# List of comma-separated packages that start with or equal this string
+# will cause a security exception to be thrown when
+# passed to checkPackageAccess unless the
+# corresponding RuntimePermission ("accessClassInPackage."+package) has
+# been granted.
+package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,org.apache.tomcat.
+#
+# List of comma-separated packages that start with or equal this string
+# will cause a security exception to be thrown when
+# passed to checkPackageDefinition unless the
+# corresponding RuntimePermission ("defineClassInPackage."+package) has
+# been granted.
+#
+# by default, no packages are restricted for definition, and none of
+# the class loaders supplied with the JDK call checkPackageDefinition.
+#
+package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,\
+org.apache.jasper.,org.apache.naming.,org.apache.tomcat.
+
+#
+#
+# List of comma-separated paths defining the contents of the "common"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
+# If left as blank,the JVM system loader will be used as Catalina's "common"
+# loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+#
+# Note: Values are enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar","/home/tomcat/lib","/home/tomcat/lib/*.jar"
+
+#
+# List of comma-separated paths defining the contents of the "server"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
+# If left as blank, the "common" loader will be used as Catalina's "server"
+# loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+#
+# Note: Values may be enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+server.loader=
+
+#
+# List of comma-separated paths defining the contents of the "shared"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_BASE path or absolute. If left as blank,
+# the "common" loader will be used as Catalina's "shared" loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+# Please note that for single jars, e.g. bar.jar, you need the URL form
+# starting with file:.
+#
+# Note: Values may be enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+shared.loader=
+
+# Default list of JAR files that should not be scanned using the JarScanner
+# functionality. This is typically used to scan JARs for configuration
+# information. JARs that do not contain such information may be excluded from
+# the scan to speed up the scanning process. This is the default list. JARs on
+# this list are excluded from all scans. The list must be a comma separated list
+# of JAR file names.
+# The list of JARs to skip may be over-ridden at a Context level for individual
+# scan types by configuring a JarScanner with a nested JarScanFilter.
+# The JARs listed below include:
+# - Tomcat Bootstrap JARs
+# - Tomcat API JARs
+# - Catalina JARs
+# - Jasper JARs
+# - Tomcat JARs
+# - Common non-Tomcat JARs
+# - Test JARs (JUnit, Cobertura and dependencies)
+tomcat.util.scan.StandardJarScanFilter.jarsToSkip=\
+applicationinsights-*.jar, \
+annotations-api.jar,\
+ant-junit*.jar,\
+ant-launcher.jar,\
+ant.jar,\
+asm-*.jar,\
+aspectj*.jar,\
+bootstrap.jar,\
+catalina-ant.jar,\
+catalina-ha.jar,\
+catalina-storeconfig.jar,\
+catalina-tribes.jar,\
+catalina.jar,\
+cglib-*.jar,\
+cobertura-*.jar,\
+commons-beanutils*.jar,\
+commons-codec*.jar,\
+commons-collections*.jar,\
+commons-daemon.jar,\
+commons-dbcp*.jar,\
+commons-digester*.jar,\
+commons-fileupload*.jar,\
+commons-httpclient*.jar,\
+commons-io*.jar,\
+commons-lang*.jar,\
+commons-logging*.jar,\
+commons-math*.jar,\
+commons-pool*.jar,\
+dom4j-*.jar,\
+easymock-*.jar,\
+ecj-*.jar,\
+el-api.jar,\
+geronimo-spec-jaxrpc*.jar,\
+h2*.jar,\
+hamcrest-*.jar,\
+hibernate*.jar,\
+httpclient*.jar,\
+icu4j-*.jar,\
+jasper-el.jar,\
+jasper.jar,\
+jaspic-api.jar,\
+jaxb-*.jar,\
+jaxen-*.jar,\
+jdom-*.jar,\
+jetty-*.jar,\
+jmx-tools.jar,\
+jmx.jar,\
+jsp-api.jar,\
+jstl.jar,\
+jta*.jar,\
+junit-*.jar,\
+junit.jar,\
+log4j*.jar,\
+mail*.jar,\
+objenesis-*.jar,\
+oraclepki.jar,\
+oro-*.jar,\
+servlet-api-*.jar,\
+servlet-api.jar,\
+slf4j*.jar,\
+taglibs-standard-spec-*.jar,\
+tagsoup-*.jar,\
+tomcat-api.jar,\
+tomcat-coyote.jar,\
+tomcat-dbcp.jar,\
+tomcat-i18n-*.jar,\
+tomcat-jdbc.jar,\
+tomcat-jni.jar,\
+tomcat-juli-adapters.jar,\
+tomcat-juli.jar,\
+tomcat-util-scan.jar,\
+tomcat-util.jar,\
+tomcat-websocket.jar,\
+tools.jar,\
+websocket-api.jar,\
+wsdl4j*.jar,\
+xercesImpl.jar,\
+xml-apis.jar,\
+xmlParserAPIs-*.jar,\
+xmlParserAPIs.jar,\
+xom-*.jar
+
+# Default list of JAR files that should be scanned that overrides the default
+# jarsToSkip list above. This is typically used to include a specific JAR that
+# has been excluded by a broad file name pattern in the jarsToSkip list.
+# The list of JARs to scan may be over-ridden at a Context level for individual
+# scan types by configuring a JarScanner with a nested JarScanFilter.
+tomcat.util.scan.StandardJarScanFilter.jarsToScan=\
+log4j-taglib*.jar,\
+log4j-web*.jar,\
+log4javascript*.jar,\
+slf4j-taglib*.jar
+
+# String cache configuration.
+tomcat.util.buf.StringCache.byte.enabled=true
+#tomcat.util.buf.StringCache.char.enabled=true
+#tomcat.util.buf.StringCache.trainThreshold=500000
+#tomcat.util.buf.StringCache.cacheSize=5000
diff --git a/docker/alpine/Tomcat/logging.properties b/docker/alpine/Tomcat/logging.properties
new file mode 100644
index 00000000..86c3fb0f
--- /dev/null
+++ b/docker/alpine/Tomcat/logging.properties
@@ -0,0 +1,79 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+handlers = 1catalina.org.apache.juli.AsyncFileHandler, 2localhost.org.apache.juli.AsyncFileHandler, 3manager.org.apache.juli.AsyncFileHandler, 4host-manager.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler
+
+.handlers = 1catalina.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+1catalina.org.apache.juli.AsyncFileHandler.level = FINE
+1catalina.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
+1catalina.org.apache.juli.AsyncFileHandler.prefix = catalina.
+1catalina.org.apache.juli.AsyncFileHandler.maxDays = 90
+1catalina.org.apache.juli.AsyncFileHandler.encoding = UTF-8
+
+2localhost.org.apache.juli.AsyncFileHandler.level = FINE
+2localhost.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
+2localhost.org.apache.juli.AsyncFileHandler.prefix = localhost.
+2localhost.org.apache.juli.AsyncFileHandler.maxDays = 90
+2localhost.org.apache.juli.AsyncFileHandler.encoding = UTF-8
+
+3manager.org.apache.juli.AsyncFileHandler.level = FINE
+3manager.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
+3manager.org.apache.juli.AsyncFileHandler.prefix = manager.
+3manager.org.apache.juli.AsyncFileHandler.maxDays = 90
+3manager.org.apache.juli.AsyncFileHandler.encoding = UTF-8
+
+4host-manager.org.apache.juli.AsyncFileHandler.level = FINE
+4host-manager.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
+4host-manager.org.apache.juli.AsyncFileHandler.prefix = host-manager.
+4host-manager.org.apache.juli.AsyncFileHandler.maxDays = 90
+4host-manager.org.apache.juli.AsyncFileHandler.encoding = UTF-8
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter
+java.util.logging.ConsoleHandler.encoding = UTF-8
+
+
+############################################################
+# Facility specific properties.
+# Provides extra control for each logger.
+############################################################
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.AsyncFileHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.AsyncFileHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 4host-manager.org.apache.juli.AsyncFileHandler
+
+# For example, set the org.apache.catalina.util.LifecycleBase logger to log
+# each component that extends LifecycleBase changing state:
+#org.apache.catalina.util.LifecycleBase.level = FINE
+
+# To see debug messages in TldLocationsCache, uncomment the following line:
+#org.apache.jasper.compiler.TldLocationsCache.level = FINE
+
+# To see debug messages for HTTP/2 handling, uncomment the following line:
+#org.apache.coyote.http2.level = FINE
+
+# To see debug messages for WebSocket handling, uncomment the following line:
+#org.apache.tomcat.websocket.level = FINE
\ No newline at end of file
diff --git a/docker/alpine/Tomcat/server.xml b/docker/alpine/Tomcat/server.xml
new file mode 100644
index 00000000..88a00d3e
--- /dev/null
+++ b/docker/alpine/Tomcat/server.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" at this level.
+     Documentation at /docs/config/server.html
+ -->
+<Server port="8005" shutdown="SHUTDOWN">
+  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
+  <!-- Security listener. Documentation at /docs/config/listeners.html
+  <Listener className="org.apache.catalina.security.SecurityListener" />
+  -->
+  <!--APR library loader. Documentation at /docs/apr.html -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+
+  <!-- Global JNDI resources
+       Documentation at /docs/jndi-resources-howto.html
+  -->
+  <GlobalNamingResources>
+    <!-- Editable user database that can also be used by
+         UserDatabaseRealm to authenticate users
+    -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+              description="User database that can be updated and saved"
+              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+              pathname="conf/tomcat-users.xml"
+               />
+  </GlobalNamingResources>
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" Note:  A "Service" is not itself a "Container",
+       so you may not define subcomponents such as "Valves" at this level.
+       Documentation at /docs/config/service.html
+   -->
+  <Service name="Catalina">
+
+    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+    <!--
+    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+        maxThreads="150" minSpareThreads="4"/>
+    -->
+
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned. Documentation at :
+         Java HTTP Connector: /docs/config/http.html
+         Java AJP  Connector: /docs/config/ajp.html
+         APR (HTTP/AJP) Connector: /docs/apr.html
+         Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
+    -->
+    <Connector port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" 
+               URIEncoding="UTF-8"/>
+    <!-- A "Connector" using the shared thread pool-->
+    <!--
+    <Connector executor="tomcatThreadPool"
+               port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" />
+    -->
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
+         This connector uses the NIO implementation. The default
+         SSLImplementation will depend on the presence of the APR/native
+         library and the useOpenSSL attribute of the
+         AprLifecycleListener.
+         Either JSSE or OpenSSL style configuration may be used regardless of
+         the SSLImplementation selected. JSSE style configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+               maxThreads="150" SSLEnabled="true">
+        <SSLHostConfig>
+            <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
+         This connector uses the APR/native implementation which always uses
+         OpenSSL for TLS.
+         Either JSSE or OpenSSL style configuration may be used. OpenSSL style
+         configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
+               maxThreads="150" SSLEnabled="true" >
+        <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
+        <SSLHostConfig>
+            <Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
+                         certificateFile="conf/localhost-rsa-cert.pem"
+                         certificateChainFile="conf/localhost-rsa-chain.pem"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <!-- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" /> -->
+
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host).
+         Documentation at /docs/config/engine.html -->
+
+    <!-- You should set jvmRoute to support load-balancing via AJP ie :
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+    -->
+    <Engine name="Catalina" defaultHost="localhost">
+
+      <!--For clustering, please take a look at documentation at:
+          /docs/cluster-howto.html  (simple how to)
+          /docs/config/cluster.html (reference documentation) -->
+      <!--
+      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+      -->
+
+      <!-- Use the LockOutRealm to prevent attempts to guess user passwords
+           via a brute-force attack -->
+      <Realm className="org.apache.catalina.realm.LockOutRealm">
+        <!-- This Realm uses the UserDatabase configured in the global JNDI
+             resources under the key "UserDatabase".  Any edits
+             that are performed against this UserDatabase are immediately
+             available for use by the Realm.  -->
+        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+               resourceName="UserDatabase"/>
+      </Realm>
+
+      <Host name="localhost"  appBase="webapps"
+            unpackWARs="false" autoDeploy="false">
+
+        <!-- SingleSignOn valve, share authentication between web applications
+             Documentation at: /docs/config/valve.html -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        -->
+
+        <!-- Access log processes all example.
+             Documentation at: /docs/config/valve.html
+             Note: The pattern used is equivalent to using pattern="common" -->
+        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="${log.base}"
+               prefix="localhost_access_log" suffix=".txt"
+               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
+
+      </Host>
+    </Engine>
+  </Service>
+</Server>
diff --git a/docker/alpine/Tomcat/startup.sh b/docker/alpine/Tomcat/startup.sh
index 8b137891..55434530 100644
--- a/docker/alpine/Tomcat/startup.sh
+++ b/docker/alpine/Tomcat/startup.sh
@@ -1 +1,6 @@
+#!/bin/sh
 
+LOG_DIR="${LOG_ROOT}/$(hostname)"
+mkdir -p "${LOG_DIR}"
+export JAVA_OPTS="${JAVA_OPTS} -Dlog.base=${LOG_DIR}"
+/usr/local/tomcat/bin/catalina.sh run

From 426787d0b03dfc702ecb889ad5a2e854a269ab47 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 3 Sep 2020 10:28:41 -0500
Subject: [PATCH 101/264] Upload Dockerfile for Tomcat

---
 docker/alpine/Dockerfile.zulu-8-jdk-tomcat | 49 ++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 docker/alpine/Dockerfile.zulu-8-jdk-tomcat

diff --git a/docker/alpine/Dockerfile.zulu-8-jdk-tomcat b/docker/alpine/Dockerfile.zulu-8-jdk-tomcat
new file mode 100644
index 00000000..dc75c978
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8-jdk-tomcat
@@ -0,0 +1,49 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8-zulu-alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG TOMCAT_VERSION=9.0.31
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+ARG TOMCAT_MAJOR=9
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apk add --update openssh-server bash openrc \
+        && rm -rf /var/cache/apk/* \
+        # Remove unnecessary services
+        && rm -f /etc/init.d/hwdrivers \
+                 /etc/init.d/hwclock \
+                 /etc/init.d/mtab \
+                 /etc/init.d/bootmisc \
+                 /etc/init.d/modules \
+                 /etc/init.d/modules-load \
+                 /etc/init.d/modloop \
+        # Install Tomcat
+        && wget -O /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose \
+        && mkdir /usr/local/tomcat \ 
+        && tar xvzf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 \
+        && rm -f /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz
+       
+COPY Tomcat/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 8080
+
+CMD ["/startup.sh"]

From d6526f510b6308552cd55c931792634f88bcfe46 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 3 Sep 2020 10:30:24 -0500
Subject: [PATCH 102/264] Upload Dockerfile for Wildfly

---
 docker/centos/Dockerfile.zulu-8-jdk-wildfly | 61 +++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 docker/centos/Dockerfile.zulu-8-jdk-wildfly

diff --git a/docker/centos/Dockerfile.zulu-8-jdk-wildfly b/docker/centos/Dockerfile.zulu-8-jdk-wildfly
new file mode 100644
index 00000000..3a2435a5
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8-jdk-wildfly
@@ -0,0 +1,61 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8-zulu-centos
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+# Install packages necessary to run WildFly
+RUN yum update -y && yum -y install bsdtar unzip && yum clean all
+
+# Create a user and group used to launch processes
+# The user ID 1000 is the default for the first "regular" user on Fedora/RHEL,
+# so there is a high chance that this ID will be equal to the current user
+# making it easier to use volumes (no permission issues)
+RUN groupadd -r jboss -g 1000 && useradd -u 1000 -r -g jboss -m -d /opt/jboss -s /sbin/nologin -c "JBoss user" jboss && \
+    chmod 755 /opt/jboss
+
+# Set the working directory to jboss' user home directory
+WORKDIR /opt/jboss
+
+# Specify the user which should be used to execute all commands below
+USER jboss
+
+# Set the WILDFLY_VERSION env variable
+ENV WILDFLY_VERSION 18.0.1.Final
+ENV WILDFLY_SHA1 ef0372589a0f08c36b15360fe7291721a7e3f7d9
+ENV JBOSS_HOME /opt/jboss/wildfly
+
+# Set the root for install
+USER root
+
+# Add the WildFly distribution to /opt, and make wildfly the owner of the extracted tar content
+# Make sure the distribution is available from a well-known place
+
+RUN cd $HOME \
+    && curl -O https://download.jboss.org/wildfly/$WILDFLY_VERSION/wildfly-$WILDFLY_VERSION.tar.gz \
+    && sha1sum wildfly-$WILDFLY_VERSION.tar.gz | grep $WILDFLY_SHA1 \
+    && tar xf wildfly-$WILDFLY_VERSION.tar.gz \
+    && mv $HOME/wildfly-$WILDFLY_VERSION $JBOSS_HOME \
+    && rm wildfly-$WILDFLY_VERSION.tar.gz \
+    && chown -R jboss:0 ${JBOSS_HOME} \
+    && chmod -R g+rw ${JBOSS_HOME}
+
+# Ensure signals are forwarded to the JVM process correctly for graceful shutdown
+ENV LAUNCH_JBOSS_IN_BACKGROUND true
+
+# Set the current user for JBoss process
+USER jboss
+
+# Expose the ports we're interested in
+EXPOSE 8080
+
+# Make Java 8 obey container resource limits, improve performance
+#ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Xms64m -Xmx512m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256M -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Djboss.modules.system.pkgs=org.jboss.byteman"
+
+# Set the default command to run on boot
+# This will boot WildFly in the standalone mode and bind to all interface
+CMD ["/opt/jboss/wildfly/bin/standalone.sh", "-b", "0.0.0.0"]

From ccd2155a7459f6580a8671485a349c88d2a13f38 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 3 Sep 2020 10:31:10 -0500
Subject: [PATCH 103/264] Upload Dockerfile for Wildfly


From 633d3629021da9f2ea7427beff134156c1e1325c Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 4 Sep 2020 16:04:42 -0500
Subject: [PATCH 104/264] Changed About and Further Information sections

---
 README.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 36c7e05b..75338f7f 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,13 @@
 ## About
-These Zulu OpenJDK Dockerfiles are to be used solely with Java applications
-or Java application components that are being developed for deployment on Microsoft
-Azure or Azure Stack, and are not intended to be used for any other purpose.
+These Zulu OpenJDK for Azure Docker images and corresponding Dockerfiles are to be used solely with Java applications or Java application components that are being developed for deployment on Microsoft Azure, Azure Functions (anywhere), Azure Stack, or Microsoft SQL Server and are not intended to be used for any other purpose.
 
 ## Further Information
-+ See [Java SE JDK](https://hub.docker.com/_/microsoft-java-jdk) on Docker Hub for more information.
-+ See [Java SE JRE](https://hub.docker.com/_/microsoft-java-jre) on Docker Hub for more information
-+ See [Java SE Headless JRE](https://hub.docker.com/_/microsoft-java-jre-headless) on Docker Hub for more information.
-+ See [Java SE JDK And Maven](https://hub.docker.com/_/microsoft-java-maven) on Docker Hub for more information.
++ [Java SE JDK](https://hub.docker.com/_/microsoft-java-jdk)
++ [Java SE JRE](https://hub.docker.com/_/microsoft-java-jre)
++ [Java SE Headless JRE](https://hub.docker.com/_/microsoft-java-jre-headless)
++ [Java SE JDK And Maven](https://hub.docker.com/_/microsoft-java-maven)
++ [Java SE JDK And Tomcat](https://hub.docker.com/_/microsoft-java-tomcat)
++ [Java SE JDK And Wildfly](https://hub.docker.com/_/microsoft-java-wildfly)
 
 ## Contributing
 This project welcomes contributions and suggestions.  Most contributions require you to agree to a

From a69cd45f8de9fd2c88cdb9831012ead87d2e18ec Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 4 Sep 2020 16:08:36 -0500
Subject: [PATCH 105/264] Changed About and Further Information sections

---
 README.zulu-jdk.md          | 6 ++----
 README.zulu-jre-headless.md | 6 ++----
 README.zulu-jre.md          | 6 ++----
 README.zulu-maven.md        | 6 ++----
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/README.zulu-jdk.md b/README.zulu-jdk.md
index 30f16056..282ff633 100644
--- a/README.zulu-jdk.md
+++ b/README.zulu-jdk.md
@@ -1,14 +1,12 @@
 ## About
-These Zulu OpenJDK Dockerfiles are to be used solely with Java applications
-or Java application components that are being developed for deployment on Microsoft
-Azure or Azure Stack, and are not intended to be used for any other purpose.
+These Zulu OpenJDK for Azure Docker images and corresponding Dockerfiles are to be used solely with Java applications or Java application components that are being developed for deployment on Microsoft Azure, Azure Functions (anywhere), Azure Stack, or Microsoft SQL Server and are not intended to be used for any other purpose.
 
 ## How To Use
 docker pull mcr.microsoft.com/java/jdk:tag<br>
 docker run --rm -it mcr.microsoft.com/java/jdk:tag
 
 ## Further Information 
-See [Java SE JDK](https://hub.docker.com/_/microsoft-java-jdk) on Docker Hub for more information.
+[Java SE JDK](https://hub.docker.com/_/microsoft-java-jdk)
 
 ## Featured Repos
 https://<span></span>repos.azul.com/azure-only/zulu/yum<br>
diff --git a/README.zulu-jre-headless.md b/README.zulu-jre-headless.md
index 1beb8499..50528a09 100644
--- a/README.zulu-jre-headless.md
+++ b/README.zulu-jre-headless.md
@@ -1,14 +1,12 @@
 ## About
-These Zulu OpenJDK Dockerfiles are to be used solely with Java applications
-or Java application components that are being developed for deployment on Microsoft
-Azure or Azure Stack, and are not intended to be used for any other purpose.
+These Zulu OpenJDK for Azure Docker images and corresponding Dockerfiles are to be used solely with Java applications or Java application components that are being developed for deployment on Microsoft Azure, Azure Functions (anywhere), Azure Stack, or Microsoft SQL Server and are not intended to be used for any other purpose.
 
 ## How To Use
 docker pull mcr.microsoft.com/java/jre-headless:tag<br>
 docker run --rm -it mcr.microsoft.com/java/jre-headless:tag
 
 ## Further Information
-See [Java SE Headless JRE](https://hub.docker.com/_/microsoft-java-jre-headless) on Docker Hub for more information.
+[Java SE Headless JRE](https://hub.docker.com/_/microsoft-java-jre-headless)
 
 ## Featured Repos
 https://<span></span>repos.azul.com/azure-only/zulu/yum<br>
diff --git a/README.zulu-jre.md b/README.zulu-jre.md
index b2add3d3..c904e59d 100644
--- a/README.zulu-jre.md
+++ b/README.zulu-jre.md
@@ -1,14 +1,12 @@
 ## About
-These Zulu OpenJDK Dockerfiles are to be used solely with Java applications
-or Java application components that are being developed for deployment on Microsoft
-Azure or Azure Stack, and are not intended to be used for any other purpose.
+These Zulu OpenJDK for Azure Docker images and corresponding Dockerfiles are to be used solely with Java applications or Java application components that are being developed for deployment on Microsoft Azure, Azure Functions (anywhere), Azure Stack, or Microsoft SQL Server and are not intended to be used for any other purpose.
 
 ## How To Use
 docker pull mcr.microsoft.com/java/jre:tag<br>
 docker run --rm -it mcr.microsoft.com/java/jre:tag
 
 ## Further Information
-See [Java SE JRE](https://hub.docker.com/_/microsoft-java-jre) on Docker Hub for more information.
+[Java SE JRE](https://hub.docker.com/_/microsoft-java-jre)
 
 ## Featured Repos
 https://<span></span>repos.azul.com/azure-only/zulu/yum<br>
diff --git a/README.zulu-maven.md b/README.zulu-maven.md
index bbf8393c..bf17b1f6 100644
--- a/README.zulu-maven.md
+++ b/README.zulu-maven.md
@@ -1,14 +1,12 @@
 ## About
-These Zulu OpenJDK Dockerfiles are to be used solely with Java applications
-or Java application components that are being developed for deployment on Microsoft
-Azure or Azure Stack, and are not intended to be used for any other purpose.
+These Zulu OpenJDK for Azure Docker images and corresponding Dockerfiles are to be used solely with Java applications or Java application components that are being developed for deployment on Microsoft Azure, Azure Functions (anywhere), Azure Stack, or Microsoft SQL Server and are not intended to be used for any other purpose.
 
 ## How To Use
 docker pull mcr.microsoft.com/java/maven:tag<br>
 docker run --rm -it mcr.microsoft.com/java/maven:tag
 
 ## Further Information
-See [Java SE JDK And Maven](https://hub.docker.com/_/microsoft-java-maven) on Docker Hub for more information.
+[Java SE JDK And Maven](https://hub.docker.com/_/microsoft-java-maven)
 
 ## Featured Repos
 https://<span></span>repos.azul.com/azure-only/zulu/yum<br>

From 1bffa4c77c07de53fb4cabcc933518ffc4ccbe40 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 4 Sep 2020 16:12:08 -0500
Subject: [PATCH 106/264] Formatting changes

---
 README.md                   | 12 ++++++------
 README.zulu-jdk.md          |  2 +-
 README.zulu-jre-headless.md |  2 +-
 README.zulu-jre.md          |  2 +-
 README.zulu-maven.md        |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 75338f7f..642a6fac 100644
--- a/README.md
+++ b/README.md
@@ -2,12 +2,12 @@
 These Zulu OpenJDK for Azure Docker images and corresponding Dockerfiles are to be used solely with Java applications or Java application components that are being developed for deployment on Microsoft Azure, Azure Functions (anywhere), Azure Stack, or Microsoft SQL Server and are not intended to be used for any other purpose.
 
 ## Further Information
-+ [Java SE JDK](https://hub.docker.com/_/microsoft-java-jdk)
-+ [Java SE JRE](https://hub.docker.com/_/microsoft-java-jre)
-+ [Java SE Headless JRE](https://hub.docker.com/_/microsoft-java-jre-headless)
-+ [Java SE JDK And Maven](https://hub.docker.com/_/microsoft-java-maven)
-+ [Java SE JDK And Tomcat](https://hub.docker.com/_/microsoft-java-tomcat)
-+ [Java SE JDK And Wildfly](https://hub.docker.com/_/microsoft-java-wildfly)
+* [Java SE JDK](https://hub.docker.com/_/microsoft-java-jdk)
+* [Java SE JRE](https://hub.docker.com/_/microsoft-java-jre)
+* [Java SE Headless JRE](https://hub.docker.com/_/microsoft-java-jre-headless)
+* [Java SE JDK And Maven](https://hub.docker.com/_/microsoft-java-maven)
+* [Java SE JDK And Tomcat](https://hub.docker.com/_/microsoft-java-tomcat)
+* [Java SE JDK And Wildfly](https://hub.docker.com/_/microsoft-java-wildfly)
 
 ## Contributing
 This project welcomes contributions and suggestions.  Most contributions require you to agree to a
diff --git a/README.zulu-jdk.md b/README.zulu-jdk.md
index 282ff633..8aa36b6d 100644
--- a/README.zulu-jdk.md
+++ b/README.zulu-jdk.md
@@ -6,7 +6,7 @@ docker pull mcr.microsoft.com/java/jdk:tag<br>
 docker run --rm -it mcr.microsoft.com/java/jdk:tag
 
 ## Further Information 
-[Java SE JDK](https://hub.docker.com/_/microsoft-java-jdk)
+* [Java SE JDK](https://hub.docker.com/_/microsoft-java-jdk)
 
 ## Featured Repos
 https://<span></span>repos.azul.com/azure-only/zulu/yum<br>
diff --git a/README.zulu-jre-headless.md b/README.zulu-jre-headless.md
index 50528a09..c27e137b 100644
--- a/README.zulu-jre-headless.md
+++ b/README.zulu-jre-headless.md
@@ -6,7 +6,7 @@ docker pull mcr.microsoft.com/java/jre-headless:tag<br>
 docker run --rm -it mcr.microsoft.com/java/jre-headless:tag
 
 ## Further Information
-[Java SE Headless JRE](https://hub.docker.com/_/microsoft-java-jre-headless)
+* [Java SE Headless JRE](https://hub.docker.com/_/microsoft-java-jre-headless)
 
 ## Featured Repos
 https://<span></span>repos.azul.com/azure-only/zulu/yum<br>
diff --git a/README.zulu-jre.md b/README.zulu-jre.md
index c904e59d..ab7f9097 100644
--- a/README.zulu-jre.md
+++ b/README.zulu-jre.md
@@ -6,7 +6,7 @@ docker pull mcr.microsoft.com/java/jre:tag<br>
 docker run --rm -it mcr.microsoft.com/java/jre:tag
 
 ## Further Information
-[Java SE JRE](https://hub.docker.com/_/microsoft-java-jre)
+* [Java SE JRE](https://hub.docker.com/_/microsoft-java-jre)
 
 ## Featured Repos
 https://<span></span>repos.azul.com/azure-only/zulu/yum<br>
diff --git a/README.zulu-maven.md b/README.zulu-maven.md
index bf17b1f6..0465df3c 100644
--- a/README.zulu-maven.md
+++ b/README.zulu-maven.md
@@ -6,7 +6,7 @@ docker pull mcr.microsoft.com/java/maven:tag<br>
 docker run --rm -it mcr.microsoft.com/java/maven:tag
 
 ## Further Information
-[Java SE JDK And Maven](https://hub.docker.com/_/microsoft-java-maven)
+* [Java SE JDK And Maven](https://hub.docker.com/_/microsoft-java-maven)
 
 ## Featured Repos
 https://<span></span>repos.azul.com/azure-only/zulu/yum<br>

From 9afe7b058aed3c4388e72c078667c1c0f25b572e Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 4 Sep 2020 16:17:20 -0500
Subject: [PATCH 107/264] Changed About and Further Information sections

---
 docker/README.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/docker/README.md b/docker/README.md
index c36d88b6..95c7f69e 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -1,9 +1,12 @@
 ## About
-These Zulu OpenJDK Dockerfiles are to be used solely with Java applications
-or Java application components that are being developed for deployment on Microsoft
-Azure or Azure Stack, and are not intended to be used for any other purpose.
+These Zulu OpenJDK for Azure Docker images and corresponding Dockerfiles are to be used solely with Java applications or Java application components that are being developed for deployment on Microsoft Azure, Azure Functions (anywhere), Azure Stack, or Microsoft SQL Server and are not intended to be used for any other purpose.
 
 ## Further Information
+* [Azul Zulu JDK README](/README.zulu-jdk.md)
+* [Azul Zulu JRE README](/README.zulu-jre.md)
+* [Azul Zulu Headless JRE README](/README.zulu-jre-headless.md)
+* [Azul Zulu JDK and Maven README](/README.zulu-maven.md)
+
 * Azul Zulu JDK Readme [(README.zulu-jdk.md)][zulu-jdk]
 * Azul Zulu JRE Readme [(README.zulu-jre.md)][zulu-jre]
 * Azul Zulu Headless JRE Readme [(README.zulu-jre-headless.md)][zulu-jre-headless]

From 97009d36659120e360e1234740cf2b2348f9ee31 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 4 Sep 2020 16:18:43 -0500
Subject: [PATCH 108/264] Changed Further Information section

---
 docker/README.md | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/docker/README.md b/docker/README.md
index 95c7f69e..70cb9500 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -7,16 +7,6 @@ These Zulu OpenJDK for Azure Docker images and corresponding Dockerfiles are to
 * [Azul Zulu Headless JRE README](/README.zulu-jre-headless.md)
 * [Azul Zulu JDK and Maven README](/README.zulu-maven.md)
 
-* Azul Zulu JDK Readme [(README.zulu-jdk.md)][zulu-jdk]
-* Azul Zulu JRE Readme [(README.zulu-jre.md)][zulu-jre]
-* Azul Zulu Headless JRE Readme [(README.zulu-jre-headless.md)][zulu-jre-headless]
-* Azul Zulu JDK And Maven Readme [(README.zulu-maven.md)][zulu-maven]
-
-[zulu-jdk]:/README.zulu-jdk.md
-[zulu-jre]:/README.zulu-jre.md
-[zulu-jre-headless]:/README.zulu-jre-headless.md
-[zulu-maven]:/README.zulu-maven.md
-
 ## Contributing
 This project welcomes contributions and suggestions.  Most contributions require you to agree to a
 Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us

From 5d6f8107e6f83a1f6842002d1785c79fa05d5477 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 14 Sep 2020 12:22:31 -0500
Subject: [PATCH 109/264] Create startup.sh

---
 docker/ubuntu/Tomcat/startup.sh | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docker/ubuntu/Tomcat/startup.sh

diff --git a/docker/ubuntu/Tomcat/startup.sh b/docker/ubuntu/Tomcat/startup.sh
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/docker/ubuntu/Tomcat/startup.sh
@@ -0,0 +1 @@
+

From d3c33191e7901de79d4f021a2008c5c2e4407a33 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 14 Sep 2020 12:23:06 -0500
Subject: [PATCH 110/264] Initial upload

---
 docker/ubuntu/Tomcat/catalina.properties | 206 +++++++++++++++++++++++
 docker/ubuntu/Tomcat/logging.properties  |  79 +++++++++
 docker/ubuntu/Tomcat/server.xml          | 169 +++++++++++++++++++
 docker/ubuntu/Tomcat/startup.sh          |   5 +
 4 files changed, 459 insertions(+)
 create mode 100644 docker/ubuntu/Tomcat/catalina.properties
 create mode 100644 docker/ubuntu/Tomcat/logging.properties
 create mode 100644 docker/ubuntu/Tomcat/server.xml

diff --git a/docker/ubuntu/Tomcat/catalina.properties b/docker/ubuntu/Tomcat/catalina.properties
new file mode 100644
index 00000000..3cbca2fe
--- /dev/null
+++ b/docker/ubuntu/Tomcat/catalina.properties
@@ -0,0 +1,206 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# List of comma-separated packages that start with or equal this string
+# will cause a security exception to be thrown when
+# passed to checkPackageAccess unless the
+# corresponding RuntimePermission ("accessClassInPackage."+package) has
+# been granted.
+package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,org.apache.tomcat.
+#
+# List of comma-separated packages that start with or equal this string
+# will cause a security exception to be thrown when
+# passed to checkPackageDefinition unless the
+# corresponding RuntimePermission ("defineClassInPackage."+package) has
+# been granted.
+#
+# by default, no packages are restricted for definition, and none of
+# the class loaders supplied with the JDK call checkPackageDefinition.
+#
+package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,\
+org.apache.jasper.,org.apache.naming.,org.apache.tomcat.
+
+#
+#
+# List of comma-separated paths defining the contents of the "common"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
+# If left as blank,the JVM system loader will be used as Catalina's "common"
+# loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+#
+# Note: Values are enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar","/home/tomcat/lib","/home/tomcat/lib/*.jar"
+
+#
+# List of comma-separated paths defining the contents of the "server"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
+# If left as blank, the "common" loader will be used as Catalina's "server"
+# loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+#
+# Note: Values may be enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+server.loader=
+
+#
+# List of comma-separated paths defining the contents of the "shared"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_BASE path or absolute. If left as blank,
+# the "common" loader will be used as Catalina's "shared" loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+# Please note that for single jars, e.g. bar.jar, you need the URL form
+# starting with file:.
+#
+# Note: Values may be enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+shared.loader=
+
+# Default list of JAR files that should not be scanned using the JarScanner
+# functionality. This is typically used to scan JARs for configuration
+# information. JARs that do not contain such information may be excluded from
+# the scan to speed up the scanning process. This is the default list. JARs on
+# this list are excluded from all scans. The list must be a comma separated list
+# of JAR file names.
+# The list of JARs to skip may be over-ridden at a Context level for individual
+# scan types by configuring a JarScanner with a nested JarScanFilter.
+# The JARs listed below include:
+# - Tomcat Bootstrap JARs
+# - Tomcat API JARs
+# - Catalina JARs
+# - Jasper JARs
+# - Tomcat JARs
+# - Common non-Tomcat JARs
+# - Test JARs (JUnit, Cobertura and dependencies)
+tomcat.util.scan.StandardJarScanFilter.jarsToSkip=\
+applicationinsights-*.jar, \
+annotations-api.jar,\
+ant-junit*.jar,\
+ant-launcher.jar,\
+ant.jar,\
+asm-*.jar,\
+aspectj*.jar,\
+bootstrap.jar,\
+catalina-ant.jar,\
+catalina-ha.jar,\
+catalina-storeconfig.jar,\
+catalina-tribes.jar,\
+catalina.jar,\
+cglib-*.jar,\
+cobertura-*.jar,\
+commons-beanutils*.jar,\
+commons-codec*.jar,\
+commons-collections*.jar,\
+commons-daemon.jar,\
+commons-dbcp*.jar,\
+commons-digester*.jar,\
+commons-fileupload*.jar,\
+commons-httpclient*.jar,\
+commons-io*.jar,\
+commons-lang*.jar,\
+commons-logging*.jar,\
+commons-math*.jar,\
+commons-pool*.jar,\
+dom4j-*.jar,\
+easymock-*.jar,\
+ecj-*.jar,\
+el-api.jar,\
+geronimo-spec-jaxrpc*.jar,\
+h2*.jar,\
+hamcrest-*.jar,\
+hibernate*.jar,\
+httpclient*.jar,\
+icu4j-*.jar,\
+jasper-el.jar,\
+jasper.jar,\
+jaspic-api.jar,\
+jaxb-*.jar,\
+jaxen-*.jar,\
+jdom-*.jar,\
+jetty-*.jar,\
+jmx-tools.jar,\
+jmx.jar,\
+jsp-api.jar,\
+jstl.jar,\
+jta*.jar,\
+junit-*.jar,\
+junit.jar,\
+log4j*.jar,\
+mail*.jar,\
+objenesis-*.jar,\
+oraclepki.jar,\
+oro-*.jar,\
+servlet-api-*.jar,\
+servlet-api.jar,\
+slf4j*.jar,\
+taglibs-standard-spec-*.jar,\
+tagsoup-*.jar,\
+tomcat-api.jar,\
+tomcat-coyote.jar,\
+tomcat-dbcp.jar,\
+tomcat-i18n-*.jar,\
+tomcat-jdbc.jar,\
+tomcat-jni.jar,\
+tomcat-juli-adapters.jar,\
+tomcat-juli.jar,\
+tomcat-util-scan.jar,\
+tomcat-util.jar,\
+tomcat-websocket.jar,\
+tools.jar,\
+websocket-api.jar,\
+wsdl4j*.jar,\
+xercesImpl.jar,\
+xml-apis.jar,\
+xmlParserAPIs-*.jar,\
+xmlParserAPIs.jar,\
+xom-*.jar
+
+# Default list of JAR files that should be scanned that overrides the default
+# jarsToSkip list above. This is typically used to include a specific JAR that
+# has been excluded by a broad file name pattern in the jarsToSkip list.
+# The list of JARs to scan may be over-ridden at a Context level for individual
+# scan types by configuring a JarScanner with a nested JarScanFilter.
+tomcat.util.scan.StandardJarScanFilter.jarsToScan=\
+log4j-taglib*.jar,\
+log4j-web*.jar,\
+log4javascript*.jar,\
+slf4j-taglib*.jar
+
+# String cache configuration.
+tomcat.util.buf.StringCache.byte.enabled=true
+#tomcat.util.buf.StringCache.char.enabled=true
+#tomcat.util.buf.StringCache.trainThreshold=500000
+#tomcat.util.buf.StringCache.cacheSize=5000
diff --git a/docker/ubuntu/Tomcat/logging.properties b/docker/ubuntu/Tomcat/logging.properties
new file mode 100644
index 00000000..86c3fb0f
--- /dev/null
+++ b/docker/ubuntu/Tomcat/logging.properties
@@ -0,0 +1,79 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+handlers = 1catalina.org.apache.juli.AsyncFileHandler, 2localhost.org.apache.juli.AsyncFileHandler, 3manager.org.apache.juli.AsyncFileHandler, 4host-manager.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler
+
+.handlers = 1catalina.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+1catalina.org.apache.juli.AsyncFileHandler.level = FINE
+1catalina.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
+1catalina.org.apache.juli.AsyncFileHandler.prefix = catalina.
+1catalina.org.apache.juli.AsyncFileHandler.maxDays = 90
+1catalina.org.apache.juli.AsyncFileHandler.encoding = UTF-8
+
+2localhost.org.apache.juli.AsyncFileHandler.level = FINE
+2localhost.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
+2localhost.org.apache.juli.AsyncFileHandler.prefix = localhost.
+2localhost.org.apache.juli.AsyncFileHandler.maxDays = 90
+2localhost.org.apache.juli.AsyncFileHandler.encoding = UTF-8
+
+3manager.org.apache.juli.AsyncFileHandler.level = FINE
+3manager.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
+3manager.org.apache.juli.AsyncFileHandler.prefix = manager.
+3manager.org.apache.juli.AsyncFileHandler.maxDays = 90
+3manager.org.apache.juli.AsyncFileHandler.encoding = UTF-8
+
+4host-manager.org.apache.juli.AsyncFileHandler.level = FINE
+4host-manager.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
+4host-manager.org.apache.juli.AsyncFileHandler.prefix = host-manager.
+4host-manager.org.apache.juli.AsyncFileHandler.maxDays = 90
+4host-manager.org.apache.juli.AsyncFileHandler.encoding = UTF-8
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter
+java.util.logging.ConsoleHandler.encoding = UTF-8
+
+
+############################################################
+# Facility specific properties.
+# Provides extra control for each logger.
+############################################################
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.AsyncFileHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.AsyncFileHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 4host-manager.org.apache.juli.AsyncFileHandler
+
+# For example, set the org.apache.catalina.util.LifecycleBase logger to log
+# each component that extends LifecycleBase changing state:
+#org.apache.catalina.util.LifecycleBase.level = FINE
+
+# To see debug messages in TldLocationsCache, uncomment the following line:
+#org.apache.jasper.compiler.TldLocationsCache.level = FINE
+
+# To see debug messages for HTTP/2 handling, uncomment the following line:
+#org.apache.coyote.http2.level = FINE
+
+# To see debug messages for WebSocket handling, uncomment the following line:
+#org.apache.tomcat.websocket.level = FINE
\ No newline at end of file
diff --git a/docker/ubuntu/Tomcat/server.xml b/docker/ubuntu/Tomcat/server.xml
new file mode 100644
index 00000000..88a00d3e
--- /dev/null
+++ b/docker/ubuntu/Tomcat/server.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" at this level.
+     Documentation at /docs/config/server.html
+ -->
+<Server port="8005" shutdown="SHUTDOWN">
+  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
+  <!-- Security listener. Documentation at /docs/config/listeners.html
+  <Listener className="org.apache.catalina.security.SecurityListener" />
+  -->
+  <!--APR library loader. Documentation at /docs/apr.html -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+
+  <!-- Global JNDI resources
+       Documentation at /docs/jndi-resources-howto.html
+  -->
+  <GlobalNamingResources>
+    <!-- Editable user database that can also be used by
+         UserDatabaseRealm to authenticate users
+    -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+              description="User database that can be updated and saved"
+              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+              pathname="conf/tomcat-users.xml"
+               />
+  </GlobalNamingResources>
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" Note:  A "Service" is not itself a "Container",
+       so you may not define subcomponents such as "Valves" at this level.
+       Documentation at /docs/config/service.html
+   -->
+  <Service name="Catalina">
+
+    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+    <!--
+    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+        maxThreads="150" minSpareThreads="4"/>
+    -->
+
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned. Documentation at :
+         Java HTTP Connector: /docs/config/http.html
+         Java AJP  Connector: /docs/config/ajp.html
+         APR (HTTP/AJP) Connector: /docs/apr.html
+         Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
+    -->
+    <Connector port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" 
+               URIEncoding="UTF-8"/>
+    <!-- A "Connector" using the shared thread pool-->
+    <!--
+    <Connector executor="tomcatThreadPool"
+               port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" />
+    -->
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
+         This connector uses the NIO implementation. The default
+         SSLImplementation will depend on the presence of the APR/native
+         library and the useOpenSSL attribute of the
+         AprLifecycleListener.
+         Either JSSE or OpenSSL style configuration may be used regardless of
+         the SSLImplementation selected. JSSE style configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+               maxThreads="150" SSLEnabled="true">
+        <SSLHostConfig>
+            <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
+         This connector uses the APR/native implementation which always uses
+         OpenSSL for TLS.
+         Either JSSE or OpenSSL style configuration may be used. OpenSSL style
+         configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
+               maxThreads="150" SSLEnabled="true" >
+        <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
+        <SSLHostConfig>
+            <Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
+                         certificateFile="conf/localhost-rsa-cert.pem"
+                         certificateChainFile="conf/localhost-rsa-chain.pem"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <!-- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" /> -->
+
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host).
+         Documentation at /docs/config/engine.html -->
+
+    <!-- You should set jvmRoute to support load-balancing via AJP ie :
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+    -->
+    <Engine name="Catalina" defaultHost="localhost">
+
+      <!--For clustering, please take a look at documentation at:
+          /docs/cluster-howto.html  (simple how to)
+          /docs/config/cluster.html (reference documentation) -->
+      <!--
+      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+      -->
+
+      <!-- Use the LockOutRealm to prevent attempts to guess user passwords
+           via a brute-force attack -->
+      <Realm className="org.apache.catalina.realm.LockOutRealm">
+        <!-- This Realm uses the UserDatabase configured in the global JNDI
+             resources under the key "UserDatabase".  Any edits
+             that are performed against this UserDatabase are immediately
+             available for use by the Realm.  -->
+        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+               resourceName="UserDatabase"/>
+      </Realm>
+
+      <Host name="localhost"  appBase="webapps"
+            unpackWARs="false" autoDeploy="false">
+
+        <!-- SingleSignOn valve, share authentication between web applications
+             Documentation at: /docs/config/valve.html -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        -->
+
+        <!-- Access log processes all example.
+             Documentation at: /docs/config/valve.html
+             Note: The pattern used is equivalent to using pattern="common" -->
+        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="${log.base}"
+               prefix="localhost_access_log" suffix=".txt"
+               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
+
+      </Host>
+    </Engine>
+  </Service>
+</Server>
diff --git a/docker/ubuntu/Tomcat/startup.sh b/docker/ubuntu/Tomcat/startup.sh
index 8b137891..55434530 100644
--- a/docker/ubuntu/Tomcat/startup.sh
+++ b/docker/ubuntu/Tomcat/startup.sh
@@ -1 +1,6 @@
+#!/bin/sh
 
+LOG_DIR="${LOG_ROOT}/$(hostname)"
+mkdir -p "${LOG_DIR}"
+export JAVA_OPTS="${JAVA_OPTS} -Dlog.base=${LOG_DIR}"
+/usr/local/tomcat/bin/catalina.sh run

From 1fe3803d55f246d0963dcd93eb7cde994cb3bc4a Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 14 Sep 2020 12:23:36 -0500
Subject: [PATCH 111/264] Create startup.sh

---
 docker/debian10/Tomcat/startup.sh | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docker/debian10/Tomcat/startup.sh

diff --git a/docker/debian10/Tomcat/startup.sh b/docker/debian10/Tomcat/startup.sh
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/docker/debian10/Tomcat/startup.sh
@@ -0,0 +1 @@
+

From 89adcd21c0df392eeb0c2f531e9e96616fd21639 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 14 Sep 2020 12:24:36 -0500
Subject: [PATCH 112/264] Initial upload

---
 docker/debian10/Tomcat/catalina.properties | 206 +++++++++++++++++++++
 docker/debian10/Tomcat/logging.properties  |  79 ++++++++
 docker/debian10/Tomcat/server.xml          | 169 +++++++++++++++++
 docker/debian10/Tomcat/startup.sh          |   5 +
 4 files changed, 459 insertions(+)
 create mode 100644 docker/debian10/Tomcat/catalina.properties
 create mode 100644 docker/debian10/Tomcat/logging.properties
 create mode 100644 docker/debian10/Tomcat/server.xml

diff --git a/docker/debian10/Tomcat/catalina.properties b/docker/debian10/Tomcat/catalina.properties
new file mode 100644
index 00000000..3cbca2fe
--- /dev/null
+++ b/docker/debian10/Tomcat/catalina.properties
@@ -0,0 +1,206 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# List of comma-separated packages that start with or equal this string
+# will cause a security exception to be thrown when
+# passed to checkPackageAccess unless the
+# corresponding RuntimePermission ("accessClassInPackage."+package) has
+# been granted.
+package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,org.apache.tomcat.
+#
+# List of comma-separated packages that start with or equal this string
+# will cause a security exception to be thrown when
+# passed to checkPackageDefinition unless the
+# corresponding RuntimePermission ("defineClassInPackage."+package) has
+# been granted.
+#
+# by default, no packages are restricted for definition, and none of
+# the class loaders supplied with the JDK call checkPackageDefinition.
+#
+package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,\
+org.apache.jasper.,org.apache.naming.,org.apache.tomcat.
+
+#
+#
+# List of comma-separated paths defining the contents of the "common"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
+# If left as blank,the JVM system loader will be used as Catalina's "common"
+# loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+#
+# Note: Values are enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar","/home/tomcat/lib","/home/tomcat/lib/*.jar"
+
+#
+# List of comma-separated paths defining the contents of the "server"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
+# If left as blank, the "common" loader will be used as Catalina's "server"
+# loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+#
+# Note: Values may be enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+server.loader=
+
+#
+# List of comma-separated paths defining the contents of the "shared"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_BASE path or absolute. If left as blank,
+# the "common" loader will be used as Catalina's "shared" loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+# Please note that for single jars, e.g. bar.jar, you need the URL form
+# starting with file:.
+#
+# Note: Values may be enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+shared.loader=
+
+# Default list of JAR files that should not be scanned using the JarScanner
+# functionality. This is typically used to scan JARs for configuration
+# information. JARs that do not contain such information may be excluded from
+# the scan to speed up the scanning process. This is the default list. JARs on
+# this list are excluded from all scans. The list must be a comma separated list
+# of JAR file names.
+# The list of JARs to skip may be over-ridden at a Context level for individual
+# scan types by configuring a JarScanner with a nested JarScanFilter.
+# The JARs listed below include:
+# - Tomcat Bootstrap JARs
+# - Tomcat API JARs
+# - Catalina JARs
+# - Jasper JARs
+# - Tomcat JARs
+# - Common non-Tomcat JARs
+# - Test JARs (JUnit, Cobertura and dependencies)
+tomcat.util.scan.StandardJarScanFilter.jarsToSkip=\
+applicationinsights-*.jar, \
+annotations-api.jar,\
+ant-junit*.jar,\
+ant-launcher.jar,\
+ant.jar,\
+asm-*.jar,\
+aspectj*.jar,\
+bootstrap.jar,\
+catalina-ant.jar,\
+catalina-ha.jar,\
+catalina-storeconfig.jar,\
+catalina-tribes.jar,\
+catalina.jar,\
+cglib-*.jar,\
+cobertura-*.jar,\
+commons-beanutils*.jar,\
+commons-codec*.jar,\
+commons-collections*.jar,\
+commons-daemon.jar,\
+commons-dbcp*.jar,\
+commons-digester*.jar,\
+commons-fileupload*.jar,\
+commons-httpclient*.jar,\
+commons-io*.jar,\
+commons-lang*.jar,\
+commons-logging*.jar,\
+commons-math*.jar,\
+commons-pool*.jar,\
+dom4j-*.jar,\
+easymock-*.jar,\
+ecj-*.jar,\
+el-api.jar,\
+geronimo-spec-jaxrpc*.jar,\
+h2*.jar,\
+hamcrest-*.jar,\
+hibernate*.jar,\
+httpclient*.jar,\
+icu4j-*.jar,\
+jasper-el.jar,\
+jasper.jar,\
+jaspic-api.jar,\
+jaxb-*.jar,\
+jaxen-*.jar,\
+jdom-*.jar,\
+jetty-*.jar,\
+jmx-tools.jar,\
+jmx.jar,\
+jsp-api.jar,\
+jstl.jar,\
+jta*.jar,\
+junit-*.jar,\
+junit.jar,\
+log4j*.jar,\
+mail*.jar,\
+objenesis-*.jar,\
+oraclepki.jar,\
+oro-*.jar,\
+servlet-api-*.jar,\
+servlet-api.jar,\
+slf4j*.jar,\
+taglibs-standard-spec-*.jar,\
+tagsoup-*.jar,\
+tomcat-api.jar,\
+tomcat-coyote.jar,\
+tomcat-dbcp.jar,\
+tomcat-i18n-*.jar,\
+tomcat-jdbc.jar,\
+tomcat-jni.jar,\
+tomcat-juli-adapters.jar,\
+tomcat-juli.jar,\
+tomcat-util-scan.jar,\
+tomcat-util.jar,\
+tomcat-websocket.jar,\
+tools.jar,\
+websocket-api.jar,\
+wsdl4j*.jar,\
+xercesImpl.jar,\
+xml-apis.jar,\
+xmlParserAPIs-*.jar,\
+xmlParserAPIs.jar,\
+xom-*.jar
+
+# Default list of JAR files that should be scanned that overrides the default
+# jarsToSkip list above. This is typically used to include a specific JAR that
+# has been excluded by a broad file name pattern in the jarsToSkip list.
+# The list of JARs to scan may be over-ridden at a Context level for individual
+# scan types by configuring a JarScanner with a nested JarScanFilter.
+tomcat.util.scan.StandardJarScanFilter.jarsToScan=\
+log4j-taglib*.jar,\
+log4j-web*.jar,\
+log4javascript*.jar,\
+slf4j-taglib*.jar
+
+# String cache configuration.
+tomcat.util.buf.StringCache.byte.enabled=true
+#tomcat.util.buf.StringCache.char.enabled=true
+#tomcat.util.buf.StringCache.trainThreshold=500000
+#tomcat.util.buf.StringCache.cacheSize=5000
diff --git a/docker/debian10/Tomcat/logging.properties b/docker/debian10/Tomcat/logging.properties
new file mode 100644
index 00000000..86c3fb0f
--- /dev/null
+++ b/docker/debian10/Tomcat/logging.properties
@@ -0,0 +1,79 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+handlers = 1catalina.org.apache.juli.AsyncFileHandler, 2localhost.org.apache.juli.AsyncFileHandler, 3manager.org.apache.juli.AsyncFileHandler, 4host-manager.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler
+
+.handlers = 1catalina.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+1catalina.org.apache.juli.AsyncFileHandler.level = FINE
+1catalina.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
+1catalina.org.apache.juli.AsyncFileHandler.prefix = catalina.
+1catalina.org.apache.juli.AsyncFileHandler.maxDays = 90
+1catalina.org.apache.juli.AsyncFileHandler.encoding = UTF-8
+
+2localhost.org.apache.juli.AsyncFileHandler.level = FINE
+2localhost.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
+2localhost.org.apache.juli.AsyncFileHandler.prefix = localhost.
+2localhost.org.apache.juli.AsyncFileHandler.maxDays = 90
+2localhost.org.apache.juli.AsyncFileHandler.encoding = UTF-8
+
+3manager.org.apache.juli.AsyncFileHandler.level = FINE
+3manager.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
+3manager.org.apache.juli.AsyncFileHandler.prefix = manager.
+3manager.org.apache.juli.AsyncFileHandler.maxDays = 90
+3manager.org.apache.juli.AsyncFileHandler.encoding = UTF-8
+
+4host-manager.org.apache.juli.AsyncFileHandler.level = FINE
+4host-manager.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
+4host-manager.org.apache.juli.AsyncFileHandler.prefix = host-manager.
+4host-manager.org.apache.juli.AsyncFileHandler.maxDays = 90
+4host-manager.org.apache.juli.AsyncFileHandler.encoding = UTF-8
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter
+java.util.logging.ConsoleHandler.encoding = UTF-8
+
+
+############################################################
+# Facility specific properties.
+# Provides extra control for each logger.
+############################################################
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.AsyncFileHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.AsyncFileHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 4host-manager.org.apache.juli.AsyncFileHandler
+
+# For example, set the org.apache.catalina.util.LifecycleBase logger to log
+# each component that extends LifecycleBase changing state:
+#org.apache.catalina.util.LifecycleBase.level = FINE
+
+# To see debug messages in TldLocationsCache, uncomment the following line:
+#org.apache.jasper.compiler.TldLocationsCache.level = FINE
+
+# To see debug messages for HTTP/2 handling, uncomment the following line:
+#org.apache.coyote.http2.level = FINE
+
+# To see debug messages for WebSocket handling, uncomment the following line:
+#org.apache.tomcat.websocket.level = FINE
\ No newline at end of file
diff --git a/docker/debian10/Tomcat/server.xml b/docker/debian10/Tomcat/server.xml
new file mode 100644
index 00000000..88a00d3e
--- /dev/null
+++ b/docker/debian10/Tomcat/server.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" at this level.
+     Documentation at /docs/config/server.html
+ -->
+<Server port="8005" shutdown="SHUTDOWN">
+  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
+  <!-- Security listener. Documentation at /docs/config/listeners.html
+  <Listener className="org.apache.catalina.security.SecurityListener" />
+  -->
+  <!--APR library loader. Documentation at /docs/apr.html -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+
+  <!-- Global JNDI resources
+       Documentation at /docs/jndi-resources-howto.html
+  -->
+  <GlobalNamingResources>
+    <!-- Editable user database that can also be used by
+         UserDatabaseRealm to authenticate users
+    -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+              description="User database that can be updated and saved"
+              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+              pathname="conf/tomcat-users.xml"
+               />
+  </GlobalNamingResources>
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" Note:  A "Service" is not itself a "Container",
+       so you may not define subcomponents such as "Valves" at this level.
+       Documentation at /docs/config/service.html
+   -->
+  <Service name="Catalina">
+
+    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+    <!--
+    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+        maxThreads="150" minSpareThreads="4"/>
+    -->
+
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned. Documentation at :
+         Java HTTP Connector: /docs/config/http.html
+         Java AJP  Connector: /docs/config/ajp.html
+         APR (HTTP/AJP) Connector: /docs/apr.html
+         Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
+    -->
+    <Connector port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" 
+               URIEncoding="UTF-8"/>
+    <!-- A "Connector" using the shared thread pool-->
+    <!--
+    <Connector executor="tomcatThreadPool"
+               port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" />
+    -->
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
+         This connector uses the NIO implementation. The default
+         SSLImplementation will depend on the presence of the APR/native
+         library and the useOpenSSL attribute of the
+         AprLifecycleListener.
+         Either JSSE or OpenSSL style configuration may be used regardless of
+         the SSLImplementation selected. JSSE style configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+               maxThreads="150" SSLEnabled="true">
+        <SSLHostConfig>
+            <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
+         This connector uses the APR/native implementation which always uses
+         OpenSSL for TLS.
+         Either JSSE or OpenSSL style configuration may be used. OpenSSL style
+         configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
+               maxThreads="150" SSLEnabled="true" >
+        <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
+        <SSLHostConfig>
+            <Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
+                         certificateFile="conf/localhost-rsa-cert.pem"
+                         certificateChainFile="conf/localhost-rsa-chain.pem"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <!-- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" /> -->
+
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host).
+         Documentation at /docs/config/engine.html -->
+
+    <!-- You should set jvmRoute to support load-balancing via AJP ie :
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+    -->
+    <Engine name="Catalina" defaultHost="localhost">
+
+      <!--For clustering, please take a look at documentation at:
+          /docs/cluster-howto.html  (simple how to)
+          /docs/config/cluster.html (reference documentation) -->
+      <!--
+      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+      -->
+
+      <!-- Use the LockOutRealm to prevent attempts to guess user passwords
+           via a brute-force attack -->
+      <Realm className="org.apache.catalina.realm.LockOutRealm">
+        <!-- This Realm uses the UserDatabase configured in the global JNDI
+             resources under the key "UserDatabase".  Any edits
+             that are performed against this UserDatabase are immediately
+             available for use by the Realm.  -->
+        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+               resourceName="UserDatabase"/>
+      </Realm>
+
+      <Host name="localhost"  appBase="webapps"
+            unpackWARs="false" autoDeploy="false">
+
+        <!-- SingleSignOn valve, share authentication between web applications
+             Documentation at: /docs/config/valve.html -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        -->
+
+        <!-- Access log processes all example.
+             Documentation at: /docs/config/valve.html
+             Note: The pattern used is equivalent to using pattern="common" -->
+        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="${log.base}"
+               prefix="localhost_access_log" suffix=".txt"
+               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
+
+      </Host>
+    </Engine>
+  </Service>
+</Server>
diff --git a/docker/debian10/Tomcat/startup.sh b/docker/debian10/Tomcat/startup.sh
index 8b137891..55434530 100644
--- a/docker/debian10/Tomcat/startup.sh
+++ b/docker/debian10/Tomcat/startup.sh
@@ -1 +1,6 @@
+#!/bin/sh
 
+LOG_DIR="${LOG_ROOT}/$(hostname)"
+mkdir -p "${LOG_DIR}"
+export JAVA_OPTS="${JAVA_OPTS} -Dlog.base=${LOG_DIR}"
+/usr/local/tomcat/bin/catalina.sh run

From d7e287d288e64bc3fb172a96567c75c690702db9 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 14 Sep 2020 12:25:04 -0500
Subject: [PATCH 113/264] Create startup.sh

---
 docker/centos/Tomcat/startup.sh | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docker/centos/Tomcat/startup.sh

diff --git a/docker/centos/Tomcat/startup.sh b/docker/centos/Tomcat/startup.sh
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/docker/centos/Tomcat/startup.sh
@@ -0,0 +1 @@
+

From 7922b06644fdf1638de86384231060d58a860aae Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 14 Sep 2020 12:25:32 -0500
Subject: [PATCH 114/264] Initial upload

---
 docker/centos/Tomcat/catalina.properties | 206 +++++++++++++++++++++++
 docker/centos/Tomcat/logging.properties  |  79 +++++++++
 docker/centos/Tomcat/server.xml          | 169 +++++++++++++++++++
 docker/centos/Tomcat/startup.sh          |   5 +
 4 files changed, 459 insertions(+)
 create mode 100644 docker/centos/Tomcat/catalina.properties
 create mode 100644 docker/centos/Tomcat/logging.properties
 create mode 100644 docker/centos/Tomcat/server.xml

diff --git a/docker/centos/Tomcat/catalina.properties b/docker/centos/Tomcat/catalina.properties
new file mode 100644
index 00000000..3cbca2fe
--- /dev/null
+++ b/docker/centos/Tomcat/catalina.properties
@@ -0,0 +1,206 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# List of comma-separated packages that start with or equal this string
+# will cause a security exception to be thrown when
+# passed to checkPackageAccess unless the
+# corresponding RuntimePermission ("accessClassInPackage."+package) has
+# been granted.
+package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,org.apache.tomcat.
+#
+# List of comma-separated packages that start with or equal this string
+# will cause a security exception to be thrown when
+# passed to checkPackageDefinition unless the
+# corresponding RuntimePermission ("defineClassInPackage."+package) has
+# been granted.
+#
+# by default, no packages are restricted for definition, and none of
+# the class loaders supplied with the JDK call checkPackageDefinition.
+#
+package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,\
+org.apache.jasper.,org.apache.naming.,org.apache.tomcat.
+
+#
+#
+# List of comma-separated paths defining the contents of the "common"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
+# If left as blank,the JVM system loader will be used as Catalina's "common"
+# loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+#
+# Note: Values are enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar","/home/tomcat/lib","/home/tomcat/lib/*.jar"
+
+#
+# List of comma-separated paths defining the contents of the "server"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
+# If left as blank, the "common" loader will be used as Catalina's "server"
+# loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+#
+# Note: Values may be enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+server.loader=
+
+#
+# List of comma-separated paths defining the contents of the "shared"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_BASE path or absolute. If left as blank,
+# the "common" loader will be used as Catalina's "shared" loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+# Please note that for single jars, e.g. bar.jar, you need the URL form
+# starting with file:.
+#
+# Note: Values may be enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+shared.loader=
+
+# Default list of JAR files that should not be scanned using the JarScanner
+# functionality. This is typically used to scan JARs for configuration
+# information. JARs that do not contain such information may be excluded from
+# the scan to speed up the scanning process. This is the default list. JARs on
+# this list are excluded from all scans. The list must be a comma separated list
+# of JAR file names.
+# The list of JARs to skip may be over-ridden at a Context level for individual
+# scan types by configuring a JarScanner with a nested JarScanFilter.
+# The JARs listed below include:
+# - Tomcat Bootstrap JARs
+# - Tomcat API JARs
+# - Catalina JARs
+# - Jasper JARs
+# - Tomcat JARs
+# - Common non-Tomcat JARs
+# - Test JARs (JUnit, Cobertura and dependencies)
+tomcat.util.scan.StandardJarScanFilter.jarsToSkip=\
+applicationinsights-*.jar, \
+annotations-api.jar,\
+ant-junit*.jar,\
+ant-launcher.jar,\
+ant.jar,\
+asm-*.jar,\
+aspectj*.jar,\
+bootstrap.jar,\
+catalina-ant.jar,\
+catalina-ha.jar,\
+catalina-storeconfig.jar,\
+catalina-tribes.jar,\
+catalina.jar,\
+cglib-*.jar,\
+cobertura-*.jar,\
+commons-beanutils*.jar,\
+commons-codec*.jar,\
+commons-collections*.jar,\
+commons-daemon.jar,\
+commons-dbcp*.jar,\
+commons-digester*.jar,\
+commons-fileupload*.jar,\
+commons-httpclient*.jar,\
+commons-io*.jar,\
+commons-lang*.jar,\
+commons-logging*.jar,\
+commons-math*.jar,\
+commons-pool*.jar,\
+dom4j-*.jar,\
+easymock-*.jar,\
+ecj-*.jar,\
+el-api.jar,\
+geronimo-spec-jaxrpc*.jar,\
+h2*.jar,\
+hamcrest-*.jar,\
+hibernate*.jar,\
+httpclient*.jar,\
+icu4j-*.jar,\
+jasper-el.jar,\
+jasper.jar,\
+jaspic-api.jar,\
+jaxb-*.jar,\
+jaxen-*.jar,\
+jdom-*.jar,\
+jetty-*.jar,\
+jmx-tools.jar,\
+jmx.jar,\
+jsp-api.jar,\
+jstl.jar,\
+jta*.jar,\
+junit-*.jar,\
+junit.jar,\
+log4j*.jar,\
+mail*.jar,\
+objenesis-*.jar,\
+oraclepki.jar,\
+oro-*.jar,\
+servlet-api-*.jar,\
+servlet-api.jar,\
+slf4j*.jar,\
+taglibs-standard-spec-*.jar,\
+tagsoup-*.jar,\
+tomcat-api.jar,\
+tomcat-coyote.jar,\
+tomcat-dbcp.jar,\
+tomcat-i18n-*.jar,\
+tomcat-jdbc.jar,\
+tomcat-jni.jar,\
+tomcat-juli-adapters.jar,\
+tomcat-juli.jar,\
+tomcat-util-scan.jar,\
+tomcat-util.jar,\
+tomcat-websocket.jar,\
+tools.jar,\
+websocket-api.jar,\
+wsdl4j*.jar,\
+xercesImpl.jar,\
+xml-apis.jar,\
+xmlParserAPIs-*.jar,\
+xmlParserAPIs.jar,\
+xom-*.jar
+
+# Default list of JAR files that should be scanned that overrides the default
+# jarsToSkip list above. This is typically used to include a specific JAR that
+# has been excluded by a broad file name pattern in the jarsToSkip list.
+# The list of JARs to scan may be over-ridden at a Context level for individual
+# scan types by configuring a JarScanner with a nested JarScanFilter.
+tomcat.util.scan.StandardJarScanFilter.jarsToScan=\
+log4j-taglib*.jar,\
+log4j-web*.jar,\
+log4javascript*.jar,\
+slf4j-taglib*.jar
+
+# String cache configuration.
+tomcat.util.buf.StringCache.byte.enabled=true
+#tomcat.util.buf.StringCache.char.enabled=true
+#tomcat.util.buf.StringCache.trainThreshold=500000
+#tomcat.util.buf.StringCache.cacheSize=5000
diff --git a/docker/centos/Tomcat/logging.properties b/docker/centos/Tomcat/logging.properties
new file mode 100644
index 00000000..86c3fb0f
--- /dev/null
+++ b/docker/centos/Tomcat/logging.properties
@@ -0,0 +1,79 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+handlers = 1catalina.org.apache.juli.AsyncFileHandler, 2localhost.org.apache.juli.AsyncFileHandler, 3manager.org.apache.juli.AsyncFileHandler, 4host-manager.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler
+
+.handlers = 1catalina.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+1catalina.org.apache.juli.AsyncFileHandler.level = FINE
+1catalina.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
+1catalina.org.apache.juli.AsyncFileHandler.prefix = catalina.
+1catalina.org.apache.juli.AsyncFileHandler.maxDays = 90
+1catalina.org.apache.juli.AsyncFileHandler.encoding = UTF-8
+
+2localhost.org.apache.juli.AsyncFileHandler.level = FINE
+2localhost.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
+2localhost.org.apache.juli.AsyncFileHandler.prefix = localhost.
+2localhost.org.apache.juli.AsyncFileHandler.maxDays = 90
+2localhost.org.apache.juli.AsyncFileHandler.encoding = UTF-8
+
+3manager.org.apache.juli.AsyncFileHandler.level = FINE
+3manager.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
+3manager.org.apache.juli.AsyncFileHandler.prefix = manager.
+3manager.org.apache.juli.AsyncFileHandler.maxDays = 90
+3manager.org.apache.juli.AsyncFileHandler.encoding = UTF-8
+
+4host-manager.org.apache.juli.AsyncFileHandler.level = FINE
+4host-manager.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
+4host-manager.org.apache.juli.AsyncFileHandler.prefix = host-manager.
+4host-manager.org.apache.juli.AsyncFileHandler.maxDays = 90
+4host-manager.org.apache.juli.AsyncFileHandler.encoding = UTF-8
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter
+java.util.logging.ConsoleHandler.encoding = UTF-8
+
+
+############################################################
+# Facility specific properties.
+# Provides extra control for each logger.
+############################################################
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.AsyncFileHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.AsyncFileHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 4host-manager.org.apache.juli.AsyncFileHandler
+
+# For example, set the org.apache.catalina.util.LifecycleBase logger to log
+# each component that extends LifecycleBase changing state:
+#org.apache.catalina.util.LifecycleBase.level = FINE
+
+# To see debug messages in TldLocationsCache, uncomment the following line:
+#org.apache.jasper.compiler.TldLocationsCache.level = FINE
+
+# To see debug messages for HTTP/2 handling, uncomment the following line:
+#org.apache.coyote.http2.level = FINE
+
+# To see debug messages for WebSocket handling, uncomment the following line:
+#org.apache.tomcat.websocket.level = FINE
\ No newline at end of file
diff --git a/docker/centos/Tomcat/server.xml b/docker/centos/Tomcat/server.xml
new file mode 100644
index 00000000..88a00d3e
--- /dev/null
+++ b/docker/centos/Tomcat/server.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" at this level.
+     Documentation at /docs/config/server.html
+ -->
+<Server port="8005" shutdown="SHUTDOWN">
+  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
+  <!-- Security listener. Documentation at /docs/config/listeners.html
+  <Listener className="org.apache.catalina.security.SecurityListener" />
+  -->
+  <!--APR library loader. Documentation at /docs/apr.html -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+
+  <!-- Global JNDI resources
+       Documentation at /docs/jndi-resources-howto.html
+  -->
+  <GlobalNamingResources>
+    <!-- Editable user database that can also be used by
+         UserDatabaseRealm to authenticate users
+    -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+              description="User database that can be updated and saved"
+              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+              pathname="conf/tomcat-users.xml"
+               />
+  </GlobalNamingResources>
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" Note:  A "Service" is not itself a "Container",
+       so you may not define subcomponents such as "Valves" at this level.
+       Documentation at /docs/config/service.html
+   -->
+  <Service name="Catalina">
+
+    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+    <!--
+    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+        maxThreads="150" minSpareThreads="4"/>
+    -->
+
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned. Documentation at :
+         Java HTTP Connector: /docs/config/http.html
+         Java AJP  Connector: /docs/config/ajp.html
+         APR (HTTP/AJP) Connector: /docs/apr.html
+         Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
+    -->
+    <Connector port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" 
+               URIEncoding="UTF-8"/>
+    <!-- A "Connector" using the shared thread pool-->
+    <!--
+    <Connector executor="tomcatThreadPool"
+               port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" />
+    -->
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
+         This connector uses the NIO implementation. The default
+         SSLImplementation will depend on the presence of the APR/native
+         library and the useOpenSSL attribute of the
+         AprLifecycleListener.
+         Either JSSE or OpenSSL style configuration may be used regardless of
+         the SSLImplementation selected. JSSE style configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+               maxThreads="150" SSLEnabled="true">
+        <SSLHostConfig>
+            <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
+         This connector uses the APR/native implementation which always uses
+         OpenSSL for TLS.
+         Either JSSE or OpenSSL style configuration may be used. OpenSSL style
+         configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
+               maxThreads="150" SSLEnabled="true" >
+        <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
+        <SSLHostConfig>
+            <Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
+                         certificateFile="conf/localhost-rsa-cert.pem"
+                         certificateChainFile="conf/localhost-rsa-chain.pem"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <!-- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" /> -->
+
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host).
+         Documentation at /docs/config/engine.html -->
+
+    <!-- You should set jvmRoute to support load-balancing via AJP ie :
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+    -->
+    <Engine name="Catalina" defaultHost="localhost">
+
+      <!--For clustering, please take a look at documentation at:
+          /docs/cluster-howto.html  (simple how to)
+          /docs/config/cluster.html (reference documentation) -->
+      <!--
+      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+      -->
+
+      <!-- Use the LockOutRealm to prevent attempts to guess user passwords
+           via a brute-force attack -->
+      <Realm className="org.apache.catalina.realm.LockOutRealm">
+        <!-- This Realm uses the UserDatabase configured in the global JNDI
+             resources under the key "UserDatabase".  Any edits
+             that are performed against this UserDatabase are immediately
+             available for use by the Realm.  -->
+        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+               resourceName="UserDatabase"/>
+      </Realm>
+
+      <Host name="localhost"  appBase="webapps"
+            unpackWARs="false" autoDeploy="false">
+
+        <!-- SingleSignOn valve, share authentication between web applications
+             Documentation at: /docs/config/valve.html -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        -->
+
+        <!-- Access log processes all example.
+             Documentation at: /docs/config/valve.html
+             Note: The pattern used is equivalent to using pattern="common" -->
+        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="${log.base}"
+               prefix="localhost_access_log" suffix=".txt"
+               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
+
+      </Host>
+    </Engine>
+  </Service>
+</Server>
diff --git a/docker/centos/Tomcat/startup.sh b/docker/centos/Tomcat/startup.sh
index 8b137891..55434530 100644
--- a/docker/centos/Tomcat/startup.sh
+++ b/docker/centos/Tomcat/startup.sh
@@ -1 +1,6 @@
+#!/bin/sh
 
+LOG_DIR="${LOG_ROOT}/$(hostname)"
+mkdir -p "${LOG_DIR}"
+export JAVA_OPTS="${JAVA_OPTS} -Dlog.base=${LOG_DIR}"
+/usr/local/tomcat/bin/catalina.sh run

From 7c906d649edf7a6cc864a63ae24a64810f7cb370 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 14 Sep 2020 12:27:00 -0500
Subject: [PATCH 115/264] Added Dockerfile for Wildfly

---
 docker/alpine/Dockerfile.zulu-8-jdk-wildfly | 58 +++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 docker/alpine/Dockerfile.zulu-8-jdk-wildfly

diff --git a/docker/alpine/Dockerfile.zulu-8-jdk-wildfly b/docker/alpine/Dockerfile.zulu-8-jdk-wildfly
new file mode 100644
index 00000000..8b694c04
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8-jdk-wildfly
@@ -0,0 +1,58 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8-zulu-alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+# Create a user and group used to launch processes
+# The user ID 1000 is the default for the first "regular" user on Fedora/RHEL,
+# so there is a high chance that this ID will be equal to the current user
+# making it easier to use volumes (no permission issues)
+RUN addgroup -S jboss -g 1000 && adduser -u 1000 -G jboss -D -h /opt/jboss -s /sbin/nologin jboss && \
+    chmod 755 /opt/jboss
+
+# Set the working directory to jboss' user home directory
+WORKDIR /opt/jboss
+
+# Specify the user which should be used to execute all commands below
+USER jboss
+
+# Set the WILDFLY_VERSION env variable
+ENV WILDFLY_VERSION 18.0.1.Final
+ENV WILDFLY_SHA1 ef0372589a0f08c36b15360fe7291721a7e3f7d9
+ENV JBOSS_HOME /opt/jboss/wildfly
+
+# Set the root for install
+USER root
+
+# Add the WildFly distribution to /opt, and make wildfly the owner of the extracted tar content
+# Make sure the distribution is available from a well-known place
+
+RUN cd $HOME \
+    && wget -O wildfly-$WILDFLY_VERSION.tar.gz https://download.jboss.org/wildfly/$WILDFLY_VERSION/wildfly-$WILDFLY_VERSION.tar.gz --no-verbose \
+    && sha1sum wildfly-$WILDFLY_VERSION.tar.gz | grep $WILDFLY_SHA1 \
+    && tar xf wildfly-$WILDFLY_VERSION.tar.gz \
+    && mv $HOME/wildfly-$WILDFLY_VERSION $JBOSS_HOME \
+    && rm wildfly-$WILDFLY_VERSION.tar.gz \
+    && chown -R jboss:0 ${JBOSS_HOME} \
+    && chmod -R g+rw ${JBOSS_HOME}
+
+# Ensure signals are forwarded to the JVM process correctly for graceful shutdown
+ENV LAUNCH_JBOSS_IN_BACKGROUND true
+
+# Set the current user for JBoss process
+USER jboss
+
+# Expose the ports we're interested in
+EXPOSE 8080
+
+# Make Java 8 obey container resource limits, improve performance
+#ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Xms64m -Xmx512m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256M -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Djboss.modules.system.pkgs=org.jboss.byteman"
+
+# Set the default command to run on boot
+# This will boot WildFly in the standalone mode and bind to all interface
+CMD ["/opt/jboss/wildfly/bin/standalone.sh", "-b", "0.0.0.0"]

From b5fbfeefc5f51ee7987c507a21da4f0de6bd3ae4 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 14 Sep 2020 12:28:08 -0500
Subject: [PATCH 116/264] Added Dockerfiles for Tomcat and Wildfly

---
 docker/centos/Dockerfile.zulu-8-jdk-tomcat | 38 ++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 docker/centos/Dockerfile.zulu-8-jdk-tomcat

diff --git a/docker/centos/Dockerfile.zulu-8-jdk-tomcat b/docker/centos/Dockerfile.zulu-8-jdk-tomcat
new file mode 100644
index 00000000..b0a800fb
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8-jdk-tomcat
@@ -0,0 +1,38 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8-zulu-centos
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG TOMCAT_VERSION=9.0.31
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+ARG TOMCAT_MAJOR=9
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Install Tomcat
+RUN curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose \
+        && mkdir /usr/local/tomcat \ 
+        && tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 \
+        && rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
+       
+COPY Tomcat/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 8080
+
+CMD ["/startup.sh"]

From f868ae12ac9616df850d230f11d2884b0ff746b7 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 14 Sep 2020 12:28:56 -0500
Subject: [PATCH 117/264] Added Dockerfiles for Tomcat and Wildfly

---
 docker/debian10/Dockerfile.zulu-8-jdk-tomcat  | 42 +++++++++++++
 docker/debian10/Dockerfile.zulu-8-jdk-wildfly | 62 +++++++++++++++++++
 2 files changed, 104 insertions(+)
 create mode 100644 docker/debian10/Dockerfile.zulu-8-jdk-tomcat
 create mode 100644 docker/debian10/Dockerfile.zulu-8-jdk-wildfly

diff --git a/docker/debian10/Dockerfile.zulu-8-jdk-tomcat b/docker/debian10/Dockerfile.zulu-8-jdk-tomcat
new file mode 100644
index 00000000..8d351514
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8-jdk-tomcat
@@ -0,0 +1,42 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG TOMCAT_VERSION=9.0.31
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+ARG TOMCAT_MAJOR=9
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update \
+        && apt-get -qq -y --no-install-recommends install curl \
+        && rm -rf /var/lib/apt/lists/* \
+        # Install Tomcat
+        && curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose \
+        && mkdir /usr/local/tomcat \ 
+        && tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 \
+        && rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
+       
+COPY Tomcat/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 8080
+
+CMD ["/startup.sh"]
diff --git a/docker/debian10/Dockerfile.zulu-8-jdk-wildfly b/docker/debian10/Dockerfile.zulu-8-jdk-wildfly
new file mode 100644
index 00000000..2b8457c3
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8-jdk-wildfly
@@ -0,0 +1,62 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+# Install packages necessary to run WildFly
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl unzip
+
+# Create a user and group used to launch processes
+# The user ID 1000 is the default for the first "regular" user on Fedora/RHEL,
+# so there is a high chance that this ID will be equal to the current user
+# making it easier to use volumes (no permission issues)
+RUN groupadd -r jboss -g 1000 && useradd -u 1000 -r -g jboss -m -d /opt/jboss -s /sbin/nologin -c "JBoss user" jboss && \
+    chmod 755 /opt/jboss
+
+# Set the working directory to jboss' user home directory
+WORKDIR /opt/jboss
+
+# Specify the user which should be used to execute all commands below
+USER jboss
+
+# Set the WILDFLY_VERSION env variable
+ENV WILDFLY_VERSION 18.0.1.Final
+ENV WILDFLY_SHA1 ef0372589a0f08c36b15360fe7291721a7e3f7d9
+ENV JBOSS_HOME /opt/jboss/wildfly
+
+# Set the root for install
+USER root
+
+# Add the WildFly distribution to /opt, and make wildfly the owner of the extracted tar content
+# Make sure the distribution is available from a well-known place
+
+RUN cd $HOME \
+    && curl -O https://download.jboss.org/wildfly/$WILDFLY_VERSION/wildfly-$WILDFLY_VERSION.tar.gz \
+    && sha1sum wildfly-$WILDFLY_VERSION.tar.gz | grep $WILDFLY_SHA1 \
+    && tar xf wildfly-$WILDFLY_VERSION.tar.gz \
+    && mv $HOME/wildfly-$WILDFLY_VERSION $JBOSS_HOME \
+    && rm wildfly-$WILDFLY_VERSION.tar.gz \
+    && chown -R jboss:0 ${JBOSS_HOME} \
+    && chmod -R g+rw ${JBOSS_HOME}
+
+# Ensure signals are forwarded to the JVM process correctly for graceful shutdown
+ENV LAUNCH_JBOSS_IN_BACKGROUND true
+
+# Set the current user for JBoss process
+USER jboss
+
+# Expose the ports we're interested in
+EXPOSE 8080
+
+# Make Java 8 obey container resource limits, improve performance
+#ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Xms64m -Xmx512m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256M -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Djboss.modules.system.pkgs=org.jboss.byteman"
+
+# Set the default command to run on boot
+# This will boot WildFly in the standalone mode and bind to all interface
+CMD ["/opt/jboss/wildfly/bin/standalone.sh", "-b", "0.0.0.0"]

From fc8efa60526e4c16e50f80dad8a377d882fe24a5 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 14 Sep 2020 12:29:35 -0500
Subject: [PATCH 118/264] Added Dockerfiles for Tomcat and Wildfly

---
 docker/ubuntu/Dockerfile.zulu-8-jdk-tomcat  | 42 ++++++++++++++
 docker/ubuntu/Dockerfile.zulu-8-jdk-wildfly | 62 +++++++++++++++++++++
 2 files changed, 104 insertions(+)
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8-jdk-tomcat
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8-jdk-wildfly

diff --git a/docker/ubuntu/Dockerfile.zulu-8-jdk-tomcat b/docker/ubuntu/Dockerfile.zulu-8-jdk-tomcat
new file mode 100644
index 00000000..25b6f8da
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8-jdk-tomcat
@@ -0,0 +1,42 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8-zulu-ubuntu
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG TOMCAT_VERSION=9.0.31
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+ARG TOMCAT_MAJOR=9
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update \
+        && apt-get -qq -y --no-install-recommends install curl \
+        && rm -rf /var/lib/apt/lists/* \
+        # Install Tomcat
+        && curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose \
+        && mkdir /usr/local/tomcat \ 
+        && tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 \
+        && rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
+       
+COPY Tomcat/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 8080
+
+CMD ["/startup.sh"]
diff --git a/docker/ubuntu/Dockerfile.zulu-8-jdk-wildfly b/docker/ubuntu/Dockerfile.zulu-8-jdk-wildfly
new file mode 100644
index 00000000..38251089
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8-jdk-wildfly
@@ -0,0 +1,62 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8-zulu-ubuntu
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+# Install packages necessary to run WildFly
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl unzip
+
+# Create a user and group used to launch processes
+# The user ID 1000 is the default for the first "regular" user on Fedora/RHEL,
+# so there is a high chance that this ID will be equal to the current user
+# making it easier to use volumes (no permission issues)
+RUN groupadd -r jboss -g 1000 && useradd -u 1000 -r -g jboss -m -d /opt/jboss -s /sbin/nologin -c "JBoss user" jboss && \
+    chmod 755 /opt/jboss
+
+# Set the working directory to jboss' user home directory
+WORKDIR /opt/jboss
+
+# Specify the user which should be used to execute all commands below
+USER jboss
+
+# Set the WILDFLY_VERSION env variable
+ENV WILDFLY_VERSION 18.0.1.Final
+ENV WILDFLY_SHA1 ef0372589a0f08c36b15360fe7291721a7e3f7d9
+ENV JBOSS_HOME /opt/jboss/wildfly
+
+# Set the root for install
+USER root
+
+# Add the WildFly distribution to /opt, and make wildfly the owner of the extracted tar content
+# Make sure the distribution is available from a well-known place
+
+RUN cd $HOME \
+    && curl -O https://download.jboss.org/wildfly/$WILDFLY_VERSION/wildfly-$WILDFLY_VERSION.tar.gz \
+    && sha1sum wildfly-$WILDFLY_VERSION.tar.gz | grep $WILDFLY_SHA1 \
+    && tar xf wildfly-$WILDFLY_VERSION.tar.gz \
+    && mv $HOME/wildfly-$WILDFLY_VERSION $JBOSS_HOME \
+    && rm wildfly-$WILDFLY_VERSION.tar.gz \
+    && chown -R jboss:0 ${JBOSS_HOME} \
+    && chmod -R g+rw ${JBOSS_HOME}
+
+# Ensure signals are forwarded to the JVM process correctly for graceful shutdown
+ENV LAUNCH_JBOSS_IN_BACKGROUND true
+
+# Set the current user for JBoss process
+USER jboss
+
+# Expose the ports we're interested in
+EXPOSE 8080
+
+# Make Java 8 obey container resource limits, improve performance
+#ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Xms64m -Xmx512m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256M -Djava.net.preferIPv4Stack=true -Djava.awt.headless=true -Djboss.modules.system.pkgs=org.jboss.byteman"
+
+# Set the default command to run on boot
+# This will boot WildFly in the standalone mode and bind to all interface
+CMD ["/opt/jboss/wildfly/bin/standalone.sh", "-b", "0.0.0.0"]

From db3ff33f8ad12aef8e16648d42840cc06849250e Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 18 Sep 2020 11:24:13 -0500
Subject: [PATCH 119/264] Added install of unzip package

---
 docker/centos/Dockerfile.zulu-8-jdk-tomcat | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/docker/centos/Dockerfile.zulu-8-jdk-tomcat b/docker/centos/Dockerfile.zulu-8-jdk-tomcat
index b0a800fb..e666acb0 100644
--- a/docker/centos/Dockerfile.zulu-8-jdk-tomcat
+++ b/docker/centos/Dockerfile.zulu-8-jdk-tomcat
@@ -19,11 +19,13 @@ ENV PATH /usr/local/tomcat/bin:$PATH
 # Make Java 8 obey container resource limits, improve performance
 ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
 
+RUN yum -q -y update && \
+    yum -q -y install unzip && \
 # Install Tomcat
-RUN curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose \
-        && mkdir /usr/local/tomcat \ 
-        && tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 \
-        && rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \ 
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
        
 COPY Tomcat/${SERVER_XML} /usr/local/tomcat/conf/server.xml
 COPY Tomcat/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties

From cb22832de5f1b8e82b2e4484852084b79a92e15c Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 18 Sep 2020 11:24:48 -0500
Subject: [PATCH 120/264] Added install of unzip package

---
 docker/debian10/Dockerfile.zulu-8-jdk-tomcat | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker/debian10/Dockerfile.zulu-8-jdk-tomcat b/docker/debian10/Dockerfile.zulu-8-jdk-tomcat
index 8d351514..a5c64ff8 100644
--- a/docker/debian10/Dockerfile.zulu-8-jdk-tomcat
+++ b/docker/debian10/Dockerfile.zulu-8-jdk-tomcat
@@ -20,14 +20,14 @@ ENV PATH /usr/local/tomcat/bin:$PATH
 ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
 
 # Cleanup & Install
-RUN apt-get -qq update \
-        && apt-get -qq -y --no-install-recommends install curl \
-        && rm -rf /var/lib/apt/lists/* \
-        # Install Tomcat
-        && curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose \
-        && mkdir /usr/local/tomcat \ 
-        && tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 \
-        && rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl unzip && \
+    rm -rf /var/lib/apt/lists/* && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \ 
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
        
 COPY Tomcat/${SERVER_XML} /usr/local/tomcat/conf/server.xml
 COPY Tomcat/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties

From e9dbb6f2bbe6d3c4a614df1f650e7b175bdcb2a7 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 18 Sep 2020 11:25:24 -0500
Subject: [PATCH 121/264] Added install of unzip package

---
 docker/ubuntu/Dockerfile.zulu-8-jdk-tomcat | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/ubuntu/Dockerfile.zulu-8-jdk-tomcat b/docker/ubuntu/Dockerfile.zulu-8-jdk-tomcat
index 25b6f8da..20914e5b 100644
--- a/docker/ubuntu/Dockerfile.zulu-8-jdk-tomcat
+++ b/docker/ubuntu/Dockerfile.zulu-8-jdk-tomcat
@@ -21,9 +21,9 @@ ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap
 
 # Cleanup & Install
 RUN apt-get -qq update \
-        && apt-get -qq -y --no-install-recommends install curl \
+        && apt-get -qq -y --no-install-recommends install curl unzip \
         && rm -rf /var/lib/apt/lists/* \
-        # Install Tomcat
+# Install Tomcat
         && curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose \
         && mkdir /usr/local/tomcat \ 
         && tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 \

From a561aa05fccd58331bef48e7e03672a400e87643 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 18 Sep 2020 11:36:39 -0500
Subject: [PATCH 122/264] Changed to Tomcat 9.0.37

---
 docker/alpine/Dockerfile.zulu-8-jdk-tomcat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/alpine/Dockerfile.zulu-8-jdk-tomcat b/docker/alpine/Dockerfile.zulu-8-jdk-tomcat
index dc75c978..5445c6e7 100644
--- a/docker/alpine/Dockerfile.zulu-8-jdk-tomcat
+++ b/docker/alpine/Dockerfile.zulu-8-jdk-tomcat
@@ -7,7 +7,7 @@
 FROM mcr.microsoft.com/java/jdk:8-zulu-alpine
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-ARG TOMCAT_VERSION=9.0.31
+ARG TOMCAT_VERSION=9.0.37
 ARG SERVER_XML=server.xml
 ARG LOGGING_PROPERTIES=logging.properties
 ARG CATALINA_PROPERTIES=catalina.properties

From 5741c6e788a2bc4401e274ef610dd85bfd0a6c88 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 18 Sep 2020 11:37:16 -0500
Subject: [PATCH 123/264] Changed to Tomcat 9.0.37

---
 docker/centos/Dockerfile.zulu-8-jdk-tomcat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/centos/Dockerfile.zulu-8-jdk-tomcat b/docker/centos/Dockerfile.zulu-8-jdk-tomcat
index e666acb0..e32c7579 100644
--- a/docker/centos/Dockerfile.zulu-8-jdk-tomcat
+++ b/docker/centos/Dockerfile.zulu-8-jdk-tomcat
@@ -7,7 +7,7 @@
 FROM mcr.microsoft.com/java/jdk:8-zulu-centos
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-ARG TOMCAT_VERSION=9.0.31
+ARG TOMCAT_VERSION=9.0.37
 ARG SERVER_XML=server.xml
 ARG LOGGING_PROPERTIES=logging.properties
 ARG CATALINA_PROPERTIES=catalina.properties

From 3ec52698ac5ccfab6fab66f49e4843d837fb0267 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 18 Sep 2020 11:37:48 -0500
Subject: [PATCH 124/264] Changed to Tomcat 9.0.37

---
 docker/debian10/Dockerfile.zulu-8-jdk-tomcat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/debian10/Dockerfile.zulu-8-jdk-tomcat b/docker/debian10/Dockerfile.zulu-8-jdk-tomcat
index a5c64ff8..a38691fe 100644
--- a/docker/debian10/Dockerfile.zulu-8-jdk-tomcat
+++ b/docker/debian10/Dockerfile.zulu-8-jdk-tomcat
@@ -7,7 +7,7 @@
 FROM mcr.microsoft.com/java/jdk:8-zulu-debian10
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-ARG TOMCAT_VERSION=9.0.31
+ARG TOMCAT_VERSION=9.0.37
 ARG SERVER_XML=server.xml
 ARG LOGGING_PROPERTIES=logging.properties
 ARG CATALINA_PROPERTIES=catalina.properties

From 8faa93b02bc0145dee36e37610bdf85ec101094c Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 18 Sep 2020 11:38:25 -0500
Subject: [PATCH 125/264] Changed to Tomcat 9.0.37

---
 docker/ubuntu/Dockerfile.zulu-8-jdk-tomcat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/ubuntu/Dockerfile.zulu-8-jdk-tomcat b/docker/ubuntu/Dockerfile.zulu-8-jdk-tomcat
index 20914e5b..5b1fc367 100644
--- a/docker/ubuntu/Dockerfile.zulu-8-jdk-tomcat
+++ b/docker/ubuntu/Dockerfile.zulu-8-jdk-tomcat
@@ -7,7 +7,7 @@
 FROM mcr.microsoft.com/java/jdk:8-zulu-ubuntu
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-ARG TOMCAT_VERSION=9.0.31
+ARG TOMCAT_VERSION=9.0.37
 ARG SERVER_XML=server.xml
 ARG LOGGING_PROPERTIES=logging.properties
 ARG CATALINA_PROPERTIES=catalina.properties

From f709345013a3d6f12f26562db29b1d8f4841c993 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 21 Sep 2020 16:19:31 -0500
Subject: [PATCH 126/264] FIles from tomcat-container-quickstart

---
 docker/alpine/Tomcat/logging.properties | 45 +++++++++----------------
 docker/alpine/Tomcat/startup.sh         |  2 ++
 2 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/docker/alpine/Tomcat/logging.properties b/docker/alpine/Tomcat/logging.properties
index 86c3fb0f..a9ed260b 100644
--- a/docker/alpine/Tomcat/logging.properties
+++ b/docker/alpine/Tomcat/logging.properties
@@ -13,39 +13,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-handlers = 1catalina.org.apache.juli.AsyncFileHandler, 2localhost.org.apache.juli.AsyncFileHandler, 3manager.org.apache.juli.AsyncFileHandler, 4host-manager.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler
 
-.handlers = 1catalina.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler
+# This file has been modified from Tomcat's original to redirect all logging to the console.
+# Console output of containers can be consumed by Azure Monitor and other services.
+
+# For more information about enabling Azure Monitor for Containers, see
+# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-enable-existing-clusters
+
+# For more information about querying logs with Azure Monitor for containers, see
+# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-log-search#search-logs-to-analyze-data
+
+
+handlers = 1catalina.java.util.logging.ConsoleHandler, 2localhost.java.util.logging.ConsoleHandler, 3manager.java.util.logging.ConsoleHandler, 4host-manager.java.util.logging.ConsoleHandler, java.util.logging.ConsoleHandler
+
+.handlers = java.util.logging.ConsoleHandler
 
 ############################################################
 # Handler specific properties.
 # Describes specific configuration info for Handlers.
 ############################################################
 
-1catalina.org.apache.juli.AsyncFileHandler.level = FINE
-1catalina.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
-1catalina.org.apache.juli.AsyncFileHandler.prefix = catalina.
-1catalina.org.apache.juli.AsyncFileHandler.maxDays = 90
-1catalina.org.apache.juli.AsyncFileHandler.encoding = UTF-8
-
-2localhost.org.apache.juli.AsyncFileHandler.level = FINE
-2localhost.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
-2localhost.org.apache.juli.AsyncFileHandler.prefix = localhost.
-2localhost.org.apache.juli.AsyncFileHandler.maxDays = 90
-2localhost.org.apache.juli.AsyncFileHandler.encoding = UTF-8
-
-3manager.org.apache.juli.AsyncFileHandler.level = FINE
-3manager.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
-3manager.org.apache.juli.AsyncFileHandler.prefix = manager.
-3manager.org.apache.juli.AsyncFileHandler.maxDays = 90
-3manager.org.apache.juli.AsyncFileHandler.encoding = UTF-8
-
-4host-manager.org.apache.juli.AsyncFileHandler.level = FINE
-4host-manager.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
-4host-manager.org.apache.juli.AsyncFileHandler.prefix = host-manager.
-4host-manager.org.apache.juli.AsyncFileHandler.maxDays = 90
-4host-manager.org.apache.juli.AsyncFileHandler.encoding = UTF-8
-
 java.util.logging.ConsoleHandler.level = FINE
 java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter
 java.util.logging.ConsoleHandler.encoding = UTF-8
@@ -57,13 +44,13 @@ java.util.logging.ConsoleHandler.encoding = UTF-8
 ############################################################
 
 org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.AsyncFileHandler
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler
 
 org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.AsyncFileHandler
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler
 
 org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 4host-manager.org.apache.juli.AsyncFileHandler
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = java.util.logging.ConsoleHandler
 
 # For example, set the org.apache.catalina.util.LifecycleBase logger to log
 # each component that extends LifecycleBase changing state:
diff --git a/docker/alpine/Tomcat/startup.sh b/docker/alpine/Tomcat/startup.sh
index 55434530..365141c2 100644
--- a/docker/alpine/Tomcat/startup.sh
+++ b/docker/alpine/Tomcat/startup.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# Create a log directory for each hostname in case a shared file system is used among multiple hosts or containers.
+# As provided in the default configuration, only the access log gets written to this directory.
 LOG_DIR="${LOG_ROOT}/$(hostname)"
 mkdir -p "${LOG_DIR}"
 export JAVA_OPTS="${JAVA_OPTS} -Dlog.base=${LOG_DIR}"

From 4f57157cece313f5c0bcd4681a496b96b5308bb6 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 21 Sep 2020 16:20:12 -0500
Subject: [PATCH 127/264] Upgrade to Tomcat 9.0.38

---
 docker/alpine/Dockerfile.zulu-8-jdk-tomcat | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docker/alpine/Dockerfile.zulu-8-jdk-tomcat b/docker/alpine/Dockerfile.zulu-8-jdk-tomcat
index 5445c6e7..e03074ee 100644
--- a/docker/alpine/Dockerfile.zulu-8-jdk-tomcat
+++ b/docker/alpine/Dockerfile.zulu-8-jdk-tomcat
@@ -7,11 +7,16 @@
 FROM mcr.microsoft.com/java/jdk:8-zulu-alpine
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-ARG TOMCAT_VERSION=9.0.37
+ARG TOMCAT_VERSION=9.0.38
 ARG SERVER_XML=server.xml
 ARG LOGGING_PROPERTIES=logging.properties
 ARG CATALINA_PROPERTIES=catalina.properties
 ARG TOMCAT_MAJOR=9
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
 ENV LOG_ROOT=/tomcat_logs
 
 ENV PATH /usr/local/tomcat/bin:$PATH

From c0ede4df3efd247f0794d1c8be63dde20e97a0d9 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 21 Sep 2020 16:21:07 -0500
Subject: [PATCH 128/264] FIles from tomcat-container-quickstart

---
 docker/centos/Tomcat/logging.properties | 45 +++++++++----------------
 docker/centos/Tomcat/startup.sh         |  2 ++
 2 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/docker/centos/Tomcat/logging.properties b/docker/centos/Tomcat/logging.properties
index 86c3fb0f..a9ed260b 100644
--- a/docker/centos/Tomcat/logging.properties
+++ b/docker/centos/Tomcat/logging.properties
@@ -13,39 +13,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-handlers = 1catalina.org.apache.juli.AsyncFileHandler, 2localhost.org.apache.juli.AsyncFileHandler, 3manager.org.apache.juli.AsyncFileHandler, 4host-manager.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler
 
-.handlers = 1catalina.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler
+# This file has been modified from Tomcat's original to redirect all logging to the console.
+# Console output of containers can be consumed by Azure Monitor and other services.
+
+# For more information about enabling Azure Monitor for Containers, see
+# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-enable-existing-clusters
+
+# For more information about querying logs with Azure Monitor for containers, see
+# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-log-search#search-logs-to-analyze-data
+
+
+handlers = 1catalina.java.util.logging.ConsoleHandler, 2localhost.java.util.logging.ConsoleHandler, 3manager.java.util.logging.ConsoleHandler, 4host-manager.java.util.logging.ConsoleHandler, java.util.logging.ConsoleHandler
+
+.handlers = java.util.logging.ConsoleHandler
 
 ############################################################
 # Handler specific properties.
 # Describes specific configuration info for Handlers.
 ############################################################
 
-1catalina.org.apache.juli.AsyncFileHandler.level = FINE
-1catalina.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
-1catalina.org.apache.juli.AsyncFileHandler.prefix = catalina.
-1catalina.org.apache.juli.AsyncFileHandler.maxDays = 90
-1catalina.org.apache.juli.AsyncFileHandler.encoding = UTF-8
-
-2localhost.org.apache.juli.AsyncFileHandler.level = FINE
-2localhost.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
-2localhost.org.apache.juli.AsyncFileHandler.prefix = localhost.
-2localhost.org.apache.juli.AsyncFileHandler.maxDays = 90
-2localhost.org.apache.juli.AsyncFileHandler.encoding = UTF-8
-
-3manager.org.apache.juli.AsyncFileHandler.level = FINE
-3manager.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
-3manager.org.apache.juli.AsyncFileHandler.prefix = manager.
-3manager.org.apache.juli.AsyncFileHandler.maxDays = 90
-3manager.org.apache.juli.AsyncFileHandler.encoding = UTF-8
-
-4host-manager.org.apache.juli.AsyncFileHandler.level = FINE
-4host-manager.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
-4host-manager.org.apache.juli.AsyncFileHandler.prefix = host-manager.
-4host-manager.org.apache.juli.AsyncFileHandler.maxDays = 90
-4host-manager.org.apache.juli.AsyncFileHandler.encoding = UTF-8
-
 java.util.logging.ConsoleHandler.level = FINE
 java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter
 java.util.logging.ConsoleHandler.encoding = UTF-8
@@ -57,13 +44,13 @@ java.util.logging.ConsoleHandler.encoding = UTF-8
 ############################################################
 
 org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.AsyncFileHandler
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler
 
 org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.AsyncFileHandler
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler
 
 org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 4host-manager.org.apache.juli.AsyncFileHandler
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = java.util.logging.ConsoleHandler
 
 # For example, set the org.apache.catalina.util.LifecycleBase logger to log
 # each component that extends LifecycleBase changing state:
diff --git a/docker/centos/Tomcat/startup.sh b/docker/centos/Tomcat/startup.sh
index 55434530..365141c2 100644
--- a/docker/centos/Tomcat/startup.sh
+++ b/docker/centos/Tomcat/startup.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# Create a log directory for each hostname in case a shared file system is used among multiple hosts or containers.
+# As provided in the default configuration, only the access log gets written to this directory.
 LOG_DIR="${LOG_ROOT}/$(hostname)"
 mkdir -p "${LOG_DIR}"
 export JAVA_OPTS="${JAVA_OPTS} -Dlog.base=${LOG_DIR}"

From c9a326067babbd1c609a335c948dee41afe27f24 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 21 Sep 2020 16:21:44 -0500
Subject: [PATCH 129/264] Upgrade to Tomcat 9.0.38

---
 docker/centos/Dockerfile.zulu-8-jdk-tomcat | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docker/centos/Dockerfile.zulu-8-jdk-tomcat b/docker/centos/Dockerfile.zulu-8-jdk-tomcat
index e32c7579..bb384cfc 100644
--- a/docker/centos/Dockerfile.zulu-8-jdk-tomcat
+++ b/docker/centos/Dockerfile.zulu-8-jdk-tomcat
@@ -7,11 +7,16 @@
 FROM mcr.microsoft.com/java/jdk:8-zulu-centos
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-ARG TOMCAT_VERSION=9.0.37
+ARG TOMCAT_VERSION=9.0.38
 ARG SERVER_XML=server.xml
 ARG LOGGING_PROPERTIES=logging.properties
 ARG CATALINA_PROPERTIES=catalina.properties
 ARG TOMCAT_MAJOR=9
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
 ENV LOG_ROOT=/tomcat_logs
 
 ENV PATH /usr/local/tomcat/bin:$PATH

From 74781de4814398685f113a2d6e34b8fe4385346d Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 21 Sep 2020 16:22:43 -0500
Subject: [PATCH 130/264] Files from tomcat-container-quickstart

---
 docker/debian10/Tomcat/logging.properties | 45 ++++++++---------------
 docker/debian10/Tomcat/startup.sh         |  2 +
 2 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/docker/debian10/Tomcat/logging.properties b/docker/debian10/Tomcat/logging.properties
index 86c3fb0f..a9ed260b 100644
--- a/docker/debian10/Tomcat/logging.properties
+++ b/docker/debian10/Tomcat/logging.properties
@@ -13,39 +13,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-handlers = 1catalina.org.apache.juli.AsyncFileHandler, 2localhost.org.apache.juli.AsyncFileHandler, 3manager.org.apache.juli.AsyncFileHandler, 4host-manager.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler
 
-.handlers = 1catalina.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler
+# This file has been modified from Tomcat's original to redirect all logging to the console.
+# Console output of containers can be consumed by Azure Monitor and other services.
+
+# For more information about enabling Azure Monitor for Containers, see
+# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-enable-existing-clusters
+
+# For more information about querying logs with Azure Monitor for containers, see
+# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-log-search#search-logs-to-analyze-data
+
+
+handlers = 1catalina.java.util.logging.ConsoleHandler, 2localhost.java.util.logging.ConsoleHandler, 3manager.java.util.logging.ConsoleHandler, 4host-manager.java.util.logging.ConsoleHandler, java.util.logging.ConsoleHandler
+
+.handlers = java.util.logging.ConsoleHandler
 
 ############################################################
 # Handler specific properties.
 # Describes specific configuration info for Handlers.
 ############################################################
 
-1catalina.org.apache.juli.AsyncFileHandler.level = FINE
-1catalina.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
-1catalina.org.apache.juli.AsyncFileHandler.prefix = catalina.
-1catalina.org.apache.juli.AsyncFileHandler.maxDays = 90
-1catalina.org.apache.juli.AsyncFileHandler.encoding = UTF-8
-
-2localhost.org.apache.juli.AsyncFileHandler.level = FINE
-2localhost.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
-2localhost.org.apache.juli.AsyncFileHandler.prefix = localhost.
-2localhost.org.apache.juli.AsyncFileHandler.maxDays = 90
-2localhost.org.apache.juli.AsyncFileHandler.encoding = UTF-8
-
-3manager.org.apache.juli.AsyncFileHandler.level = FINE
-3manager.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
-3manager.org.apache.juli.AsyncFileHandler.prefix = manager.
-3manager.org.apache.juli.AsyncFileHandler.maxDays = 90
-3manager.org.apache.juli.AsyncFileHandler.encoding = UTF-8
-
-4host-manager.org.apache.juli.AsyncFileHandler.level = FINE
-4host-manager.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
-4host-manager.org.apache.juli.AsyncFileHandler.prefix = host-manager.
-4host-manager.org.apache.juli.AsyncFileHandler.maxDays = 90
-4host-manager.org.apache.juli.AsyncFileHandler.encoding = UTF-8
-
 java.util.logging.ConsoleHandler.level = FINE
 java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter
 java.util.logging.ConsoleHandler.encoding = UTF-8
@@ -57,13 +44,13 @@ java.util.logging.ConsoleHandler.encoding = UTF-8
 ############################################################
 
 org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.AsyncFileHandler
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler
 
 org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.AsyncFileHandler
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler
 
 org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 4host-manager.org.apache.juli.AsyncFileHandler
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = java.util.logging.ConsoleHandler
 
 # For example, set the org.apache.catalina.util.LifecycleBase logger to log
 # each component that extends LifecycleBase changing state:
diff --git a/docker/debian10/Tomcat/startup.sh b/docker/debian10/Tomcat/startup.sh
index 55434530..365141c2 100644
--- a/docker/debian10/Tomcat/startup.sh
+++ b/docker/debian10/Tomcat/startup.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# Create a log directory for each hostname in case a shared file system is used among multiple hosts or containers.
+# As provided in the default configuration, only the access log gets written to this directory.
 LOG_DIR="${LOG_ROOT}/$(hostname)"
 mkdir -p "${LOG_DIR}"
 export JAVA_OPTS="${JAVA_OPTS} -Dlog.base=${LOG_DIR}"

From 23ad2f5d0be536eacdddc12945557e7ce273c9c5 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 21 Sep 2020 16:23:11 -0500
Subject: [PATCH 131/264] Upgrade to Tomcat 9.0.38

---
 docker/debian10/Dockerfile.zulu-8-jdk-tomcat | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docker/debian10/Dockerfile.zulu-8-jdk-tomcat b/docker/debian10/Dockerfile.zulu-8-jdk-tomcat
index a38691fe..13e85ddb 100644
--- a/docker/debian10/Dockerfile.zulu-8-jdk-tomcat
+++ b/docker/debian10/Dockerfile.zulu-8-jdk-tomcat
@@ -7,11 +7,16 @@
 FROM mcr.microsoft.com/java/jdk:8-zulu-debian10
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-ARG TOMCAT_VERSION=9.0.37
+ARG TOMCAT_VERSION=9.0.38
 ARG SERVER_XML=server.xml
 ARG LOGGING_PROPERTIES=logging.properties
 ARG CATALINA_PROPERTIES=catalina.properties
 ARG TOMCAT_MAJOR=9
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
 ENV LOG_ROOT=/tomcat_logs
 
 ENV PATH /usr/local/tomcat/bin:$PATH

From c42eca03de5ec25374d965ec67cbeb8ada9d506c Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 21 Sep 2020 16:24:02 -0500
Subject: [PATCH 132/264] Files from tomcat-container-quickstart

---
 docker/ubuntu/Tomcat/logging.properties | 45 +++++++++----------------
 docker/ubuntu/Tomcat/startup.sh         |  2 ++
 2 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/docker/ubuntu/Tomcat/logging.properties b/docker/ubuntu/Tomcat/logging.properties
index 86c3fb0f..a9ed260b 100644
--- a/docker/ubuntu/Tomcat/logging.properties
+++ b/docker/ubuntu/Tomcat/logging.properties
@@ -13,39 +13,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-handlers = 1catalina.org.apache.juli.AsyncFileHandler, 2localhost.org.apache.juli.AsyncFileHandler, 3manager.org.apache.juli.AsyncFileHandler, 4host-manager.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler
 
-.handlers = 1catalina.org.apache.juli.AsyncFileHandler, java.util.logging.ConsoleHandler
+# This file has been modified from Tomcat's original to redirect all logging to the console.
+# Console output of containers can be consumed by Azure Monitor and other services.
+
+# For more information about enabling Azure Monitor for Containers, see
+# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-enable-existing-clusters
+
+# For more information about querying logs with Azure Monitor for containers, see
+# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-log-search#search-logs-to-analyze-data
+
+
+handlers = 1catalina.java.util.logging.ConsoleHandler, 2localhost.java.util.logging.ConsoleHandler, 3manager.java.util.logging.ConsoleHandler, 4host-manager.java.util.logging.ConsoleHandler, java.util.logging.ConsoleHandler
+
+.handlers = java.util.logging.ConsoleHandler
 
 ############################################################
 # Handler specific properties.
 # Describes specific configuration info for Handlers.
 ############################################################
 
-1catalina.org.apache.juli.AsyncFileHandler.level = FINE
-1catalina.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
-1catalina.org.apache.juli.AsyncFileHandler.prefix = catalina.
-1catalina.org.apache.juli.AsyncFileHandler.maxDays = 90
-1catalina.org.apache.juli.AsyncFileHandler.encoding = UTF-8
-
-2localhost.org.apache.juli.AsyncFileHandler.level = FINE
-2localhost.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
-2localhost.org.apache.juli.AsyncFileHandler.prefix = localhost.
-2localhost.org.apache.juli.AsyncFileHandler.maxDays = 90
-2localhost.org.apache.juli.AsyncFileHandler.encoding = UTF-8
-
-3manager.org.apache.juli.AsyncFileHandler.level = FINE
-3manager.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
-3manager.org.apache.juli.AsyncFileHandler.prefix = manager.
-3manager.org.apache.juli.AsyncFileHandler.maxDays = 90
-3manager.org.apache.juli.AsyncFileHandler.encoding = UTF-8
-
-4host-manager.org.apache.juli.AsyncFileHandler.level = FINE
-4host-manager.org.apache.juli.AsyncFileHandler.directory = ${log.base}/Application
-4host-manager.org.apache.juli.AsyncFileHandler.prefix = host-manager.
-4host-manager.org.apache.juli.AsyncFileHandler.maxDays = 90
-4host-manager.org.apache.juli.AsyncFileHandler.encoding = UTF-8
-
 java.util.logging.ConsoleHandler.level = FINE
 java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter
 java.util.logging.ConsoleHandler.encoding = UTF-8
@@ -57,13 +44,13 @@ java.util.logging.ConsoleHandler.encoding = UTF-8
 ############################################################
 
 org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.AsyncFileHandler
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler
 
 org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.AsyncFileHandler
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler
 
 org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 4host-manager.org.apache.juli.AsyncFileHandler
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = java.util.logging.ConsoleHandler
 
 # For example, set the org.apache.catalina.util.LifecycleBase logger to log
 # each component that extends LifecycleBase changing state:
diff --git a/docker/ubuntu/Tomcat/startup.sh b/docker/ubuntu/Tomcat/startup.sh
index 55434530..365141c2 100644
--- a/docker/ubuntu/Tomcat/startup.sh
+++ b/docker/ubuntu/Tomcat/startup.sh
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# Create a log directory for each hostname in case a shared file system is used among multiple hosts or containers.
+# As provided in the default configuration, only the access log gets written to this directory.
 LOG_DIR="${LOG_ROOT}/$(hostname)"
 mkdir -p "${LOG_DIR}"
 export JAVA_OPTS="${JAVA_OPTS} -Dlog.base=${LOG_DIR}"

From 023d31444551fc0e1de9d14cc7ddb8e9f3ff268d Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 21 Sep 2020 16:24:30 -0500
Subject: [PATCH 133/264] Upgrade to Tomcat 9.0.38

---
 docker/ubuntu/Dockerfile.zulu-8-jdk-tomcat | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docker/ubuntu/Dockerfile.zulu-8-jdk-tomcat b/docker/ubuntu/Dockerfile.zulu-8-jdk-tomcat
index 5b1fc367..c1324171 100644
--- a/docker/ubuntu/Dockerfile.zulu-8-jdk-tomcat
+++ b/docker/ubuntu/Dockerfile.zulu-8-jdk-tomcat
@@ -7,11 +7,16 @@
 FROM mcr.microsoft.com/java/jdk:8-zulu-ubuntu
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-ARG TOMCAT_VERSION=9.0.37
+ARG TOMCAT_VERSION=9.0.38
 ARG SERVER_XML=server.xml
 ARG LOGGING_PROPERTIES=logging.properties
 ARG CATALINA_PROPERTIES=catalina.properties
 ARG TOMCAT_MAJOR=9
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
 ENV LOG_ROOT=/tomcat_logs
 
 ENV PATH /usr/local/tomcat/bin:$PATH

From bfe17b4df6040350d78f0a838bad1c1d1070d54b Mon Sep 17 00:00:00 2001
From: zulu-ci <zulu-ci@azul.com>
Date: Wed, 23 Sep 2020 15:51:35 +0000
Subject: [PATCH 134/264] java15 dockerfiles

---
 docker/alpine/Dockerfile.zulu-15u0-jdk        | 32 +++++++++++++++++++
 docker/alpine/Dockerfile.zulu-15u0-jre        | 30 +++++++++++++++++
 .../alpine/Dockerfile.zulu-15u0-jre-headless  | 30 +++++++++++++++++
 .../Dockerfile.zulu-15u0-jre-headless-tools   | 32 +++++++++++++++++++
 docker/centos/Dockerfile.zulu-15u0-jdk        | 17 ++++++++++
 docker/centos/Dockerfile.zulu-15u0-jre        | 17 ++++++++++
 .../centos/Dockerfile.zulu-15u0-jre-headless  | 16 ++++++++++
 docker/debian10/Dockerfile.zulu-15u0-jdk      | 21 ++++++++++++
 docker/debian10/Dockerfile.zulu-15u0-jre      | 21 ++++++++++++
 .../Dockerfile.zulu-15u0-jre-headless         | 21 ++++++++++++
 docker/debian9/Dockerfile.zulu-15u0-jdk       | 21 ++++++++++++
 docker/debian9/Dockerfile.zulu-15u0-jre       | 21 ++++++++++++
 .../debian9/Dockerfile.zulu-15u0-jre-headless | 21 ++++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-15u0-jdk  | 21 ++++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-15u0-jre  | 21 ++++++++++++
 .../Dockerfile.zulu-15u0-jre-headless         | 21 ++++++++++++
 docker/ubuntu/Dockerfile.zulu-15u0-jdk        | 21 ++++++++++++
 docker/ubuntu/Dockerfile.zulu-15u0-jre        | 21 ++++++++++++
 .../ubuntu/Dockerfile.zulu-15u0-jre-headless  | 21 ++++++++++++
 .../Dockerfile.zulu-15u0-jdk                  | 17 ++++++++++
 .../Dockerfile.zulu-15u0-jre                  | 16 ++++++++++
 21 files changed, 459 insertions(+)
 create mode 100644 docker/alpine/Dockerfile.zulu-15u0-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-15u0-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-15u0-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-15u0-jre-headless-tools
 create mode 100644 docker/centos/Dockerfile.zulu-15u0-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-15u0-jre
 create mode 100644 docker/centos/Dockerfile.zulu-15u0-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-15u0-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-15u0-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-15u0-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-15u0-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-15u0-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-15u0-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-15u0-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-15u0-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-15u0-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-15u0-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-15u0-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-15u0-jre-headless
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-15u0-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-15u0-jre

diff --git a/docker/alpine/Dockerfile.zulu-15u0-jdk b/docker/alpine/Dockerfile.zulu-15u0-jdk
new file mode 100644
index 00000000..3d4f8bde
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-15u0-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-15-azure-jdk_15.27.17-15.0.0-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15/zulu-15-azure-jdk_15.27.17-15.0.0-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-15u0-jre b/docker/alpine/Dockerfile.zulu-15u0-jre
new file mode 100644
index 00000000..16676973
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-15u0-jre
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-15-azure-jre_15.27.17-15.0.0-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15/zulu-15-azure-jre_15.27.17-15.0.0-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-15u0-jre-headless b/docker/alpine/Dockerfile.zulu-15u0-jre-headless
new file mode 100644
index 00000000..028991ee
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-15u0-jre-headless
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-15-azure-jre-headless_15.27.17-15.0.0-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15/zulu-15-azure-jre-headless_15.27.17-15.0.0-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-15u0-jre-headless-tools b/docker/alpine/Dockerfile.zulu-15u0-jre-headless-tools
new file mode 100644
index 00000000..cced64aa
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-15u0-jre-headless-tools
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-15-azure-jre-headless-tools_15.27.17-15.0.0-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15/zulu-15-azure-jre-headless-tools_15.27.17-15.0.0-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/centos/Dockerfile.zulu-15u0-jdk b/docker/centos/Dockerfile.zulu-15u0-jdk
new file mode 100644
index 00000000..e5b486da
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-15u0-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-15-azure-jdk-15.27.17
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure
+
diff --git a/docker/centos/Dockerfile.zulu-15u0-jre b/docker/centos/Dockerfile.zulu-15u0-jre
new file mode 100644
index 00000000..860d03e6
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-15u0-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-15-azure-jre-15.27.17
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure
+
diff --git a/docker/centos/Dockerfile.zulu-15u0-jre-headless b/docker/centos/Dockerfile.zulu-15u0-jre-headless
new file mode 100644
index 00000000..0b9c082a
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-15u0-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-15-azure-jre-headless-15.27.17
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure
diff --git a/docker/debian10/Dockerfile.zulu-15u0-jdk b/docker/debian10/Dockerfile.zulu-15u0-jdk
new file mode 100644
index 00000000..e8239f62
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-15u0-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.27+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-15u0-jre b/docker/debian10/Dockerfile.zulu-15u0-jre
new file mode 100644
index 00000000..973a9bfb
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-15u0-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.27+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-15u0-jre-headless b/docker/debian10/Dockerfile.zulu-15u0-jre-headless
new file mode 100644
index 00000000..b3dbb2ae
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-15u0-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.27+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-15u0-jdk b/docker/debian9/Dockerfile.zulu-15u0-jdk
new file mode 100644
index 00000000..1a3f556e
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-15u0-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.27+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-15u0-jre b/docker/debian9/Dockerfile.zulu-15u0-jre
new file mode 100644
index 00000000..f084c1ee
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-15u0-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.27+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-15u0-jre-headless b/docker/debian9/Dockerfile.zulu-15u0-jre-headless
new file mode 100644
index 00000000..1390aac8
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-15u0-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.27+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u0-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-15u0-jdk
new file mode 100644
index 00000000..f742cbc3
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u0-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.27+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u0-jre b/docker/ubuntu-18.04/Dockerfile.zulu-15u0-jre
new file mode 100644
index 00000000..4dc9f26c
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u0-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.27+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u0-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-15u0-jre-headless
new file mode 100644
index 00000000..366161e9
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u0-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.27+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-15u0-jdk b/docker/ubuntu/Dockerfile.zulu-15u0-jdk
new file mode 100644
index 00000000..a0b6529d
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-15u0-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.27+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-15u0-jre b/docker/ubuntu/Dockerfile.zulu-15u0-jre
new file mode 100644
index 00000000..0ec529a6
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-15u0-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.27+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-15u0-jre-headless b/docker/ubuntu/Dockerfile.zulu-15u0-jre-headless
new file mode 100644
index 00000000..b3f90e03
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-15u0-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.27+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/windowsservercore/Dockerfile.zulu-15u0-jdk b/docker/windowsservercore/Dockerfile.zulu-15u0-jdk
new file mode 100644
index 00000000..f242382a
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-15u0-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-15-azure-jdk_15.27.17-15.0.0-win_x64.msi && \
+    setx PACKAGE_DIR zulu-15/15.0.0 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-15"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-15/15/zulu-15-azure-jdk_15.27.17-15.0.0-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-15u0-jre b/docker/windowsservercore/Dockerfile.zulu-15u0-jre
new file mode 100644
index 00000000..e2c885e3
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-15u0-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-15-azure-jre_15.27.17-15.0.0-win_x64.msi && \
+    setx PACKAGE_DIR zulu-15/15.0.0 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-15-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-15/15/zulu-15-azure-jre_15.27.17-15.0.0-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%

From d53be0e93d4eccf597a97e439f7e1b96a7bca4df Mon Sep 17 00:00:00 2001
From: zulu-ci <zulu-ci@azul.com>
Date: Tue, 20 Oct 2020 21:05:02 +0000
Subject: [PATCH 135/264] october release

---
 docker/alpine/Dockerfile.zulu-11u9-jdk        | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-11u9-jre        | 32 ++++++++++++++
 .../alpine/Dockerfile.zulu-11u9-jre-headless  | 32 ++++++++++++++
 .../Dockerfile.zulu-11u9-jre-headless-tools   | 30 +++++++++++++
 docker/alpine/Dockerfile.zulu-13u5-jdk        | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-13u5-jre        | 30 +++++++++++++
 .../alpine/Dockerfile.zulu-13u5-jre-headless  | 30 +++++++++++++
 .../Dockerfile.zulu-13u5-jre-headless-tools   | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-15u1-jdk        | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-15u1-jre        | 30 +++++++++++++
 .../alpine/Dockerfile.zulu-15u1-jre-headless  | 30 +++++++++++++
 .../Dockerfile.zulu-15u1-jre-headless-tools   | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-7u282-jdk       | 42 +++++++++++++++++++
 docker/alpine/Dockerfile.zulu-7u282-jre       | 42 +++++++++++++++++++
 .../alpine/Dockerfile.zulu-7u282-jre-headless | 42 +++++++++++++++++++
 docker/alpine/Dockerfile.zulu-8u272-jdk       | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-8u272-jre       | 32 ++++++++++++++
 .../alpine/Dockerfile.zulu-8u272-jre-headless | 32 ++++++++++++++
 .../Dockerfile.zulu-8u272-jre-headless-tools  | 32 ++++++++++++++
 docker/centos/Dockerfile.zulu-11u9-jdk        | 17 ++++++++
 docker/centos/Dockerfile.zulu-11u9-jre        | 17 ++++++++
 .../centos/Dockerfile.zulu-11u9-jre-headless  | 16 +++++++
 docker/centos/Dockerfile.zulu-13u5-jdk        | 17 ++++++++
 docker/centos/Dockerfile.zulu-13u5-jre        | 17 ++++++++
 .../centos/Dockerfile.zulu-13u5-jre-headless  | 16 +++++++
 docker/centos/Dockerfile.zulu-15u1-jdk        | 17 ++++++++
 docker/centos/Dockerfile.zulu-15u1-jre        | 17 ++++++++
 .../centos/Dockerfile.zulu-15u1-jre-headless  | 16 +++++++
 docker/centos/Dockerfile.zulu-7u282-jdk       | 17 ++++++++
 docker/centos/Dockerfile.zulu-7u282-jre       | 17 ++++++++
 .../centos/Dockerfile.zulu-7u282-jre-headless | 16 +++++++
 docker/centos/Dockerfile.zulu-8u272-jdk       | 17 ++++++++
 docker/centos/Dockerfile.zulu-8u272-jre       | 17 ++++++++
 .../centos/Dockerfile.zulu-8u272-jre-headless | 16 +++++++
 docker/debian10/Dockerfile.zulu-11u9-jdk      | 21 ++++++++++
 docker/debian10/Dockerfile.zulu-11u9-jre      | 21 ++++++++++
 .../Dockerfile.zulu-11u9-jre-headless         | 21 ++++++++++
 docker/debian10/Dockerfile.zulu-13u5-jdk      | 21 ++++++++++
 docker/debian10/Dockerfile.zulu-13u5-jre      | 21 ++++++++++
 .../Dockerfile.zulu-13u5-jre-headless         | 21 ++++++++++
 docker/debian10/Dockerfile.zulu-15u1-jdk      | 21 ++++++++++
 docker/debian10/Dockerfile.zulu-15u1-jre      | 21 ++++++++++
 .../Dockerfile.zulu-15u1-jre-headless         | 21 ++++++++++
 docker/debian10/Dockerfile.zulu-7u282-jdk     | 21 ++++++++++
 docker/debian10/Dockerfile.zulu-7u282-jre     | 21 ++++++++++
 .../Dockerfile.zulu-7u282-jre-headless        | 21 ++++++++++
 docker/debian10/Dockerfile.zulu-8u272-jdk     | 21 ++++++++++
 docker/debian10/Dockerfile.zulu-8u272-jre     | 21 ++++++++++
 .../Dockerfile.zulu-8u272-jre-headless        | 21 ++++++++++
 .../Dockerfile.zulu-8u272-jre-headless-tools  | 27 ++++++++++++
 docker/debian10/Dockerfile.zulu-8u272-maven   | 31 ++++++++++++++
 docker/debian9/Dockerfile.zulu-11u9-jdk       | 21 ++++++++++
 docker/debian9/Dockerfile.zulu-11u9-jre       | 21 ++++++++++
 .../debian9/Dockerfile.zulu-11u9-jre-headless | 21 ++++++++++
 docker/debian9/Dockerfile.zulu-13u5-jdk       | 21 ++++++++++
 docker/debian9/Dockerfile.zulu-13u5-jre       | 21 ++++++++++
 .../debian9/Dockerfile.zulu-13u5-jre-headless | 21 ++++++++++
 docker/debian9/Dockerfile.zulu-15u1-jdk       | 21 ++++++++++
 docker/debian9/Dockerfile.zulu-15u1-jre       | 21 ++++++++++
 .../debian9/Dockerfile.zulu-15u1-jre-headless | 21 ++++++++++
 docker/debian9/Dockerfile.zulu-7u282-jdk      | 21 ++++++++++
 docker/debian9/Dockerfile.zulu-7u282-jre      | 21 ++++++++++
 .../Dockerfile.zulu-7u282-jre-headless        | 21 ++++++++++
 docker/debian9/Dockerfile.zulu-8u272-jdk      | 21 ++++++++++
 docker/debian9/Dockerfile.zulu-8u272-jre      | 21 ++++++++++
 .../Dockerfile.zulu-8u272-jre-headless        | 21 ++++++++++
 docker/debian9/Dockerfile.zulu-8u272-maven    | 31 ++++++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-11u9-jdk  | 21 ++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-11u9-jre  | 21 ++++++++++
 .../Dockerfile.zulu-11u9-jre-headless         | 21 ++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-13u5-jdk  | 21 ++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-13u5-jre  | 21 ++++++++++
 .../Dockerfile.zulu-13u5-jre-headless         | 21 ++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-15u1-jdk  | 21 ++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-15u1-jre  | 21 ++++++++++
 .../Dockerfile.zulu-15u1-jre-headless         | 21 ++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-7u282-jdk | 21 ++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-7u282-jre | 21 ++++++++++
 .../Dockerfile.zulu-7u282-jre-headless        | 21 ++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-8u272-jdk | 21 ++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-8u272-jre | 21 ++++++++++
 .../Dockerfile.zulu-8u272-jre-headless        | 21 ++++++++++
 docker/ubuntu/Dockerfile.zulu-11u9-jdk        | 21 ++++++++++
 docker/ubuntu/Dockerfile.zulu-11u9-jre        | 21 ++++++++++
 .../ubuntu/Dockerfile.zulu-11u9-jre-headless  | 21 ++++++++++
 docker/ubuntu/Dockerfile.zulu-13u5-jdk        | 21 ++++++++++
 docker/ubuntu/Dockerfile.zulu-13u5-jre        | 21 ++++++++++
 .../ubuntu/Dockerfile.zulu-13u5-jre-headless  | 21 ++++++++++
 docker/ubuntu/Dockerfile.zulu-15u1-jdk        | 21 ++++++++++
 docker/ubuntu/Dockerfile.zulu-15u1-jre        | 21 ++++++++++
 .../ubuntu/Dockerfile.zulu-15u1-jre-headless  | 21 ++++++++++
 docker/ubuntu/Dockerfile.zulu-7u282-jdk       | 21 ++++++++++
 docker/ubuntu/Dockerfile.zulu-7u282-jre       | 21 ++++++++++
 .../ubuntu/Dockerfile.zulu-7u282-jre-headless | 21 ++++++++++
 docker/ubuntu/Dockerfile.zulu-8u272-jdk       | 21 ++++++++++
 docker/ubuntu/Dockerfile.zulu-8u272-jre       | 21 ++++++++++
 .../ubuntu/Dockerfile.zulu-8u272-jre-headless | 21 ++++++++++
 .../Dockerfile.zulu-11u9-jdk                  | 17 ++++++++
 .../Dockerfile.zulu-11u9-jre                  | 16 +++++++
 .../Dockerfile.zulu-13u5-jdk                  | 17 ++++++++
 .../Dockerfile.zulu-13u5-jre                  | 16 +++++++
 .../Dockerfile.zulu-14u2-jdk                  |  5 ++-
 .../Dockerfile.zulu-14u2-jre                  |  2 +-
 .../Dockerfile.zulu-15u1-jdk                  | 17 ++++++++
 .../Dockerfile.zulu-15u1-jre                  | 16 +++++++
 .../Dockerfile.zulu-7u282-jdk                 | 17 ++++++++
 .../Dockerfile.zulu-7u282-jre                 | 16 +++++++
 .../Dockerfile.zulu-8u272-jdk                 | 17 ++++++++
 .../Dockerfile.zulu-8u272-jre                 | 16 +++++++
 109 files changed, 2396 insertions(+), 3 deletions(-)
 create mode 100644 docker/alpine/Dockerfile.zulu-11u9-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-11u9-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-11u9-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools
 create mode 100644 docker/alpine/Dockerfile.zulu-13u5-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-13u5-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-13u5-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-13u5-jre-headless-tools
 create mode 100644 docker/alpine/Dockerfile.zulu-15u1-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-15u1-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-15u1-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-15u1-jre-headless-tools
 create mode 100644 docker/alpine/Dockerfile.zulu-7u282-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-7u282-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-7u282-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-8u272-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-8u272-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-8u272-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-8u272-jre-headless-tools
 create mode 100644 docker/centos/Dockerfile.zulu-11u9-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-11u9-jre
 create mode 100644 docker/centos/Dockerfile.zulu-11u9-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-13u5-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-13u5-jre
 create mode 100644 docker/centos/Dockerfile.zulu-13u5-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-15u1-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-15u1-jre
 create mode 100644 docker/centos/Dockerfile.zulu-15u1-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-7u282-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-7u282-jre
 create mode 100644 docker/centos/Dockerfile.zulu-7u282-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-8u272-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-8u272-jre
 create mode 100644 docker/centos/Dockerfile.zulu-8u272-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-11u9-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-11u9-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-11u9-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-13u5-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-13u5-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-13u5-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-15u1-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-15u1-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-15u1-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-7u282-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-7u282-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-7u282-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-8u272-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-8u272-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-8u272-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-8u272-jre-headless-tools
 create mode 100644 docker/debian10/Dockerfile.zulu-8u272-maven
 create mode 100644 docker/debian9/Dockerfile.zulu-11u9-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-11u9-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-11u9-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-13u5-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-13u5-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-13u5-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-15u1-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-15u1-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-15u1-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-7u282-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-7u282-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-7u282-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-8u272-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-8u272-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-8u272-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-8u272-maven
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-11u9-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-11u9-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-11u9-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-13u5-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-13u5-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-13u5-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-15u1-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-15u1-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-15u1-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u282-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u282-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u282-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u272-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u272-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u272-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u9-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u9-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u9-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-13u5-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-13u5-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-13u5-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-15u1-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-15u1-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-15u1-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-7u282-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-7u282-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-7u282-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u272-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u272-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u272-jre-headless
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-11u9-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-11u9-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-13u5-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-13u5-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-15u1-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-15u1-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-7u282-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-7u282-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-8u272-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-8u272-jre

diff --git a/docker/alpine/Dockerfile.zulu-11u9-jdk b/docker/alpine/Dockerfile.zulu-11u9-jdk
new file mode 100644
index 00000000..155bb0a2
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u9-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jdk_11.43.21-11.0.9-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.9/zulu-11-azure-jdk_11.43.21-11.0.9-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-11u9-jre b/docker/alpine/Dockerfile.zulu-11u9-jre
new file mode 100644
index 00000000..ce2b6aba
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u9-jre
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jre_11.43.21-11.0.9-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.9/zulu-11-azure-jre_11.43.21-11.0.9-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-11u9-jre-headless b/docker/alpine/Dockerfile.zulu-11u9-jre-headless
new file mode 100644
index 00000000..c377094f
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u9-jre-headless
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jre-headless_11.43.21-11.0.9-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.9/zulu-11-azure-jre-headless_11.43.21-11.0.9-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools b/docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools
new file mode 100644
index 00000000..516d8a3f
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jre-headless-tools_11.43.21-11.0.9-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.9/zulu-11-azure-jre-headless-tools_11.43.21-11.0.9-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-13u5-jdk b/docker/alpine/Dockerfile.zulu-13u5-jdk
new file mode 100644
index 00000000..c3771676
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u5-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jdk_13.35.17-13.0.5-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.5/zulu-13-azure-jdk_13.35.17-13.0.5-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-13u5-jre b/docker/alpine/Dockerfile.zulu-13u5-jre
new file mode 100644
index 00000000..346755c4
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u5-jre
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jre_13.35.17-13.0.5-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.5/zulu-13-azure-jre_13.35.17-13.0.5-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-13u5-jre-headless b/docker/alpine/Dockerfile.zulu-13u5-jre-headless
new file mode 100644
index 00000000..c9f05a92
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u5-jre-headless
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jre-headless_13.35.17-13.0.5-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.5/zulu-13-azure-jre-headless_13.35.17-13.0.5-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-13u5-jre-headless-tools b/docker/alpine/Dockerfile.zulu-13u5-jre-headless-tools
new file mode 100644
index 00000000..fc27f949
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u5-jre-headless-tools
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jre-headless-tools_13.35.17-13.0.5-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.5/zulu-13-azure-jre-headless-tools_13.35.17-13.0.5-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-15u1-jdk b/docker/alpine/Dockerfile.zulu-15u1-jdk
new file mode 100644
index 00000000..364edd29
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-15u1-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-15-azure-jdk_15.28.13-15.0.1-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.1/zulu-15-azure-jdk_15.28.13-15.0.1-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-15u1-jre b/docker/alpine/Dockerfile.zulu-15u1-jre
new file mode 100644
index 00000000..684562cf
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-15u1-jre
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-15-azure-jre_15.28.13-15.0.1-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.1/zulu-15-azure-jre_15.28.13-15.0.1-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-15u1-jre-headless b/docker/alpine/Dockerfile.zulu-15u1-jre-headless
new file mode 100644
index 00000000..c7ff014e
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-15u1-jre-headless
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-15-azure-jre-headless_15.28.13-15.0.1-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.1/zulu-15-azure-jre-headless_15.28.13-15.0.1-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-15u1-jre-headless-tools b/docker/alpine/Dockerfile.zulu-15u1-jre-headless-tools
new file mode 100644
index 00000000..dc75238d
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-15u1-jre-headless-tools
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-15-azure-jre-headless-tools_15.28.13-15.0.1-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.1/zulu-15-azure-jre-headless-tools_15.28.13-15.0.1-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-7u282-jdk b/docker/alpine/Dockerfile.zulu-7u282-jdk
new file mode 100644
index 00000000..28f46260
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-7u282-jdk
@@ -0,0 +1,42 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-7-azure-jdk_7.42.0.13-7.0.282-linux_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add binutils ca-certificates wget zstd tar && \
+    apk update && \
+    apk upgrade && \
+    wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+    wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
+    wget -O gcc-libs.tar.zst https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    tar -I zstd -xf gcc-libs.tar.zst -C /tmp && \
+    tar -xJf zlib.tar.xz -C /tmp && \
+    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
+    rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u282/zulu-7-azure-jdk_7.42.0.13-7.0.282-linux_x64.tar.gz && rm /root/.wget-hsts && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-7u282-jre b/docker/alpine/Dockerfile.zulu-7u282-jre
new file mode 100644
index 00000000..12cd3637
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-7u282-jre
@@ -0,0 +1,42 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-7-azure-jre_7.42.0.13-7.0.282-linux_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add binutils ca-certificates wget zstd tar && \
+    apk update && \
+    apk upgrade && \
+    wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+    wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
+    wget -O gcc-libs.tar.zst https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    tar -I zstd -xf gcc-libs.tar.zst -C /tmp && \
+    tar -xJf zlib.tar.xz -C /tmp && \
+    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
+    rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u282/zulu-7-azure-jre_7.42.0.13-7.0.282-linux_x64.tar.gz && rm /root/.wget-hsts && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-7u282-jre-headless b/docker/alpine/Dockerfile.zulu-7u282-jre-headless
new file mode 100644
index 00000000..fbdb2252
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-7u282-jre-headless
@@ -0,0 +1,42 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-7-azure-jre-headless_7.42.0.13-7.0.282-linux_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add binutils ca-certificates wget zstd tar && \
+    apk update && \
+    apk upgrade && \
+    wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+    wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
+    wget -O gcc-libs.tar.zst https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    tar -I zstd -xf gcc-libs.tar.zst -C /tmp && \
+    tar -xJf zlib.tar.xz -C /tmp && \
+    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
+    rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u282/zulu-7-azure-jre-headless_7.42.0.13-7.0.282-linux_x64.tar.gz && rm /root/.wget-hsts && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u272-jdk b/docker/alpine/Dockerfile.zulu-8u272-jdk
new file mode 100644
index 00000000..b6383689
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u272-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jdk_8.50.0.21-8.0.272-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u272/zulu-8-azure-jdk_8.50.0.21-8.0.272-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u272-jre b/docker/alpine/Dockerfile.zulu-8u272-jre
new file mode 100644
index 00000000..3a786098
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u272-jre
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre_8.50.0.21-8.0.272-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u272/zulu-8-azure-jre_8.50.0.21-8.0.272-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u272-jre-headless b/docker/alpine/Dockerfile.zulu-8u272-jre-headless
new file mode 100644
index 00000000..5ef07eef
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u272-jre-headless
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre-headless_8.50.0.21-8.0.272-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u272/zulu-8-azure-jre-headless_8.50.0.21-8.0.272-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u272-jre-headless-tools b/docker/alpine/Dockerfile.zulu-8u272-jre-headless-tools
new file mode 100644
index 00000000..4ce3980f
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u272-jre-headless-tools
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre-headless-tools_8.50.0.21-8.0.272-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u272/zulu-8-azure-jre-headless-tools_8.50.0.21-8.0.272-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/centos/Dockerfile.zulu-11u9-jdk b/docker/centos/Dockerfile.zulu-11u9-jdk
new file mode 100644
index 00000000..50f162b4
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u9-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-11-azure-jdk-11.43.21
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure
+
diff --git a/docker/centos/Dockerfile.zulu-11u9-jre b/docker/centos/Dockerfile.zulu-11u9-jre
new file mode 100644
index 00000000..4ab76d29
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u9-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-11-azure-jre-11.43.21
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure
+
diff --git a/docker/centos/Dockerfile.zulu-11u9-jre-headless b/docker/centos/Dockerfile.zulu-11u9-jre-headless
new file mode 100644
index 00000000..3b1320f9
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u9-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-11-azure-jre-headless-11.43.21
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure
diff --git a/docker/centos/Dockerfile.zulu-13u5-jdk b/docker/centos/Dockerfile.zulu-13u5-jdk
new file mode 100644
index 00000000..88c98e06
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-13u5-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-13-azure-jdk-13.35.17
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure
+
diff --git a/docker/centos/Dockerfile.zulu-13u5-jre b/docker/centos/Dockerfile.zulu-13u5-jre
new file mode 100644
index 00000000..71ba1092
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-13u5-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-13-azure-jre-13.35.17
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure
+
diff --git a/docker/centos/Dockerfile.zulu-13u5-jre-headless b/docker/centos/Dockerfile.zulu-13u5-jre-headless
new file mode 100644
index 00000000..349665b4
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-13u5-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-13-azure-jre-headless-13.35.17
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure
diff --git a/docker/centos/Dockerfile.zulu-15u1-jdk b/docker/centos/Dockerfile.zulu-15u1-jdk
new file mode 100644
index 00000000..eb2d00a7
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-15u1-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-15-azure-jdk-15.28.13
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure
+
diff --git a/docker/centos/Dockerfile.zulu-15u1-jre b/docker/centos/Dockerfile.zulu-15u1-jre
new file mode 100644
index 00000000..d8b2312b
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-15u1-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-15-azure-jre-15.28.13
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure
+
diff --git a/docker/centos/Dockerfile.zulu-15u1-jre-headless b/docker/centos/Dockerfile.zulu-15u1-jre-headless
new file mode 100644
index 00000000..c5b33b47
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-15u1-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-15-azure-jre-headless-15.28.13
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure
diff --git a/docker/centos/Dockerfile.zulu-7u282-jdk b/docker/centos/Dockerfile.zulu-7u282-jdk
new file mode 100644
index 00000000..43e90db7
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-7u282-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-7-azure-jdk-7.42.0.13
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure
+
diff --git a/docker/centos/Dockerfile.zulu-7u282-jre b/docker/centos/Dockerfile.zulu-7u282-jre
new file mode 100644
index 00000000..e3480ddf
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-7u282-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-7-azure-jre-7.42.0.13
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure
+
diff --git a/docker/centos/Dockerfile.zulu-7u282-jre-headless b/docker/centos/Dockerfile.zulu-7u282-jre-headless
new file mode 100644
index 00000000..5a664b46
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-7u282-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-7-azure-jre-headless-7.42.0.13
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure
diff --git a/docker/centos/Dockerfile.zulu-8u272-jdk b/docker/centos/Dockerfile.zulu-8u272-jdk
new file mode 100644
index 00000000..8bcdf95f
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u272-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-8-azure-jdk-8.50.0.21
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure
+
diff --git a/docker/centos/Dockerfile.zulu-8u272-jre b/docker/centos/Dockerfile.zulu-8u272-jre
new file mode 100644
index 00000000..fe1a4194
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u272-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-8-azure-jre-8.50.0.21
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure
+
diff --git a/docker/centos/Dockerfile.zulu-8u272-jre-headless b/docker/centos/Dockerfile.zulu-8u272-jre-headless
new file mode 100644
index 00000000..923cb0b6
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u272-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-8-azure-jre-headless-8.50.0.21
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure
diff --git a/docker/debian10/Dockerfile.zulu-11u9-jdk b/docker/debian10/Dockerfile.zulu-11u9-jdk
new file mode 100644
index 00000000..2c461944
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u9-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.43+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u9-jre b/docker/debian10/Dockerfile.zulu-11u9-jre
new file mode 100644
index 00000000..0e737b55
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u9-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.43+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u9-jre-headless b/docker/debian10/Dockerfile.zulu-11u9-jre-headless
new file mode 100644
index 00000000..9e78159d
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u9-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.43+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-13u5-jdk b/docker/debian10/Dockerfile.zulu-13u5-jdk
new file mode 100644
index 00000000..9a6a0672
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-13u5-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.35+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-13u5-jre b/docker/debian10/Dockerfile.zulu-13u5-jre
new file mode 100644
index 00000000..03628e45
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-13u5-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.35+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-13u5-jre-headless b/docker/debian10/Dockerfile.zulu-13u5-jre-headless
new file mode 100644
index 00000000..f4d2ba4f
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-13u5-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.35+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-15u1-jdk b/docker/debian10/Dockerfile.zulu-15u1-jdk
new file mode 100644
index 00000000..5047c7f4
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-15u1-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.28+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-15u1-jre b/docker/debian10/Dockerfile.zulu-15u1-jre
new file mode 100644
index 00000000..26b96476
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-15u1-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.28+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-15u1-jre-headless b/docker/debian10/Dockerfile.zulu-15u1-jre-headless
new file mode 100644
index 00000000..d34fb97a
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-15u1-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.28+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u282-jdk b/docker/debian10/Dockerfile.zulu-7u282-jdk
new file mode 100644
index 00000000..b297bc38
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-7u282-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.42.0.13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u282-jre b/docker/debian10/Dockerfile.zulu-7u282-jre
new file mode 100644
index 00000000..aeeaaa9e
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-7u282-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.42.0.13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u282-jre-headless b/docker/debian10/Dockerfile.zulu-7u282-jre-headless
new file mode 100644
index 00000000..d9b7879a
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-7u282-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.42.0.13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u272-jdk b/docker/debian10/Dockerfile.zulu-8u272-jdk
new file mode 100644
index 00000000..17be60a7
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u272-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.50.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u272-jre b/docker/debian10/Dockerfile.zulu-8u272-jre
new file mode 100644
index 00000000..fae5e4d3
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u272-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.50.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u272-jre-headless b/docker/debian10/Dockerfile.zulu-8u272-jre-headless
new file mode 100644
index 00000000..acda1339
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u272-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.50.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u272-jre-headless-tools b/docker/debian10/Dockerfile.zulu-8u272-jre-headless-tools
new file mode 100644
index 00000000..625940b0
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u272-jre-headless-tools
@@ -0,0 +1,27 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG ZULU_DIR=zulu-8-azure-jre-headless-tools_8.50.0.21-8.0.272-linux_musl_x64
+ARG ZULU_PACK=$ZULU_DIR.tar.gz
+ARG INSTALL_DIR=/usr/lib/jvm
+ARG BIN_DIR=/usr/bin
+ARG MAN_DIR=/usr/share/man/man1
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install ca-certificates curl musl && \
+    mkdir -p ${INSTALL_DIR} && \
+    curl -o /tmp/${ZULU_PACK} https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u272/zulu-8-azure-jre-headless-tools_8.50.0.21-8.0.272-linux_musl_x64.tar.gz && \
+    tar -xf /tmp/${ZULU_PACK} -C ${INSTALL_DIR} && rm -f /tmp/${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \; && \
+    rm -rf /var/lib/apt/lists/* /tmp/*
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-jre-headless-tools_8.50.0.21-8.0.272-linux_musl_x64
diff --git a/docker/debian10/Dockerfile.zulu-8u272-maven b/docker/debian10/Dockerfile.zulu-8u272-maven
new file mode 100644
index 00000000..e6543044
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u272-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u272-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian9/Dockerfile.zulu-11u9-jdk b/docker/debian9/Dockerfile.zulu-11u9-jdk
new file mode 100644
index 00000000..e403d0cc
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u9-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.43+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u9-jre b/docker/debian9/Dockerfile.zulu-11u9-jre
new file mode 100644
index 00000000..3e0e79fd
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u9-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.43+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u9-jre-headless b/docker/debian9/Dockerfile.zulu-11u9-jre-headless
new file mode 100644
index 00000000..eb331a60
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u9-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.43+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u5-jdk b/docker/debian9/Dockerfile.zulu-13u5-jdk
new file mode 100644
index 00000000..505f999a
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-13u5-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.35+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u5-jre b/docker/debian9/Dockerfile.zulu-13u5-jre
new file mode 100644
index 00000000..edc2715e
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-13u5-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.35+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u5-jre-headless b/docker/debian9/Dockerfile.zulu-13u5-jre-headless
new file mode 100644
index 00000000..a5d8c6f6
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-13u5-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.35+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-15u1-jdk b/docker/debian9/Dockerfile.zulu-15u1-jdk
new file mode 100644
index 00000000..2e166944
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-15u1-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.28+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-15u1-jre b/docker/debian9/Dockerfile.zulu-15u1-jre
new file mode 100644
index 00000000..29623c09
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-15u1-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.28+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-15u1-jre-headless b/docker/debian9/Dockerfile.zulu-15u1-jre-headless
new file mode 100644
index 00000000..74b63b9b
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-15u1-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.28+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u282-jdk b/docker/debian9/Dockerfile.zulu-7u282-jdk
new file mode 100644
index 00000000..c8ea49c8
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-7u282-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.42.0.13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u282-jre b/docker/debian9/Dockerfile.zulu-7u282-jre
new file mode 100644
index 00000000..7e6d80ac
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-7u282-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.42.0.13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u282-jre-headless b/docker/debian9/Dockerfile.zulu-7u282-jre-headless
new file mode 100644
index 00000000..5f1fc1b6
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-7u282-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.42.0.13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u272-jdk b/docker/debian9/Dockerfile.zulu-8u272-jdk
new file mode 100644
index 00000000..68f4e5e3
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u272-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.50.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u272-jre b/docker/debian9/Dockerfile.zulu-8u272-jre
new file mode 100644
index 00000000..1c874c8f
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u272-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.50.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u272-jre-headless b/docker/debian9/Dockerfile.zulu-8u272-jre-headless
new file mode 100644
index 00000000..9536e852
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u272-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.50.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u272-maven b/docker/debian9/Dockerfile.zulu-8u272-maven
new file mode 100644
index 00000000..0cec32fa
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u272-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u272-zulu-debian9
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jdk
new file mode 100644
index 00000000..efa0171b
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.43+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jre b/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jre
new file mode 100644
index 00000000..d138476c
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.43+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jre-headless
new file mode 100644
index 00000000..96536ce7
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.43+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jdk
new file mode 100644
index 00000000..309f344d
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.35+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jre b/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jre
new file mode 100644
index 00000000..ee575870
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.35+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jre-headless
new file mode 100644
index 00000000..86bb5e69
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.35+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jdk
new file mode 100644
index 00000000..42cb0442
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.28+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jre b/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jre
new file mode 100644
index 00000000..4c4deab9
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.28+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jre-headless
new file mode 100644
index 00000000..e4f9fba2
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.28+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u282-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-7u282-jdk
new file mode 100644
index 00000000..77ee374b
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u282-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.42.0.13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u282-jre b/docker/ubuntu-18.04/Dockerfile.zulu-7u282-jre
new file mode 100644
index 00000000..d692fe0d
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u282-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.42.0.13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u282-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-7u282-jre-headless
new file mode 100644
index 00000000..13296089
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u282-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.42.0.13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u272-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-8u272-jdk
new file mode 100644
index 00000000..5bce82fe
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u272-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.50.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u272-jre b/docker/ubuntu-18.04/Dockerfile.zulu-8u272-jre
new file mode 100644
index 00000000..003a027f
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u272-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.50.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u272-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-8u272-jre-headless
new file mode 100644
index 00000000..febc9336
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u272-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.50.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u9-jdk b/docker/ubuntu/Dockerfile.zulu-11u9-jdk
new file mode 100644
index 00000000..4bce1553
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u9-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.43+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u9-jre b/docker/ubuntu/Dockerfile.zulu-11u9-jre
new file mode 100644
index 00000000..5e60bdc1
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u9-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.43+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u9-jre-headless b/docker/ubuntu/Dockerfile.zulu-11u9-jre-headless
new file mode 100644
index 00000000..2ccd7552
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u9-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.43+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u5-jdk b/docker/ubuntu/Dockerfile.zulu-13u5-jdk
new file mode 100644
index 00000000..bab2436a
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-13u5-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.35+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u5-jre b/docker/ubuntu/Dockerfile.zulu-13u5-jre
new file mode 100644
index 00000000..6ee415fe
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-13u5-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.35+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u5-jre-headless b/docker/ubuntu/Dockerfile.zulu-13u5-jre-headless
new file mode 100644
index 00000000..14a3fd6e
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-13u5-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.35+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-15u1-jdk b/docker/ubuntu/Dockerfile.zulu-15u1-jdk
new file mode 100644
index 00000000..77ec52b0
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-15u1-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.28+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-15u1-jre b/docker/ubuntu/Dockerfile.zulu-15u1-jre
new file mode 100644
index 00000000..f72d41a8
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-15u1-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.28+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-15u1-jre-headless b/docker/ubuntu/Dockerfile.zulu-15u1-jre-headless
new file mode 100644
index 00000000..ea7e0ef1
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-15u1-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.28+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u282-jdk b/docker/ubuntu/Dockerfile.zulu-7u282-jdk
new file mode 100644
index 00000000..adf90a44
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-7u282-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.42.0.13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u282-jre b/docker/ubuntu/Dockerfile.zulu-7u282-jre
new file mode 100644
index 00000000..2d2d2f79
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-7u282-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.42.0.13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u282-jre-headless b/docker/ubuntu/Dockerfile.zulu-7u282-jre-headless
new file mode 100644
index 00000000..3ec70ec9
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-7u282-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.42.0.13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u272-jdk b/docker/ubuntu/Dockerfile.zulu-8u272-jdk
new file mode 100644
index 00000000..37d6458a
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u272-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.50.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u272-jre b/docker/ubuntu/Dockerfile.zulu-8u272-jre
new file mode 100644
index 00000000..d1c21072
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u272-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.50.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u272-jre-headless b/docker/ubuntu/Dockerfile.zulu-8u272-jre-headless
new file mode 100644
index 00000000..f0d5f81f
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u272-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.50.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/windowsservercore/Dockerfile.zulu-11u9-jdk b/docker/windowsservercore/Dockerfile.zulu-11u9-jdk
new file mode 100644
index 00000000..288f6286
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-11u9-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-11-azure-jdk_11.43.21-11.0.9-win_x64.msi && \
+    setx PACKAGE_DIR zulu-11/11.0.9 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-11"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.9/zulu-11-azure-jdk_11.43.21-11.0.9-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-11u9-jre b/docker/windowsservercore/Dockerfile.zulu-11u9-jre
new file mode 100644
index 00000000..87b80f3e
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-11u9-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-11-azure-jre_11.43.21-11.0.9-win_x64.msi && \
+    setx PACKAGE_DIR zulu-11/11.0.9 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-11-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.9/zulu-11-azure-jre_11.43.21-11.0.9-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-13u5-jdk b/docker/windowsservercore/Dockerfile.zulu-13u5-jdk
new file mode 100644
index 00000000..550932c2
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-13u5-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-13-azure-jdk_13.35.17-13.0.5-win_x64.msi && \
+    setx PACKAGE_DIR zulu-13/13.0.5 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-13"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.5/zulu-13-azure-jdk_13.35.17-13.0.5-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-13u5-jre b/docker/windowsservercore/Dockerfile.zulu-13u5-jre
new file mode 100644
index 00000000..21d1110d
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-13u5-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-13-azure-jre_13.35.17-13.0.5-win_x64.msi && \
+    setx PACKAGE_DIR zulu-13/13.0.5 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-13-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.5/zulu-13-azure-jre_13.35.17-13.0.5-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-14u2-jdk b/docker/windowsservercore/Dockerfile.zulu-14u2-jdk
index 2ec6dba6..0934084c 100644
--- a/docker/windowsservercore/Dockerfile.zulu-14u2-jdk
+++ b/docker/windowsservercore/Dockerfile.zulu-14u2-jdk
@@ -9,8 +9,9 @@ MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN setx PACKAGE zulu-14-azure-jdk_14.29.23-14.0.2-win_x64.msi && \
     setx PACKAGE_DIR zulu-14/14.0.2 && \
-    setx /m JAVA_HOME "C:\Program Files\zulu\zulu-14"
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-14"
+    
 
-RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-14/14.0.2/zulu-14-azure-jdk_14.29.23-14.0.2-win_x64.msi', 'C:\%PACKAGE%')
 RUN msiexec /quiet /i C:\%PACKAGE% && \
     del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-14u2-jre b/docker/windowsservercore/Dockerfile.zulu-14u2-jre
index b397257d..5159e9f3 100644
--- a/docker/windowsservercore/Dockerfile.zulu-14u2-jre
+++ b/docker/windowsservercore/Dockerfile.zulu-14u2-jre
@@ -11,6 +11,6 @@ RUN setx PACKAGE zulu-14-azure-jre_14.29.23-14.0.2-win_x64.msi && \
     setx PACKAGE_DIR zulu-14/14.0.2 && \
     setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-14-jre"
 
-RUN powershell -Command (new-object System.Net.WebClient).DownloadFile('http://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%PACKAGE%', 'C:\%PACKAGE%')
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-14/14.0.2/zulu-14-azure-jre_14.29.23-14.0.2-win_x64.msi', 'C:\%PACKAGE%')
 RUN msiexec /quiet /i C:\%PACKAGE% && \
     del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-15u1-jdk b/docker/windowsservercore/Dockerfile.zulu-15u1-jdk
new file mode 100644
index 00000000..d16862cb
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-15u1-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-15-azure-jdk_15.28.13-15.0.1-win_x64.msi && \
+    setx PACKAGE_DIR zulu-15/15.0.1 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-15"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.1/zulu-15-azure-jdk_15.28.13-15.0.1-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-15u1-jre b/docker/windowsservercore/Dockerfile.zulu-15u1-jre
new file mode 100644
index 00000000..6d858d19
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-15u1-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-15-azure-jre_15.28.13-15.0.1-win_x64.msi && \
+    setx PACKAGE_DIR zulu-15/15.0.1 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-15-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.1/zulu-15-azure-jre_15.28.13-15.0.1-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-7u282-jdk b/docker/windowsservercore/Dockerfile.zulu-7u282-jdk
new file mode 100644
index 00000000..e4c39bb7
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-7u282-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-7-azure-jdk_7.42.0.13-7.0.282-win_x64.msi && \
+    setx PACKAGE_DIR zulu-7/7u282 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-7"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u282/zulu-7-azure-jdk_7.42.0.13-7.0.282-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-7u282-jre b/docker/windowsservercore/Dockerfile.zulu-7u282-jre
new file mode 100644
index 00000000..b085b648
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-7u282-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-7-azure-jre_7.42.0.13-7.0.282-win_x64.msi && \
+    setx PACKAGE_DIR zulu-7/7u282 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-7-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u282/zulu-7-azure-jre_7.42.0.13-7.0.282-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-8u272-jdk b/docker/windowsservercore/Dockerfile.zulu-8u272-jdk
new file mode 100644
index 00000000..f1e9b0cc
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-8u272-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-8-azure-jdk_8.50.0.21-8.0.272-win_x64.msi && \
+    setx PACKAGE_DIR zulu-8/8u272 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-8"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u272/zulu-8-azure-jdk_8.50.0.21-8.0.272-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-8u272-jre b/docker/windowsservercore/Dockerfile.zulu-8u272-jre
new file mode 100644
index 00000000..9cb1b4b6
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-8u272-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-8-azure-jre_8.50.0.21-8.0.272-win_x64.msi && \
+    setx PACKAGE_DIR zulu-8/8u272 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-8-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u272/zulu-8-azure-jre_8.50.0.21-8.0.272-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%

From 6c37006b1463dc83b32b1b84f23f4336aea652ad Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 22 Oct 2020 08:49:07 -0500
Subject: [PATCH 136/264] Added Dockerfile.zulu-11u9-jdk-maven

---
 docker/debian9/Dockerfile.zulu-11u9-jdk-maven | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 docker/debian9/Dockerfile.zulu-11u9-jdk-maven

diff --git a/docker/debian9/Dockerfile.zulu-11u9-jdk-maven b/docker/debian9/Dockerfile.zulu-11u9-jdk-maven
new file mode 100644
index 00000000..9e2f6548
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u9-jdk-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+ 
+FROM mcr.microsoft.com/java/jdk:11u9-zulu-debian9
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+ 
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+ 
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+ 
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+ 
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+ 
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]

From 682f7c8e1b4e600dbaf7f0d351388dfe49b4bc72 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 22 Oct 2020 09:04:25 -0500
Subject: [PATCH 137/264] Create mvn-entrypoint.sh

---
 docker/debian10/Maven/mvn-entrypoint.sh | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docker/debian10/Maven/mvn-entrypoint.sh

diff --git a/docker/debian10/Maven/mvn-entrypoint.sh b/docker/debian10/Maven/mvn-entrypoint.sh
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/docker/debian10/Maven/mvn-entrypoint.sh
@@ -0,0 +1 @@
+

From b496b11166cba2da1a48ecc7d9740d5320bf9db7 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 22 Oct 2020 09:05:43 -0500
Subject: [PATCH 138/264] Initial add

---
 docker/debian10/Maven/mvn-entrypoint.sh   | 38 +++++++++++++++++++++++
 docker/debian10/Maven/settings-docker.xml |  6 ++++
 2 files changed, 44 insertions(+)
 create mode 100644 docker/debian10/Maven/settings-docker.xml

diff --git a/docker/debian10/Maven/mvn-entrypoint.sh b/docker/debian10/Maven/mvn-entrypoint.sh
index 8b137891..b20bda41 100644
--- a/docker/debian10/Maven/mvn-entrypoint.sh
+++ b/docker/debian10/Maven/mvn-entrypoint.sh
@@ -1 +1,39 @@
+#! /bin/bash -eu
 
+set -o pipefail
+
+# Copy files from /usr/share/maven/ref into ${MAVEN_CONFIG}
+# So the initial ~/.m2 is set with expected content.
+# Don't override, as this is just a reference setup
+copy_reference_file() {
+  local root="${1}"
+  local f="${2%/}"
+  local logfile="${3}"
+  local rel="${f/${root}/}" # path relative to /usr/share/maven/ref/
+  echo "$f" >> "$logfile"
+  echo " $f -> $rel" >> "$logfile"
+  if [[ ! -e ${MAVEN_CONFIG}/${rel} || $f = *.override ]]
+  then
+    echo "copy $rel to ${MAVEN_CONFIG}" >> "$logfile"
+    mkdir -p "${MAVEN_CONFIG}/$(dirname "${rel}")"
+    cp -r "${f}" "${MAVEN_CONFIG}/${rel}";
+  fi;
+}
+
+copy_reference_files() {
+  local log="$MAVEN_CONFIG/copy_reference_file.log"
+
+  if (sh -c "mkdir -p \"$MAVEN_CONFIG\" && touch \"${log}\"" > /dev/null 2>&1)
+  then
+      echo "--- Copying files at $(date)" >> "$log"
+      find /usr/share/maven/ref/ -type f -exec bash -eu -c 'copy_reference_file /usr/share/maven/ref/ "$1" "$2"' _ {} "$log" \;
+  else
+    echo "Can not write to ${log}. Wrong volume permissions? Carrying on ..."
+  fi
+}
+
+export -f copy_reference_file
+copy_reference_files
+unset MAVEN_CONFIG
+
+exec "$@"
diff --git a/docker/debian10/Maven/settings-docker.xml b/docker/debian10/Maven/settings-docker.xml
new file mode 100644
index 00000000..586c587c
--- /dev/null
+++ b/docker/debian10/Maven/settings-docker.xml
@@ -0,0 +1,6 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                      https://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <localRepository>/usr/share/maven/ref/repository</localRepository>
+</settings>

From bd3e7b31ae5ff78b296a98de720b9c8f7ecfdaaf Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 22 Oct 2020 09:06:43 -0500
Subject: [PATCH 139/264] Delete mvn-entrypoint.sh

---
 docker/debian10/mvn-entrypoint.sh | 39 -------------------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 docker/debian10/mvn-entrypoint.sh

diff --git a/docker/debian10/mvn-entrypoint.sh b/docker/debian10/mvn-entrypoint.sh
deleted file mode 100644
index b20bda41..00000000
--- a/docker/debian10/mvn-entrypoint.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/bash -eu
-
-set -o pipefail
-
-# Copy files from /usr/share/maven/ref into ${MAVEN_CONFIG}
-# So the initial ~/.m2 is set with expected content.
-# Don't override, as this is just a reference setup
-copy_reference_file() {
-  local root="${1}"
-  local f="${2%/}"
-  local logfile="${3}"
-  local rel="${f/${root}/}" # path relative to /usr/share/maven/ref/
-  echo "$f" >> "$logfile"
-  echo " $f -> $rel" >> "$logfile"
-  if [[ ! -e ${MAVEN_CONFIG}/${rel} || $f = *.override ]]
-  then
-    echo "copy $rel to ${MAVEN_CONFIG}" >> "$logfile"
-    mkdir -p "${MAVEN_CONFIG}/$(dirname "${rel}")"
-    cp -r "${f}" "${MAVEN_CONFIG}/${rel}";
-  fi;
-}
-
-copy_reference_files() {
-  local log="$MAVEN_CONFIG/copy_reference_file.log"
-
-  if (sh -c "mkdir -p \"$MAVEN_CONFIG\" && touch \"${log}\"" > /dev/null 2>&1)
-  then
-      echo "--- Copying files at $(date)" >> "$log"
-      find /usr/share/maven/ref/ -type f -exec bash -eu -c 'copy_reference_file /usr/share/maven/ref/ "$1" "$2"' _ {} "$log" \;
-  else
-    echo "Can not write to ${log}. Wrong volume permissions? Carrying on ..."
-  fi
-}
-
-export -f copy_reference_file
-copy_reference_files
-unset MAVEN_CONFIG
-
-exec "$@"

From 19d466f1113774b11caaa8d94fb40a820483e32b Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 22 Oct 2020 09:06:56 -0500
Subject: [PATCH 140/264] Delete settings-docker.xml

---
 docker/debian10/settings-docker.xml | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 docker/debian10/settings-docker.xml

diff --git a/docker/debian10/settings-docker.xml b/docker/debian10/settings-docker.xml
deleted file mode 100644
index 586c587c..00000000
--- a/docker/debian10/settings-docker.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                      https://maven.apache.org/xsd/settings-1.0.0.xsd">
-  <localRepository>/usr/share/maven/ref/repository</localRepository>
-</settings>

From a4bfd66eb3df4b1e65f6d5e989c622e150b88790 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 22 Oct 2020 09:13:11 -0500
Subject: [PATCH 141/264] Corrected a few 8u maven Dockerfile file names

---
 .../debian10/Dockerfile.zulu-8u262-jdk-maven  | 31 +++++++++++++++++++
 .../debian10/Dockerfile.zulu-8u265-jdk-maven  | 31 +++++++++++++++++++
 .../debian10/Dockerfile.zulu-8u272-jdk-maven  | 31 +++++++++++++++++++
 3 files changed, 93 insertions(+)
 create mode 100644 docker/debian10/Dockerfile.zulu-8u262-jdk-maven
 create mode 100644 docker/debian10/Dockerfile.zulu-8u265-jdk-maven
 create mode 100644 docker/debian10/Dockerfile.zulu-8u272-jdk-maven

diff --git a/docker/debian10/Dockerfile.zulu-8u262-jdk-maven b/docker/debian10/Dockerfile.zulu-8u262-jdk-maven
new file mode 100644
index 00000000..d40fdd60
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u262-jdk-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u262-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian10/Dockerfile.zulu-8u265-jdk-maven b/docker/debian10/Dockerfile.zulu-8u265-jdk-maven
new file mode 100644
index 00000000..f62cdeab
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u265-jdk-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u265-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian10/Dockerfile.zulu-8u272-jdk-maven b/docker/debian10/Dockerfile.zulu-8u272-jdk-maven
new file mode 100644
index 00000000..e6543044
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u272-jdk-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u272-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]

From fc135dd99e2d2d2d08e1fb246b0432e70ffd1f13 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 22 Oct 2020 09:13:47 -0500
Subject: [PATCH 142/264] Delete Dockerfile.zulu-8u262-maven

---
 docker/debian10/Dockerfile.zulu-8u262-maven | 31 ---------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 docker/debian10/Dockerfile.zulu-8u262-maven

diff --git a/docker/debian10/Dockerfile.zulu-8u262-maven b/docker/debian10/Dockerfile.zulu-8u262-maven
deleted file mode 100644
index d40fdd60..00000000
--- a/docker/debian10/Dockerfile.zulu-8u262-maven
+++ /dev/null
@@ -1,31 +0,0 @@
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM mcr.microsoft.com/java/jdk:8u262-zulu-debian10
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-ARG MAVEN_VERSION=3.6.3
-ARG USER_HOME_DIR="/root"
-ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
-ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install curl && \
-    mkdir -p /usr/share/maven /usr/share/maven/ref && \
-    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
-    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
-    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
-    rm -f /tmp/apache-maven.tar.gz && \
-    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV MAVEN_HOME /usr/share/maven
-ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
-
-COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY Maven/settings-docker.xml /usr/share/maven/ref/
-
-ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
-CMD ["mvn"]

From 56ed2bceeca0834453494340be6edbd0d279269b Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 22 Oct 2020 09:14:04 -0500
Subject: [PATCH 143/264] Delete Dockerfile.zulu-8u265-maven

---
 docker/debian10/Dockerfile.zulu-8u265-maven | 31 ---------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 docker/debian10/Dockerfile.zulu-8u265-maven

diff --git a/docker/debian10/Dockerfile.zulu-8u265-maven b/docker/debian10/Dockerfile.zulu-8u265-maven
deleted file mode 100644
index f62cdeab..00000000
--- a/docker/debian10/Dockerfile.zulu-8u265-maven
+++ /dev/null
@@ -1,31 +0,0 @@
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM mcr.microsoft.com/java/jdk:8u265-zulu-debian10
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-ARG MAVEN_VERSION=3.6.3
-ARG USER_HOME_DIR="/root"
-ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
-ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install curl && \
-    mkdir -p /usr/share/maven /usr/share/maven/ref && \
-    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
-    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
-    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
-    rm -f /tmp/apache-maven.tar.gz && \
-    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV MAVEN_HOME /usr/share/maven
-ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
-
-COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY Maven/settings-docker.xml /usr/share/maven/ref/
-
-ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
-CMD ["mvn"]

From 7d1c3fc4d907a32a4aed27bb85a2caf00899169a Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 22 Oct 2020 09:14:33 -0500
Subject: [PATCH 144/264] Delete Dockerfile.zulu-8u272-maven

---
 docker/debian10/Dockerfile.zulu-8u272-maven | 31 ---------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 docker/debian10/Dockerfile.zulu-8u272-maven

diff --git a/docker/debian10/Dockerfile.zulu-8u272-maven b/docker/debian10/Dockerfile.zulu-8u272-maven
deleted file mode 100644
index e6543044..00000000
--- a/docker/debian10/Dockerfile.zulu-8u272-maven
+++ /dev/null
@@ -1,31 +0,0 @@
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM mcr.microsoft.com/java/jdk:8u272-zulu-debian10
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-ARG MAVEN_VERSION=3.6.3
-ARG USER_HOME_DIR="/root"
-ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
-ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install curl && \
-    mkdir -p /usr/share/maven /usr/share/maven/ref && \
-    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
-    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
-    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
-    rm -f /tmp/apache-maven.tar.gz && \
-    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV MAVEN_HOME /usr/share/maven
-ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
-
-COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY Maven/settings-docker.xml /usr/share/maven/ref/
-
-ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
-CMD ["mvn"]

From ea5a1eae5b5098913a9fc5df3a10b549ef41d58c Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 22 Oct 2020 09:16:34 -0500
Subject: [PATCH 145/264] Changed a few 8u maven Dockerfile file names

---
 .../debian9/Dockerfile.zulu-8u262-jdk-maven   | 31 +++++++++++++++++++
 .../debian9/Dockerfile.zulu-8u265-jdk-maven   | 31 +++++++++++++++++++
 .../debian9/Dockerfile.zulu-8u272-jdk-maven   | 31 +++++++++++++++++++
 3 files changed, 93 insertions(+)
 create mode 100644 docker/debian9/Dockerfile.zulu-8u262-jdk-maven
 create mode 100644 docker/debian9/Dockerfile.zulu-8u265-jdk-maven
 create mode 100644 docker/debian9/Dockerfile.zulu-8u272-jdk-maven

diff --git a/docker/debian9/Dockerfile.zulu-8u262-jdk-maven b/docker/debian9/Dockerfile.zulu-8u262-jdk-maven
new file mode 100644
index 00000000..150d9100
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u262-jdk-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u262-zulu-debian9
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian9/Dockerfile.zulu-8u265-jdk-maven b/docker/debian9/Dockerfile.zulu-8u265-jdk-maven
new file mode 100644
index 00000000..4feeaf60
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u265-jdk-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u265-zulu-debian9
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian9/Dockerfile.zulu-8u272-jdk-maven b/docker/debian9/Dockerfile.zulu-8u272-jdk-maven
new file mode 100644
index 00000000..0cec32fa
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u272-jdk-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u272-zulu-debian9
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]

From c306b42d11ad9fc3b31795e6fdeb9fa8b1ace21d Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 22 Oct 2020 09:17:17 -0500
Subject: [PATCH 146/264] Delete Dockerfile.zulu-8u262-maven

---
 docker/debian9/Dockerfile.zulu-8u262-maven | 31 ----------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 docker/debian9/Dockerfile.zulu-8u262-maven

diff --git a/docker/debian9/Dockerfile.zulu-8u262-maven b/docker/debian9/Dockerfile.zulu-8u262-maven
deleted file mode 100644
index 150d9100..00000000
--- a/docker/debian9/Dockerfile.zulu-8u262-maven
+++ /dev/null
@@ -1,31 +0,0 @@
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM mcr.microsoft.com/java/jdk:8u262-zulu-debian9
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-ARG MAVEN_VERSION=3.6.3
-ARG USER_HOME_DIR="/root"
-ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
-ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install curl && \
-    mkdir -p /usr/share/maven /usr/share/maven/ref && \
-    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
-    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
-    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
-    rm -f /tmp/apache-maven.tar.gz && \
-    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV MAVEN_HOME /usr/share/maven
-ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
-
-COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY Maven/settings-docker.xml /usr/share/maven/ref/
-
-ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
-CMD ["mvn"]

From b44f2aba38a13726939d2c8464ab4023d9653b6c Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 22 Oct 2020 09:17:36 -0500
Subject: [PATCH 147/264] Delete Dockerfile.zulu-8u265-maven

---
 docker/debian9/Dockerfile.zulu-8u265-maven | 31 ----------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 docker/debian9/Dockerfile.zulu-8u265-maven

diff --git a/docker/debian9/Dockerfile.zulu-8u265-maven b/docker/debian9/Dockerfile.zulu-8u265-maven
deleted file mode 100644
index 4feeaf60..00000000
--- a/docker/debian9/Dockerfile.zulu-8u265-maven
+++ /dev/null
@@ -1,31 +0,0 @@
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM mcr.microsoft.com/java/jdk:8u265-zulu-debian9
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-ARG MAVEN_VERSION=3.6.3
-ARG USER_HOME_DIR="/root"
-ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
-ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install curl && \
-    mkdir -p /usr/share/maven /usr/share/maven/ref && \
-    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
-    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
-    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
-    rm -f /tmp/apache-maven.tar.gz && \
-    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV MAVEN_HOME /usr/share/maven
-ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
-
-COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY Maven/settings-docker.xml /usr/share/maven/ref/
-
-ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
-CMD ["mvn"]

From 3bfae77b07ad04cc880e02ceb6e046684bfcfcea Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 22 Oct 2020 09:18:00 -0500
Subject: [PATCH 148/264] Delete Dockerfile.zulu-8u272-maven

---
 docker/debian9/Dockerfile.zulu-8u272-maven | 31 ----------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 docker/debian9/Dockerfile.zulu-8u272-maven

diff --git a/docker/debian9/Dockerfile.zulu-8u272-maven b/docker/debian9/Dockerfile.zulu-8u272-maven
deleted file mode 100644
index 0cec32fa..00000000
--- a/docker/debian9/Dockerfile.zulu-8u272-maven
+++ /dev/null
@@ -1,31 +0,0 @@
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM mcr.microsoft.com/java/jdk:8u272-zulu-debian9
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-ARG MAVEN_VERSION=3.6.3
-ARG USER_HOME_DIR="/root"
-ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
-ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install curl && \
-    mkdir -p /usr/share/maven /usr/share/maven/ref && \
-    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
-    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
-    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
-    rm -f /tmp/apache-maven.tar.gz && \
-    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV MAVEN_HOME /usr/share/maven
-ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
-
-COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY Maven/settings-docker.xml /usr/share/maven/ref/
-
-ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
-CMD ["mvn"]

From 93c720fa9b2c18bb0d3537808ddee6acc87b6951 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 22 Oct 2020 11:38:02 -0500
Subject: [PATCH 149/264] Delete Dockerfile.zulu-8-jdk-tomcat

---
 docker/alpine/Dockerfile.zulu-8-jdk-tomcat | 54 ----------------------
 1 file changed, 54 deletions(-)
 delete mode 100644 docker/alpine/Dockerfile.zulu-8-jdk-tomcat

diff --git a/docker/alpine/Dockerfile.zulu-8-jdk-tomcat b/docker/alpine/Dockerfile.zulu-8-jdk-tomcat
deleted file mode 100644
index e03074ee..00000000
--- a/docker/alpine/Dockerfile.zulu-8-jdk-tomcat
+++ /dev/null
@@ -1,54 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM mcr.microsoft.com/java/jdk:8-zulu-alpine
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-ARG TOMCAT_VERSION=9.0.38
-ARG SERVER_XML=server.xml
-ARG LOGGING_PROPERTIES=logging.properties
-ARG CATALINA_PROPERTIES=catalina.properties
-ARG TOMCAT_MAJOR=9
-
-# As provided here, only the access log gets written to this location.
-# Mount to a persistent volume to preserve access logs.
-# Modify this value to specify a different log directory.
-# e.g. /home/logs in Azure App Service
-ENV LOG_ROOT=/tomcat_logs
-
-ENV PATH /usr/local/tomcat/bin:$PATH
-
-# Make Java 8 obey container resource limits, improve performance
-ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
-
-# Cleanup & Install
-RUN apk add --update openssh-server bash openrc \
-        && rm -rf /var/cache/apk/* \
-        # Remove unnecessary services
-        && rm -f /etc/init.d/hwdrivers \
-                 /etc/init.d/hwclock \
-                 /etc/init.d/mtab \
-                 /etc/init.d/bootmisc \
-                 /etc/init.d/modules \
-                 /etc/init.d/modules-load \
-                 /etc/init.d/modloop \
-        # Install Tomcat
-        && wget -O /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose \
-        && mkdir /usr/local/tomcat \ 
-        && tar xvzf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 \
-        && rm -f /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz
-       
-COPY Tomcat/${SERVER_XML} /usr/local/tomcat/conf/server.xml
-COPY Tomcat/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
-COPY Tomcat/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
-
-# Copy the startup script
-COPY Tomcat/startup.sh /startup.sh
-RUN chmod a+x /startup.sh
-
-EXPOSE 8080
-
-CMD ["/startup.sh"]

From a8461b5577dd000ced075fd803f029782035fa9b Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 22 Oct 2020 11:38:28 -0500
Subject: [PATCH 150/264] Delete Dockerfile.zulu-8-jdk-tomcat

---
 docker/centos/Dockerfile.zulu-8-jdk-tomcat | 45 ----------------------
 1 file changed, 45 deletions(-)
 delete mode 100644 docker/centos/Dockerfile.zulu-8-jdk-tomcat

diff --git a/docker/centos/Dockerfile.zulu-8-jdk-tomcat b/docker/centos/Dockerfile.zulu-8-jdk-tomcat
deleted file mode 100644
index bb384cfc..00000000
--- a/docker/centos/Dockerfile.zulu-8-jdk-tomcat
+++ /dev/null
@@ -1,45 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM mcr.microsoft.com/java/jdk:8-zulu-centos
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-ARG TOMCAT_VERSION=9.0.38
-ARG SERVER_XML=server.xml
-ARG LOGGING_PROPERTIES=logging.properties
-ARG CATALINA_PROPERTIES=catalina.properties
-ARG TOMCAT_MAJOR=9
-
-# As provided here, only the access log gets written to this location.
-# Mount to a persistent volume to preserve access logs.
-# Modify this value to specify a different log directory.
-# e.g. /home/logs in Azure App Service
-ENV LOG_ROOT=/tomcat_logs
-
-ENV PATH /usr/local/tomcat/bin:$PATH
-
-# Make Java 8 obey container resource limits, improve performance
-ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
-
-RUN yum -q -y update && \
-    yum -q -y install unzip && \
-# Install Tomcat
-    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
-    mkdir /usr/local/tomcat && \ 
-    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
-    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
-       
-COPY Tomcat/${SERVER_XML} /usr/local/tomcat/conf/server.xml
-COPY Tomcat/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
-COPY Tomcat/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
-
-# Copy the startup script
-COPY Tomcat/startup.sh /startup.sh
-RUN chmod a+x /startup.sh
-
-EXPOSE 8080
-
-CMD ["/startup.sh"]

From 6ddc42e95d25700eb00343466e5754eb94c37763 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 22 Oct 2020 11:38:57 -0500
Subject: [PATCH 151/264] Delete Dockerfile.zulu-8-jdk-tomcat

---
 docker/debian10/Dockerfile.zulu-8-jdk-tomcat | 47 --------------------
 1 file changed, 47 deletions(-)
 delete mode 100644 docker/debian10/Dockerfile.zulu-8-jdk-tomcat

diff --git a/docker/debian10/Dockerfile.zulu-8-jdk-tomcat b/docker/debian10/Dockerfile.zulu-8-jdk-tomcat
deleted file mode 100644
index 13e85ddb..00000000
--- a/docker/debian10/Dockerfile.zulu-8-jdk-tomcat
+++ /dev/null
@@ -1,47 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM mcr.microsoft.com/java/jdk:8-zulu-debian10
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-ARG TOMCAT_VERSION=9.0.38
-ARG SERVER_XML=server.xml
-ARG LOGGING_PROPERTIES=logging.properties
-ARG CATALINA_PROPERTIES=catalina.properties
-ARG TOMCAT_MAJOR=9
-
-# As provided here, only the access log gets written to this location.
-# Mount to a persistent volume to preserve access logs.
-# Modify this value to specify a different log directory.
-# e.g. /home/logs in Azure App Service
-ENV LOG_ROOT=/tomcat_logs
-
-ENV PATH /usr/local/tomcat/bin:$PATH
-
-# Make Java 8 obey container resource limits, improve performance
-ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
-
-# Cleanup & Install
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install curl unzip && \
-    rm -rf /var/lib/apt/lists/* && \
-# Install Tomcat
-    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
-    mkdir /usr/local/tomcat && \ 
-    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
-    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
-       
-COPY Tomcat/${SERVER_XML} /usr/local/tomcat/conf/server.xml
-COPY Tomcat/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
-COPY Tomcat/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
-
-# Copy the startup script
-COPY Tomcat/startup.sh /startup.sh
-RUN chmod a+x /startup.sh
-
-EXPOSE 8080
-
-CMD ["/startup.sh"]

From 78acaf743c14a6f21d2aa4d608921b5da32bbc59 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 22 Oct 2020 11:39:24 -0500
Subject: [PATCH 152/264] Delete Dockerfile.zulu-8-jdk-tomcat

---
 docker/ubuntu/Dockerfile.zulu-8-jdk-tomcat | 47 ----------------------
 1 file changed, 47 deletions(-)
 delete mode 100644 docker/ubuntu/Dockerfile.zulu-8-jdk-tomcat

diff --git a/docker/ubuntu/Dockerfile.zulu-8-jdk-tomcat b/docker/ubuntu/Dockerfile.zulu-8-jdk-tomcat
deleted file mode 100644
index c1324171..00000000
--- a/docker/ubuntu/Dockerfile.zulu-8-jdk-tomcat
+++ /dev/null
@@ -1,47 +0,0 @@
-
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM mcr.microsoft.com/java/jdk:8-zulu-ubuntu
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-ARG TOMCAT_VERSION=9.0.38
-ARG SERVER_XML=server.xml
-ARG LOGGING_PROPERTIES=logging.properties
-ARG CATALINA_PROPERTIES=catalina.properties
-ARG TOMCAT_MAJOR=9
-
-# As provided here, only the access log gets written to this location.
-# Mount to a persistent volume to preserve access logs.
-# Modify this value to specify a different log directory.
-# e.g. /home/logs in Azure App Service
-ENV LOG_ROOT=/tomcat_logs
-
-ENV PATH /usr/local/tomcat/bin:$PATH
-
-# Make Java 8 obey container resource limits, improve performance
-ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
-
-# Cleanup & Install
-RUN apt-get -qq update \
-        && apt-get -qq -y --no-install-recommends install curl unzip \
-        && rm -rf /var/lib/apt/lists/* \
-# Install Tomcat
-        && curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose \
-        && mkdir /usr/local/tomcat \ 
-        && tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 \
-        && rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
-       
-COPY Tomcat/${SERVER_XML} /usr/local/tomcat/conf/server.xml
-COPY Tomcat/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
-COPY Tomcat/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
-
-# Copy the startup script
-COPY Tomcat/startup.sh /startup.sh
-RUN chmod a+x /startup.sh
-
-EXPOSE 8080
-
-CMD ["/startup.sh"]

From c7853f16c2f028928a7ce831f941d83af24ffff2 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 2 Nov 2020 16:11:37 -0600
Subject: [PATCH 153/264] Added Dockerfile for Zulu 11u9 JRE with tools

---
 .../Dockerfile.zulu-11u9-jre-headless-tools   | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools

diff --git a/docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools b/docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools
new file mode 100644
index 00000000..7aac0106
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools
@@ -0,0 +1,31 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u9-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jdk:11u9-zulu-debian10 AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG INSTALL_DIR=/usr/lib/jvm
+ARG JDK_DIR=${INSTALL_DIR}/zulu-11-azure-amd64
+ARG JRE_DIR=${INSTALL_DIR}/zre-hl-11-azure-amd64
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_TOOLS_DIR=${INSTALL_DIR}/zre-hl-tools-11-azure-amd64 && \
+    JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_TOOLS_DIR}
+
+FROM debian:buster
+
+ARG JRE_TOOLS_DIR=/usr/lib/jvm/zre-hl-tools-11-azure-amd64
+COPY --from=stage2 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+
+RUN cd /usr/bin && find ${JRE_TOOLS_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=${JRE_TOOLS_DIR}

From 920ce2e28391076588fb08765c332f4695288f7c Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 2 Nov 2020 16:13:47 -0600
Subject: [PATCH 154/264] Added Dockerfile for Zulu 11u9 JDK with Maven

---
 .../debian10/Dockerfile.zulu-11u9-jdk-maven   | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 docker/debian10/Dockerfile.zulu-11u9-jdk-maven

diff --git a/docker/debian10/Dockerfile.zulu-11u9-jdk-maven b/docker/debian10/Dockerfile.zulu-11u9-jdk-maven
new file mode 100644
index 00000000..5c91621a
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u9-jdk-maven
@@ -0,0 +1,30 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+ 
+FROM mcr.microsoft.com/java/jdk:11u9-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+ 
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+ 
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+ 
+ENV MAVEN_HOME /usr/share/maven
+ 
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+ 
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]

From 95bfbcc5bd00f12554c991e3296173fc8a4772fd Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 3 Nov 2020 12:59:58 -0600
Subject: [PATCH 155/264] Create Dockerfile.zulu-7u282-jre-tools

---
 docker/windowsnanoserver-2004/Dockerfile.zulu-7u282-jre-tools | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-7u282-jre-tools

diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-7u282-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-7u282-jre-tools
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-7u282-jre-tools
@@ -0,0 +1 @@
+

From 4695324ca58dd0d829cf28f2774e50a24819f17b Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 3 Nov 2020 13:00:53 -0600
Subject: [PATCH 156/264] Initial add

---
 .../Dockerfile.zulu-11u9-jre-tools            | 42 +++++++++++++++++++
 .../Dockerfile.zulu-13u5-jre-tools            | 42 +++++++++++++++++++
 .../Dockerfile.zulu-15u1-jre-tools            | 42 +++++++++++++++++++
 .../Dockerfile.zulu-7u282-jre-tools           | 34 +++++++++++++++
 .../Dockerfile.zulu-8u272-jre-tools           | 35 ++++++++++++++++
 5 files changed, 195 insertions(+)
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-11u9-jre-tools
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-13u5-jre-tools
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-15u1-jre-tools
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-8u272-jre-tools

diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-11u9-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-11u9-jre-tools
new file mode 100644
index 00000000..b822f5fa
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-11u9-jre-tools
@@ -0,0 +1,42 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:11u9-zulu-windowsservercore AS stage1
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-11/11.0.9
+ARG JRE_PACKAGE=zulu-11-azure-jre_11.43.21-11.0.9-win_x64.msi
+ARG JRE_TOOLS_DIR="C:\zulu-11-azure-jre-tools_11.43.21-11.0.9-win_x64"
+ARG JRE_DIR="C:\Program Files\Zulu\zulu-11-jre"
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-11"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%JRE_PACKAGE%', '%JRE_PACKAGE%') && \
+    msiexec /quiet /i %JRE_PACKAGE% && \
+    del %JRE_PACKAGE%
+
+RUN jimage.exe list "%JRE_DIR%\lib\modules" | findstr "Module: " > modules.out && \
+    powershell -Command "(Get-Content modules.out) -replace 'Module: ', '' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) -join ',' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) + ',jdk.jcmd' | Out-File modules.out" && \
+    for /f %P in ('type modules.out') do setx /m JRE_MODULES %P && \
+    del modules.out
+
+RUN jlink --no-header-files --strip-debug --module-path "%JDK_DIR%\jmods" --add-modules %JRE_MODULES% --output %JRE_TOOLS_DIR%
+
+FROM mcr.microsoft.com/windows/nanoserver:2004
+
+ARG JRE_TOOLS_DIR="C:\zulu-11-azure-jre-tools_11.43.21-11.0.9-win_x64"
+
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+COPY --from=stage1 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+
+USER ContainerUser
+RUN echo JAVA_HOME=%JAVA_HOME% && \
+    java -version
+
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-13u5-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-13u5-jre-tools
new file mode 100644
index 00000000..6a2638a2
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-13u5-jre-tools
@@ -0,0 +1,42 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:13u5-zulu-windowsservercore AS stage1
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-13/13.0.5
+ARG JRE_PACKAGE=zulu-13-azure-jre_13.35.17-13.0.5-win_x64.msi
+ARG JRE_TOOLS_DIR="C:\zulu-13-azure-jre-tools_13.35.17-13.0.5-win_x64"
+ARG JRE_DIR="C:\Program Files\Zulu\zulu-13-jre"
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-13"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%JRE_PACKAGE%', '%JRE_PACKAGE%') && \
+    msiexec /quiet /i %JRE_PACKAGE% && \
+    del %JRE_PACKAGE%
+
+RUN jimage.exe list "%JRE_DIR%\lib\modules" | findstr "Module: " > modules.out && \
+    powershell -Command "(Get-Content modules.out) -replace 'Module: ', '' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) -join ',' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) + ',jdk.jcmd' | Out-File modules.out" && \
+    for /f %P in ('type modules.out') do setx /m JRE_MODULES %P && \
+    del modules.out
+
+RUN jlink --no-header-files --strip-debug --module-path "%JDK_DIR%\jmods" --add-modules %JRE_MODULES% --output %JRE_TOOLS_DIR%
+
+FROM mcr.microsoft.com/windows/nanoserver:2004
+
+ARG JRE_TOOLS_DIR="C:\zulu-13-azure-jre-tools_13.35.17-13.0.5-win_x64"
+
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+COPY --from=stage1 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+
+USER ContainerUser
+RUN echo JAVA_HOME=%JAVA_HOME% && \
+    java -version
+
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-15u1-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-15u1-jre-tools
new file mode 100644
index 00000000..271abb64
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-15u1-jre-tools
@@ -0,0 +1,42 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:15u1-zulu-windowsservercore AS stage1
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-15/15.0.1
+ARG JRE_PACKAGE=zulu-15-azure-jre_15.28.13-15.0.1-win_x64.msi
+ARG JRE_TOOLS_DIR="C:\zulu-15-azure-jre-tools_15.28.13-15.0.1-win_x64"
+ARG JRE_DIR="C:\Program Files\Zulu\zulu-15-jre"
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-15"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%JRE_PACKAGE%', '%JRE_PACKAGE%') && \
+    msiexec /quiet /i %JRE_PACKAGE% && \
+    del %JRE_PACKAGE%
+
+RUN jimage.exe list "%JRE_DIR%\lib\modules" | findstr "Module: " > modules.out && \
+    powershell -Command "(Get-Content modules.out) -replace 'Module: ', '' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) -join ',' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) + ',jdk.jcmd' | Out-File modules.out" && \
+    for /f %P in ('type modules.out') do setx /m JRE_MODULES %P && \
+    del modules.out
+
+RUN jlink --no-header-files --strip-debug --module-path "%JDK_DIR%\jmods" --add-modules %JRE_MODULES% --output %JRE_TOOLS_DIR%
+
+FROM mcr.microsoft.com/windows/nanoserver:2004
+
+ARG JRE_TOOLS_DIR="C:\zulu-15-azure-jre-tools_15.28.13-15.0.1-win_x64"
+
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+COPY --from=stage1 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+
+USER ContainerUser
+RUN echo JAVA_HOME=%JAVA_HOME% && \
+    java -version
+
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-7u282-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-7u282-jre-tools
index 8b137891..1d72b1f4 100644
--- a/docker/windowsnanoserver-2004/Dockerfile.zulu-7u282-jre-tools
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-7u282-jre-tools
@@ -1 +1,35 @@
 
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:7u282-zulu-windowsservercore AS stage1
+FROM mcr.microsoft.com/windows/nanoserver:2004
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-7/7u282
+ARG JRE_TOOLS_DIR=zulu-7-azure-jre-tools_7.42.0.13-7.0.282-win_x64
+ARG JRE_DIR=zulu-7-azure-jre_7.42.0.13-7.0.282-win_x64
+ARG JRE_PACKAGE=$JRE_DIR.zip
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-7"
+    
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "C:\%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+RUN curl https://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%JRE_PACKAGE% -o %JRE_PACKAGE% && \
+    tar -xf %JRE_PACKAGE% && \
+    del %JRE_PACKAGE% && \
+    move %JRE_DIR% %JRE_TOOLS_DIR%
+
+COPY --from=stage1 ${JDK_DIR}/bin/jstack.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_TOOLS_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/bin/attach.dll ${JRE_TOOLS_DIR}/bin
+
+USER ContainerUser
+RUN echo JAVA_HOME=%JAVA_HOME% && \
+    java -version
+
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-8u272-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-8u272-jre-tools
new file mode 100644
index 00000000..0e81aba6
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-8u272-jre-tools
@@ -0,0 +1,35 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u272-zulu-windowsservercore AS stage1
+FROM mcr.microsoft.com/windows/nanoserver:2004
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-8/8u272
+ARG JRE_TOOLS_DIR=zulu-8-azure-jre-tools_8.50.0.21-8.0.272-win_x64
+ARG JRE_DIR=zulu-8-azure-jre_8.50.0.21-8.0.272-win_x64
+ARG JRE_PACKAGE=$JRE_DIR.zip
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-8"
+    
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "C:\%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+RUN curl https://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%JRE_PACKAGE% -o %JRE_PACKAGE% && \
+    tar -xf %JRE_PACKAGE% && \
+    del %JRE_PACKAGE% && \
+    move %JRE_DIR% %JRE_TOOLS_DIR%
+
+COPY --from=stage1 ${JDK_DIR}/bin/jstack.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_TOOLS_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/bin/attach.dll ${JRE_TOOLS_DIR}/bin
+
+USER ContainerUser
+RUN echo JAVA_HOME=%JAVA_HOME% && \
+    java -version
+

From b0a79ed2d024708f504b47148650466cebe42979 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 4 Nov 2020 09:05:11 -0600
Subject: [PATCH 157/264] Fixed Dockerfile.zulu-8u272-jre-headless-tools.
 Dockerfile was from Alpine.

---
 .../Dockerfile.zulu-8u272-jre-headless-tools  | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/docker/debian10/Dockerfile.zulu-8u272-jre-headless-tools b/docker/debian10/Dockerfile.zulu-8u272-jre-headless-tools
index 625940b0..e618aff5 100644
--- a/docker/debian10/Dockerfile.zulu-8u272-jre-headless-tools
+++ b/docker/debian10/Dockerfile.zulu-8u272-jre-headless-tools
@@ -4,24 +4,19 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM debian:buster
+FROM mcr.microsoft.com/java/jdk:8u272-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u272-zulu-debian10
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-ARG ZULU_DIR=zulu-8-azure-jre-headless-tools_8.50.0.21-8.0.272-linux_musl_x64
-ARG ZULU_PACK=$ZULU_DIR.tar.gz
-ARG INSTALL_DIR=/usr/lib/jvm
-ARG BIN_DIR=/usr/bin
-ARG MAN_DIR=/usr/share/man/man1
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
 
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install ca-certificates curl musl && \
-    mkdir -p ${INSTALL_DIR} && \
-    curl -o /tmp/${ZULU_PACK} https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u272/zulu-8-azure-jre-headless-tools_8.50.0.21-8.0.272-linux_musl_x64.tar.gz && \
-    tar -xf /tmp/${ZULU_PACK} -C ${INSTALL_DIR} && rm -f /tmp/${ZULU_PACK} && \
-    cd ${BIN_DIR} && \
-    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
-    mkdir -p ${MAN_DIR} && \
-    cd ${MAN_DIR} && \
-    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \; && \
-    rm -rf /var/lib/apt/lists/* /tmp/*
-ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-jre-headless-tools_8.50.0.21-8.0.272-linux_musl_x64
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+
+ENV JAVA_HOME=${JRE_DIR}

From a94024e672e6eca15f855d6d612a9ea7e896036a Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Sat, 7 Nov 2020 08:34:37 -0600
Subject: [PATCH 158/264] Create server.xml

---
 docker/debian10/Tomcat/v8/server.xml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docker/debian10/Tomcat/v8/server.xml

diff --git a/docker/debian10/Tomcat/v8/server.xml b/docker/debian10/Tomcat/v8/server.xml
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/docker/debian10/Tomcat/v8/server.xml
@@ -0,0 +1 @@
+

From 167ec987c86980383e77c34834d3257c65a3a4bc Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Sat, 7 Nov 2020 08:34:59 -0600
Subject: [PATCH 159/264] Create server.xml

---
 docker/debian10/Tomcat/v9/server.xml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docker/debian10/Tomcat/v9/server.xml

diff --git a/docker/debian10/Tomcat/v9/server.xml b/docker/debian10/Tomcat/v9/server.xml
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/docker/debian10/Tomcat/v9/server.xml
@@ -0,0 +1 @@
+

From 611ca28a47ff2e0ffc71bb4376e80f9a846b311e Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Sat, 7 Nov 2020 08:36:13 -0600
Subject: [PATCH 160/264] Initial add

---
 docker/debian10/Tomcat/v8/catalina.properties | 215 ++++++++++++++++++
 docker/debian10/Tomcat/v8/logging.properties  |  66 ++++++
 docker/debian10/Tomcat/v8/server.xml          | 167 ++++++++++++++
 docker/debian10/Tomcat/v8/startup.sh          |   8 +
 4 files changed, 456 insertions(+)
 create mode 100644 docker/debian10/Tomcat/v8/catalina.properties
 create mode 100644 docker/debian10/Tomcat/v8/logging.properties
 create mode 100644 docker/debian10/Tomcat/v8/startup.sh

diff --git a/docker/debian10/Tomcat/v8/catalina.properties b/docker/debian10/Tomcat/v8/catalina.properties
new file mode 100644
index 00000000..9d0c93ee
--- /dev/null
+++ b/docker/debian10/Tomcat/v8/catalina.properties
@@ -0,0 +1,215 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# List of comma-separated packages that start with or equal this string
+# will cause a security exception to be thrown when
+# passed to checkPackageAccess unless the
+# corresponding RuntimePermission ("accessClassInPackage."+package) has
+# been granted.
+package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,org.apache.tomcat.
+#
+# List of comma-separated packages that start with or equal this string
+# will cause a security exception to be thrown when
+# passed to checkPackageDefinition unless the
+# corresponding RuntimePermission ("defineClassInPackage."+package) has
+# been granted.
+#
+# by default, no packages are restricted for definition, and none of
+# the class loaders supplied with the JDK call checkPackageDefinition.
+#
+package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,\
+org.apache.jasper.,org.apache.naming.,org.apache.tomcat.
+
+#
+#
+# List of comma-separated paths defining the contents of the "common"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
+# If left as blank,the JVM system loader will be used as Catalina's "common"
+# loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+#
+# Note: Values are enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar","/home/tomcat/lib","/home/tomcat/lib/*.jar"
+
+#
+# List of comma-separated paths defining the contents of the "server"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
+# If left as blank, the "common" loader will be used as Catalina's "server"
+# loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+#
+# Note: Values may be enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+server.loader=
+
+#
+# List of comma-separated paths defining the contents of the "shared"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_BASE path or absolute. If left as blank,
+# the "common" loader will be used as Catalina's "shared" loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+# Please note that for single jars, e.g. bar.jar, you need the URL form
+# starting with file:.
+#
+# Note: Values may be enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+shared.loader=
+
+# Default list of JAR files that should not be scanned using the JarScanner
+# functionality. This is typically used to scan JARs for configuration
+# information. JARs that do not contain such information may be excluded from
+# the scan to speed up the scanning process. This is the default list. JARs on
+# this list are excluded from all scans. The list must be a comma separated list
+# of JAR file names.
+# The list of JARs to skip may be over-ridden at a Context level for individual
+# scan types by configuring a JarScanner with a nested JarScanFilter.
+# The JARs listed below include:
+# - Tomcat Bootstrap JARs
+# - Tomcat API JARs
+# - Catalina JARs
+# - Jasper JARs
+# - Tomcat JARs
+# - Common non-Tomcat JARs
+# - Test JARs (JUnit, Cobertura and dependencies)
+tomcat.util.scan.StandardJarScanFilter.jarsToSkip=\
+applicationinsights-*.jar, \
+annotations-api.jar,\
+ant-junit*.jar,\
+ant-launcher.jar,\
+ant.jar,\
+asm-*.jar,\
+aspectj*.jar,\
+bootstrap.jar,\
+catalina-ant.jar,\
+catalina-ha.jar,\
+catalina-jmx-remote.jar,\
+catalina-storeconfig.jar,\
+catalina-tribes.jar,\
+catalina-ws.jar,\
+catalina.jar,\
+cglib-*.jar,\
+cobertura-*.jar,\
+commons-beanutils*.jar,\
+commons-codec*.jar,\
+commons-collections*.jar,\
+commons-daemon.jar,\
+commons-dbcp*.jar,\
+commons-digester*.jar,\
+commons-fileupload*.jar,\
+commons-httpclient*.jar,\
+commons-io*.jar,\
+commons-lang*.jar,\
+commons-logging*.jar,\
+commons-math*.jar,\
+commons-pool*.jar,\
+dom4j-*.jar,\
+easymock-*.jar,\
+ecj-*.jar,\
+el-api.jar,\
+geronimo-spec-jaxrpc*.jar,\
+h2*.jar,\
+hamcrest-*.jar,\
+hibernate*.jar,\
+httpclient*.jar,\
+icu4j-*.jar,\
+jasper-el.jar,\
+jasper.jar,\
+jaspic-api.jar,\
+jaxb-*.jar,\
+jaxen-*.jar,\
+jdom-*.jar,\
+jetty-*.jar,\
+jmx-tools.jar,\
+jmx.jar,\
+jsp-api.jar,\
+jstl.jar,\
+jta*.jar,\
+junit-*.jar,\
+junit.jar,\
+log4j*.jar,\
+mail*.jar,\
+objenesis-*.jar,\
+oraclepki.jar,\
+oro-*.jar,\
+servlet-api-*.jar,\
+servlet-api.jar,\
+slf4j*.jar,\
+taglibs-standard-spec-*.jar,\
+tagsoup-*.jar,\
+tomcat-api.jar,\
+tomcat-coyote.jar,\
+tomcat-dbcp.jar,\
+tomcat-i18n-*.jar,\
+tomcat-jdbc.jar,\
+tomcat-jni.jar,\
+tomcat-juli-adapters.jar,\
+tomcat-juli.jar,\
+tomcat-util-scan.jar,\
+tomcat-util.jar,\
+tomcat-websocket.jar,\
+tools.jar,\
+websocket-api.jar,\
+wsdl4j*.jar,\
+xercesImpl.jar,\
+xml-apis.jar,\
+xmlParserAPIs-*.jar,\
+xmlParserAPIs.jar,\
+xom-*.jar
+
+# Default list of JAR files that should be scanned that overrides the default
+# jarsToSkip list above. This is typically used to include a specific JAR that
+# has been excluded by a broad file name pattern in the jarsToSkip list.
+# The list of JARs to scan may be over-ridden at a Context level for individual
+# scan types by configuring a JarScanner with a nested JarScanFilter.
+tomcat.util.scan.StandardJarScanFilter.jarsToScan=\
+log4j-taglib*.jar,\
+log4j-web*.jar,\
+log4javascript*.jar,\
+slf4j-taglib*.jar
+
+# String cache configuration.
+tomcat.util.buf.StringCache.byte.enabled=true
+#tomcat.util.buf.StringCache.char.enabled=true
+#tomcat.util.buf.StringCache.trainThreshold=500000
+#tomcat.util.buf.StringCache.cacheSize=5000
+
+# This system property is deprecated. Use the relaxedPathChars relaxedQueryChars
+# attributes of the Connector instead. These attributes permit a wider range of
+# characters to be configured as valid.
+# Allow for changes to HTTP request validation
+# WARNING: Using this option may expose the server to CVE-2016-6816
+#tomcat.util.http.parser.HttpParser.requestTargetAllow=|
diff --git a/docker/debian10/Tomcat/v8/logging.properties b/docker/debian10/Tomcat/v8/logging.properties
new file mode 100644
index 00000000..a72a295d
--- /dev/null
+++ b/docker/debian10/Tomcat/v8/logging.properties
@@ -0,0 +1,66 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# This file has been modified from Tomcat's original to redirect all logging to the console.
+# Console output of containers can be consumed by Azure Monitor and other services.
+
+# For more information about enabling Azure Monitor for Containers, see
+# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-enable-existing-clusters
+
+# For more information about querying logs with Azure Monitor for containers, see
+# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-log-search#search-logs-to-analyze-data
+
+
+handlers = 1catalina.java.util.logging.ConsoleHandler, 2localhost.java.util.logging.ConsoleHandler, 3manager.java.util.logging.ConsoleHandler, 4host-manager.java.util.logging.ConsoleHandler, java.util.logging.ConsoleHandler
+
+.handlers = java.util.logging.ConsoleHandler
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter
+java.util.logging.ConsoleHandler.encoding = UTF-8
+
+
+############################################################
+# Facility specific properties.
+# Provides extra control for each logger.
+############################################################
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = java.util.logging.ConsoleHandler
+
+# For example, set the org.apache.catalina.util.LifecycleBase logger to log
+# each component that extends LifecycleBase changing state:
+#org.apache.catalina.util.LifecycleBase.level = FINE
+
+# To see debug messages in TldLocationsCache, uncomment the following line:
+#org.apache.jasper.compiler.TldLocationsCache.level = FINE
+
+# To see debug messages for HTTP/2 handling, uncomment the following line:
+#org.apache.coyote.http2.level = FINE
+
+# To see debug messages for WebSocket handling, uncomment the following line:
+#org.apache.tomcat.websocket.level = FINE
diff --git a/docker/debian10/Tomcat/v8/server.xml b/docker/debian10/Tomcat/v8/server.xml
index 8b137891..53ba3706 100644
--- a/docker/debian10/Tomcat/v8/server.xml
+++ b/docker/debian10/Tomcat/v8/server.xml
@@ -1 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" at this level.
+     Documentation at /docs/config/server.html
+ -->
+<Server port="8005" shutdown="SHUTDOWN">
+  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
+  <!-- Security listener. Documentation at /docs/config/listeners.html
+  <Listener className="org.apache.catalina.security.SecurityListener" />
+  -->
+  <!--APR library loader. Documentation at /docs/apr.html -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+
+  <!-- Global JNDI resources
+       Documentation at /docs/jndi-resources-howto.html
+  -->
+  <GlobalNamingResources>
+    <!-- Editable user database that can also be used by
+         UserDatabaseRealm to authenticate users
+    -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+              description="User database that can be updated and saved"
+              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+              pathname="conf/tomcat-users.xml" />
+  </GlobalNamingResources>
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" Note:  A "Service" is not itself a "Container",
+       so you may not define subcomponents such as "Valves" at this level.
+       Documentation at /docs/config/service.html
+   -->
+  <Service name="Catalina">
+
+    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+    <!--
+    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+        maxThreads="150" minSpareThreads="4"/>
+    -->
+
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned. Documentation at :
+         Java HTTP Connector: /docs/config/http.html
+         Java AJP  Connector: /docs/config/ajp.html
+         APR (HTTP/AJP) Connector: /docs/apr.html
+         Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
+    -->
+    <Connector port="80" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" 
+               URIEncoding="UTF-8"/>
+    <!-- A "Connector" using the shared thread pool-->
+    <!--
+    <Connector executor="tomcatThreadPool"
+               port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" />
+    -->
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
+         This connector uses the NIO implementation. The default
+         SSLImplementation will depend on the presence of the APR/native
+         library and the useOpenSSL attribute of the
+         AprLifecycleListener.
+         Either JSSE or OpenSSL style configuration may be used regardless of
+         the SSLImplementation selected. JSSE style configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+               maxThreads="150" SSLEnabled="true">
+        <SSLHostConfig>
+            <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
+         This connector uses the APR/native implementation which always uses
+         OpenSSL for TLS.
+         Either JSSE or OpenSSL style configuration may be used. OpenSSL style
+         configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
+               maxThreads="150" SSLEnabled="true" >
+        <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
+        <SSLHostConfig>
+            <Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
+                         certificateFile="conf/localhost-rsa-cert.pem"
+                         certificateChainFile="conf/localhost-rsa-chain.pem"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <!-- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" /> -->
+
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host).
+         Documentation at /docs/config/engine.html -->
+
+    <!-- You should set jvmRoute to support load-balancing via AJP ie :
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+    -->
+    <Engine name="Catalina" defaultHost="localhost">
+
+      <!--For clustering, please take a look at documentation at:
+          /docs/cluster-howto.html  (simple how to)
+          /docs/config/cluster.html (reference documentation) -->
+      <!--
+      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+      -->
+
+      <!-- Use the LockOutRealm to prevent attempts to guess user passwords
+           via a brute-force attack -->
+      <Realm className="org.apache.catalina.realm.LockOutRealm">
+        <!-- This Realm uses the UserDatabase configured in the global JNDI
+             resources under the key "UserDatabase".  Any edits
+             that are performed against this UserDatabase are immediately
+             available for use by the Realm.  -->
+        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+               resourceName="UserDatabase"/>
+      </Realm>
+
+      <Host name="localhost"  appBase="webapps"
+            unpackWARs="false" autoDeploy="false">
+
+        <!-- SingleSignOn valve, share authentication between web applications
+             Documentation at: /docs/config/valve.html -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        -->
+
+        <!-- Access log processes all example.
+             Documentation at: /docs/config/valve.html
+             Note: The pattern used is equivalent to using pattern="common" -->
+        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="${log.base}"
+               prefix="localhost_access_log" suffix=".txt"
+               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
+
+      </Host>
+    </Engine>
+  </Service>
+</Server>
diff --git a/docker/debian10/Tomcat/v8/startup.sh b/docker/debian10/Tomcat/v8/startup.sh
new file mode 100644
index 00000000..365141c2
--- /dev/null
+++ b/docker/debian10/Tomcat/v8/startup.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Create a log directory for each hostname in case a shared file system is used among multiple hosts or containers.
+# As provided in the default configuration, only the access log gets written to this directory.
+LOG_DIR="${LOG_ROOT}/$(hostname)"
+mkdir -p "${LOG_DIR}"
+export JAVA_OPTS="${JAVA_OPTS} -Dlog.base=${LOG_DIR}"
+/usr/local/tomcat/bin/catalina.sh run

From 5e09f8a23631de60129155767d7b409767aab8cb Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Sat, 7 Nov 2020 08:36:52 -0600
Subject: [PATCH 161/264] Initial add

---
 docker/debian10/Tomcat/v9/catalina.properties | 207 ++++++++++++++++++
 docker/debian10/Tomcat/v9/logging.properties  |  66 ++++++
 docker/debian10/Tomcat/v9/server.xml          | 167 ++++++++++++++
 docker/debian10/Tomcat/v9/startup.sh          |   8 +
 4 files changed, 448 insertions(+)
 create mode 100644 docker/debian10/Tomcat/v9/catalina.properties
 create mode 100644 docker/debian10/Tomcat/v9/logging.properties
 create mode 100644 docker/debian10/Tomcat/v9/startup.sh

diff --git a/docker/debian10/Tomcat/v9/catalina.properties b/docker/debian10/Tomcat/v9/catalina.properties
new file mode 100644
index 00000000..fcd1e139
--- /dev/null
+++ b/docker/debian10/Tomcat/v9/catalina.properties
@@ -0,0 +1,207 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# List of comma-separated packages that start with or equal this string
+# will cause a security exception to be thrown when
+# passed to checkPackageAccess unless the
+# corresponding RuntimePermission ("accessClassInPackage."+package) has
+# been granted.
+package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,org.apache.tomcat.
+#
+# List of comma-separated packages that start with or equal this string
+# will cause a security exception to be thrown when
+# passed to checkPackageDefinition unless the
+# corresponding RuntimePermission ("defineClassInPackage."+package) has
+# been granted.
+#
+# by default, no packages are restricted for definition, and none of
+# the class loaders supplied with the JDK call checkPackageDefinition.
+#
+package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,\
+org.apache.jasper.,org.apache.naming.,org.apache.tomcat.
+
+#
+#
+# List of comma-separated paths defining the contents of the "common"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
+# If left as blank,the JVM system loader will be used as Catalina's "common"
+# loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+#
+# Note: Values are enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar","/home/tomcat/lib","/home/tomcat/lib/*.jar"
+
+#
+# List of comma-separated paths defining the contents of the "server"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
+# If left as blank, the "common" loader will be used as Catalina's "server"
+# loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+#
+# Note: Values may be enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+server.loader=
+
+#
+# List of comma-separated paths defining the contents of the "shared"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_BASE path or absolute. If left as blank,
+# the "common" loader will be used as Catalina's "shared" loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+# Please note that for single jars, e.g. bar.jar, you need the URL form
+# starting with file:.
+#
+# Note: Values may be enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+shared.loader=
+
+# Default list of JAR files that should not be scanned using the JarScanner
+# functionality. This is typically used to scan JARs for configuration
+# information. JARs that do not contain such information may be excluded from
+# the scan to speed up the scanning process. This is the default list. JARs on
+# this list are excluded from all scans. The list must be a comma separated list
+# of JAR file names.
+# The list of JARs to skip may be over-ridden at a Context level for individual
+# scan types by configuring a JarScanner with a nested JarScanFilter.
+# The JARs listed below include:
+# - Tomcat Bootstrap JARs
+# - Tomcat API JARs
+# - Catalina JARs
+# - Jasper JARs
+# - Tomcat JARs
+# - Common non-Tomcat JARs
+# - Test JARs (JUnit, Cobertura and dependencies)
+tomcat.util.scan.StandardJarScanFilter.jarsToSkip=\
+applicationinsights-*.jar, \
+annotations-api.jar,\
+ant-junit*.jar,\
+ant-launcher.jar,\
+ant.jar,\
+asm-*.jar,\
+aspectj*.jar,\
+bootstrap.jar,\
+catalina-ant.jar,\
+catalina-ha.jar,\
+catalina-ssi.jar,\
+catalina-storeconfig.jar,\
+catalina-tribes.jar,\
+catalina.jar,\
+cglib-*.jar,\
+cobertura-*.jar,\
+commons-beanutils*.jar,\
+commons-codec*.jar,\
+commons-collections*.jar,\
+commons-daemon.jar,\
+commons-dbcp*.jar,\
+commons-digester*.jar,\
+commons-fileupload*.jar,\
+commons-httpclient*.jar,\
+commons-io*.jar,\
+commons-lang*.jar,\
+commons-logging*.jar,\
+commons-math*.jar,\
+commons-pool*.jar,\
+dom4j-*.jar,\
+easymock-*.jar,\
+ecj-*.jar,\
+el-api.jar,\
+geronimo-spec-jaxrpc*.jar,\
+h2*.jar,\
+hamcrest-*.jar,\
+hibernate*.jar,\
+httpclient*.jar,\
+icu4j-*.jar,\
+jasper-el.jar,\
+jasper.jar,\
+jaspic-api.jar,\
+jaxb-*.jar,\
+jaxen-*.jar,\
+jdom-*.jar,\
+jetty-*.jar,\
+jmx-tools.jar,\
+jmx.jar,\
+jsp-api.jar,\
+jstl.jar,\
+jta*.jar,\
+junit-*.jar,\
+junit.jar,\
+log4j*.jar,\
+mail*.jar,\
+objenesis-*.jar,\
+oraclepki.jar,\
+oro-*.jar,\
+servlet-api-*.jar,\
+servlet-api.jar,\
+slf4j*.jar,\
+taglibs-standard-spec-*.jar,\
+tagsoup-*.jar,\
+tomcat-api.jar,\
+tomcat-coyote.jar,\
+tomcat-dbcp.jar,\
+tomcat-i18n-*.jar,\
+tomcat-jdbc.jar,\
+tomcat-jni.jar,\
+tomcat-juli-adapters.jar,\
+tomcat-juli.jar,\
+tomcat-util-scan.jar,\
+tomcat-util.jar,\
+tomcat-websocket.jar,\
+tools.jar,\
+websocket-api.jar,\
+wsdl4j*.jar,\
+xercesImpl.jar,\
+xml-apis.jar,\
+xmlParserAPIs-*.jar,\
+xmlParserAPIs.jar,\
+xom-*.jar
+
+# Default list of JAR files that should be scanned that overrides the default
+# jarsToSkip list above. This is typically used to include a specific JAR that
+# has been excluded by a broad file name pattern in the jarsToSkip list.
+# The list of JARs to scan may be over-ridden at a Context level for individual
+# scan types by configuring a JarScanner with a nested JarScanFilter.
+tomcat.util.scan.StandardJarScanFilter.jarsToScan=\
+log4j-taglib*.jar,\
+log4j-web*.jar,\
+log4javascript*.jar,\
+slf4j-taglib*.jar
+
+# String cache configuration.
+tomcat.util.buf.StringCache.byte.enabled=true
+#tomcat.util.buf.StringCache.char.enabled=true
+#tomcat.util.buf.StringCache.trainThreshold=500000
+#tomcat.util.buf.StringCache.cacheSize=5000
diff --git a/docker/debian10/Tomcat/v9/logging.properties b/docker/debian10/Tomcat/v9/logging.properties
new file mode 100644
index 00000000..a72a295d
--- /dev/null
+++ b/docker/debian10/Tomcat/v9/logging.properties
@@ -0,0 +1,66 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# This file has been modified from Tomcat's original to redirect all logging to the console.
+# Console output of containers can be consumed by Azure Monitor and other services.
+
+# For more information about enabling Azure Monitor for Containers, see
+# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-enable-existing-clusters
+
+# For more information about querying logs with Azure Monitor for containers, see
+# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-log-search#search-logs-to-analyze-data
+
+
+handlers = 1catalina.java.util.logging.ConsoleHandler, 2localhost.java.util.logging.ConsoleHandler, 3manager.java.util.logging.ConsoleHandler, 4host-manager.java.util.logging.ConsoleHandler, java.util.logging.ConsoleHandler
+
+.handlers = java.util.logging.ConsoleHandler
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter
+java.util.logging.ConsoleHandler.encoding = UTF-8
+
+
+############################################################
+# Facility specific properties.
+# Provides extra control for each logger.
+############################################################
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = java.util.logging.ConsoleHandler
+
+# For example, set the org.apache.catalina.util.LifecycleBase logger to log
+# each component that extends LifecycleBase changing state:
+#org.apache.catalina.util.LifecycleBase.level = FINE
+
+# To see debug messages in TldLocationsCache, uncomment the following line:
+#org.apache.jasper.compiler.TldLocationsCache.level = FINE
+
+# To see debug messages for HTTP/2 handling, uncomment the following line:
+#org.apache.coyote.http2.level = FINE
+
+# To see debug messages for WebSocket handling, uncomment the following line:
+#org.apache.tomcat.websocket.level = FINE
diff --git a/docker/debian10/Tomcat/v9/server.xml b/docker/debian10/Tomcat/v9/server.xml
index 8b137891..53ba3706 100644
--- a/docker/debian10/Tomcat/v9/server.xml
+++ b/docker/debian10/Tomcat/v9/server.xml
@@ -1 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" at this level.
+     Documentation at /docs/config/server.html
+ -->
+<Server port="8005" shutdown="SHUTDOWN">
+  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
+  <!-- Security listener. Documentation at /docs/config/listeners.html
+  <Listener className="org.apache.catalina.security.SecurityListener" />
+  -->
+  <!--APR library loader. Documentation at /docs/apr.html -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+
+  <!-- Global JNDI resources
+       Documentation at /docs/jndi-resources-howto.html
+  -->
+  <GlobalNamingResources>
+    <!-- Editable user database that can also be used by
+         UserDatabaseRealm to authenticate users
+    -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+              description="User database that can be updated and saved"
+              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+              pathname="conf/tomcat-users.xml" />
+  </GlobalNamingResources>
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" Note:  A "Service" is not itself a "Container",
+       so you may not define subcomponents such as "Valves" at this level.
+       Documentation at /docs/config/service.html
+   -->
+  <Service name="Catalina">
+
+    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+    <!--
+    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+        maxThreads="150" minSpareThreads="4"/>
+    -->
+
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned. Documentation at :
+         Java HTTP Connector: /docs/config/http.html
+         Java AJP  Connector: /docs/config/ajp.html
+         APR (HTTP/AJP) Connector: /docs/apr.html
+         Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
+    -->
+    <Connector port="80" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" 
+               URIEncoding="UTF-8"/>
+    <!-- A "Connector" using the shared thread pool-->
+    <!--
+    <Connector executor="tomcatThreadPool"
+               port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" />
+    -->
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
+         This connector uses the NIO implementation. The default
+         SSLImplementation will depend on the presence of the APR/native
+         library and the useOpenSSL attribute of the
+         AprLifecycleListener.
+         Either JSSE or OpenSSL style configuration may be used regardless of
+         the SSLImplementation selected. JSSE style configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+               maxThreads="150" SSLEnabled="true">
+        <SSLHostConfig>
+            <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
+         This connector uses the APR/native implementation which always uses
+         OpenSSL for TLS.
+         Either JSSE or OpenSSL style configuration may be used. OpenSSL style
+         configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
+               maxThreads="150" SSLEnabled="true" >
+        <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
+        <SSLHostConfig>
+            <Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
+                         certificateFile="conf/localhost-rsa-cert.pem"
+                         certificateChainFile="conf/localhost-rsa-chain.pem"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <!-- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" /> -->
+
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host).
+         Documentation at /docs/config/engine.html -->
+
+    <!-- You should set jvmRoute to support load-balancing via AJP ie :
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+    -->
+    <Engine name="Catalina" defaultHost="localhost">
+
+      <!--For clustering, please take a look at documentation at:
+          /docs/cluster-howto.html  (simple how to)
+          /docs/config/cluster.html (reference documentation) -->
+      <!--
+      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+      -->
+
+      <!-- Use the LockOutRealm to prevent attempts to guess user passwords
+           via a brute-force attack -->
+      <Realm className="org.apache.catalina.realm.LockOutRealm">
+        <!-- This Realm uses the UserDatabase configured in the global JNDI
+             resources under the key "UserDatabase".  Any edits
+             that are performed against this UserDatabase are immediately
+             available for use by the Realm.  -->
+        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+               resourceName="UserDatabase"/>
+      </Realm>
+
+      <Host name="localhost"  appBase="webapps"
+            unpackWARs="false" autoDeploy="false">
+
+        <!-- SingleSignOn valve, share authentication between web applications
+             Documentation at: /docs/config/valve.html -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        -->
+
+        <!-- Access log processes all example.
+             Documentation at: /docs/config/valve.html
+             Note: The pattern used is equivalent to using pattern="common" -->
+        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="${log.base}"
+               prefix="localhost_access_log" suffix=".txt"
+               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
+
+      </Host>
+    </Engine>
+  </Service>
+</Server>
diff --git a/docker/debian10/Tomcat/v9/startup.sh b/docker/debian10/Tomcat/v9/startup.sh
new file mode 100644
index 00000000..365141c2
--- /dev/null
+++ b/docker/debian10/Tomcat/v9/startup.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Create a log directory for each hostname in case a shared file system is used among multiple hosts or containers.
+# As provided in the default configuration, only the access log gets written to this directory.
+LOG_DIR="${LOG_ROOT}/$(hostname)"
+mkdir -p "${LOG_DIR}"
+export JAVA_OPTS="${JAVA_OPTS} -Dlog.base=${LOG_DIR}"
+/usr/local/tomcat/bin/catalina.sh run

From e7380fd2680c85d26636c95d809bee0ba793814b Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Sat, 7 Nov 2020 08:37:12 -0600
Subject: [PATCH 162/264] Delete catalina.properties

---
 docker/debian10/Tomcat/catalina.properties | 206 ---------------------
 1 file changed, 206 deletions(-)
 delete mode 100644 docker/debian10/Tomcat/catalina.properties

diff --git a/docker/debian10/Tomcat/catalina.properties b/docker/debian10/Tomcat/catalina.properties
deleted file mode 100644
index 3cbca2fe..00000000
--- a/docker/debian10/Tomcat/catalina.properties
+++ /dev/null
@@ -1,206 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageAccess unless the
-# corresponding RuntimePermission ("accessClassInPackage."+package) has
-# been granted.
-package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,org.apache.tomcat.
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageDefinition unless the
-# corresponding RuntimePermission ("defineClassInPackage."+package) has
-# been granted.
-#
-# by default, no packages are restricted for definition, and none of
-# the class loaders supplied with the JDK call checkPackageDefinition.
-#
-package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,\
-org.apache.jasper.,org.apache.naming.,org.apache.tomcat.
-
-#
-#
-# List of comma-separated paths defining the contents of the "common"
-# classloader. Prefixes should be used to define what is the repository type.
-# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
-# If left as blank,the JVM system loader will be used as Catalina's "common"
-# loader.
-# Examples:
-#     "foo": Add this folder as a class repository
-#     "foo/*.jar": Add all the JARs of the specified folder as class
-#                  repositories
-#     "foo/bar.jar": Add bar.jar as a class repository
-#
-# Note: Values are enclosed in double quotes ("...") in case either the
-#       ${catalina.base} path or the ${catalina.home} path contains a comma.
-#       Because double quotes are used for quoting, the double quote character
-#       may not appear in a path.
-common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar","/home/tomcat/lib","/home/tomcat/lib/*.jar"
-
-#
-# List of comma-separated paths defining the contents of the "server"
-# classloader. Prefixes should be used to define what is the repository type.
-# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
-# If left as blank, the "common" loader will be used as Catalina's "server"
-# loader.
-# Examples:
-#     "foo": Add this folder as a class repository
-#     "foo/*.jar": Add all the JARs of the specified folder as class
-#                  repositories
-#     "foo/bar.jar": Add bar.jar as a class repository
-#
-# Note: Values may be enclosed in double quotes ("...") in case either the
-#       ${catalina.base} path or the ${catalina.home} path contains a comma.
-#       Because double quotes are used for quoting, the double quote character
-#       may not appear in a path.
-server.loader=
-
-#
-# List of comma-separated paths defining the contents of the "shared"
-# classloader. Prefixes should be used to define what is the repository type.
-# Path may be relative to the CATALINA_BASE path or absolute. If left as blank,
-# the "common" loader will be used as Catalina's "shared" loader.
-# Examples:
-#     "foo": Add this folder as a class repository
-#     "foo/*.jar": Add all the JARs of the specified folder as class
-#                  repositories
-#     "foo/bar.jar": Add bar.jar as a class repository
-# Please note that for single jars, e.g. bar.jar, you need the URL form
-# starting with file:.
-#
-# Note: Values may be enclosed in double quotes ("...") in case either the
-#       ${catalina.base} path or the ${catalina.home} path contains a comma.
-#       Because double quotes are used for quoting, the double quote character
-#       may not appear in a path.
-shared.loader=
-
-# Default list of JAR files that should not be scanned using the JarScanner
-# functionality. This is typically used to scan JARs for configuration
-# information. JARs that do not contain such information may be excluded from
-# the scan to speed up the scanning process. This is the default list. JARs on
-# this list are excluded from all scans. The list must be a comma separated list
-# of JAR file names.
-# The list of JARs to skip may be over-ridden at a Context level for individual
-# scan types by configuring a JarScanner with a nested JarScanFilter.
-# The JARs listed below include:
-# - Tomcat Bootstrap JARs
-# - Tomcat API JARs
-# - Catalina JARs
-# - Jasper JARs
-# - Tomcat JARs
-# - Common non-Tomcat JARs
-# - Test JARs (JUnit, Cobertura and dependencies)
-tomcat.util.scan.StandardJarScanFilter.jarsToSkip=\
-applicationinsights-*.jar, \
-annotations-api.jar,\
-ant-junit*.jar,\
-ant-launcher.jar,\
-ant.jar,\
-asm-*.jar,\
-aspectj*.jar,\
-bootstrap.jar,\
-catalina-ant.jar,\
-catalina-ha.jar,\
-catalina-storeconfig.jar,\
-catalina-tribes.jar,\
-catalina.jar,\
-cglib-*.jar,\
-cobertura-*.jar,\
-commons-beanutils*.jar,\
-commons-codec*.jar,\
-commons-collections*.jar,\
-commons-daemon.jar,\
-commons-dbcp*.jar,\
-commons-digester*.jar,\
-commons-fileupload*.jar,\
-commons-httpclient*.jar,\
-commons-io*.jar,\
-commons-lang*.jar,\
-commons-logging*.jar,\
-commons-math*.jar,\
-commons-pool*.jar,\
-dom4j-*.jar,\
-easymock-*.jar,\
-ecj-*.jar,\
-el-api.jar,\
-geronimo-spec-jaxrpc*.jar,\
-h2*.jar,\
-hamcrest-*.jar,\
-hibernate*.jar,\
-httpclient*.jar,\
-icu4j-*.jar,\
-jasper-el.jar,\
-jasper.jar,\
-jaspic-api.jar,\
-jaxb-*.jar,\
-jaxen-*.jar,\
-jdom-*.jar,\
-jetty-*.jar,\
-jmx-tools.jar,\
-jmx.jar,\
-jsp-api.jar,\
-jstl.jar,\
-jta*.jar,\
-junit-*.jar,\
-junit.jar,\
-log4j*.jar,\
-mail*.jar,\
-objenesis-*.jar,\
-oraclepki.jar,\
-oro-*.jar,\
-servlet-api-*.jar,\
-servlet-api.jar,\
-slf4j*.jar,\
-taglibs-standard-spec-*.jar,\
-tagsoup-*.jar,\
-tomcat-api.jar,\
-tomcat-coyote.jar,\
-tomcat-dbcp.jar,\
-tomcat-i18n-*.jar,\
-tomcat-jdbc.jar,\
-tomcat-jni.jar,\
-tomcat-juli-adapters.jar,\
-tomcat-juli.jar,\
-tomcat-util-scan.jar,\
-tomcat-util.jar,\
-tomcat-websocket.jar,\
-tools.jar,\
-websocket-api.jar,\
-wsdl4j*.jar,\
-xercesImpl.jar,\
-xml-apis.jar,\
-xmlParserAPIs-*.jar,\
-xmlParserAPIs.jar,\
-xom-*.jar
-
-# Default list of JAR files that should be scanned that overrides the default
-# jarsToSkip list above. This is typically used to include a specific JAR that
-# has been excluded by a broad file name pattern in the jarsToSkip list.
-# The list of JARs to scan may be over-ridden at a Context level for individual
-# scan types by configuring a JarScanner with a nested JarScanFilter.
-tomcat.util.scan.StandardJarScanFilter.jarsToScan=\
-log4j-taglib*.jar,\
-log4j-web*.jar,\
-log4javascript*.jar,\
-slf4j-taglib*.jar
-
-# String cache configuration.
-tomcat.util.buf.StringCache.byte.enabled=true
-#tomcat.util.buf.StringCache.char.enabled=true
-#tomcat.util.buf.StringCache.trainThreshold=500000
-#tomcat.util.buf.StringCache.cacheSize=5000

From 2855331ebf8df09c0dc40b11e1becca47d68122b Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Sat, 7 Nov 2020 08:37:22 -0600
Subject: [PATCH 163/264] Delete logging.properties

---
 docker/debian10/Tomcat/logging.properties | 66 -----------------------
 1 file changed, 66 deletions(-)
 delete mode 100644 docker/debian10/Tomcat/logging.properties

diff --git a/docker/debian10/Tomcat/logging.properties b/docker/debian10/Tomcat/logging.properties
deleted file mode 100644
index a9ed260b..00000000
--- a/docker/debian10/Tomcat/logging.properties
+++ /dev/null
@@ -1,66 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-# This file has been modified from Tomcat's original to redirect all logging to the console.
-# Console output of containers can be consumed by Azure Monitor and other services.
-
-# For more information about enabling Azure Monitor for Containers, see
-# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-enable-existing-clusters
-
-# For more information about querying logs with Azure Monitor for containers, see
-# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-log-search#search-logs-to-analyze-data
-
-
-handlers = 1catalina.java.util.logging.ConsoleHandler, 2localhost.java.util.logging.ConsoleHandler, 3manager.java.util.logging.ConsoleHandler, 4host-manager.java.util.logging.ConsoleHandler, java.util.logging.ConsoleHandler
-
-.handlers = java.util.logging.ConsoleHandler
-
-############################################################
-# Handler specific properties.
-# Describes specific configuration info for Handlers.
-############################################################
-
-java.util.logging.ConsoleHandler.level = FINE
-java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter
-java.util.logging.ConsoleHandler.encoding = UTF-8
-
-
-############################################################
-# Facility specific properties.
-# Provides extra control for each logger.
-############################################################
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = java.util.logging.ConsoleHandler
-
-# For example, set the org.apache.catalina.util.LifecycleBase logger to log
-# each component that extends LifecycleBase changing state:
-#org.apache.catalina.util.LifecycleBase.level = FINE
-
-# To see debug messages in TldLocationsCache, uncomment the following line:
-#org.apache.jasper.compiler.TldLocationsCache.level = FINE
-
-# To see debug messages for HTTP/2 handling, uncomment the following line:
-#org.apache.coyote.http2.level = FINE
-
-# To see debug messages for WebSocket handling, uncomment the following line:
-#org.apache.tomcat.websocket.level = FINE
\ No newline at end of file

From 2f4b593976e15c9007f53bd18675cf4a304cf26e Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Sat, 7 Nov 2020 08:37:31 -0600
Subject: [PATCH 164/264] Delete server.xml

---
 docker/debian10/Tomcat/server.xml | 169 ------------------------------
 1 file changed, 169 deletions(-)
 delete mode 100644 docker/debian10/Tomcat/server.xml

diff --git a/docker/debian10/Tomcat/server.xml b/docker/debian10/Tomcat/server.xml
deleted file mode 100644
index 88a00d3e..00000000
--- a/docker/debian10/Tomcat/server.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!-- Note:  A "Server" is not itself a "Container", so you may not
-     define subcomponents such as "Valves" at this level.
-     Documentation at /docs/config/server.html
- -->
-<Server port="8005" shutdown="SHUTDOWN">
-  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
-  <!-- Security listener. Documentation at /docs/config/listeners.html
-  <Listener className="org.apache.catalina.security.SecurityListener" />
-  -->
-  <!--APR library loader. Documentation at /docs/apr.html -->
-  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
-  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
-  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
-  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
-  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
-
-  <!-- Global JNDI resources
-       Documentation at /docs/jndi-resources-howto.html
-  -->
-  <GlobalNamingResources>
-    <!-- Editable user database that can also be used by
-         UserDatabaseRealm to authenticate users
-    -->
-    <Resource name="UserDatabase" auth="Container"
-              type="org.apache.catalina.UserDatabase"
-              description="User database that can be updated and saved"
-              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
-              pathname="conf/tomcat-users.xml"
-               />
-  </GlobalNamingResources>
-
-  <!-- A "Service" is a collection of one or more "Connectors" that share
-       a single "Container" Note:  A "Service" is not itself a "Container",
-       so you may not define subcomponents such as "Valves" at this level.
-       Documentation at /docs/config/service.html
-   -->
-  <Service name="Catalina">
-
-    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
-    <!--
-    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
-        maxThreads="150" minSpareThreads="4"/>
-    -->
-
-
-    <!-- A "Connector" represents an endpoint by which requests are received
-         and responses are returned. Documentation at :
-         Java HTTP Connector: /docs/config/http.html
-         Java AJP  Connector: /docs/config/ajp.html
-         APR (HTTP/AJP) Connector: /docs/apr.html
-         Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
-    -->
-    <Connector port="8080" protocol="HTTP/1.1"
-               connectionTimeout="20000"
-               redirectPort="8443" 
-               URIEncoding="UTF-8"/>
-    <!-- A "Connector" using the shared thread pool-->
-    <!--
-    <Connector executor="tomcatThreadPool"
-               port="8080" protocol="HTTP/1.1"
-               connectionTimeout="20000"
-               redirectPort="8443" />
-    -->
-    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
-         This connector uses the NIO implementation. The default
-         SSLImplementation will depend on the presence of the APR/native
-         library and the useOpenSSL attribute of the
-         AprLifecycleListener.
-         Either JSSE or OpenSSL style configuration may be used regardless of
-         the SSLImplementation selected. JSSE style configuration is used below.
-    -->
-    <!--
-    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
-               maxThreads="150" SSLEnabled="true">
-        <SSLHostConfig>
-            <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
-                         type="RSA" />
-        </SSLHostConfig>
-    </Connector>
-    -->
-    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
-         This connector uses the APR/native implementation which always uses
-         OpenSSL for TLS.
-         Either JSSE or OpenSSL style configuration may be used. OpenSSL style
-         configuration is used below.
-    -->
-    <!--
-    <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
-               maxThreads="150" SSLEnabled="true" >
-        <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
-        <SSLHostConfig>
-            <Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
-                         certificateFile="conf/localhost-rsa-cert.pem"
-                         certificateChainFile="conf/localhost-rsa-chain.pem"
-                         type="RSA" />
-        </SSLHostConfig>
-    </Connector>
-    -->
-
-    <!-- Define an AJP 1.3 Connector on port 8009 -->
-    <!-- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" /> -->
-
-
-    <!-- An Engine represents the entry point (within Catalina) that processes
-         every request.  The Engine implementation for Tomcat stand alone
-         analyzes the HTTP headers included with the request, and passes them
-         on to the appropriate Host (virtual host).
-         Documentation at /docs/config/engine.html -->
-
-    <!-- You should set jvmRoute to support load-balancing via AJP ie :
-    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
-    -->
-    <Engine name="Catalina" defaultHost="localhost">
-
-      <!--For clustering, please take a look at documentation at:
-          /docs/cluster-howto.html  (simple how to)
-          /docs/config/cluster.html (reference documentation) -->
-      <!--
-      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
-      -->
-
-      <!-- Use the LockOutRealm to prevent attempts to guess user passwords
-           via a brute-force attack -->
-      <Realm className="org.apache.catalina.realm.LockOutRealm">
-        <!-- This Realm uses the UserDatabase configured in the global JNDI
-             resources under the key "UserDatabase".  Any edits
-             that are performed against this UserDatabase are immediately
-             available for use by the Realm.  -->
-        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
-               resourceName="UserDatabase"/>
-      </Realm>
-
-      <Host name="localhost"  appBase="webapps"
-            unpackWARs="false" autoDeploy="false">
-
-        <!-- SingleSignOn valve, share authentication between web applications
-             Documentation at: /docs/config/valve.html -->
-        <!--
-        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
-        -->
-
-        <!-- Access log processes all example.
-             Documentation at: /docs/config/valve.html
-             Note: The pattern used is equivalent to using pattern="common" -->
-        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="${log.base}"
-               prefix="localhost_access_log" suffix=".txt"
-               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
-
-      </Host>
-    </Engine>
-  </Service>
-</Server>

From 1f359e138540560048d3c9bde95adca036f2293e Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Sat, 7 Nov 2020 08:37:39 -0600
Subject: [PATCH 165/264] Delete startup.sh

---
 docker/debian10/Tomcat/startup.sh | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 docker/debian10/Tomcat/startup.sh

diff --git a/docker/debian10/Tomcat/startup.sh b/docker/debian10/Tomcat/startup.sh
deleted file mode 100644
index 365141c2..00000000
--- a/docker/debian10/Tomcat/startup.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# Create a log directory for each hostname in case a shared file system is used among multiple hosts or containers.
-# As provided in the default configuration, only the access log gets written to this directory.
-LOG_DIR="${LOG_ROOT}/$(hostname)"
-mkdir -p "${LOG_DIR}"
-export JAVA_OPTS="${JAVA_OPTS} -Dlog.base=${LOG_DIR}"
-/usr/local/tomcat/bin/catalina.sh run

From dab8fdedb8f8e63f3e764d391dd20debc66969a7 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Sat, 7 Nov 2020 08:38:24 -0600
Subject: [PATCH 166/264] Added Dockerfiles for Tomcat

---
 ...rfile.zulu-11u9-jre-headless-tools-tomcat8 | 66 +++++++++++++++++++
 ...rfile.zulu-11u9-jre-headless-tools-tomcat9 | 66 +++++++++++++++++++
 ...file.zulu-8u272-jre-headless-tools-tomcat8 | 61 +++++++++++++++++
 ...file.zulu-8u272-jre-headless-tools-tomcat9 | 61 +++++++++++++++++
 4 files changed, 254 insertions(+)
 create mode 100644 docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8
 create mode 100644 docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9
 create mode 100644 docker/debian10/Dockerfile.zulu-8u272-jre-headless-tools-tomcat8
 create mode 100644 docker/debian10/Dockerfile.zulu-8u272-jre-headless-tools-tomcat9

diff --git a/docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8 b/docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..d8d11cd3
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8
@@ -0,0 +1,66 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u9-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jdk:11u9-zulu-debian10 AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure-amd64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM debian:buster
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.59
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install ca-certificates curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9 b/docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..eaf7a157
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9
@@ -0,0 +1,66 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u9-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jdk:11u9-zulu-debian10 AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure-amd64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM debian:buster
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.39
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install ca-certificates curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/debian10/Dockerfile.zulu-8u272-jre-headless-tools-tomcat8 b/docker/debian10/Dockerfile.zulu-8u272-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..4bb54dea
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u272-jre-headless-tools-tomcat8
@@ -0,0 +1,61 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u272-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u272-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.59
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/debian10/Dockerfile.zulu-8u272-jre-headless-tools-tomcat9 b/docker/debian10/Dockerfile.zulu-8u272-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..942cf1b8
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u272-jre-headless-tools-tomcat9
@@ -0,0 +1,61 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u272-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u272-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.39
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]

From 9489a0e9047616564d2ab3a2a5759df1a3d97485 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 9 Nov 2020 10:32:11 -0600
Subject: [PATCH 167/264] Create server.xml

---
 docker/alpine/Tomcat/v8/server.xml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docker/alpine/Tomcat/v8/server.xml

diff --git a/docker/alpine/Tomcat/v8/server.xml b/docker/alpine/Tomcat/v8/server.xml
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/docker/alpine/Tomcat/v8/server.xml
@@ -0,0 +1 @@
+

From 0ae4fe2439688569881b486f78e2cf071251e251 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 9 Nov 2020 10:32:28 -0600
Subject: [PATCH 168/264] Create server.xml

---
 docker/alpine/Tomcat/v9/server.xml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docker/alpine/Tomcat/v9/server.xml

diff --git a/docker/alpine/Tomcat/v9/server.xml b/docker/alpine/Tomcat/v9/server.xml
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/docker/alpine/Tomcat/v9/server.xml
@@ -0,0 +1 @@
+

From 31b08ceea3a21c26c9865e4baf5885e13165ce4d Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 9 Nov 2020 10:33:16 -0600
Subject: [PATCH 169/264] Initial add

---
 docker/alpine/Tomcat/v9/catalina.properties | 207 ++++++++++++++++++++
 docker/alpine/Tomcat/v9/logging.properties  |  66 +++++++
 docker/alpine/Tomcat/v9/server.xml          | 167 ++++++++++++++++
 docker/alpine/Tomcat/v9/startup.sh          |   8 +
 4 files changed, 448 insertions(+)
 create mode 100644 docker/alpine/Tomcat/v9/catalina.properties
 create mode 100644 docker/alpine/Tomcat/v9/logging.properties
 create mode 100644 docker/alpine/Tomcat/v9/startup.sh

diff --git a/docker/alpine/Tomcat/v9/catalina.properties b/docker/alpine/Tomcat/v9/catalina.properties
new file mode 100644
index 00000000..fcd1e139
--- /dev/null
+++ b/docker/alpine/Tomcat/v9/catalina.properties
@@ -0,0 +1,207 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# List of comma-separated packages that start with or equal this string
+# will cause a security exception to be thrown when
+# passed to checkPackageAccess unless the
+# corresponding RuntimePermission ("accessClassInPackage."+package) has
+# been granted.
+package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,org.apache.tomcat.
+#
+# List of comma-separated packages that start with or equal this string
+# will cause a security exception to be thrown when
+# passed to checkPackageDefinition unless the
+# corresponding RuntimePermission ("defineClassInPackage."+package) has
+# been granted.
+#
+# by default, no packages are restricted for definition, and none of
+# the class loaders supplied with the JDK call checkPackageDefinition.
+#
+package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,\
+org.apache.jasper.,org.apache.naming.,org.apache.tomcat.
+
+#
+#
+# List of comma-separated paths defining the contents of the "common"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
+# If left as blank,the JVM system loader will be used as Catalina's "common"
+# loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+#
+# Note: Values are enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar","/home/tomcat/lib","/home/tomcat/lib/*.jar"
+
+#
+# List of comma-separated paths defining the contents of the "server"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
+# If left as blank, the "common" loader will be used as Catalina's "server"
+# loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+#
+# Note: Values may be enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+server.loader=
+
+#
+# List of comma-separated paths defining the contents of the "shared"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_BASE path or absolute. If left as blank,
+# the "common" loader will be used as Catalina's "shared" loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+# Please note that for single jars, e.g. bar.jar, you need the URL form
+# starting with file:.
+#
+# Note: Values may be enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+shared.loader=
+
+# Default list of JAR files that should not be scanned using the JarScanner
+# functionality. This is typically used to scan JARs for configuration
+# information. JARs that do not contain such information may be excluded from
+# the scan to speed up the scanning process. This is the default list. JARs on
+# this list are excluded from all scans. The list must be a comma separated list
+# of JAR file names.
+# The list of JARs to skip may be over-ridden at a Context level for individual
+# scan types by configuring a JarScanner with a nested JarScanFilter.
+# The JARs listed below include:
+# - Tomcat Bootstrap JARs
+# - Tomcat API JARs
+# - Catalina JARs
+# - Jasper JARs
+# - Tomcat JARs
+# - Common non-Tomcat JARs
+# - Test JARs (JUnit, Cobertura and dependencies)
+tomcat.util.scan.StandardJarScanFilter.jarsToSkip=\
+applicationinsights-*.jar, \
+annotations-api.jar,\
+ant-junit*.jar,\
+ant-launcher.jar,\
+ant.jar,\
+asm-*.jar,\
+aspectj*.jar,\
+bootstrap.jar,\
+catalina-ant.jar,\
+catalina-ha.jar,\
+catalina-ssi.jar,\
+catalina-storeconfig.jar,\
+catalina-tribes.jar,\
+catalina.jar,\
+cglib-*.jar,\
+cobertura-*.jar,\
+commons-beanutils*.jar,\
+commons-codec*.jar,\
+commons-collections*.jar,\
+commons-daemon.jar,\
+commons-dbcp*.jar,\
+commons-digester*.jar,\
+commons-fileupload*.jar,\
+commons-httpclient*.jar,\
+commons-io*.jar,\
+commons-lang*.jar,\
+commons-logging*.jar,\
+commons-math*.jar,\
+commons-pool*.jar,\
+dom4j-*.jar,\
+easymock-*.jar,\
+ecj-*.jar,\
+el-api.jar,\
+geronimo-spec-jaxrpc*.jar,\
+h2*.jar,\
+hamcrest-*.jar,\
+hibernate*.jar,\
+httpclient*.jar,\
+icu4j-*.jar,\
+jasper-el.jar,\
+jasper.jar,\
+jaspic-api.jar,\
+jaxb-*.jar,\
+jaxen-*.jar,\
+jdom-*.jar,\
+jetty-*.jar,\
+jmx-tools.jar,\
+jmx.jar,\
+jsp-api.jar,\
+jstl.jar,\
+jta*.jar,\
+junit-*.jar,\
+junit.jar,\
+log4j*.jar,\
+mail*.jar,\
+objenesis-*.jar,\
+oraclepki.jar,\
+oro-*.jar,\
+servlet-api-*.jar,\
+servlet-api.jar,\
+slf4j*.jar,\
+taglibs-standard-spec-*.jar,\
+tagsoup-*.jar,\
+tomcat-api.jar,\
+tomcat-coyote.jar,\
+tomcat-dbcp.jar,\
+tomcat-i18n-*.jar,\
+tomcat-jdbc.jar,\
+tomcat-jni.jar,\
+tomcat-juli-adapters.jar,\
+tomcat-juli.jar,\
+tomcat-util-scan.jar,\
+tomcat-util.jar,\
+tomcat-websocket.jar,\
+tools.jar,\
+websocket-api.jar,\
+wsdl4j*.jar,\
+xercesImpl.jar,\
+xml-apis.jar,\
+xmlParserAPIs-*.jar,\
+xmlParserAPIs.jar,\
+xom-*.jar
+
+# Default list of JAR files that should be scanned that overrides the default
+# jarsToSkip list above. This is typically used to include a specific JAR that
+# has been excluded by a broad file name pattern in the jarsToSkip list.
+# The list of JARs to scan may be over-ridden at a Context level for individual
+# scan types by configuring a JarScanner with a nested JarScanFilter.
+tomcat.util.scan.StandardJarScanFilter.jarsToScan=\
+log4j-taglib*.jar,\
+log4j-web*.jar,\
+log4javascript*.jar,\
+slf4j-taglib*.jar
+
+# String cache configuration.
+tomcat.util.buf.StringCache.byte.enabled=true
+#tomcat.util.buf.StringCache.char.enabled=true
+#tomcat.util.buf.StringCache.trainThreshold=500000
+#tomcat.util.buf.StringCache.cacheSize=5000
diff --git a/docker/alpine/Tomcat/v9/logging.properties b/docker/alpine/Tomcat/v9/logging.properties
new file mode 100644
index 00000000..a72a295d
--- /dev/null
+++ b/docker/alpine/Tomcat/v9/logging.properties
@@ -0,0 +1,66 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# This file has been modified from Tomcat's original to redirect all logging to the console.
+# Console output of containers can be consumed by Azure Monitor and other services.
+
+# For more information about enabling Azure Monitor for Containers, see
+# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-enable-existing-clusters
+
+# For more information about querying logs with Azure Monitor for containers, see
+# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-log-search#search-logs-to-analyze-data
+
+
+handlers = 1catalina.java.util.logging.ConsoleHandler, 2localhost.java.util.logging.ConsoleHandler, 3manager.java.util.logging.ConsoleHandler, 4host-manager.java.util.logging.ConsoleHandler, java.util.logging.ConsoleHandler
+
+.handlers = java.util.logging.ConsoleHandler
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter
+java.util.logging.ConsoleHandler.encoding = UTF-8
+
+
+############################################################
+# Facility specific properties.
+# Provides extra control for each logger.
+############################################################
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = java.util.logging.ConsoleHandler
+
+# For example, set the org.apache.catalina.util.LifecycleBase logger to log
+# each component that extends LifecycleBase changing state:
+#org.apache.catalina.util.LifecycleBase.level = FINE
+
+# To see debug messages in TldLocationsCache, uncomment the following line:
+#org.apache.jasper.compiler.TldLocationsCache.level = FINE
+
+# To see debug messages for HTTP/2 handling, uncomment the following line:
+#org.apache.coyote.http2.level = FINE
+
+# To see debug messages for WebSocket handling, uncomment the following line:
+#org.apache.tomcat.websocket.level = FINE
diff --git a/docker/alpine/Tomcat/v9/server.xml b/docker/alpine/Tomcat/v9/server.xml
index 8b137891..53ba3706 100644
--- a/docker/alpine/Tomcat/v9/server.xml
+++ b/docker/alpine/Tomcat/v9/server.xml
@@ -1 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" at this level.
+     Documentation at /docs/config/server.html
+ -->
+<Server port="8005" shutdown="SHUTDOWN">
+  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
+  <!-- Security listener. Documentation at /docs/config/listeners.html
+  <Listener className="org.apache.catalina.security.SecurityListener" />
+  -->
+  <!--APR library loader. Documentation at /docs/apr.html -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+
+  <!-- Global JNDI resources
+       Documentation at /docs/jndi-resources-howto.html
+  -->
+  <GlobalNamingResources>
+    <!-- Editable user database that can also be used by
+         UserDatabaseRealm to authenticate users
+    -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+              description="User database that can be updated and saved"
+              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+              pathname="conf/tomcat-users.xml" />
+  </GlobalNamingResources>
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" Note:  A "Service" is not itself a "Container",
+       so you may not define subcomponents such as "Valves" at this level.
+       Documentation at /docs/config/service.html
+   -->
+  <Service name="Catalina">
+
+    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+    <!--
+    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+        maxThreads="150" minSpareThreads="4"/>
+    -->
+
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned. Documentation at :
+         Java HTTP Connector: /docs/config/http.html
+         Java AJP  Connector: /docs/config/ajp.html
+         APR (HTTP/AJP) Connector: /docs/apr.html
+         Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
+    -->
+    <Connector port="80" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" 
+               URIEncoding="UTF-8"/>
+    <!-- A "Connector" using the shared thread pool-->
+    <!--
+    <Connector executor="tomcatThreadPool"
+               port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" />
+    -->
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
+         This connector uses the NIO implementation. The default
+         SSLImplementation will depend on the presence of the APR/native
+         library and the useOpenSSL attribute of the
+         AprLifecycleListener.
+         Either JSSE or OpenSSL style configuration may be used regardless of
+         the SSLImplementation selected. JSSE style configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+               maxThreads="150" SSLEnabled="true">
+        <SSLHostConfig>
+            <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
+         This connector uses the APR/native implementation which always uses
+         OpenSSL for TLS.
+         Either JSSE or OpenSSL style configuration may be used. OpenSSL style
+         configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
+               maxThreads="150" SSLEnabled="true" >
+        <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
+        <SSLHostConfig>
+            <Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
+                         certificateFile="conf/localhost-rsa-cert.pem"
+                         certificateChainFile="conf/localhost-rsa-chain.pem"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <!-- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" /> -->
+
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host).
+         Documentation at /docs/config/engine.html -->
+
+    <!-- You should set jvmRoute to support load-balancing via AJP ie :
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+    -->
+    <Engine name="Catalina" defaultHost="localhost">
+
+      <!--For clustering, please take a look at documentation at:
+          /docs/cluster-howto.html  (simple how to)
+          /docs/config/cluster.html (reference documentation) -->
+      <!--
+      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+      -->
+
+      <!-- Use the LockOutRealm to prevent attempts to guess user passwords
+           via a brute-force attack -->
+      <Realm className="org.apache.catalina.realm.LockOutRealm">
+        <!-- This Realm uses the UserDatabase configured in the global JNDI
+             resources under the key "UserDatabase".  Any edits
+             that are performed against this UserDatabase are immediately
+             available for use by the Realm.  -->
+        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+               resourceName="UserDatabase"/>
+      </Realm>
+
+      <Host name="localhost"  appBase="webapps"
+            unpackWARs="false" autoDeploy="false">
+
+        <!-- SingleSignOn valve, share authentication between web applications
+             Documentation at: /docs/config/valve.html -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        -->
+
+        <!-- Access log processes all example.
+             Documentation at: /docs/config/valve.html
+             Note: The pattern used is equivalent to using pattern="common" -->
+        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="${log.base}"
+               prefix="localhost_access_log" suffix=".txt"
+               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
+
+      </Host>
+    </Engine>
+  </Service>
+</Server>
diff --git a/docker/alpine/Tomcat/v9/startup.sh b/docker/alpine/Tomcat/v9/startup.sh
new file mode 100644
index 00000000..365141c2
--- /dev/null
+++ b/docker/alpine/Tomcat/v9/startup.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Create a log directory for each hostname in case a shared file system is used among multiple hosts or containers.
+# As provided in the default configuration, only the access log gets written to this directory.
+LOG_DIR="${LOG_ROOT}/$(hostname)"
+mkdir -p "${LOG_DIR}"
+export JAVA_OPTS="${JAVA_OPTS} -Dlog.base=${LOG_DIR}"
+/usr/local/tomcat/bin/catalina.sh run

From bd8453e6f7175c4817a3fa156603351d07da189d Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 9 Nov 2020 10:33:50 -0600
Subject: [PATCH 170/264] Initial add

---
 docker/alpine/Tomcat/v8/catalina.properties | 215 ++++++++++++++++++++
 docker/alpine/Tomcat/v8/logging.properties  |  66 ++++++
 docker/alpine/Tomcat/v8/server.xml          | 167 +++++++++++++++
 docker/alpine/Tomcat/v8/startup.sh          |   8 +
 4 files changed, 456 insertions(+)
 create mode 100644 docker/alpine/Tomcat/v8/catalina.properties
 create mode 100644 docker/alpine/Tomcat/v8/logging.properties
 create mode 100644 docker/alpine/Tomcat/v8/startup.sh

diff --git a/docker/alpine/Tomcat/v8/catalina.properties b/docker/alpine/Tomcat/v8/catalina.properties
new file mode 100644
index 00000000..9d0c93ee
--- /dev/null
+++ b/docker/alpine/Tomcat/v8/catalina.properties
@@ -0,0 +1,215 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# List of comma-separated packages that start with or equal this string
+# will cause a security exception to be thrown when
+# passed to checkPackageAccess unless the
+# corresponding RuntimePermission ("accessClassInPackage."+package) has
+# been granted.
+package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,org.apache.tomcat.
+#
+# List of comma-separated packages that start with or equal this string
+# will cause a security exception to be thrown when
+# passed to checkPackageDefinition unless the
+# corresponding RuntimePermission ("defineClassInPackage."+package) has
+# been granted.
+#
+# by default, no packages are restricted for definition, and none of
+# the class loaders supplied with the JDK call checkPackageDefinition.
+#
+package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,\
+org.apache.jasper.,org.apache.naming.,org.apache.tomcat.
+
+#
+#
+# List of comma-separated paths defining the contents of the "common"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
+# If left as blank,the JVM system loader will be used as Catalina's "common"
+# loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+#
+# Note: Values are enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar","/home/tomcat/lib","/home/tomcat/lib/*.jar"
+
+#
+# List of comma-separated paths defining the contents of the "server"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
+# If left as blank, the "common" loader will be used as Catalina's "server"
+# loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+#
+# Note: Values may be enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+server.loader=
+
+#
+# List of comma-separated paths defining the contents of the "shared"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_BASE path or absolute. If left as blank,
+# the "common" loader will be used as Catalina's "shared" loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+# Please note that for single jars, e.g. bar.jar, you need the URL form
+# starting with file:.
+#
+# Note: Values may be enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+shared.loader=
+
+# Default list of JAR files that should not be scanned using the JarScanner
+# functionality. This is typically used to scan JARs for configuration
+# information. JARs that do not contain such information may be excluded from
+# the scan to speed up the scanning process. This is the default list. JARs on
+# this list are excluded from all scans. The list must be a comma separated list
+# of JAR file names.
+# The list of JARs to skip may be over-ridden at a Context level for individual
+# scan types by configuring a JarScanner with a nested JarScanFilter.
+# The JARs listed below include:
+# - Tomcat Bootstrap JARs
+# - Tomcat API JARs
+# - Catalina JARs
+# - Jasper JARs
+# - Tomcat JARs
+# - Common non-Tomcat JARs
+# - Test JARs (JUnit, Cobertura and dependencies)
+tomcat.util.scan.StandardJarScanFilter.jarsToSkip=\
+applicationinsights-*.jar, \
+annotations-api.jar,\
+ant-junit*.jar,\
+ant-launcher.jar,\
+ant.jar,\
+asm-*.jar,\
+aspectj*.jar,\
+bootstrap.jar,\
+catalina-ant.jar,\
+catalina-ha.jar,\
+catalina-jmx-remote.jar,\
+catalina-storeconfig.jar,\
+catalina-tribes.jar,\
+catalina-ws.jar,\
+catalina.jar,\
+cglib-*.jar,\
+cobertura-*.jar,\
+commons-beanutils*.jar,\
+commons-codec*.jar,\
+commons-collections*.jar,\
+commons-daemon.jar,\
+commons-dbcp*.jar,\
+commons-digester*.jar,\
+commons-fileupload*.jar,\
+commons-httpclient*.jar,\
+commons-io*.jar,\
+commons-lang*.jar,\
+commons-logging*.jar,\
+commons-math*.jar,\
+commons-pool*.jar,\
+dom4j-*.jar,\
+easymock-*.jar,\
+ecj-*.jar,\
+el-api.jar,\
+geronimo-spec-jaxrpc*.jar,\
+h2*.jar,\
+hamcrest-*.jar,\
+hibernate*.jar,\
+httpclient*.jar,\
+icu4j-*.jar,\
+jasper-el.jar,\
+jasper.jar,\
+jaspic-api.jar,\
+jaxb-*.jar,\
+jaxen-*.jar,\
+jdom-*.jar,\
+jetty-*.jar,\
+jmx-tools.jar,\
+jmx.jar,\
+jsp-api.jar,\
+jstl.jar,\
+jta*.jar,\
+junit-*.jar,\
+junit.jar,\
+log4j*.jar,\
+mail*.jar,\
+objenesis-*.jar,\
+oraclepki.jar,\
+oro-*.jar,\
+servlet-api-*.jar,\
+servlet-api.jar,\
+slf4j*.jar,\
+taglibs-standard-spec-*.jar,\
+tagsoup-*.jar,\
+tomcat-api.jar,\
+tomcat-coyote.jar,\
+tomcat-dbcp.jar,\
+tomcat-i18n-*.jar,\
+tomcat-jdbc.jar,\
+tomcat-jni.jar,\
+tomcat-juli-adapters.jar,\
+tomcat-juli.jar,\
+tomcat-util-scan.jar,\
+tomcat-util.jar,\
+tomcat-websocket.jar,\
+tools.jar,\
+websocket-api.jar,\
+wsdl4j*.jar,\
+xercesImpl.jar,\
+xml-apis.jar,\
+xmlParserAPIs-*.jar,\
+xmlParserAPIs.jar,\
+xom-*.jar
+
+# Default list of JAR files that should be scanned that overrides the default
+# jarsToSkip list above. This is typically used to include a specific JAR that
+# has been excluded by a broad file name pattern in the jarsToSkip list.
+# The list of JARs to scan may be over-ridden at a Context level for individual
+# scan types by configuring a JarScanner with a nested JarScanFilter.
+tomcat.util.scan.StandardJarScanFilter.jarsToScan=\
+log4j-taglib*.jar,\
+log4j-web*.jar,\
+log4javascript*.jar,\
+slf4j-taglib*.jar
+
+# String cache configuration.
+tomcat.util.buf.StringCache.byte.enabled=true
+#tomcat.util.buf.StringCache.char.enabled=true
+#tomcat.util.buf.StringCache.trainThreshold=500000
+#tomcat.util.buf.StringCache.cacheSize=5000
+
+# This system property is deprecated. Use the relaxedPathChars relaxedQueryChars
+# attributes of the Connector instead. These attributes permit a wider range of
+# characters to be configured as valid.
+# Allow for changes to HTTP request validation
+# WARNING: Using this option may expose the server to CVE-2016-6816
+#tomcat.util.http.parser.HttpParser.requestTargetAllow=|
diff --git a/docker/alpine/Tomcat/v8/logging.properties b/docker/alpine/Tomcat/v8/logging.properties
new file mode 100644
index 00000000..a72a295d
--- /dev/null
+++ b/docker/alpine/Tomcat/v8/logging.properties
@@ -0,0 +1,66 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# This file has been modified from Tomcat's original to redirect all logging to the console.
+# Console output of containers can be consumed by Azure Monitor and other services.
+
+# For more information about enabling Azure Monitor for Containers, see
+# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-enable-existing-clusters
+
+# For more information about querying logs with Azure Monitor for containers, see
+# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-log-search#search-logs-to-analyze-data
+
+
+handlers = 1catalina.java.util.logging.ConsoleHandler, 2localhost.java.util.logging.ConsoleHandler, 3manager.java.util.logging.ConsoleHandler, 4host-manager.java.util.logging.ConsoleHandler, java.util.logging.ConsoleHandler
+
+.handlers = java.util.logging.ConsoleHandler
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter
+java.util.logging.ConsoleHandler.encoding = UTF-8
+
+
+############################################################
+# Facility specific properties.
+# Provides extra control for each logger.
+############################################################
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = java.util.logging.ConsoleHandler
+
+# For example, set the org.apache.catalina.util.LifecycleBase logger to log
+# each component that extends LifecycleBase changing state:
+#org.apache.catalina.util.LifecycleBase.level = FINE
+
+# To see debug messages in TldLocationsCache, uncomment the following line:
+#org.apache.jasper.compiler.TldLocationsCache.level = FINE
+
+# To see debug messages for HTTP/2 handling, uncomment the following line:
+#org.apache.coyote.http2.level = FINE
+
+# To see debug messages for WebSocket handling, uncomment the following line:
+#org.apache.tomcat.websocket.level = FINE
diff --git a/docker/alpine/Tomcat/v8/server.xml b/docker/alpine/Tomcat/v8/server.xml
index 8b137891..53ba3706 100644
--- a/docker/alpine/Tomcat/v8/server.xml
+++ b/docker/alpine/Tomcat/v8/server.xml
@@ -1 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" at this level.
+     Documentation at /docs/config/server.html
+ -->
+<Server port="8005" shutdown="SHUTDOWN">
+  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
+  <!-- Security listener. Documentation at /docs/config/listeners.html
+  <Listener className="org.apache.catalina.security.SecurityListener" />
+  -->
+  <!--APR library loader. Documentation at /docs/apr.html -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+
+  <!-- Global JNDI resources
+       Documentation at /docs/jndi-resources-howto.html
+  -->
+  <GlobalNamingResources>
+    <!-- Editable user database that can also be used by
+         UserDatabaseRealm to authenticate users
+    -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+              description="User database that can be updated and saved"
+              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+              pathname="conf/tomcat-users.xml" />
+  </GlobalNamingResources>
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" Note:  A "Service" is not itself a "Container",
+       so you may not define subcomponents such as "Valves" at this level.
+       Documentation at /docs/config/service.html
+   -->
+  <Service name="Catalina">
+
+    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+    <!--
+    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+        maxThreads="150" minSpareThreads="4"/>
+    -->
+
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned. Documentation at :
+         Java HTTP Connector: /docs/config/http.html
+         Java AJP  Connector: /docs/config/ajp.html
+         APR (HTTP/AJP) Connector: /docs/apr.html
+         Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
+    -->
+    <Connector port="80" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" 
+               URIEncoding="UTF-8"/>
+    <!-- A "Connector" using the shared thread pool-->
+    <!--
+    <Connector executor="tomcatThreadPool"
+               port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" />
+    -->
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
+         This connector uses the NIO implementation. The default
+         SSLImplementation will depend on the presence of the APR/native
+         library and the useOpenSSL attribute of the
+         AprLifecycleListener.
+         Either JSSE or OpenSSL style configuration may be used regardless of
+         the SSLImplementation selected. JSSE style configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+               maxThreads="150" SSLEnabled="true">
+        <SSLHostConfig>
+            <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
+         This connector uses the APR/native implementation which always uses
+         OpenSSL for TLS.
+         Either JSSE or OpenSSL style configuration may be used. OpenSSL style
+         configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
+               maxThreads="150" SSLEnabled="true" >
+        <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
+        <SSLHostConfig>
+            <Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
+                         certificateFile="conf/localhost-rsa-cert.pem"
+                         certificateChainFile="conf/localhost-rsa-chain.pem"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <!-- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" /> -->
+
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host).
+         Documentation at /docs/config/engine.html -->
+
+    <!-- You should set jvmRoute to support load-balancing via AJP ie :
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+    -->
+    <Engine name="Catalina" defaultHost="localhost">
+
+      <!--For clustering, please take a look at documentation at:
+          /docs/cluster-howto.html  (simple how to)
+          /docs/config/cluster.html (reference documentation) -->
+      <!--
+      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+      -->
+
+      <!-- Use the LockOutRealm to prevent attempts to guess user passwords
+           via a brute-force attack -->
+      <Realm className="org.apache.catalina.realm.LockOutRealm">
+        <!-- This Realm uses the UserDatabase configured in the global JNDI
+             resources under the key "UserDatabase".  Any edits
+             that are performed against this UserDatabase are immediately
+             available for use by the Realm.  -->
+        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+               resourceName="UserDatabase"/>
+      </Realm>
+
+      <Host name="localhost"  appBase="webapps"
+            unpackWARs="false" autoDeploy="false">
+
+        <!-- SingleSignOn valve, share authentication between web applications
+             Documentation at: /docs/config/valve.html -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        -->
+
+        <!-- Access log processes all example.
+             Documentation at: /docs/config/valve.html
+             Note: The pattern used is equivalent to using pattern="common" -->
+        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="${log.base}"
+               prefix="localhost_access_log" suffix=".txt"
+               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
+
+      </Host>
+    </Engine>
+  </Service>
+</Server>
diff --git a/docker/alpine/Tomcat/v8/startup.sh b/docker/alpine/Tomcat/v8/startup.sh
new file mode 100644
index 00000000..365141c2
--- /dev/null
+++ b/docker/alpine/Tomcat/v8/startup.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Create a log directory for each hostname in case a shared file system is used among multiple hosts or containers.
+# As provided in the default configuration, only the access log gets written to this directory.
+LOG_DIR="${LOG_ROOT}/$(hostname)"
+mkdir -p "${LOG_DIR}"
+export JAVA_OPTS="${JAVA_OPTS} -Dlog.base=${LOG_DIR}"
+/usr/local/tomcat/bin/catalina.sh run

From e529e43d83771a57bda614e37d8df257d969a1bc Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 9 Nov 2020 10:34:06 -0600
Subject: [PATCH 171/264] Delete catalina.properties

---
 docker/alpine/Tomcat/catalina.properties | 206 -----------------------
 1 file changed, 206 deletions(-)
 delete mode 100644 docker/alpine/Tomcat/catalina.properties

diff --git a/docker/alpine/Tomcat/catalina.properties b/docker/alpine/Tomcat/catalina.properties
deleted file mode 100644
index 3cbca2fe..00000000
--- a/docker/alpine/Tomcat/catalina.properties
+++ /dev/null
@@ -1,206 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageAccess unless the
-# corresponding RuntimePermission ("accessClassInPackage."+package) has
-# been granted.
-package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,org.apache.tomcat.
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageDefinition unless the
-# corresponding RuntimePermission ("defineClassInPackage."+package) has
-# been granted.
-#
-# by default, no packages are restricted for definition, and none of
-# the class loaders supplied with the JDK call checkPackageDefinition.
-#
-package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,\
-org.apache.jasper.,org.apache.naming.,org.apache.tomcat.
-
-#
-#
-# List of comma-separated paths defining the contents of the "common"
-# classloader. Prefixes should be used to define what is the repository type.
-# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
-# If left as blank,the JVM system loader will be used as Catalina's "common"
-# loader.
-# Examples:
-#     "foo": Add this folder as a class repository
-#     "foo/*.jar": Add all the JARs of the specified folder as class
-#                  repositories
-#     "foo/bar.jar": Add bar.jar as a class repository
-#
-# Note: Values are enclosed in double quotes ("...") in case either the
-#       ${catalina.base} path or the ${catalina.home} path contains a comma.
-#       Because double quotes are used for quoting, the double quote character
-#       may not appear in a path.
-common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar","/home/tomcat/lib","/home/tomcat/lib/*.jar"
-
-#
-# List of comma-separated paths defining the contents of the "server"
-# classloader. Prefixes should be used to define what is the repository type.
-# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
-# If left as blank, the "common" loader will be used as Catalina's "server"
-# loader.
-# Examples:
-#     "foo": Add this folder as a class repository
-#     "foo/*.jar": Add all the JARs of the specified folder as class
-#                  repositories
-#     "foo/bar.jar": Add bar.jar as a class repository
-#
-# Note: Values may be enclosed in double quotes ("...") in case either the
-#       ${catalina.base} path or the ${catalina.home} path contains a comma.
-#       Because double quotes are used for quoting, the double quote character
-#       may not appear in a path.
-server.loader=
-
-#
-# List of comma-separated paths defining the contents of the "shared"
-# classloader. Prefixes should be used to define what is the repository type.
-# Path may be relative to the CATALINA_BASE path or absolute. If left as blank,
-# the "common" loader will be used as Catalina's "shared" loader.
-# Examples:
-#     "foo": Add this folder as a class repository
-#     "foo/*.jar": Add all the JARs of the specified folder as class
-#                  repositories
-#     "foo/bar.jar": Add bar.jar as a class repository
-# Please note that for single jars, e.g. bar.jar, you need the URL form
-# starting with file:.
-#
-# Note: Values may be enclosed in double quotes ("...") in case either the
-#       ${catalina.base} path or the ${catalina.home} path contains a comma.
-#       Because double quotes are used for quoting, the double quote character
-#       may not appear in a path.
-shared.loader=
-
-# Default list of JAR files that should not be scanned using the JarScanner
-# functionality. This is typically used to scan JARs for configuration
-# information. JARs that do not contain such information may be excluded from
-# the scan to speed up the scanning process. This is the default list. JARs on
-# this list are excluded from all scans. The list must be a comma separated list
-# of JAR file names.
-# The list of JARs to skip may be over-ridden at a Context level for individual
-# scan types by configuring a JarScanner with a nested JarScanFilter.
-# The JARs listed below include:
-# - Tomcat Bootstrap JARs
-# - Tomcat API JARs
-# - Catalina JARs
-# - Jasper JARs
-# - Tomcat JARs
-# - Common non-Tomcat JARs
-# - Test JARs (JUnit, Cobertura and dependencies)
-tomcat.util.scan.StandardJarScanFilter.jarsToSkip=\
-applicationinsights-*.jar, \
-annotations-api.jar,\
-ant-junit*.jar,\
-ant-launcher.jar,\
-ant.jar,\
-asm-*.jar,\
-aspectj*.jar,\
-bootstrap.jar,\
-catalina-ant.jar,\
-catalina-ha.jar,\
-catalina-storeconfig.jar,\
-catalina-tribes.jar,\
-catalina.jar,\
-cglib-*.jar,\
-cobertura-*.jar,\
-commons-beanutils*.jar,\
-commons-codec*.jar,\
-commons-collections*.jar,\
-commons-daemon.jar,\
-commons-dbcp*.jar,\
-commons-digester*.jar,\
-commons-fileupload*.jar,\
-commons-httpclient*.jar,\
-commons-io*.jar,\
-commons-lang*.jar,\
-commons-logging*.jar,\
-commons-math*.jar,\
-commons-pool*.jar,\
-dom4j-*.jar,\
-easymock-*.jar,\
-ecj-*.jar,\
-el-api.jar,\
-geronimo-spec-jaxrpc*.jar,\
-h2*.jar,\
-hamcrest-*.jar,\
-hibernate*.jar,\
-httpclient*.jar,\
-icu4j-*.jar,\
-jasper-el.jar,\
-jasper.jar,\
-jaspic-api.jar,\
-jaxb-*.jar,\
-jaxen-*.jar,\
-jdom-*.jar,\
-jetty-*.jar,\
-jmx-tools.jar,\
-jmx.jar,\
-jsp-api.jar,\
-jstl.jar,\
-jta*.jar,\
-junit-*.jar,\
-junit.jar,\
-log4j*.jar,\
-mail*.jar,\
-objenesis-*.jar,\
-oraclepki.jar,\
-oro-*.jar,\
-servlet-api-*.jar,\
-servlet-api.jar,\
-slf4j*.jar,\
-taglibs-standard-spec-*.jar,\
-tagsoup-*.jar,\
-tomcat-api.jar,\
-tomcat-coyote.jar,\
-tomcat-dbcp.jar,\
-tomcat-i18n-*.jar,\
-tomcat-jdbc.jar,\
-tomcat-jni.jar,\
-tomcat-juli-adapters.jar,\
-tomcat-juli.jar,\
-tomcat-util-scan.jar,\
-tomcat-util.jar,\
-tomcat-websocket.jar,\
-tools.jar,\
-websocket-api.jar,\
-wsdl4j*.jar,\
-xercesImpl.jar,\
-xml-apis.jar,\
-xmlParserAPIs-*.jar,\
-xmlParserAPIs.jar,\
-xom-*.jar
-
-# Default list of JAR files that should be scanned that overrides the default
-# jarsToSkip list above. This is typically used to include a specific JAR that
-# has been excluded by a broad file name pattern in the jarsToSkip list.
-# The list of JARs to scan may be over-ridden at a Context level for individual
-# scan types by configuring a JarScanner with a nested JarScanFilter.
-tomcat.util.scan.StandardJarScanFilter.jarsToScan=\
-log4j-taglib*.jar,\
-log4j-web*.jar,\
-log4javascript*.jar,\
-slf4j-taglib*.jar
-
-# String cache configuration.
-tomcat.util.buf.StringCache.byte.enabled=true
-#tomcat.util.buf.StringCache.char.enabled=true
-#tomcat.util.buf.StringCache.trainThreshold=500000
-#tomcat.util.buf.StringCache.cacheSize=5000

From be561a368902256e8559de21a98ebfd104d4139e Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 9 Nov 2020 10:34:14 -0600
Subject: [PATCH 172/264] Delete logging.properties

---
 docker/alpine/Tomcat/logging.properties | 66 -------------------------
 1 file changed, 66 deletions(-)
 delete mode 100644 docker/alpine/Tomcat/logging.properties

diff --git a/docker/alpine/Tomcat/logging.properties b/docker/alpine/Tomcat/logging.properties
deleted file mode 100644
index a9ed260b..00000000
--- a/docker/alpine/Tomcat/logging.properties
+++ /dev/null
@@ -1,66 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-# This file has been modified from Tomcat's original to redirect all logging to the console.
-# Console output of containers can be consumed by Azure Monitor and other services.
-
-# For more information about enabling Azure Monitor for Containers, see
-# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-enable-existing-clusters
-
-# For more information about querying logs with Azure Monitor for containers, see
-# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-log-search#search-logs-to-analyze-data
-
-
-handlers = 1catalina.java.util.logging.ConsoleHandler, 2localhost.java.util.logging.ConsoleHandler, 3manager.java.util.logging.ConsoleHandler, 4host-manager.java.util.logging.ConsoleHandler, java.util.logging.ConsoleHandler
-
-.handlers = java.util.logging.ConsoleHandler
-
-############################################################
-# Handler specific properties.
-# Describes specific configuration info for Handlers.
-############################################################
-
-java.util.logging.ConsoleHandler.level = FINE
-java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter
-java.util.logging.ConsoleHandler.encoding = UTF-8
-
-
-############################################################
-# Facility specific properties.
-# Provides extra control for each logger.
-############################################################
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = java.util.logging.ConsoleHandler
-
-# For example, set the org.apache.catalina.util.LifecycleBase logger to log
-# each component that extends LifecycleBase changing state:
-#org.apache.catalina.util.LifecycleBase.level = FINE
-
-# To see debug messages in TldLocationsCache, uncomment the following line:
-#org.apache.jasper.compiler.TldLocationsCache.level = FINE
-
-# To see debug messages for HTTP/2 handling, uncomment the following line:
-#org.apache.coyote.http2.level = FINE
-
-# To see debug messages for WebSocket handling, uncomment the following line:
-#org.apache.tomcat.websocket.level = FINE
\ No newline at end of file

From 3eb1fbd255144b5b6723bd0ef50ac037e020f172 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 9 Nov 2020 10:34:22 -0600
Subject: [PATCH 173/264] Delete server.xml

---
 docker/alpine/Tomcat/server.xml | 169 --------------------------------
 1 file changed, 169 deletions(-)
 delete mode 100644 docker/alpine/Tomcat/server.xml

diff --git a/docker/alpine/Tomcat/server.xml b/docker/alpine/Tomcat/server.xml
deleted file mode 100644
index 88a00d3e..00000000
--- a/docker/alpine/Tomcat/server.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!-- Note:  A "Server" is not itself a "Container", so you may not
-     define subcomponents such as "Valves" at this level.
-     Documentation at /docs/config/server.html
- -->
-<Server port="8005" shutdown="SHUTDOWN">
-  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
-  <!-- Security listener. Documentation at /docs/config/listeners.html
-  <Listener className="org.apache.catalina.security.SecurityListener" />
-  -->
-  <!--APR library loader. Documentation at /docs/apr.html -->
-  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
-  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
-  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
-  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
-  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
-
-  <!-- Global JNDI resources
-       Documentation at /docs/jndi-resources-howto.html
-  -->
-  <GlobalNamingResources>
-    <!-- Editable user database that can also be used by
-         UserDatabaseRealm to authenticate users
-    -->
-    <Resource name="UserDatabase" auth="Container"
-              type="org.apache.catalina.UserDatabase"
-              description="User database that can be updated and saved"
-              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
-              pathname="conf/tomcat-users.xml"
-               />
-  </GlobalNamingResources>
-
-  <!-- A "Service" is a collection of one or more "Connectors" that share
-       a single "Container" Note:  A "Service" is not itself a "Container",
-       so you may not define subcomponents such as "Valves" at this level.
-       Documentation at /docs/config/service.html
-   -->
-  <Service name="Catalina">
-
-    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
-    <!--
-    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
-        maxThreads="150" minSpareThreads="4"/>
-    -->
-
-
-    <!-- A "Connector" represents an endpoint by which requests are received
-         and responses are returned. Documentation at :
-         Java HTTP Connector: /docs/config/http.html
-         Java AJP  Connector: /docs/config/ajp.html
-         APR (HTTP/AJP) Connector: /docs/apr.html
-         Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
-    -->
-    <Connector port="8080" protocol="HTTP/1.1"
-               connectionTimeout="20000"
-               redirectPort="8443" 
-               URIEncoding="UTF-8"/>
-    <!-- A "Connector" using the shared thread pool-->
-    <!--
-    <Connector executor="tomcatThreadPool"
-               port="8080" protocol="HTTP/1.1"
-               connectionTimeout="20000"
-               redirectPort="8443" />
-    -->
-    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
-         This connector uses the NIO implementation. The default
-         SSLImplementation will depend on the presence of the APR/native
-         library and the useOpenSSL attribute of the
-         AprLifecycleListener.
-         Either JSSE or OpenSSL style configuration may be used regardless of
-         the SSLImplementation selected. JSSE style configuration is used below.
-    -->
-    <!--
-    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
-               maxThreads="150" SSLEnabled="true">
-        <SSLHostConfig>
-            <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
-                         type="RSA" />
-        </SSLHostConfig>
-    </Connector>
-    -->
-    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
-         This connector uses the APR/native implementation which always uses
-         OpenSSL for TLS.
-         Either JSSE or OpenSSL style configuration may be used. OpenSSL style
-         configuration is used below.
-    -->
-    <!--
-    <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
-               maxThreads="150" SSLEnabled="true" >
-        <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
-        <SSLHostConfig>
-            <Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
-                         certificateFile="conf/localhost-rsa-cert.pem"
-                         certificateChainFile="conf/localhost-rsa-chain.pem"
-                         type="RSA" />
-        </SSLHostConfig>
-    </Connector>
-    -->
-
-    <!-- Define an AJP 1.3 Connector on port 8009 -->
-    <!-- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" /> -->
-
-
-    <!-- An Engine represents the entry point (within Catalina) that processes
-         every request.  The Engine implementation for Tomcat stand alone
-         analyzes the HTTP headers included with the request, and passes them
-         on to the appropriate Host (virtual host).
-         Documentation at /docs/config/engine.html -->
-
-    <!-- You should set jvmRoute to support load-balancing via AJP ie :
-    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
-    -->
-    <Engine name="Catalina" defaultHost="localhost">
-
-      <!--For clustering, please take a look at documentation at:
-          /docs/cluster-howto.html  (simple how to)
-          /docs/config/cluster.html (reference documentation) -->
-      <!--
-      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
-      -->
-
-      <!-- Use the LockOutRealm to prevent attempts to guess user passwords
-           via a brute-force attack -->
-      <Realm className="org.apache.catalina.realm.LockOutRealm">
-        <!-- This Realm uses the UserDatabase configured in the global JNDI
-             resources under the key "UserDatabase".  Any edits
-             that are performed against this UserDatabase are immediately
-             available for use by the Realm.  -->
-        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
-               resourceName="UserDatabase"/>
-      </Realm>
-
-      <Host name="localhost"  appBase="webapps"
-            unpackWARs="false" autoDeploy="false">
-
-        <!-- SingleSignOn valve, share authentication between web applications
-             Documentation at: /docs/config/valve.html -->
-        <!--
-        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
-        -->
-
-        <!-- Access log processes all example.
-             Documentation at: /docs/config/valve.html
-             Note: The pattern used is equivalent to using pattern="common" -->
-        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="${log.base}"
-               prefix="localhost_access_log" suffix=".txt"
-               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
-
-      </Host>
-    </Engine>
-  </Service>
-</Server>

From 31bc1df4d4931cd76c02987000f11a6ff99d9b80 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 9 Nov 2020 10:34:30 -0600
Subject: [PATCH 174/264] Delete startup.sh

---
 docker/alpine/Tomcat/startup.sh | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 docker/alpine/Tomcat/startup.sh

diff --git a/docker/alpine/Tomcat/startup.sh b/docker/alpine/Tomcat/startup.sh
deleted file mode 100644
index 365141c2..00000000
--- a/docker/alpine/Tomcat/startup.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# Create a log directory for each hostname in case a shared file system is used among multiple hosts or containers.
-# As provided in the default configuration, only the access log gets written to this directory.
-LOG_DIR="${LOG_ROOT}/$(hostname)"
-mkdir -p "${LOG_DIR}"
-export JAVA_OPTS="${JAVA_OPTS} -Dlog.base=${LOG_DIR}"
-/usr/local/tomcat/bin/catalina.sh run

From 4185face60963accf3f5c19d6e09da6832dc2638 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 9 Nov 2020 10:35:15 -0600
Subject: [PATCH 175/264] Added Dockerfiles for Tomcat

---
 ...rfile.zulu-11u9-jre-headless-tools-tomcat8 | 72 +++++++++++++++++++
 ...rfile.zulu-11u9-jre-headless-tools-tomcat9 | 72 +++++++++++++++++++
 ...file.zulu-8u272-jre-headless-tools-tomcat8 | 67 +++++++++++++++++
 ...file.zulu-8u272-jre-headless-tools-tomcat9 | 67 +++++++++++++++++
 4 files changed, 278 insertions(+)
 create mode 100644 docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8
 create mode 100644 docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9
 create mode 100644 docker/alpine/Dockerfile.zulu-8u272-jre-headless-tools-tomcat8
 create mode 100644 docker/alpine/Dockerfile.zulu-8u272-jre-headless-tools-tomcat9

diff --git a/docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8 b/docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..8ebda05a
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8
@@ -0,0 +1,72 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u9-zulu-alpine AS stage1
+FROM mcr.microsoft.com/java/jdk:11u9-zulu-alpine AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-jdk_11.43.21-11.0.9-linux_musl_x64
+ARG JRE_DIR=/usr/lib/jvm/zulu-11-azure-jre-headless_11.43.21-11.0.9-linux_musl_x64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM alpine
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.59
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apk add --update openssh-server bash openrc && \
+    apk update && \
+    apk upgrade && \
+    rm -rf /var/cache/apk/* && \
+    # Remove unnecessary services
+    rm -f /etc/init.d/hwdrivers \
+          /etc/init.d/hwclock \
+          /etc/init.d/mtab \
+          /etc/init.d/bootmisc \
+          /etc/init.d/modules \
+          /etc/init.d/modules-load \
+          /etc/init.d/modloop && \
+    # Install Tomcat
+    wget -O /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9 b/docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..a0b73b2d
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9
@@ -0,0 +1,72 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u9-zulu-alpine AS stage1
+FROM mcr.microsoft.com/java/jdk:11u9-zulu-alpine AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-jdk_11.43.21-11.0.9-linux_musl_x64
+ARG JRE_DIR=/usr/lib/jvm/zulu-11-azure-jre-headless_11.43.21-11.0.9-linux_musl_x64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM alpine
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.39
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apk add --update openssh-server bash openrc && \
+    apk update && \
+    apk upgrade && \
+    rm -rf /var/cache/apk/* && \
+    # Remove unnecessary services
+    rm -f /etc/init.d/hwdrivers \
+          /etc/init.d/hwclock \
+          /etc/init.d/mtab \
+          /etc/init.d/bootmisc \
+          /etc/init.d/modules \
+          /etc/init.d/modules-load \
+          /etc/init.d/modloop && \
+    # Install Tomcat
+    wget -O /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/alpine/Dockerfile.zulu-8u272-jre-headless-tools-tomcat8 b/docker/alpine/Dockerfile.zulu-8u272-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..900134f1
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u272-jre-headless-tools-tomcat8
@@ -0,0 +1,67 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u272-zulu-alpine AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u272-zulu-alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-jdk_8.50.0.21-8.0.272-linux_musl_x64
+ARG JRE_DIR=/usr/lib/jvm/zulu-8-azure-jre-headless_8.50.0.21-8.0.272-linux_musl_x64
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.59
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apk add --update openssh-server bash openrc && \
+    apk update && \
+    apk upgrade && \
+    rm -rf /var/cache/apk/* && \
+    # Remove unnecessary services
+    rm -f /etc/init.d/hwdrivers \
+          /etc/init.d/hwclock \
+          /etc/init.d/mtab \
+          /etc/init.d/bootmisc \
+          /etc/init.d/modules \
+          /etc/init.d/modules-load \
+          /etc/init.d/modloop && \
+    # Install Tomcat
+    wget -O /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/alpine/Dockerfile.zulu-8u272-jre-headless-tools-tomcat9 b/docker/alpine/Dockerfile.zulu-8u272-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..6fb125ac
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u272-jre-headless-tools-tomcat9
@@ -0,0 +1,67 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u272-zulu-alpine AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u272-zulu-alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-jdk_8.50.0.21-8.0.272-linux_musl_x64
+ARG JRE_DIR=/usr/lib/jvm/zulu-8-azure-jre-headless_8.50.0.21-8.0.272-linux_musl_x64
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.39
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apk add --update openssh-server bash openrc && \
+    apk update && \
+    apk upgrade && \
+    rm -rf /var/cache/apk/* && \
+    # Remove unnecessary services
+    rm -f /etc/init.d/hwdrivers \
+          /etc/init.d/hwclock \
+          /etc/init.d/mtab \
+          /etc/init.d/bootmisc \
+          /etc/init.d/modules \
+          /etc/init.d/modules-load \
+          /etc/init.d/modloop && \
+    # Install Tomcat
+    wget -O /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]

From 521cb4717fc6cb7dd189923e110d0f4545b98ec6 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 9 Nov 2020 11:47:26 -0600
Subject: [PATCH 176/264] Added stage3

---
 docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8 | 2 +-
 docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8 b/docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8
index 8ebda05a..6091851a 100644
--- a/docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8
+++ b/docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8
@@ -18,7 +18,7 @@ RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e
     rm -rf ${JRE_DIR} && \
     jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
 
-FROM alpine
+FROM alpine AS stage3
 
 ARG TOMCAT_MAJOR=8
 ARG TOMCAT_VERSION=8.5.59
diff --git a/docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9 b/docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9
index a0b73b2d..eb48272e 100644
--- a/docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9
+++ b/docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9
@@ -18,7 +18,7 @@ RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e
     rm -rf ${JRE_DIR} && \
     jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
 
-FROM alpine
+FROM alpine AS stage3
 
 ARG TOMCAT_MAJOR=9
 ARG TOMCAT_VERSION=9.0.39

From 397759faa1d3b30f3cef4fc23a07befd93594921 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 9 Nov 2020 11:47:58 -0600
Subject: [PATCH 177/264] Added stage3

---
 docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8 | 2 +-
 docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8 b/docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8
index d8d11cd3..afbbd8c8 100644
--- a/docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8
+++ b/docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8
@@ -18,7 +18,7 @@ RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e
     rm -rf ${JRE_DIR} && \
     jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
 
-FROM debian:buster
+FROM debian:buster AS stage3
 
 ARG TOMCAT_MAJOR=8
 ARG TOMCAT_VERSION=8.5.59
diff --git a/docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9 b/docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9
index eaf7a157..28cfa0a0 100644
--- a/docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9
+++ b/docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9
@@ -18,7 +18,7 @@ RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e
     rm -rf ${JRE_DIR} && \
     jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
 
-FROM debian:buster
+FROM debian:buster AS stage3
 
 ARG TOMCAT_MAJOR=9
 ARG TOMCAT_VERSION=9.0.39

From e84a728cade4cb7491036afd24ee0fa18768f907 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Sat, 21 Nov 2020 11:24:01 -0600
Subject: [PATCH 178/264] Added Dockerfiles with Tomcat

---
 ...rfile.zulu-11u9-jre-headless-tools-tomcat8 | 62 +++++++++++++++++++
 ...rfile.zulu-11u9-jre-headless-tools-tomcat9 | 62 +++++++++++++++++++
 ...file.zulu-8u272-jre-headless-tools-tomcat8 | 57 +++++++++++++++++
 ...file.zulu-8u272-jre-headless-tools-tomcat9 | 57 +++++++++++++++++
 4 files changed, 238 insertions(+)
 create mode 100644 docker/centos/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8
 create mode 100644 docker/centos/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9
 create mode 100644 docker/centos/Dockerfile.zulu-8u272-jre-headless-tools-tomcat8
 create mode 100644 docker/centos/Dockerfile.zulu-8u272-jre-headless-tools-tomcat9

diff --git a/docker/centos/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8 b/docker/centos/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..c0989a52
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8
@@ -0,0 +1,62 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u9-zulu-centos AS stage1
+FROM mcr.microsoft.com/java/jdk:11u9-zulu-centos AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM centos:latest AS stage3
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.59
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+RUN yum -q -y update && \
+    yum -q -y install unzip && \
+    yum -q -y upgrade && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
+       
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/centos/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9 b/docker/centos/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..2eb31e98
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9
@@ -0,0 +1,62 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u9-zulu-centos AS stage1
+FROM mcr.microsoft.com/java/jdk:11u9-zulu-centos AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM centos:latest AS stage3
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.39
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+RUN yum -q -y update && \
+    yum -q -y install unzip && \
+    yum -q -y upgrade && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
+       
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/centos/Dockerfile.zulu-8u272-jre-headless-tools-tomcat8 b/docker/centos/Dockerfile.zulu-8u272-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..3dbd06e7
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u272-jre-headless-tools-tomcat8
@@ -0,0 +1,57 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u272-zulu-centos AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u272-zulu-centos
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.59
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+RUN yum -q -y update && \
+    yum -q -y install unzip && \
+    yum -q -y upgrade && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
+       
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/centos/Dockerfile.zulu-8u272-jre-headless-tools-tomcat9 b/docker/centos/Dockerfile.zulu-8u272-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..a33b0035
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u272-jre-headless-tools-tomcat9
@@ -0,0 +1,57 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u272-zulu-centos AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u272-zulu-centos
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.39
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+RUN yum -q -y update && \
+    yum -q -y install unzip && \
+    yum -q -y upgrade && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
+       
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]

From e0ccee52695e1b7d5b838bbca9f32023cd7b77e7 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Sat, 21 Nov 2020 11:25:02 -0600
Subject: [PATCH 179/264] Added Dockerfiles for Tomcat

---
 ...rfile.zulu-11u9-jre-headless-tools-tomcat8 | 66 +++++++++++++++++++
 ...rfile.zulu-11u9-jre-headless-tools-tomcat9 | 66 +++++++++++++++++++
 ...file.zulu-8u272-jre-headless-tools-tomcat8 | 61 +++++++++++++++++
 ...file.zulu-8u272-jre-headless-tools-tomcat9 | 61 +++++++++++++++++
 4 files changed, 254 insertions(+)
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u272-jre-headless-tools-tomcat8
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u272-jre-headless-tools-tomcat9

diff --git a/docker/ubuntu/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8 b/docker/ubuntu/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..b9c2a151
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8
@@ -0,0 +1,66 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u9-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jdk:11u9-zulu-ubuntu AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure-amd64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM ubuntu:focal AS stage3
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.59
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install ca-certificates curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/ubuntu/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9 b/docker/ubuntu/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..36ceb792
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9
@@ -0,0 +1,66 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u9-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jdk:11u9-zulu-ubuntu AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure-amd64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM ubuntu:focal AS stage3
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.39
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install ca-certificates curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/ubuntu/Dockerfile.zulu-8u272-jre-headless-tools-tomcat8 b/docker/ubuntu/Dockerfile.zulu-8u272-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..f84270ee
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u272-jre-headless-tools-tomcat8
@@ -0,0 +1,61 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u272-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u272-zulu-ubuntu
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.59
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/ubuntu/Dockerfile.zulu-8u272-jre-headless-tools-tomcat9 b/docker/ubuntu/Dockerfile.zulu-8u272-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..12fd31d0
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u272-jre-headless-tools-tomcat9
@@ -0,0 +1,61 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u272-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u272-zulu-ubuntu
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.39
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]

From 8122b3f69bf34fbe9a8075dd899631970c266246 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 25 Nov 2020 09:08:09 -0600
Subject: [PATCH 180/264] Create server.xml

---
 docker/ubuntu/Tomcat/v8/server.xml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docker/ubuntu/Tomcat/v8/server.xml

diff --git a/docker/ubuntu/Tomcat/v8/server.xml b/docker/ubuntu/Tomcat/v8/server.xml
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/docker/ubuntu/Tomcat/v8/server.xml
@@ -0,0 +1 @@
+

From f61bc42441f026ab2b647e43c2a6cda524bc797a Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 25 Nov 2020 09:08:24 -0600
Subject: [PATCH 181/264] Create server.xml

---
 docker/ubuntu/Tomcat/v9/server.xml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docker/ubuntu/Tomcat/v9/server.xml

diff --git a/docker/ubuntu/Tomcat/v9/server.xml b/docker/ubuntu/Tomcat/v9/server.xml
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/docker/ubuntu/Tomcat/v9/server.xml
@@ -0,0 +1 @@
+

From 622a57f81193248d1b3b62aa3a054b8243d5634a Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 25 Nov 2020 09:09:17 -0600
Subject: [PATCH 182/264] Initial add

---
 docker/ubuntu/Tomcat/v8/catalina.properties | 215 ++++++++++++++++++++
 docker/ubuntu/Tomcat/v8/logging.properties  |  66 ++++++
 docker/ubuntu/Tomcat/v8/server.xml          | 167 +++++++++++++++
 docker/ubuntu/Tomcat/v8/startup.sh          |   8 +
 4 files changed, 456 insertions(+)
 create mode 100644 docker/ubuntu/Tomcat/v8/catalina.properties
 create mode 100644 docker/ubuntu/Tomcat/v8/logging.properties
 create mode 100644 docker/ubuntu/Tomcat/v8/startup.sh

diff --git a/docker/ubuntu/Tomcat/v8/catalina.properties b/docker/ubuntu/Tomcat/v8/catalina.properties
new file mode 100644
index 00000000..9d0c93ee
--- /dev/null
+++ b/docker/ubuntu/Tomcat/v8/catalina.properties
@@ -0,0 +1,215 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# List of comma-separated packages that start with or equal this string
+# will cause a security exception to be thrown when
+# passed to checkPackageAccess unless the
+# corresponding RuntimePermission ("accessClassInPackage."+package) has
+# been granted.
+package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,org.apache.tomcat.
+#
+# List of comma-separated packages that start with or equal this string
+# will cause a security exception to be thrown when
+# passed to checkPackageDefinition unless the
+# corresponding RuntimePermission ("defineClassInPackage."+package) has
+# been granted.
+#
+# by default, no packages are restricted for definition, and none of
+# the class loaders supplied with the JDK call checkPackageDefinition.
+#
+package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,\
+org.apache.jasper.,org.apache.naming.,org.apache.tomcat.
+
+#
+#
+# List of comma-separated paths defining the contents of the "common"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
+# If left as blank,the JVM system loader will be used as Catalina's "common"
+# loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+#
+# Note: Values are enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar","/home/tomcat/lib","/home/tomcat/lib/*.jar"
+
+#
+# List of comma-separated paths defining the contents of the "server"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
+# If left as blank, the "common" loader will be used as Catalina's "server"
+# loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+#
+# Note: Values may be enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+server.loader=
+
+#
+# List of comma-separated paths defining the contents of the "shared"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_BASE path or absolute. If left as blank,
+# the "common" loader will be used as Catalina's "shared" loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+# Please note that for single jars, e.g. bar.jar, you need the URL form
+# starting with file:.
+#
+# Note: Values may be enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+shared.loader=
+
+# Default list of JAR files that should not be scanned using the JarScanner
+# functionality. This is typically used to scan JARs for configuration
+# information. JARs that do not contain such information may be excluded from
+# the scan to speed up the scanning process. This is the default list. JARs on
+# this list are excluded from all scans. The list must be a comma separated list
+# of JAR file names.
+# The list of JARs to skip may be over-ridden at a Context level for individual
+# scan types by configuring a JarScanner with a nested JarScanFilter.
+# The JARs listed below include:
+# - Tomcat Bootstrap JARs
+# - Tomcat API JARs
+# - Catalina JARs
+# - Jasper JARs
+# - Tomcat JARs
+# - Common non-Tomcat JARs
+# - Test JARs (JUnit, Cobertura and dependencies)
+tomcat.util.scan.StandardJarScanFilter.jarsToSkip=\
+applicationinsights-*.jar, \
+annotations-api.jar,\
+ant-junit*.jar,\
+ant-launcher.jar,\
+ant.jar,\
+asm-*.jar,\
+aspectj*.jar,\
+bootstrap.jar,\
+catalina-ant.jar,\
+catalina-ha.jar,\
+catalina-jmx-remote.jar,\
+catalina-storeconfig.jar,\
+catalina-tribes.jar,\
+catalina-ws.jar,\
+catalina.jar,\
+cglib-*.jar,\
+cobertura-*.jar,\
+commons-beanutils*.jar,\
+commons-codec*.jar,\
+commons-collections*.jar,\
+commons-daemon.jar,\
+commons-dbcp*.jar,\
+commons-digester*.jar,\
+commons-fileupload*.jar,\
+commons-httpclient*.jar,\
+commons-io*.jar,\
+commons-lang*.jar,\
+commons-logging*.jar,\
+commons-math*.jar,\
+commons-pool*.jar,\
+dom4j-*.jar,\
+easymock-*.jar,\
+ecj-*.jar,\
+el-api.jar,\
+geronimo-spec-jaxrpc*.jar,\
+h2*.jar,\
+hamcrest-*.jar,\
+hibernate*.jar,\
+httpclient*.jar,\
+icu4j-*.jar,\
+jasper-el.jar,\
+jasper.jar,\
+jaspic-api.jar,\
+jaxb-*.jar,\
+jaxen-*.jar,\
+jdom-*.jar,\
+jetty-*.jar,\
+jmx-tools.jar,\
+jmx.jar,\
+jsp-api.jar,\
+jstl.jar,\
+jta*.jar,\
+junit-*.jar,\
+junit.jar,\
+log4j*.jar,\
+mail*.jar,\
+objenesis-*.jar,\
+oraclepki.jar,\
+oro-*.jar,\
+servlet-api-*.jar,\
+servlet-api.jar,\
+slf4j*.jar,\
+taglibs-standard-spec-*.jar,\
+tagsoup-*.jar,\
+tomcat-api.jar,\
+tomcat-coyote.jar,\
+tomcat-dbcp.jar,\
+tomcat-i18n-*.jar,\
+tomcat-jdbc.jar,\
+tomcat-jni.jar,\
+tomcat-juli-adapters.jar,\
+tomcat-juli.jar,\
+tomcat-util-scan.jar,\
+tomcat-util.jar,\
+tomcat-websocket.jar,\
+tools.jar,\
+websocket-api.jar,\
+wsdl4j*.jar,\
+xercesImpl.jar,\
+xml-apis.jar,\
+xmlParserAPIs-*.jar,\
+xmlParserAPIs.jar,\
+xom-*.jar
+
+# Default list of JAR files that should be scanned that overrides the default
+# jarsToSkip list above. This is typically used to include a specific JAR that
+# has been excluded by a broad file name pattern in the jarsToSkip list.
+# The list of JARs to scan may be over-ridden at a Context level for individual
+# scan types by configuring a JarScanner with a nested JarScanFilter.
+tomcat.util.scan.StandardJarScanFilter.jarsToScan=\
+log4j-taglib*.jar,\
+log4j-web*.jar,\
+log4javascript*.jar,\
+slf4j-taglib*.jar
+
+# String cache configuration.
+tomcat.util.buf.StringCache.byte.enabled=true
+#tomcat.util.buf.StringCache.char.enabled=true
+#tomcat.util.buf.StringCache.trainThreshold=500000
+#tomcat.util.buf.StringCache.cacheSize=5000
+
+# This system property is deprecated. Use the relaxedPathChars relaxedQueryChars
+# attributes of the Connector instead. These attributes permit a wider range of
+# characters to be configured as valid.
+# Allow for changes to HTTP request validation
+# WARNING: Using this option may expose the server to CVE-2016-6816
+#tomcat.util.http.parser.HttpParser.requestTargetAllow=|
diff --git a/docker/ubuntu/Tomcat/v8/logging.properties b/docker/ubuntu/Tomcat/v8/logging.properties
new file mode 100644
index 00000000..a72a295d
--- /dev/null
+++ b/docker/ubuntu/Tomcat/v8/logging.properties
@@ -0,0 +1,66 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# This file has been modified from Tomcat's original to redirect all logging to the console.
+# Console output of containers can be consumed by Azure Monitor and other services.
+
+# For more information about enabling Azure Monitor for Containers, see
+# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-enable-existing-clusters
+
+# For more information about querying logs with Azure Monitor for containers, see
+# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-log-search#search-logs-to-analyze-data
+
+
+handlers = 1catalina.java.util.logging.ConsoleHandler, 2localhost.java.util.logging.ConsoleHandler, 3manager.java.util.logging.ConsoleHandler, 4host-manager.java.util.logging.ConsoleHandler, java.util.logging.ConsoleHandler
+
+.handlers = java.util.logging.ConsoleHandler
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter
+java.util.logging.ConsoleHandler.encoding = UTF-8
+
+
+############################################################
+# Facility specific properties.
+# Provides extra control for each logger.
+############################################################
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = java.util.logging.ConsoleHandler
+
+# For example, set the org.apache.catalina.util.LifecycleBase logger to log
+# each component that extends LifecycleBase changing state:
+#org.apache.catalina.util.LifecycleBase.level = FINE
+
+# To see debug messages in TldLocationsCache, uncomment the following line:
+#org.apache.jasper.compiler.TldLocationsCache.level = FINE
+
+# To see debug messages for HTTP/2 handling, uncomment the following line:
+#org.apache.coyote.http2.level = FINE
+
+# To see debug messages for WebSocket handling, uncomment the following line:
+#org.apache.tomcat.websocket.level = FINE
diff --git a/docker/ubuntu/Tomcat/v8/server.xml b/docker/ubuntu/Tomcat/v8/server.xml
index 8b137891..53ba3706 100644
--- a/docker/ubuntu/Tomcat/v8/server.xml
+++ b/docker/ubuntu/Tomcat/v8/server.xml
@@ -1 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" at this level.
+     Documentation at /docs/config/server.html
+ -->
+<Server port="8005" shutdown="SHUTDOWN">
+  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
+  <!-- Security listener. Documentation at /docs/config/listeners.html
+  <Listener className="org.apache.catalina.security.SecurityListener" />
+  -->
+  <!--APR library loader. Documentation at /docs/apr.html -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+
+  <!-- Global JNDI resources
+       Documentation at /docs/jndi-resources-howto.html
+  -->
+  <GlobalNamingResources>
+    <!-- Editable user database that can also be used by
+         UserDatabaseRealm to authenticate users
+    -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+              description="User database that can be updated and saved"
+              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+              pathname="conf/tomcat-users.xml" />
+  </GlobalNamingResources>
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" Note:  A "Service" is not itself a "Container",
+       so you may not define subcomponents such as "Valves" at this level.
+       Documentation at /docs/config/service.html
+   -->
+  <Service name="Catalina">
+
+    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+    <!--
+    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+        maxThreads="150" minSpareThreads="4"/>
+    -->
+
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned. Documentation at :
+         Java HTTP Connector: /docs/config/http.html
+         Java AJP  Connector: /docs/config/ajp.html
+         APR (HTTP/AJP) Connector: /docs/apr.html
+         Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
+    -->
+    <Connector port="80" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" 
+               URIEncoding="UTF-8"/>
+    <!-- A "Connector" using the shared thread pool-->
+    <!--
+    <Connector executor="tomcatThreadPool"
+               port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" />
+    -->
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
+         This connector uses the NIO implementation. The default
+         SSLImplementation will depend on the presence of the APR/native
+         library and the useOpenSSL attribute of the
+         AprLifecycleListener.
+         Either JSSE or OpenSSL style configuration may be used regardless of
+         the SSLImplementation selected. JSSE style configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+               maxThreads="150" SSLEnabled="true">
+        <SSLHostConfig>
+            <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
+         This connector uses the APR/native implementation which always uses
+         OpenSSL for TLS.
+         Either JSSE or OpenSSL style configuration may be used. OpenSSL style
+         configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
+               maxThreads="150" SSLEnabled="true" >
+        <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
+        <SSLHostConfig>
+            <Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
+                         certificateFile="conf/localhost-rsa-cert.pem"
+                         certificateChainFile="conf/localhost-rsa-chain.pem"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <!-- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" /> -->
+
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host).
+         Documentation at /docs/config/engine.html -->
+
+    <!-- You should set jvmRoute to support load-balancing via AJP ie :
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+    -->
+    <Engine name="Catalina" defaultHost="localhost">
+
+      <!--For clustering, please take a look at documentation at:
+          /docs/cluster-howto.html  (simple how to)
+          /docs/config/cluster.html (reference documentation) -->
+      <!--
+      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+      -->
+
+      <!-- Use the LockOutRealm to prevent attempts to guess user passwords
+           via a brute-force attack -->
+      <Realm className="org.apache.catalina.realm.LockOutRealm">
+        <!-- This Realm uses the UserDatabase configured in the global JNDI
+             resources under the key "UserDatabase".  Any edits
+             that are performed against this UserDatabase are immediately
+             available for use by the Realm.  -->
+        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+               resourceName="UserDatabase"/>
+      </Realm>
+
+      <Host name="localhost"  appBase="webapps"
+            unpackWARs="false" autoDeploy="false">
+
+        <!-- SingleSignOn valve, share authentication between web applications
+             Documentation at: /docs/config/valve.html -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        -->
+
+        <!-- Access log processes all example.
+             Documentation at: /docs/config/valve.html
+             Note: The pattern used is equivalent to using pattern="common" -->
+        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="${log.base}"
+               prefix="localhost_access_log" suffix=".txt"
+               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
+
+      </Host>
+    </Engine>
+  </Service>
+</Server>
diff --git a/docker/ubuntu/Tomcat/v8/startup.sh b/docker/ubuntu/Tomcat/v8/startup.sh
new file mode 100644
index 00000000..365141c2
--- /dev/null
+++ b/docker/ubuntu/Tomcat/v8/startup.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Create a log directory for each hostname in case a shared file system is used among multiple hosts or containers.
+# As provided in the default configuration, only the access log gets written to this directory.
+LOG_DIR="${LOG_ROOT}/$(hostname)"
+mkdir -p "${LOG_DIR}"
+export JAVA_OPTS="${JAVA_OPTS} -Dlog.base=${LOG_DIR}"
+/usr/local/tomcat/bin/catalina.sh run

From 25ce031ef048f9f64bdc9b209a834fc4f920114c Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 25 Nov 2020 09:09:55 -0600
Subject: [PATCH 183/264] Initial add

---
 docker/ubuntu/Tomcat/v9/catalina.properties | 207 ++++++++++++++++++++
 docker/ubuntu/Tomcat/v9/logging.properties  |  66 +++++++
 docker/ubuntu/Tomcat/v9/server.xml          | 167 ++++++++++++++++
 docker/ubuntu/Tomcat/v9/startup.sh          |   8 +
 4 files changed, 448 insertions(+)
 create mode 100644 docker/ubuntu/Tomcat/v9/catalina.properties
 create mode 100644 docker/ubuntu/Tomcat/v9/logging.properties
 create mode 100644 docker/ubuntu/Tomcat/v9/startup.sh

diff --git a/docker/ubuntu/Tomcat/v9/catalina.properties b/docker/ubuntu/Tomcat/v9/catalina.properties
new file mode 100644
index 00000000..fcd1e139
--- /dev/null
+++ b/docker/ubuntu/Tomcat/v9/catalina.properties
@@ -0,0 +1,207 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# List of comma-separated packages that start with or equal this string
+# will cause a security exception to be thrown when
+# passed to checkPackageAccess unless the
+# corresponding RuntimePermission ("accessClassInPackage."+package) has
+# been granted.
+package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,org.apache.tomcat.
+#
+# List of comma-separated packages that start with or equal this string
+# will cause a security exception to be thrown when
+# passed to checkPackageDefinition unless the
+# corresponding RuntimePermission ("defineClassInPackage."+package) has
+# been granted.
+#
+# by default, no packages are restricted for definition, and none of
+# the class loaders supplied with the JDK call checkPackageDefinition.
+#
+package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,\
+org.apache.jasper.,org.apache.naming.,org.apache.tomcat.
+
+#
+#
+# List of comma-separated paths defining the contents of the "common"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
+# If left as blank,the JVM system loader will be used as Catalina's "common"
+# loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+#
+# Note: Values are enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar","/home/tomcat/lib","/home/tomcat/lib/*.jar"
+
+#
+# List of comma-separated paths defining the contents of the "server"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
+# If left as blank, the "common" loader will be used as Catalina's "server"
+# loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+#
+# Note: Values may be enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+server.loader=
+
+#
+# List of comma-separated paths defining the contents of the "shared"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_BASE path or absolute. If left as blank,
+# the "common" loader will be used as Catalina's "shared" loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+# Please note that for single jars, e.g. bar.jar, you need the URL form
+# starting with file:.
+#
+# Note: Values may be enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+shared.loader=
+
+# Default list of JAR files that should not be scanned using the JarScanner
+# functionality. This is typically used to scan JARs for configuration
+# information. JARs that do not contain such information may be excluded from
+# the scan to speed up the scanning process. This is the default list. JARs on
+# this list are excluded from all scans. The list must be a comma separated list
+# of JAR file names.
+# The list of JARs to skip may be over-ridden at a Context level for individual
+# scan types by configuring a JarScanner with a nested JarScanFilter.
+# The JARs listed below include:
+# - Tomcat Bootstrap JARs
+# - Tomcat API JARs
+# - Catalina JARs
+# - Jasper JARs
+# - Tomcat JARs
+# - Common non-Tomcat JARs
+# - Test JARs (JUnit, Cobertura and dependencies)
+tomcat.util.scan.StandardJarScanFilter.jarsToSkip=\
+applicationinsights-*.jar, \
+annotations-api.jar,\
+ant-junit*.jar,\
+ant-launcher.jar,\
+ant.jar,\
+asm-*.jar,\
+aspectj*.jar,\
+bootstrap.jar,\
+catalina-ant.jar,\
+catalina-ha.jar,\
+catalina-ssi.jar,\
+catalina-storeconfig.jar,\
+catalina-tribes.jar,\
+catalina.jar,\
+cglib-*.jar,\
+cobertura-*.jar,\
+commons-beanutils*.jar,\
+commons-codec*.jar,\
+commons-collections*.jar,\
+commons-daemon.jar,\
+commons-dbcp*.jar,\
+commons-digester*.jar,\
+commons-fileupload*.jar,\
+commons-httpclient*.jar,\
+commons-io*.jar,\
+commons-lang*.jar,\
+commons-logging*.jar,\
+commons-math*.jar,\
+commons-pool*.jar,\
+dom4j-*.jar,\
+easymock-*.jar,\
+ecj-*.jar,\
+el-api.jar,\
+geronimo-spec-jaxrpc*.jar,\
+h2*.jar,\
+hamcrest-*.jar,\
+hibernate*.jar,\
+httpclient*.jar,\
+icu4j-*.jar,\
+jasper-el.jar,\
+jasper.jar,\
+jaspic-api.jar,\
+jaxb-*.jar,\
+jaxen-*.jar,\
+jdom-*.jar,\
+jetty-*.jar,\
+jmx-tools.jar,\
+jmx.jar,\
+jsp-api.jar,\
+jstl.jar,\
+jta*.jar,\
+junit-*.jar,\
+junit.jar,\
+log4j*.jar,\
+mail*.jar,\
+objenesis-*.jar,\
+oraclepki.jar,\
+oro-*.jar,\
+servlet-api-*.jar,\
+servlet-api.jar,\
+slf4j*.jar,\
+taglibs-standard-spec-*.jar,\
+tagsoup-*.jar,\
+tomcat-api.jar,\
+tomcat-coyote.jar,\
+tomcat-dbcp.jar,\
+tomcat-i18n-*.jar,\
+tomcat-jdbc.jar,\
+tomcat-jni.jar,\
+tomcat-juli-adapters.jar,\
+tomcat-juli.jar,\
+tomcat-util-scan.jar,\
+tomcat-util.jar,\
+tomcat-websocket.jar,\
+tools.jar,\
+websocket-api.jar,\
+wsdl4j*.jar,\
+xercesImpl.jar,\
+xml-apis.jar,\
+xmlParserAPIs-*.jar,\
+xmlParserAPIs.jar,\
+xom-*.jar
+
+# Default list of JAR files that should be scanned that overrides the default
+# jarsToSkip list above. This is typically used to include a specific JAR that
+# has been excluded by a broad file name pattern in the jarsToSkip list.
+# The list of JARs to scan may be over-ridden at a Context level for individual
+# scan types by configuring a JarScanner with a nested JarScanFilter.
+tomcat.util.scan.StandardJarScanFilter.jarsToScan=\
+log4j-taglib*.jar,\
+log4j-web*.jar,\
+log4javascript*.jar,\
+slf4j-taglib*.jar
+
+# String cache configuration.
+tomcat.util.buf.StringCache.byte.enabled=true
+#tomcat.util.buf.StringCache.char.enabled=true
+#tomcat.util.buf.StringCache.trainThreshold=500000
+#tomcat.util.buf.StringCache.cacheSize=5000
diff --git a/docker/ubuntu/Tomcat/v9/logging.properties b/docker/ubuntu/Tomcat/v9/logging.properties
new file mode 100644
index 00000000..a72a295d
--- /dev/null
+++ b/docker/ubuntu/Tomcat/v9/logging.properties
@@ -0,0 +1,66 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# This file has been modified from Tomcat's original to redirect all logging to the console.
+# Console output of containers can be consumed by Azure Monitor and other services.
+
+# For more information about enabling Azure Monitor for Containers, see
+# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-enable-existing-clusters
+
+# For more information about querying logs with Azure Monitor for containers, see
+# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-log-search#search-logs-to-analyze-data
+
+
+handlers = 1catalina.java.util.logging.ConsoleHandler, 2localhost.java.util.logging.ConsoleHandler, 3manager.java.util.logging.ConsoleHandler, 4host-manager.java.util.logging.ConsoleHandler, java.util.logging.ConsoleHandler
+
+.handlers = java.util.logging.ConsoleHandler
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter
+java.util.logging.ConsoleHandler.encoding = UTF-8
+
+
+############################################################
+# Facility specific properties.
+# Provides extra control for each logger.
+############################################################
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = java.util.logging.ConsoleHandler
+
+# For example, set the org.apache.catalina.util.LifecycleBase logger to log
+# each component that extends LifecycleBase changing state:
+#org.apache.catalina.util.LifecycleBase.level = FINE
+
+# To see debug messages in TldLocationsCache, uncomment the following line:
+#org.apache.jasper.compiler.TldLocationsCache.level = FINE
+
+# To see debug messages for HTTP/2 handling, uncomment the following line:
+#org.apache.coyote.http2.level = FINE
+
+# To see debug messages for WebSocket handling, uncomment the following line:
+#org.apache.tomcat.websocket.level = FINE
diff --git a/docker/ubuntu/Tomcat/v9/server.xml b/docker/ubuntu/Tomcat/v9/server.xml
index 8b137891..53ba3706 100644
--- a/docker/ubuntu/Tomcat/v9/server.xml
+++ b/docker/ubuntu/Tomcat/v9/server.xml
@@ -1 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" at this level.
+     Documentation at /docs/config/server.html
+ -->
+<Server port="8005" shutdown="SHUTDOWN">
+  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
+  <!-- Security listener. Documentation at /docs/config/listeners.html
+  <Listener className="org.apache.catalina.security.SecurityListener" />
+  -->
+  <!--APR library loader. Documentation at /docs/apr.html -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+
+  <!-- Global JNDI resources
+       Documentation at /docs/jndi-resources-howto.html
+  -->
+  <GlobalNamingResources>
+    <!-- Editable user database that can also be used by
+         UserDatabaseRealm to authenticate users
+    -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+              description="User database that can be updated and saved"
+              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+              pathname="conf/tomcat-users.xml" />
+  </GlobalNamingResources>
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" Note:  A "Service" is not itself a "Container",
+       so you may not define subcomponents such as "Valves" at this level.
+       Documentation at /docs/config/service.html
+   -->
+  <Service name="Catalina">
+
+    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+    <!--
+    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+        maxThreads="150" minSpareThreads="4"/>
+    -->
+
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned. Documentation at :
+         Java HTTP Connector: /docs/config/http.html
+         Java AJP  Connector: /docs/config/ajp.html
+         APR (HTTP/AJP) Connector: /docs/apr.html
+         Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
+    -->
+    <Connector port="80" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" 
+               URIEncoding="UTF-8"/>
+    <!-- A "Connector" using the shared thread pool-->
+    <!--
+    <Connector executor="tomcatThreadPool"
+               port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" />
+    -->
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
+         This connector uses the NIO implementation. The default
+         SSLImplementation will depend on the presence of the APR/native
+         library and the useOpenSSL attribute of the
+         AprLifecycleListener.
+         Either JSSE or OpenSSL style configuration may be used regardless of
+         the SSLImplementation selected. JSSE style configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+               maxThreads="150" SSLEnabled="true">
+        <SSLHostConfig>
+            <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
+         This connector uses the APR/native implementation which always uses
+         OpenSSL for TLS.
+         Either JSSE or OpenSSL style configuration may be used. OpenSSL style
+         configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
+               maxThreads="150" SSLEnabled="true" >
+        <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
+        <SSLHostConfig>
+            <Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
+                         certificateFile="conf/localhost-rsa-cert.pem"
+                         certificateChainFile="conf/localhost-rsa-chain.pem"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <!-- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" /> -->
+
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host).
+         Documentation at /docs/config/engine.html -->
+
+    <!-- You should set jvmRoute to support load-balancing via AJP ie :
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+    -->
+    <Engine name="Catalina" defaultHost="localhost">
+
+      <!--For clustering, please take a look at documentation at:
+          /docs/cluster-howto.html  (simple how to)
+          /docs/config/cluster.html (reference documentation) -->
+      <!--
+      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+      -->
+
+      <!-- Use the LockOutRealm to prevent attempts to guess user passwords
+           via a brute-force attack -->
+      <Realm className="org.apache.catalina.realm.LockOutRealm">
+        <!-- This Realm uses the UserDatabase configured in the global JNDI
+             resources under the key "UserDatabase".  Any edits
+             that are performed against this UserDatabase are immediately
+             available for use by the Realm.  -->
+        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+               resourceName="UserDatabase"/>
+      </Realm>
+
+      <Host name="localhost"  appBase="webapps"
+            unpackWARs="false" autoDeploy="false">
+
+        <!-- SingleSignOn valve, share authentication between web applications
+             Documentation at: /docs/config/valve.html -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        -->
+
+        <!-- Access log processes all example.
+             Documentation at: /docs/config/valve.html
+             Note: The pattern used is equivalent to using pattern="common" -->
+        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="${log.base}"
+               prefix="localhost_access_log" suffix=".txt"
+               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
+
+      </Host>
+    </Engine>
+  </Service>
+</Server>
diff --git a/docker/ubuntu/Tomcat/v9/startup.sh b/docker/ubuntu/Tomcat/v9/startup.sh
new file mode 100644
index 00000000..365141c2
--- /dev/null
+++ b/docker/ubuntu/Tomcat/v9/startup.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Create a log directory for each hostname in case a shared file system is used among multiple hosts or containers.
+# As provided in the default configuration, only the access log gets written to this directory.
+LOG_DIR="${LOG_ROOT}/$(hostname)"
+mkdir -p "${LOG_DIR}"
+export JAVA_OPTS="${JAVA_OPTS} -Dlog.base=${LOG_DIR}"
+/usr/local/tomcat/bin/catalina.sh run

From 0614f8d3474e3b70839e55fc048f71dc1773e3d0 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 25 Nov 2020 09:10:20 -0600
Subject: [PATCH 184/264] Delete catalina.properties

---
 docker/ubuntu/Tomcat/catalina.properties | 206 -----------------------
 1 file changed, 206 deletions(-)
 delete mode 100644 docker/ubuntu/Tomcat/catalina.properties

diff --git a/docker/ubuntu/Tomcat/catalina.properties b/docker/ubuntu/Tomcat/catalina.properties
deleted file mode 100644
index 3cbca2fe..00000000
--- a/docker/ubuntu/Tomcat/catalina.properties
+++ /dev/null
@@ -1,206 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageAccess unless the
-# corresponding RuntimePermission ("accessClassInPackage."+package) has
-# been granted.
-package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,org.apache.tomcat.
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageDefinition unless the
-# corresponding RuntimePermission ("defineClassInPackage."+package) has
-# been granted.
-#
-# by default, no packages are restricted for definition, and none of
-# the class loaders supplied with the JDK call checkPackageDefinition.
-#
-package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,\
-org.apache.jasper.,org.apache.naming.,org.apache.tomcat.
-
-#
-#
-# List of comma-separated paths defining the contents of the "common"
-# classloader. Prefixes should be used to define what is the repository type.
-# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
-# If left as blank,the JVM system loader will be used as Catalina's "common"
-# loader.
-# Examples:
-#     "foo": Add this folder as a class repository
-#     "foo/*.jar": Add all the JARs of the specified folder as class
-#                  repositories
-#     "foo/bar.jar": Add bar.jar as a class repository
-#
-# Note: Values are enclosed in double quotes ("...") in case either the
-#       ${catalina.base} path or the ${catalina.home} path contains a comma.
-#       Because double quotes are used for quoting, the double quote character
-#       may not appear in a path.
-common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar","/home/tomcat/lib","/home/tomcat/lib/*.jar"
-
-#
-# List of comma-separated paths defining the contents of the "server"
-# classloader. Prefixes should be used to define what is the repository type.
-# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
-# If left as blank, the "common" loader will be used as Catalina's "server"
-# loader.
-# Examples:
-#     "foo": Add this folder as a class repository
-#     "foo/*.jar": Add all the JARs of the specified folder as class
-#                  repositories
-#     "foo/bar.jar": Add bar.jar as a class repository
-#
-# Note: Values may be enclosed in double quotes ("...") in case either the
-#       ${catalina.base} path or the ${catalina.home} path contains a comma.
-#       Because double quotes are used for quoting, the double quote character
-#       may not appear in a path.
-server.loader=
-
-#
-# List of comma-separated paths defining the contents of the "shared"
-# classloader. Prefixes should be used to define what is the repository type.
-# Path may be relative to the CATALINA_BASE path or absolute. If left as blank,
-# the "common" loader will be used as Catalina's "shared" loader.
-# Examples:
-#     "foo": Add this folder as a class repository
-#     "foo/*.jar": Add all the JARs of the specified folder as class
-#                  repositories
-#     "foo/bar.jar": Add bar.jar as a class repository
-# Please note that for single jars, e.g. bar.jar, you need the URL form
-# starting with file:.
-#
-# Note: Values may be enclosed in double quotes ("...") in case either the
-#       ${catalina.base} path or the ${catalina.home} path contains a comma.
-#       Because double quotes are used for quoting, the double quote character
-#       may not appear in a path.
-shared.loader=
-
-# Default list of JAR files that should not be scanned using the JarScanner
-# functionality. This is typically used to scan JARs for configuration
-# information. JARs that do not contain such information may be excluded from
-# the scan to speed up the scanning process. This is the default list. JARs on
-# this list are excluded from all scans. The list must be a comma separated list
-# of JAR file names.
-# The list of JARs to skip may be over-ridden at a Context level for individual
-# scan types by configuring a JarScanner with a nested JarScanFilter.
-# The JARs listed below include:
-# - Tomcat Bootstrap JARs
-# - Tomcat API JARs
-# - Catalina JARs
-# - Jasper JARs
-# - Tomcat JARs
-# - Common non-Tomcat JARs
-# - Test JARs (JUnit, Cobertura and dependencies)
-tomcat.util.scan.StandardJarScanFilter.jarsToSkip=\
-applicationinsights-*.jar, \
-annotations-api.jar,\
-ant-junit*.jar,\
-ant-launcher.jar,\
-ant.jar,\
-asm-*.jar,\
-aspectj*.jar,\
-bootstrap.jar,\
-catalina-ant.jar,\
-catalina-ha.jar,\
-catalina-storeconfig.jar,\
-catalina-tribes.jar,\
-catalina.jar,\
-cglib-*.jar,\
-cobertura-*.jar,\
-commons-beanutils*.jar,\
-commons-codec*.jar,\
-commons-collections*.jar,\
-commons-daemon.jar,\
-commons-dbcp*.jar,\
-commons-digester*.jar,\
-commons-fileupload*.jar,\
-commons-httpclient*.jar,\
-commons-io*.jar,\
-commons-lang*.jar,\
-commons-logging*.jar,\
-commons-math*.jar,\
-commons-pool*.jar,\
-dom4j-*.jar,\
-easymock-*.jar,\
-ecj-*.jar,\
-el-api.jar,\
-geronimo-spec-jaxrpc*.jar,\
-h2*.jar,\
-hamcrest-*.jar,\
-hibernate*.jar,\
-httpclient*.jar,\
-icu4j-*.jar,\
-jasper-el.jar,\
-jasper.jar,\
-jaspic-api.jar,\
-jaxb-*.jar,\
-jaxen-*.jar,\
-jdom-*.jar,\
-jetty-*.jar,\
-jmx-tools.jar,\
-jmx.jar,\
-jsp-api.jar,\
-jstl.jar,\
-jta*.jar,\
-junit-*.jar,\
-junit.jar,\
-log4j*.jar,\
-mail*.jar,\
-objenesis-*.jar,\
-oraclepki.jar,\
-oro-*.jar,\
-servlet-api-*.jar,\
-servlet-api.jar,\
-slf4j*.jar,\
-taglibs-standard-spec-*.jar,\
-tagsoup-*.jar,\
-tomcat-api.jar,\
-tomcat-coyote.jar,\
-tomcat-dbcp.jar,\
-tomcat-i18n-*.jar,\
-tomcat-jdbc.jar,\
-tomcat-jni.jar,\
-tomcat-juli-adapters.jar,\
-tomcat-juli.jar,\
-tomcat-util-scan.jar,\
-tomcat-util.jar,\
-tomcat-websocket.jar,\
-tools.jar,\
-websocket-api.jar,\
-wsdl4j*.jar,\
-xercesImpl.jar,\
-xml-apis.jar,\
-xmlParserAPIs-*.jar,\
-xmlParserAPIs.jar,\
-xom-*.jar
-
-# Default list of JAR files that should be scanned that overrides the default
-# jarsToSkip list above. This is typically used to include a specific JAR that
-# has been excluded by a broad file name pattern in the jarsToSkip list.
-# The list of JARs to scan may be over-ridden at a Context level for individual
-# scan types by configuring a JarScanner with a nested JarScanFilter.
-tomcat.util.scan.StandardJarScanFilter.jarsToScan=\
-log4j-taglib*.jar,\
-log4j-web*.jar,\
-log4javascript*.jar,\
-slf4j-taglib*.jar
-
-# String cache configuration.
-tomcat.util.buf.StringCache.byte.enabled=true
-#tomcat.util.buf.StringCache.char.enabled=true
-#tomcat.util.buf.StringCache.trainThreshold=500000
-#tomcat.util.buf.StringCache.cacheSize=5000

From 242b9e05ca99e0825113e84d04427a252930ffd7 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 25 Nov 2020 09:10:28 -0600
Subject: [PATCH 185/264] Delete logging.properties

---
 docker/ubuntu/Tomcat/logging.properties | 66 -------------------------
 1 file changed, 66 deletions(-)
 delete mode 100644 docker/ubuntu/Tomcat/logging.properties

diff --git a/docker/ubuntu/Tomcat/logging.properties b/docker/ubuntu/Tomcat/logging.properties
deleted file mode 100644
index a9ed260b..00000000
--- a/docker/ubuntu/Tomcat/logging.properties
+++ /dev/null
@@ -1,66 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-# This file has been modified from Tomcat's original to redirect all logging to the console.
-# Console output of containers can be consumed by Azure Monitor and other services.
-
-# For more information about enabling Azure Monitor for Containers, see
-# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-enable-existing-clusters
-
-# For more information about querying logs with Azure Monitor for containers, see
-# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-log-search#search-logs-to-analyze-data
-
-
-handlers = 1catalina.java.util.logging.ConsoleHandler, 2localhost.java.util.logging.ConsoleHandler, 3manager.java.util.logging.ConsoleHandler, 4host-manager.java.util.logging.ConsoleHandler, java.util.logging.ConsoleHandler
-
-.handlers = java.util.logging.ConsoleHandler
-
-############################################################
-# Handler specific properties.
-# Describes specific configuration info for Handlers.
-############################################################
-
-java.util.logging.ConsoleHandler.level = FINE
-java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter
-java.util.logging.ConsoleHandler.encoding = UTF-8
-
-
-############################################################
-# Facility specific properties.
-# Provides extra control for each logger.
-############################################################
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = java.util.logging.ConsoleHandler
-
-# For example, set the org.apache.catalina.util.LifecycleBase logger to log
-# each component that extends LifecycleBase changing state:
-#org.apache.catalina.util.LifecycleBase.level = FINE
-
-# To see debug messages in TldLocationsCache, uncomment the following line:
-#org.apache.jasper.compiler.TldLocationsCache.level = FINE
-
-# To see debug messages for HTTP/2 handling, uncomment the following line:
-#org.apache.coyote.http2.level = FINE
-
-# To see debug messages for WebSocket handling, uncomment the following line:
-#org.apache.tomcat.websocket.level = FINE
\ No newline at end of file

From 236ba93cee3e997d95ee745fd5621cca5f60ef48 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 25 Nov 2020 09:10:39 -0600
Subject: [PATCH 186/264] Delete server.xml

---
 docker/ubuntu/Tomcat/server.xml | 169 --------------------------------
 1 file changed, 169 deletions(-)
 delete mode 100644 docker/ubuntu/Tomcat/server.xml

diff --git a/docker/ubuntu/Tomcat/server.xml b/docker/ubuntu/Tomcat/server.xml
deleted file mode 100644
index 88a00d3e..00000000
--- a/docker/ubuntu/Tomcat/server.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!-- Note:  A "Server" is not itself a "Container", so you may not
-     define subcomponents such as "Valves" at this level.
-     Documentation at /docs/config/server.html
- -->
-<Server port="8005" shutdown="SHUTDOWN">
-  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
-  <!-- Security listener. Documentation at /docs/config/listeners.html
-  <Listener className="org.apache.catalina.security.SecurityListener" />
-  -->
-  <!--APR library loader. Documentation at /docs/apr.html -->
-  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
-  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
-  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
-  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
-  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
-
-  <!-- Global JNDI resources
-       Documentation at /docs/jndi-resources-howto.html
-  -->
-  <GlobalNamingResources>
-    <!-- Editable user database that can also be used by
-         UserDatabaseRealm to authenticate users
-    -->
-    <Resource name="UserDatabase" auth="Container"
-              type="org.apache.catalina.UserDatabase"
-              description="User database that can be updated and saved"
-              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
-              pathname="conf/tomcat-users.xml"
-               />
-  </GlobalNamingResources>
-
-  <!-- A "Service" is a collection of one or more "Connectors" that share
-       a single "Container" Note:  A "Service" is not itself a "Container",
-       so you may not define subcomponents such as "Valves" at this level.
-       Documentation at /docs/config/service.html
-   -->
-  <Service name="Catalina">
-
-    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
-    <!--
-    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
-        maxThreads="150" minSpareThreads="4"/>
-    -->
-
-
-    <!-- A "Connector" represents an endpoint by which requests are received
-         and responses are returned. Documentation at :
-         Java HTTP Connector: /docs/config/http.html
-         Java AJP  Connector: /docs/config/ajp.html
-         APR (HTTP/AJP) Connector: /docs/apr.html
-         Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
-    -->
-    <Connector port="8080" protocol="HTTP/1.1"
-               connectionTimeout="20000"
-               redirectPort="8443" 
-               URIEncoding="UTF-8"/>
-    <!-- A "Connector" using the shared thread pool-->
-    <!--
-    <Connector executor="tomcatThreadPool"
-               port="8080" protocol="HTTP/1.1"
-               connectionTimeout="20000"
-               redirectPort="8443" />
-    -->
-    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
-         This connector uses the NIO implementation. The default
-         SSLImplementation will depend on the presence of the APR/native
-         library and the useOpenSSL attribute of the
-         AprLifecycleListener.
-         Either JSSE or OpenSSL style configuration may be used regardless of
-         the SSLImplementation selected. JSSE style configuration is used below.
-    -->
-    <!--
-    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
-               maxThreads="150" SSLEnabled="true">
-        <SSLHostConfig>
-            <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
-                         type="RSA" />
-        </SSLHostConfig>
-    </Connector>
-    -->
-    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
-         This connector uses the APR/native implementation which always uses
-         OpenSSL for TLS.
-         Either JSSE or OpenSSL style configuration may be used. OpenSSL style
-         configuration is used below.
-    -->
-    <!--
-    <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
-               maxThreads="150" SSLEnabled="true" >
-        <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
-        <SSLHostConfig>
-            <Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
-                         certificateFile="conf/localhost-rsa-cert.pem"
-                         certificateChainFile="conf/localhost-rsa-chain.pem"
-                         type="RSA" />
-        </SSLHostConfig>
-    </Connector>
-    -->
-
-    <!-- Define an AJP 1.3 Connector on port 8009 -->
-    <!-- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" /> -->
-
-
-    <!-- An Engine represents the entry point (within Catalina) that processes
-         every request.  The Engine implementation for Tomcat stand alone
-         analyzes the HTTP headers included with the request, and passes them
-         on to the appropriate Host (virtual host).
-         Documentation at /docs/config/engine.html -->
-
-    <!-- You should set jvmRoute to support load-balancing via AJP ie :
-    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
-    -->
-    <Engine name="Catalina" defaultHost="localhost">
-
-      <!--For clustering, please take a look at documentation at:
-          /docs/cluster-howto.html  (simple how to)
-          /docs/config/cluster.html (reference documentation) -->
-      <!--
-      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
-      -->
-
-      <!-- Use the LockOutRealm to prevent attempts to guess user passwords
-           via a brute-force attack -->
-      <Realm className="org.apache.catalina.realm.LockOutRealm">
-        <!-- This Realm uses the UserDatabase configured in the global JNDI
-             resources under the key "UserDatabase".  Any edits
-             that are performed against this UserDatabase are immediately
-             available for use by the Realm.  -->
-        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
-               resourceName="UserDatabase"/>
-      </Realm>
-
-      <Host name="localhost"  appBase="webapps"
-            unpackWARs="false" autoDeploy="false">
-
-        <!-- SingleSignOn valve, share authentication between web applications
-             Documentation at: /docs/config/valve.html -->
-        <!--
-        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
-        -->
-
-        <!-- Access log processes all example.
-             Documentation at: /docs/config/valve.html
-             Note: The pattern used is equivalent to using pattern="common" -->
-        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="${log.base}"
-               prefix="localhost_access_log" suffix=".txt"
-               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
-
-      </Host>
-    </Engine>
-  </Service>
-</Server>

From 5987d92003630c1bf9e74222d9c5b5f9885e1c9c Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 25 Nov 2020 09:10:46 -0600
Subject: [PATCH 187/264] Delete startup.sh

---
 docker/ubuntu/Tomcat/startup.sh | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 docker/ubuntu/Tomcat/startup.sh

diff --git a/docker/ubuntu/Tomcat/startup.sh b/docker/ubuntu/Tomcat/startup.sh
deleted file mode 100644
index 365141c2..00000000
--- a/docker/ubuntu/Tomcat/startup.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# Create a log directory for each hostname in case a shared file system is used among multiple hosts or containers.
-# As provided in the default configuration, only the access log gets written to this directory.
-LOG_DIR="${LOG_ROOT}/$(hostname)"
-mkdir -p "${LOG_DIR}"
-export JAVA_OPTS="${JAVA_OPTS} -Dlog.base=${LOG_DIR}"
-/usr/local/tomcat/bin/catalina.sh run

From f74be5aed434450651d4aff3fa755e5ac323b443 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 25 Nov 2020 09:11:07 -0600
Subject: [PATCH 188/264] Create server.xml

---
 docker/centos/Tomcat/v8/server.xml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docker/centos/Tomcat/v8/server.xml

diff --git a/docker/centos/Tomcat/v8/server.xml b/docker/centos/Tomcat/v8/server.xml
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/docker/centos/Tomcat/v8/server.xml
@@ -0,0 +1 @@
+

From d36e56613c08d53d2a703db75122d0df4bd74674 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 25 Nov 2020 09:11:21 -0600
Subject: [PATCH 189/264] Create server.xml

---
 docker/centos/Tomcat/v9/server.xml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docker/centos/Tomcat/v9/server.xml

diff --git a/docker/centos/Tomcat/v9/server.xml b/docker/centos/Tomcat/v9/server.xml
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/docker/centos/Tomcat/v9/server.xml
@@ -0,0 +1 @@
+

From 20385d2b21be1169527e3039e1c7abc7c3e768d1 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 25 Nov 2020 09:11:31 -0600
Subject: [PATCH 190/264] Delete catalina.properties

---
 docker/centos/Tomcat/catalina.properties | 206 -----------------------
 1 file changed, 206 deletions(-)
 delete mode 100644 docker/centos/Tomcat/catalina.properties

diff --git a/docker/centos/Tomcat/catalina.properties b/docker/centos/Tomcat/catalina.properties
deleted file mode 100644
index 3cbca2fe..00000000
--- a/docker/centos/Tomcat/catalina.properties
+++ /dev/null
@@ -1,206 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageAccess unless the
-# corresponding RuntimePermission ("accessClassInPackage."+package) has
-# been granted.
-package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,org.apache.tomcat.
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageDefinition unless the
-# corresponding RuntimePermission ("defineClassInPackage."+package) has
-# been granted.
-#
-# by default, no packages are restricted for definition, and none of
-# the class loaders supplied with the JDK call checkPackageDefinition.
-#
-package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,\
-org.apache.jasper.,org.apache.naming.,org.apache.tomcat.
-
-#
-#
-# List of comma-separated paths defining the contents of the "common"
-# classloader. Prefixes should be used to define what is the repository type.
-# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
-# If left as blank,the JVM system loader will be used as Catalina's "common"
-# loader.
-# Examples:
-#     "foo": Add this folder as a class repository
-#     "foo/*.jar": Add all the JARs of the specified folder as class
-#                  repositories
-#     "foo/bar.jar": Add bar.jar as a class repository
-#
-# Note: Values are enclosed in double quotes ("...") in case either the
-#       ${catalina.base} path or the ${catalina.home} path contains a comma.
-#       Because double quotes are used for quoting, the double quote character
-#       may not appear in a path.
-common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar","/home/tomcat/lib","/home/tomcat/lib/*.jar"
-
-#
-# List of comma-separated paths defining the contents of the "server"
-# classloader. Prefixes should be used to define what is the repository type.
-# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
-# If left as blank, the "common" loader will be used as Catalina's "server"
-# loader.
-# Examples:
-#     "foo": Add this folder as a class repository
-#     "foo/*.jar": Add all the JARs of the specified folder as class
-#                  repositories
-#     "foo/bar.jar": Add bar.jar as a class repository
-#
-# Note: Values may be enclosed in double quotes ("...") in case either the
-#       ${catalina.base} path or the ${catalina.home} path contains a comma.
-#       Because double quotes are used for quoting, the double quote character
-#       may not appear in a path.
-server.loader=
-
-#
-# List of comma-separated paths defining the contents of the "shared"
-# classloader. Prefixes should be used to define what is the repository type.
-# Path may be relative to the CATALINA_BASE path or absolute. If left as blank,
-# the "common" loader will be used as Catalina's "shared" loader.
-# Examples:
-#     "foo": Add this folder as a class repository
-#     "foo/*.jar": Add all the JARs of the specified folder as class
-#                  repositories
-#     "foo/bar.jar": Add bar.jar as a class repository
-# Please note that for single jars, e.g. bar.jar, you need the URL form
-# starting with file:.
-#
-# Note: Values may be enclosed in double quotes ("...") in case either the
-#       ${catalina.base} path or the ${catalina.home} path contains a comma.
-#       Because double quotes are used for quoting, the double quote character
-#       may not appear in a path.
-shared.loader=
-
-# Default list of JAR files that should not be scanned using the JarScanner
-# functionality. This is typically used to scan JARs for configuration
-# information. JARs that do not contain such information may be excluded from
-# the scan to speed up the scanning process. This is the default list. JARs on
-# this list are excluded from all scans. The list must be a comma separated list
-# of JAR file names.
-# The list of JARs to skip may be over-ridden at a Context level for individual
-# scan types by configuring a JarScanner with a nested JarScanFilter.
-# The JARs listed below include:
-# - Tomcat Bootstrap JARs
-# - Tomcat API JARs
-# - Catalina JARs
-# - Jasper JARs
-# - Tomcat JARs
-# - Common non-Tomcat JARs
-# - Test JARs (JUnit, Cobertura and dependencies)
-tomcat.util.scan.StandardJarScanFilter.jarsToSkip=\
-applicationinsights-*.jar, \
-annotations-api.jar,\
-ant-junit*.jar,\
-ant-launcher.jar,\
-ant.jar,\
-asm-*.jar,\
-aspectj*.jar,\
-bootstrap.jar,\
-catalina-ant.jar,\
-catalina-ha.jar,\
-catalina-storeconfig.jar,\
-catalina-tribes.jar,\
-catalina.jar,\
-cglib-*.jar,\
-cobertura-*.jar,\
-commons-beanutils*.jar,\
-commons-codec*.jar,\
-commons-collections*.jar,\
-commons-daemon.jar,\
-commons-dbcp*.jar,\
-commons-digester*.jar,\
-commons-fileupload*.jar,\
-commons-httpclient*.jar,\
-commons-io*.jar,\
-commons-lang*.jar,\
-commons-logging*.jar,\
-commons-math*.jar,\
-commons-pool*.jar,\
-dom4j-*.jar,\
-easymock-*.jar,\
-ecj-*.jar,\
-el-api.jar,\
-geronimo-spec-jaxrpc*.jar,\
-h2*.jar,\
-hamcrest-*.jar,\
-hibernate*.jar,\
-httpclient*.jar,\
-icu4j-*.jar,\
-jasper-el.jar,\
-jasper.jar,\
-jaspic-api.jar,\
-jaxb-*.jar,\
-jaxen-*.jar,\
-jdom-*.jar,\
-jetty-*.jar,\
-jmx-tools.jar,\
-jmx.jar,\
-jsp-api.jar,\
-jstl.jar,\
-jta*.jar,\
-junit-*.jar,\
-junit.jar,\
-log4j*.jar,\
-mail*.jar,\
-objenesis-*.jar,\
-oraclepki.jar,\
-oro-*.jar,\
-servlet-api-*.jar,\
-servlet-api.jar,\
-slf4j*.jar,\
-taglibs-standard-spec-*.jar,\
-tagsoup-*.jar,\
-tomcat-api.jar,\
-tomcat-coyote.jar,\
-tomcat-dbcp.jar,\
-tomcat-i18n-*.jar,\
-tomcat-jdbc.jar,\
-tomcat-jni.jar,\
-tomcat-juli-adapters.jar,\
-tomcat-juli.jar,\
-tomcat-util-scan.jar,\
-tomcat-util.jar,\
-tomcat-websocket.jar,\
-tools.jar,\
-websocket-api.jar,\
-wsdl4j*.jar,\
-xercesImpl.jar,\
-xml-apis.jar,\
-xmlParserAPIs-*.jar,\
-xmlParserAPIs.jar,\
-xom-*.jar
-
-# Default list of JAR files that should be scanned that overrides the default
-# jarsToSkip list above. This is typically used to include a specific JAR that
-# has been excluded by a broad file name pattern in the jarsToSkip list.
-# The list of JARs to scan may be over-ridden at a Context level for individual
-# scan types by configuring a JarScanner with a nested JarScanFilter.
-tomcat.util.scan.StandardJarScanFilter.jarsToScan=\
-log4j-taglib*.jar,\
-log4j-web*.jar,\
-log4javascript*.jar,\
-slf4j-taglib*.jar
-
-# String cache configuration.
-tomcat.util.buf.StringCache.byte.enabled=true
-#tomcat.util.buf.StringCache.char.enabled=true
-#tomcat.util.buf.StringCache.trainThreshold=500000
-#tomcat.util.buf.StringCache.cacheSize=5000

From 822ee5ae76f81faaa2a2b4dab1f899227cc9c02b Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 25 Nov 2020 09:11:38 -0600
Subject: [PATCH 191/264] Delete logging.properties

---
 docker/centos/Tomcat/logging.properties | 66 -------------------------
 1 file changed, 66 deletions(-)
 delete mode 100644 docker/centos/Tomcat/logging.properties

diff --git a/docker/centos/Tomcat/logging.properties b/docker/centos/Tomcat/logging.properties
deleted file mode 100644
index a9ed260b..00000000
--- a/docker/centos/Tomcat/logging.properties
+++ /dev/null
@@ -1,66 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-# This file has been modified from Tomcat's original to redirect all logging to the console.
-# Console output of containers can be consumed by Azure Monitor and other services.
-
-# For more information about enabling Azure Monitor for Containers, see
-# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-enable-existing-clusters
-
-# For more information about querying logs with Azure Monitor for containers, see
-# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-log-search#search-logs-to-analyze-data
-
-
-handlers = 1catalina.java.util.logging.ConsoleHandler, 2localhost.java.util.logging.ConsoleHandler, 3manager.java.util.logging.ConsoleHandler, 4host-manager.java.util.logging.ConsoleHandler, java.util.logging.ConsoleHandler
-
-.handlers = java.util.logging.ConsoleHandler
-
-############################################################
-# Handler specific properties.
-# Describes specific configuration info for Handlers.
-############################################################
-
-java.util.logging.ConsoleHandler.level = FINE
-java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter
-java.util.logging.ConsoleHandler.encoding = UTF-8
-
-
-############################################################
-# Facility specific properties.
-# Provides extra control for each logger.
-############################################################
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = java.util.logging.ConsoleHandler
-
-# For example, set the org.apache.catalina.util.LifecycleBase logger to log
-# each component that extends LifecycleBase changing state:
-#org.apache.catalina.util.LifecycleBase.level = FINE
-
-# To see debug messages in TldLocationsCache, uncomment the following line:
-#org.apache.jasper.compiler.TldLocationsCache.level = FINE
-
-# To see debug messages for HTTP/2 handling, uncomment the following line:
-#org.apache.coyote.http2.level = FINE
-
-# To see debug messages for WebSocket handling, uncomment the following line:
-#org.apache.tomcat.websocket.level = FINE
\ No newline at end of file

From 6490db9f028c00b6f728918641837ca740025210 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 25 Nov 2020 09:11:45 -0600
Subject: [PATCH 192/264] Delete server.xml

---
 docker/centos/Tomcat/server.xml | 169 --------------------------------
 1 file changed, 169 deletions(-)
 delete mode 100644 docker/centos/Tomcat/server.xml

diff --git a/docker/centos/Tomcat/server.xml b/docker/centos/Tomcat/server.xml
deleted file mode 100644
index 88a00d3e..00000000
--- a/docker/centos/Tomcat/server.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!-- Note:  A "Server" is not itself a "Container", so you may not
-     define subcomponents such as "Valves" at this level.
-     Documentation at /docs/config/server.html
- -->
-<Server port="8005" shutdown="SHUTDOWN">
-  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
-  <!-- Security listener. Documentation at /docs/config/listeners.html
-  <Listener className="org.apache.catalina.security.SecurityListener" />
-  -->
-  <!--APR library loader. Documentation at /docs/apr.html -->
-  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
-  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
-  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
-  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
-  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
-
-  <!-- Global JNDI resources
-       Documentation at /docs/jndi-resources-howto.html
-  -->
-  <GlobalNamingResources>
-    <!-- Editable user database that can also be used by
-         UserDatabaseRealm to authenticate users
-    -->
-    <Resource name="UserDatabase" auth="Container"
-              type="org.apache.catalina.UserDatabase"
-              description="User database that can be updated and saved"
-              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
-              pathname="conf/tomcat-users.xml"
-               />
-  </GlobalNamingResources>
-
-  <!-- A "Service" is a collection of one or more "Connectors" that share
-       a single "Container" Note:  A "Service" is not itself a "Container",
-       so you may not define subcomponents such as "Valves" at this level.
-       Documentation at /docs/config/service.html
-   -->
-  <Service name="Catalina">
-
-    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
-    <!--
-    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
-        maxThreads="150" minSpareThreads="4"/>
-    -->
-
-
-    <!-- A "Connector" represents an endpoint by which requests are received
-         and responses are returned. Documentation at :
-         Java HTTP Connector: /docs/config/http.html
-         Java AJP  Connector: /docs/config/ajp.html
-         APR (HTTP/AJP) Connector: /docs/apr.html
-         Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
-    -->
-    <Connector port="8080" protocol="HTTP/1.1"
-               connectionTimeout="20000"
-               redirectPort="8443" 
-               URIEncoding="UTF-8"/>
-    <!-- A "Connector" using the shared thread pool-->
-    <!--
-    <Connector executor="tomcatThreadPool"
-               port="8080" protocol="HTTP/1.1"
-               connectionTimeout="20000"
-               redirectPort="8443" />
-    -->
-    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
-         This connector uses the NIO implementation. The default
-         SSLImplementation will depend on the presence of the APR/native
-         library and the useOpenSSL attribute of the
-         AprLifecycleListener.
-         Either JSSE or OpenSSL style configuration may be used regardless of
-         the SSLImplementation selected. JSSE style configuration is used below.
-    -->
-    <!--
-    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
-               maxThreads="150" SSLEnabled="true">
-        <SSLHostConfig>
-            <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
-                         type="RSA" />
-        </SSLHostConfig>
-    </Connector>
-    -->
-    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
-         This connector uses the APR/native implementation which always uses
-         OpenSSL for TLS.
-         Either JSSE or OpenSSL style configuration may be used. OpenSSL style
-         configuration is used below.
-    -->
-    <!--
-    <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
-               maxThreads="150" SSLEnabled="true" >
-        <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
-        <SSLHostConfig>
-            <Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
-                         certificateFile="conf/localhost-rsa-cert.pem"
-                         certificateChainFile="conf/localhost-rsa-chain.pem"
-                         type="RSA" />
-        </SSLHostConfig>
-    </Connector>
-    -->
-
-    <!-- Define an AJP 1.3 Connector on port 8009 -->
-    <!-- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" /> -->
-
-
-    <!-- An Engine represents the entry point (within Catalina) that processes
-         every request.  The Engine implementation for Tomcat stand alone
-         analyzes the HTTP headers included with the request, and passes them
-         on to the appropriate Host (virtual host).
-         Documentation at /docs/config/engine.html -->
-
-    <!-- You should set jvmRoute to support load-balancing via AJP ie :
-    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
-    -->
-    <Engine name="Catalina" defaultHost="localhost">
-
-      <!--For clustering, please take a look at documentation at:
-          /docs/cluster-howto.html  (simple how to)
-          /docs/config/cluster.html (reference documentation) -->
-      <!--
-      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
-      -->
-
-      <!-- Use the LockOutRealm to prevent attempts to guess user passwords
-           via a brute-force attack -->
-      <Realm className="org.apache.catalina.realm.LockOutRealm">
-        <!-- This Realm uses the UserDatabase configured in the global JNDI
-             resources under the key "UserDatabase".  Any edits
-             that are performed against this UserDatabase are immediately
-             available for use by the Realm.  -->
-        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
-               resourceName="UserDatabase"/>
-      </Realm>
-
-      <Host name="localhost"  appBase="webapps"
-            unpackWARs="false" autoDeploy="false">
-
-        <!-- SingleSignOn valve, share authentication between web applications
-             Documentation at: /docs/config/valve.html -->
-        <!--
-        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
-        -->
-
-        <!-- Access log processes all example.
-             Documentation at: /docs/config/valve.html
-             Note: The pattern used is equivalent to using pattern="common" -->
-        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="${log.base}"
-               prefix="localhost_access_log" suffix=".txt"
-               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
-
-      </Host>
-    </Engine>
-  </Service>
-</Server>

From 6cb51ade1ddda2234370a66edfb49c8646fbb25f Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 25 Nov 2020 09:11:53 -0600
Subject: [PATCH 193/264] Delete startup.sh

---
 docker/centos/Tomcat/startup.sh | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 docker/centos/Tomcat/startup.sh

diff --git a/docker/centos/Tomcat/startup.sh b/docker/centos/Tomcat/startup.sh
deleted file mode 100644
index 365141c2..00000000
--- a/docker/centos/Tomcat/startup.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# Create a log directory for each hostname in case a shared file system is used among multiple hosts or containers.
-# As provided in the default configuration, only the access log gets written to this directory.
-LOG_DIR="${LOG_ROOT}/$(hostname)"
-mkdir -p "${LOG_DIR}"
-export JAVA_OPTS="${JAVA_OPTS} -Dlog.base=${LOG_DIR}"
-/usr/local/tomcat/bin/catalina.sh run

From d342b477dda90c899a65607d9e3e08a8f6a87c39 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 25 Nov 2020 09:15:22 -0600
Subject: [PATCH 194/264] Initial add

---
 docker/centos/Tomcat/v8/catalina.properties | 215 ++++++++++++++++++++
 docker/centos/Tomcat/v8/logging.properties  |  66 ++++++
 docker/centos/Tomcat/v8/server.xml          | 167 +++++++++++++++
 docker/centos/Tomcat/v8/startup.sh          |   8 +
 4 files changed, 456 insertions(+)
 create mode 100644 docker/centos/Tomcat/v8/catalina.properties
 create mode 100644 docker/centos/Tomcat/v8/logging.properties
 create mode 100644 docker/centos/Tomcat/v8/startup.sh

diff --git a/docker/centos/Tomcat/v8/catalina.properties b/docker/centos/Tomcat/v8/catalina.properties
new file mode 100644
index 00000000..9d0c93ee
--- /dev/null
+++ b/docker/centos/Tomcat/v8/catalina.properties
@@ -0,0 +1,215 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# List of comma-separated packages that start with or equal this string
+# will cause a security exception to be thrown when
+# passed to checkPackageAccess unless the
+# corresponding RuntimePermission ("accessClassInPackage."+package) has
+# been granted.
+package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,org.apache.tomcat.
+#
+# List of comma-separated packages that start with or equal this string
+# will cause a security exception to be thrown when
+# passed to checkPackageDefinition unless the
+# corresponding RuntimePermission ("defineClassInPackage."+package) has
+# been granted.
+#
+# by default, no packages are restricted for definition, and none of
+# the class loaders supplied with the JDK call checkPackageDefinition.
+#
+package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,\
+org.apache.jasper.,org.apache.naming.,org.apache.tomcat.
+
+#
+#
+# List of comma-separated paths defining the contents of the "common"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
+# If left as blank,the JVM system loader will be used as Catalina's "common"
+# loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+#
+# Note: Values are enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar","/home/tomcat/lib","/home/tomcat/lib/*.jar"
+
+#
+# List of comma-separated paths defining the contents of the "server"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
+# If left as blank, the "common" loader will be used as Catalina's "server"
+# loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+#
+# Note: Values may be enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+server.loader=
+
+#
+# List of comma-separated paths defining the contents of the "shared"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_BASE path or absolute. If left as blank,
+# the "common" loader will be used as Catalina's "shared" loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+# Please note that for single jars, e.g. bar.jar, you need the URL form
+# starting with file:.
+#
+# Note: Values may be enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+shared.loader=
+
+# Default list of JAR files that should not be scanned using the JarScanner
+# functionality. This is typically used to scan JARs for configuration
+# information. JARs that do not contain such information may be excluded from
+# the scan to speed up the scanning process. This is the default list. JARs on
+# this list are excluded from all scans. The list must be a comma separated list
+# of JAR file names.
+# The list of JARs to skip may be over-ridden at a Context level for individual
+# scan types by configuring a JarScanner with a nested JarScanFilter.
+# The JARs listed below include:
+# - Tomcat Bootstrap JARs
+# - Tomcat API JARs
+# - Catalina JARs
+# - Jasper JARs
+# - Tomcat JARs
+# - Common non-Tomcat JARs
+# - Test JARs (JUnit, Cobertura and dependencies)
+tomcat.util.scan.StandardJarScanFilter.jarsToSkip=\
+applicationinsights-*.jar, \
+annotations-api.jar,\
+ant-junit*.jar,\
+ant-launcher.jar,\
+ant.jar,\
+asm-*.jar,\
+aspectj*.jar,\
+bootstrap.jar,\
+catalina-ant.jar,\
+catalina-ha.jar,\
+catalina-jmx-remote.jar,\
+catalina-storeconfig.jar,\
+catalina-tribes.jar,\
+catalina-ws.jar,\
+catalina.jar,\
+cglib-*.jar,\
+cobertura-*.jar,\
+commons-beanutils*.jar,\
+commons-codec*.jar,\
+commons-collections*.jar,\
+commons-daemon.jar,\
+commons-dbcp*.jar,\
+commons-digester*.jar,\
+commons-fileupload*.jar,\
+commons-httpclient*.jar,\
+commons-io*.jar,\
+commons-lang*.jar,\
+commons-logging*.jar,\
+commons-math*.jar,\
+commons-pool*.jar,\
+dom4j-*.jar,\
+easymock-*.jar,\
+ecj-*.jar,\
+el-api.jar,\
+geronimo-spec-jaxrpc*.jar,\
+h2*.jar,\
+hamcrest-*.jar,\
+hibernate*.jar,\
+httpclient*.jar,\
+icu4j-*.jar,\
+jasper-el.jar,\
+jasper.jar,\
+jaspic-api.jar,\
+jaxb-*.jar,\
+jaxen-*.jar,\
+jdom-*.jar,\
+jetty-*.jar,\
+jmx-tools.jar,\
+jmx.jar,\
+jsp-api.jar,\
+jstl.jar,\
+jta*.jar,\
+junit-*.jar,\
+junit.jar,\
+log4j*.jar,\
+mail*.jar,\
+objenesis-*.jar,\
+oraclepki.jar,\
+oro-*.jar,\
+servlet-api-*.jar,\
+servlet-api.jar,\
+slf4j*.jar,\
+taglibs-standard-spec-*.jar,\
+tagsoup-*.jar,\
+tomcat-api.jar,\
+tomcat-coyote.jar,\
+tomcat-dbcp.jar,\
+tomcat-i18n-*.jar,\
+tomcat-jdbc.jar,\
+tomcat-jni.jar,\
+tomcat-juli-adapters.jar,\
+tomcat-juli.jar,\
+tomcat-util-scan.jar,\
+tomcat-util.jar,\
+tomcat-websocket.jar,\
+tools.jar,\
+websocket-api.jar,\
+wsdl4j*.jar,\
+xercesImpl.jar,\
+xml-apis.jar,\
+xmlParserAPIs-*.jar,\
+xmlParserAPIs.jar,\
+xom-*.jar
+
+# Default list of JAR files that should be scanned that overrides the default
+# jarsToSkip list above. This is typically used to include a specific JAR that
+# has been excluded by a broad file name pattern in the jarsToSkip list.
+# The list of JARs to scan may be over-ridden at a Context level for individual
+# scan types by configuring a JarScanner with a nested JarScanFilter.
+tomcat.util.scan.StandardJarScanFilter.jarsToScan=\
+log4j-taglib*.jar,\
+log4j-web*.jar,\
+log4javascript*.jar,\
+slf4j-taglib*.jar
+
+# String cache configuration.
+tomcat.util.buf.StringCache.byte.enabled=true
+#tomcat.util.buf.StringCache.char.enabled=true
+#tomcat.util.buf.StringCache.trainThreshold=500000
+#tomcat.util.buf.StringCache.cacheSize=5000
+
+# This system property is deprecated. Use the relaxedPathChars relaxedQueryChars
+# attributes of the Connector instead. These attributes permit a wider range of
+# characters to be configured as valid.
+# Allow for changes to HTTP request validation
+# WARNING: Using this option may expose the server to CVE-2016-6816
+#tomcat.util.http.parser.HttpParser.requestTargetAllow=|
diff --git a/docker/centos/Tomcat/v8/logging.properties b/docker/centos/Tomcat/v8/logging.properties
new file mode 100644
index 00000000..a72a295d
--- /dev/null
+++ b/docker/centos/Tomcat/v8/logging.properties
@@ -0,0 +1,66 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# This file has been modified from Tomcat's original to redirect all logging to the console.
+# Console output of containers can be consumed by Azure Monitor and other services.
+
+# For more information about enabling Azure Monitor for Containers, see
+# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-enable-existing-clusters
+
+# For more information about querying logs with Azure Monitor for containers, see
+# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-log-search#search-logs-to-analyze-data
+
+
+handlers = 1catalina.java.util.logging.ConsoleHandler, 2localhost.java.util.logging.ConsoleHandler, 3manager.java.util.logging.ConsoleHandler, 4host-manager.java.util.logging.ConsoleHandler, java.util.logging.ConsoleHandler
+
+.handlers = java.util.logging.ConsoleHandler
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter
+java.util.logging.ConsoleHandler.encoding = UTF-8
+
+
+############################################################
+# Facility specific properties.
+# Provides extra control for each logger.
+############################################################
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = java.util.logging.ConsoleHandler
+
+# For example, set the org.apache.catalina.util.LifecycleBase logger to log
+# each component that extends LifecycleBase changing state:
+#org.apache.catalina.util.LifecycleBase.level = FINE
+
+# To see debug messages in TldLocationsCache, uncomment the following line:
+#org.apache.jasper.compiler.TldLocationsCache.level = FINE
+
+# To see debug messages for HTTP/2 handling, uncomment the following line:
+#org.apache.coyote.http2.level = FINE
+
+# To see debug messages for WebSocket handling, uncomment the following line:
+#org.apache.tomcat.websocket.level = FINE
diff --git a/docker/centos/Tomcat/v8/server.xml b/docker/centos/Tomcat/v8/server.xml
index 8b137891..53ba3706 100644
--- a/docker/centos/Tomcat/v8/server.xml
+++ b/docker/centos/Tomcat/v8/server.xml
@@ -1 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" at this level.
+     Documentation at /docs/config/server.html
+ -->
+<Server port="8005" shutdown="SHUTDOWN">
+  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
+  <!-- Security listener. Documentation at /docs/config/listeners.html
+  <Listener className="org.apache.catalina.security.SecurityListener" />
+  -->
+  <!--APR library loader. Documentation at /docs/apr.html -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+
+  <!-- Global JNDI resources
+       Documentation at /docs/jndi-resources-howto.html
+  -->
+  <GlobalNamingResources>
+    <!-- Editable user database that can also be used by
+         UserDatabaseRealm to authenticate users
+    -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+              description="User database that can be updated and saved"
+              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+              pathname="conf/tomcat-users.xml" />
+  </GlobalNamingResources>
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" Note:  A "Service" is not itself a "Container",
+       so you may not define subcomponents such as "Valves" at this level.
+       Documentation at /docs/config/service.html
+   -->
+  <Service name="Catalina">
+
+    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+    <!--
+    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+        maxThreads="150" minSpareThreads="4"/>
+    -->
+
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned. Documentation at :
+         Java HTTP Connector: /docs/config/http.html
+         Java AJP  Connector: /docs/config/ajp.html
+         APR (HTTP/AJP) Connector: /docs/apr.html
+         Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
+    -->
+    <Connector port="80" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" 
+               URIEncoding="UTF-8"/>
+    <!-- A "Connector" using the shared thread pool-->
+    <!--
+    <Connector executor="tomcatThreadPool"
+               port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" />
+    -->
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
+         This connector uses the NIO implementation. The default
+         SSLImplementation will depend on the presence of the APR/native
+         library and the useOpenSSL attribute of the
+         AprLifecycleListener.
+         Either JSSE or OpenSSL style configuration may be used regardless of
+         the SSLImplementation selected. JSSE style configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+               maxThreads="150" SSLEnabled="true">
+        <SSLHostConfig>
+            <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
+         This connector uses the APR/native implementation which always uses
+         OpenSSL for TLS.
+         Either JSSE or OpenSSL style configuration may be used. OpenSSL style
+         configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
+               maxThreads="150" SSLEnabled="true" >
+        <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
+        <SSLHostConfig>
+            <Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
+                         certificateFile="conf/localhost-rsa-cert.pem"
+                         certificateChainFile="conf/localhost-rsa-chain.pem"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <!-- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" /> -->
+
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host).
+         Documentation at /docs/config/engine.html -->
+
+    <!-- You should set jvmRoute to support load-balancing via AJP ie :
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+    -->
+    <Engine name="Catalina" defaultHost="localhost">
+
+      <!--For clustering, please take a look at documentation at:
+          /docs/cluster-howto.html  (simple how to)
+          /docs/config/cluster.html (reference documentation) -->
+      <!--
+      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+      -->
+
+      <!-- Use the LockOutRealm to prevent attempts to guess user passwords
+           via a brute-force attack -->
+      <Realm className="org.apache.catalina.realm.LockOutRealm">
+        <!-- This Realm uses the UserDatabase configured in the global JNDI
+             resources under the key "UserDatabase".  Any edits
+             that are performed against this UserDatabase are immediately
+             available for use by the Realm.  -->
+        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+               resourceName="UserDatabase"/>
+      </Realm>
+
+      <Host name="localhost"  appBase="webapps"
+            unpackWARs="false" autoDeploy="false">
+
+        <!-- SingleSignOn valve, share authentication between web applications
+             Documentation at: /docs/config/valve.html -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        -->
+
+        <!-- Access log processes all example.
+             Documentation at: /docs/config/valve.html
+             Note: The pattern used is equivalent to using pattern="common" -->
+        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="${log.base}"
+               prefix="localhost_access_log" suffix=".txt"
+               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
+
+      </Host>
+    </Engine>
+  </Service>
+</Server>
diff --git a/docker/centos/Tomcat/v8/startup.sh b/docker/centos/Tomcat/v8/startup.sh
new file mode 100644
index 00000000..365141c2
--- /dev/null
+++ b/docker/centos/Tomcat/v8/startup.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Create a log directory for each hostname in case a shared file system is used among multiple hosts or containers.
+# As provided in the default configuration, only the access log gets written to this directory.
+LOG_DIR="${LOG_ROOT}/$(hostname)"
+mkdir -p "${LOG_DIR}"
+export JAVA_OPTS="${JAVA_OPTS} -Dlog.base=${LOG_DIR}"
+/usr/local/tomcat/bin/catalina.sh run

From 8d4133bfd15ab9fd01b0680faadd157967f980dc Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 25 Nov 2020 09:16:05 -0600
Subject: [PATCH 195/264] Initial add

---
 docker/centos/Tomcat/v9/catalina.properties | 207 ++++++++++++++++++++
 docker/centos/Tomcat/v9/logging.properties  |  66 +++++++
 docker/centos/Tomcat/v9/server.xml          | 167 ++++++++++++++++
 docker/centos/Tomcat/v9/startup.sh          |   8 +
 4 files changed, 448 insertions(+)
 create mode 100644 docker/centos/Tomcat/v9/catalina.properties
 create mode 100644 docker/centos/Tomcat/v9/logging.properties
 create mode 100644 docker/centos/Tomcat/v9/startup.sh

diff --git a/docker/centos/Tomcat/v9/catalina.properties b/docker/centos/Tomcat/v9/catalina.properties
new file mode 100644
index 00000000..fcd1e139
--- /dev/null
+++ b/docker/centos/Tomcat/v9/catalina.properties
@@ -0,0 +1,207 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# List of comma-separated packages that start with or equal this string
+# will cause a security exception to be thrown when
+# passed to checkPackageAccess unless the
+# corresponding RuntimePermission ("accessClassInPackage."+package) has
+# been granted.
+package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.jasper.,org.apache.tomcat.
+#
+# List of comma-separated packages that start with or equal this string
+# will cause a security exception to be thrown when
+# passed to checkPackageDefinition unless the
+# corresponding RuntimePermission ("defineClassInPackage."+package) has
+# been granted.
+#
+# by default, no packages are restricted for definition, and none of
+# the class loaders supplied with the JDK call checkPackageDefinition.
+#
+package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,\
+org.apache.jasper.,org.apache.naming.,org.apache.tomcat.
+
+#
+#
+# List of comma-separated paths defining the contents of the "common"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
+# If left as blank,the JVM system loader will be used as Catalina's "common"
+# loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+#
+# Note: Values are enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+common.loader="${catalina.base}/lib","${catalina.base}/lib/*.jar","${catalina.home}/lib","${catalina.home}/lib/*.jar","/home/tomcat/lib","/home/tomcat/lib/*.jar"
+
+#
+# List of comma-separated paths defining the contents of the "server"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
+# If left as blank, the "common" loader will be used as Catalina's "server"
+# loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+#
+# Note: Values may be enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+server.loader=
+
+#
+# List of comma-separated paths defining the contents of the "shared"
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_BASE path or absolute. If left as blank,
+# the "common" loader will be used as Catalina's "shared" loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+# Please note that for single jars, e.g. bar.jar, you need the URL form
+# starting with file:.
+#
+# Note: Values may be enclosed in double quotes ("...") in case either the
+#       ${catalina.base} path or the ${catalina.home} path contains a comma.
+#       Because double quotes are used for quoting, the double quote character
+#       may not appear in a path.
+shared.loader=
+
+# Default list of JAR files that should not be scanned using the JarScanner
+# functionality. This is typically used to scan JARs for configuration
+# information. JARs that do not contain such information may be excluded from
+# the scan to speed up the scanning process. This is the default list. JARs on
+# this list are excluded from all scans. The list must be a comma separated list
+# of JAR file names.
+# The list of JARs to skip may be over-ridden at a Context level for individual
+# scan types by configuring a JarScanner with a nested JarScanFilter.
+# The JARs listed below include:
+# - Tomcat Bootstrap JARs
+# - Tomcat API JARs
+# - Catalina JARs
+# - Jasper JARs
+# - Tomcat JARs
+# - Common non-Tomcat JARs
+# - Test JARs (JUnit, Cobertura and dependencies)
+tomcat.util.scan.StandardJarScanFilter.jarsToSkip=\
+applicationinsights-*.jar, \
+annotations-api.jar,\
+ant-junit*.jar,\
+ant-launcher.jar,\
+ant.jar,\
+asm-*.jar,\
+aspectj*.jar,\
+bootstrap.jar,\
+catalina-ant.jar,\
+catalina-ha.jar,\
+catalina-ssi.jar,\
+catalina-storeconfig.jar,\
+catalina-tribes.jar,\
+catalina.jar,\
+cglib-*.jar,\
+cobertura-*.jar,\
+commons-beanutils*.jar,\
+commons-codec*.jar,\
+commons-collections*.jar,\
+commons-daemon.jar,\
+commons-dbcp*.jar,\
+commons-digester*.jar,\
+commons-fileupload*.jar,\
+commons-httpclient*.jar,\
+commons-io*.jar,\
+commons-lang*.jar,\
+commons-logging*.jar,\
+commons-math*.jar,\
+commons-pool*.jar,\
+dom4j-*.jar,\
+easymock-*.jar,\
+ecj-*.jar,\
+el-api.jar,\
+geronimo-spec-jaxrpc*.jar,\
+h2*.jar,\
+hamcrest-*.jar,\
+hibernate*.jar,\
+httpclient*.jar,\
+icu4j-*.jar,\
+jasper-el.jar,\
+jasper.jar,\
+jaspic-api.jar,\
+jaxb-*.jar,\
+jaxen-*.jar,\
+jdom-*.jar,\
+jetty-*.jar,\
+jmx-tools.jar,\
+jmx.jar,\
+jsp-api.jar,\
+jstl.jar,\
+jta*.jar,\
+junit-*.jar,\
+junit.jar,\
+log4j*.jar,\
+mail*.jar,\
+objenesis-*.jar,\
+oraclepki.jar,\
+oro-*.jar,\
+servlet-api-*.jar,\
+servlet-api.jar,\
+slf4j*.jar,\
+taglibs-standard-spec-*.jar,\
+tagsoup-*.jar,\
+tomcat-api.jar,\
+tomcat-coyote.jar,\
+tomcat-dbcp.jar,\
+tomcat-i18n-*.jar,\
+tomcat-jdbc.jar,\
+tomcat-jni.jar,\
+tomcat-juli-adapters.jar,\
+tomcat-juli.jar,\
+tomcat-util-scan.jar,\
+tomcat-util.jar,\
+tomcat-websocket.jar,\
+tools.jar,\
+websocket-api.jar,\
+wsdl4j*.jar,\
+xercesImpl.jar,\
+xml-apis.jar,\
+xmlParserAPIs-*.jar,\
+xmlParserAPIs.jar,\
+xom-*.jar
+
+# Default list of JAR files that should be scanned that overrides the default
+# jarsToSkip list above. This is typically used to include a specific JAR that
+# has been excluded by a broad file name pattern in the jarsToSkip list.
+# The list of JARs to scan may be over-ridden at a Context level for individual
+# scan types by configuring a JarScanner with a nested JarScanFilter.
+tomcat.util.scan.StandardJarScanFilter.jarsToScan=\
+log4j-taglib*.jar,\
+log4j-web*.jar,\
+log4javascript*.jar,\
+slf4j-taglib*.jar
+
+# String cache configuration.
+tomcat.util.buf.StringCache.byte.enabled=true
+#tomcat.util.buf.StringCache.char.enabled=true
+#tomcat.util.buf.StringCache.trainThreshold=500000
+#tomcat.util.buf.StringCache.cacheSize=5000
diff --git a/docker/centos/Tomcat/v9/logging.properties b/docker/centos/Tomcat/v9/logging.properties
new file mode 100644
index 00000000..a72a295d
--- /dev/null
+++ b/docker/centos/Tomcat/v9/logging.properties
@@ -0,0 +1,66 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# This file has been modified from Tomcat's original to redirect all logging to the console.
+# Console output of containers can be consumed by Azure Monitor and other services.
+
+# For more information about enabling Azure Monitor for Containers, see
+# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-enable-existing-clusters
+
+# For more information about querying logs with Azure Monitor for containers, see
+# https://docs.microsoft.com/azure/azure-monitor/insights/container-insights-log-search#search-logs-to-analyze-data
+
+
+handlers = 1catalina.java.util.logging.ConsoleHandler, 2localhost.java.util.logging.ConsoleHandler, 3manager.java.util.logging.ConsoleHandler, 4host-manager.java.util.logging.ConsoleHandler, java.util.logging.ConsoleHandler
+
+.handlers = java.util.logging.ConsoleHandler
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = org.apache.juli.OneLineFormatter
+java.util.logging.ConsoleHandler.encoding = UTF-8
+
+
+############################################################
+# Facility specific properties.
+# Provides extra control for each logger.
+############################################################
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = java.util.logging.ConsoleHandler
+
+# For example, set the org.apache.catalina.util.LifecycleBase logger to log
+# each component that extends LifecycleBase changing state:
+#org.apache.catalina.util.LifecycleBase.level = FINE
+
+# To see debug messages in TldLocationsCache, uncomment the following line:
+#org.apache.jasper.compiler.TldLocationsCache.level = FINE
+
+# To see debug messages for HTTP/2 handling, uncomment the following line:
+#org.apache.coyote.http2.level = FINE
+
+# To see debug messages for WebSocket handling, uncomment the following line:
+#org.apache.tomcat.websocket.level = FINE
diff --git a/docker/centos/Tomcat/v9/server.xml b/docker/centos/Tomcat/v9/server.xml
index 8b137891..53ba3706 100644
--- a/docker/centos/Tomcat/v9/server.xml
+++ b/docker/centos/Tomcat/v9/server.xml
@@ -1 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
 
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- Note:  A "Server" is not itself a "Container", so you may not
+     define subcomponents such as "Valves" at this level.
+     Documentation at /docs/config/server.html
+ -->
+<Server port="8005" shutdown="SHUTDOWN">
+  <Listener className="org.apache.catalina.startup.VersionLoggerListener" />
+  <!-- Security listener. Documentation at /docs/config/listeners.html
+  <Listener className="org.apache.catalina.security.SecurityListener" />
+  -->
+  <!--APR library loader. Documentation at /docs/apr.html -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+  <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+  <Listener className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+  <Listener className="org.apache.catalina.core.ThreadLocalLeakPreventionListener" />
+
+  <!-- Global JNDI resources
+       Documentation at /docs/jndi-resources-howto.html
+  -->
+  <GlobalNamingResources>
+    <!-- Editable user database that can also be used by
+         UserDatabaseRealm to authenticate users
+    -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+              description="User database that can be updated and saved"
+              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+              pathname="conf/tomcat-users.xml" />
+  </GlobalNamingResources>
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" Note:  A "Service" is not itself a "Container",
+       so you may not define subcomponents such as "Valves" at this level.
+       Documentation at /docs/config/service.html
+   -->
+  <Service name="Catalina">
+
+    <!--The connectors can use a shared executor, you can define one or more named thread pools-->
+    <!--
+    <Executor name="tomcatThreadPool" namePrefix="catalina-exec-"
+        maxThreads="150" minSpareThreads="4"/>
+    -->
+
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned. Documentation at :
+         Java HTTP Connector: /docs/config/http.html
+         Java AJP  Connector: /docs/config/ajp.html
+         APR (HTTP/AJP) Connector: /docs/apr.html
+         Define a non-SSL/TLS HTTP/1.1 Connector on port 8080
+    -->
+    <Connector port="80" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" 
+               URIEncoding="UTF-8"/>
+    <!-- A "Connector" using the shared thread pool-->
+    <!--
+    <Connector executor="tomcatThreadPool"
+               port="8080" protocol="HTTP/1.1"
+               connectionTimeout="20000"
+               redirectPort="8443" />
+    -->
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443
+         This connector uses the NIO implementation. The default
+         SSLImplementation will depend on the presence of the APR/native
+         library and the useOpenSSL attribute of the
+         AprLifecycleListener.
+         Either JSSE or OpenSSL style configuration may be used regardless of
+         the SSLImplementation selected. JSSE style configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
+               maxThreads="150" SSLEnabled="true">
+        <SSLHostConfig>
+            <Certificate certificateKeystoreFile="conf/localhost-rsa.jks"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+    <!-- Define an SSL/TLS HTTP/1.1 Connector on port 8443 with HTTP/2
+         This connector uses the APR/native implementation which always uses
+         OpenSSL for TLS.
+         Either JSSE or OpenSSL style configuration may be used. OpenSSL style
+         configuration is used below.
+    -->
+    <!--
+    <Connector port="8443" protocol="org.apache.coyote.http11.Http11AprProtocol"
+               maxThreads="150" SSLEnabled="true" >
+        <UpgradeProtocol className="org.apache.coyote.http2.Http2Protocol" />
+        <SSLHostConfig>
+            <Certificate certificateKeyFile="conf/localhost-rsa-key.pem"
+                         certificateFile="conf/localhost-rsa-cert.pem"
+                         certificateChainFile="conf/localhost-rsa-chain.pem"
+                         type="RSA" />
+        </SSLHostConfig>
+    </Connector>
+    -->
+
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <!-- <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" /> -->
+
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host).
+         Documentation at /docs/config/engine.html -->
+
+    <!-- You should set jvmRoute to support load-balancing via AJP ie :
+    <Engine name="Catalina" defaultHost="localhost" jvmRoute="jvm1">
+    -->
+    <Engine name="Catalina" defaultHost="localhost">
+
+      <!--For clustering, please take a look at documentation at:
+          /docs/cluster-howto.html  (simple how to)
+          /docs/config/cluster.html (reference documentation) -->
+      <!--
+      <Cluster className="org.apache.catalina.ha.tcp.SimpleTcpCluster"/>
+      -->
+
+      <!-- Use the LockOutRealm to prevent attempts to guess user passwords
+           via a brute-force attack -->
+      <Realm className="org.apache.catalina.realm.LockOutRealm">
+        <!-- This Realm uses the UserDatabase configured in the global JNDI
+             resources under the key "UserDatabase".  Any edits
+             that are performed against this UserDatabase are immediately
+             available for use by the Realm.  -->
+        <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+               resourceName="UserDatabase"/>
+      </Realm>
+
+      <Host name="localhost"  appBase="webapps"
+            unpackWARs="false" autoDeploy="false">
+
+        <!-- SingleSignOn valve, share authentication between web applications
+             Documentation at: /docs/config/valve.html -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        -->
+
+        <!-- Access log processes all example.
+             Documentation at: /docs/config/valve.html
+             Note: The pattern used is equivalent to using pattern="common" -->
+        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="${log.base}"
+               prefix="localhost_access_log" suffix=".txt"
+               pattern="%h %l %u %t &quot;%r&quot; %s %b" />
+
+      </Host>
+    </Engine>
+  </Service>
+</Server>
diff --git a/docker/centos/Tomcat/v9/startup.sh b/docker/centos/Tomcat/v9/startup.sh
new file mode 100644
index 00000000..365141c2
--- /dev/null
+++ b/docker/centos/Tomcat/v9/startup.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Create a log directory for each hostname in case a shared file system is used among multiple hosts or containers.
+# As provided in the default configuration, only the access log gets written to this directory.
+LOG_DIR="${LOG_ROOT}/$(hostname)"
+mkdir -p "${LOG_DIR}"
+export JAVA_OPTS="${JAVA_OPTS} -Dlog.base=${LOG_DIR}"
+/usr/local/tomcat/bin/catalina.sh run

From c280941dd39b05499dfa55ef90b8ee7ced09b8e9 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 25 Nov 2020 09:41:18 -0600
Subject: [PATCH 196/264] Removed Wildfly

---
 README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 642a6fac..1da9d630 100644
--- a/README.md
+++ b/README.md
@@ -5,9 +5,8 @@ These Zulu OpenJDK for Azure Docker images and corresponding Dockerfiles are to
 * [Java SE JDK](https://hub.docker.com/_/microsoft-java-jdk)
 * [Java SE JRE](https://hub.docker.com/_/microsoft-java-jre)
 * [Java SE Headless JRE](https://hub.docker.com/_/microsoft-java-jre-headless)
-* [Java SE JDK And Maven](https://hub.docker.com/_/microsoft-java-maven)
-* [Java SE JDK And Tomcat](https://hub.docker.com/_/microsoft-java-tomcat)
-* [Java SE JDK And Wildfly](https://hub.docker.com/_/microsoft-java-wildfly)
+* [Java SE JDK And Apache Maven](https://hub.docker.com/_/microsoft-java-maven)
+* [Java SE JDK And Apache Tomcat](https://hub.docker.com/_/microsoft-java-tomcat)
 
 ## Contributing
 This project welcomes contributions and suggestions.  Most contributions require you to agree to a

From dc2306e8b49c2c246c46d389f81d18e7efee18d9 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 25 Nov 2020 09:43:08 -0600
Subject: [PATCH 197/264] Added Tomcat

---
 docker/README.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docker/README.md b/docker/README.md
index 70cb9500..1da9d630 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -2,10 +2,11 @@
 These Zulu OpenJDK for Azure Docker images and corresponding Dockerfiles are to be used solely with Java applications or Java application components that are being developed for deployment on Microsoft Azure, Azure Functions (anywhere), Azure Stack, or Microsoft SQL Server and are not intended to be used for any other purpose.
 
 ## Further Information
-* [Azul Zulu JDK README](/README.zulu-jdk.md)
-* [Azul Zulu JRE README](/README.zulu-jre.md)
-* [Azul Zulu Headless JRE README](/README.zulu-jre-headless.md)
-* [Azul Zulu JDK and Maven README](/README.zulu-maven.md)
+* [Java SE JDK](https://hub.docker.com/_/microsoft-java-jdk)
+* [Java SE JRE](https://hub.docker.com/_/microsoft-java-jre)
+* [Java SE Headless JRE](https://hub.docker.com/_/microsoft-java-jre-headless)
+* [Java SE JDK And Apache Maven](https://hub.docker.com/_/microsoft-java-maven)
+* [Java SE JDK And Apache Tomcat](https://hub.docker.com/_/microsoft-java-tomcat)
 
 ## Contributing
 This project welcomes contributions and suggestions.  Most contributions require you to agree to a

From 4551a9b855ba08b38dca53aa26f3e4548fea8be6 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 25 Nov 2020 09:45:55 -0600
Subject: [PATCH 198/264] Changed Maven to Apache Maven

---
 README.zulu-maven.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.zulu-maven.md b/README.zulu-maven.md
index 0465df3c..ad759f7a 100644
--- a/README.zulu-maven.md
+++ b/README.zulu-maven.md
@@ -6,7 +6,7 @@ docker pull mcr.microsoft.com/java/maven:tag<br>
 docker run --rm -it mcr.microsoft.com/java/maven:tag
 
 ## Further Information
-* [Java SE JDK And Maven](https://hub.docker.com/_/microsoft-java-maven)
+* [Java SE JDK And Apache Maven](https://hub.docker.com/_/microsoft-java-maven)
 
 ## Featured Repos
 https://<span></span>repos.azul.com/azure-only/zulu/yum<br>

From 5e85ac7e98edf933d16a26057bc7c905c758d3c9 Mon Sep 17 00:00:00 2001
From: zulu-ci <zulu-ci@azul.com>
Date: Mon, 30 Nov 2020 18:48:09 +0000
Subject: [PATCH 199/264] respinUpdates

---
 docker/alpine/Dockerfile.zulu-15u1-jdk        |  4 +-
 docker/alpine/Dockerfile.zulu-15u1-jre        |  4 +-
 .../alpine/Dockerfile.zulu-15u1-jre-headless  |  4 +-
 .../Dockerfile.zulu-15u1-jre-headless-tools   |  4 +-
 docker/alpine/Dockerfile.zulu-7u285-jdk       | 42 +++++++++++++++++++
 docker/alpine/Dockerfile.zulu-7u285-jre       | 42 +++++++++++++++++++
 .../alpine/Dockerfile.zulu-7u285-jre-headless | 42 +++++++++++++++++++
 docker/alpine/Dockerfile.zulu-8u275-jdk       | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-8u275-jre       | 32 ++++++++++++++
 .../alpine/Dockerfile.zulu-8u275-jre-headless | 32 ++++++++++++++
 .../Dockerfile.zulu-8u275-jre-headless-tools  | 32 ++++++++++++++
 docker/centos/Dockerfile.zulu-15u1-jdk        |  2 +-
 docker/centos/Dockerfile.zulu-15u1-jre        |  2 +-
 .../centos/Dockerfile.zulu-15u1-jre-headless  |  2 +-
 docker/centos/Dockerfile.zulu-7u285-jdk       | 17 ++++++++
 docker/centos/Dockerfile.zulu-7u285-jre       | 17 ++++++++
 .../centos/Dockerfile.zulu-7u285-jre-headless | 16 +++++++
 docker/centos/Dockerfile.zulu-8u275-jdk       | 17 ++++++++
 docker/centos/Dockerfile.zulu-8u275-jre       | 17 ++++++++
 .../centos/Dockerfile.zulu-8u275-jre-headless | 16 +++++++
 docker/debian10/Dockerfile.zulu-15u1-jdk      |  2 +-
 docker/debian10/Dockerfile.zulu-15u1-jre      |  2 +-
 .../Dockerfile.zulu-15u1-jre-headless         |  2 +-
 docker/debian10/Dockerfile.zulu-7u285-jdk     | 21 ++++++++++
 docker/debian10/Dockerfile.zulu-7u285-jre     | 21 ++++++++++
 .../Dockerfile.zulu-7u285-jre-headless        | 21 ++++++++++
 docker/debian10/Dockerfile.zulu-8u275-jdk     | 21 ++++++++++
 docker/debian10/Dockerfile.zulu-8u275-jre     | 21 ++++++++++
 .../Dockerfile.zulu-8u275-jre-headless        | 21 ++++++++++
 .../Dockerfile.zulu-8u275-jre-headless-tools  | 27 ++++++++++++
 docker/debian10/Dockerfile.zulu-8u275-maven   | 31 ++++++++++++++
 docker/debian9/Dockerfile.zulu-15u1-jdk       |  2 +-
 docker/debian9/Dockerfile.zulu-15u1-jre       |  2 +-
 .../debian9/Dockerfile.zulu-15u1-jre-headless |  2 +-
 docker/debian9/Dockerfile.zulu-7u285-jdk      | 21 ++++++++++
 docker/debian9/Dockerfile.zulu-7u285-jre      | 21 ++++++++++
 .../Dockerfile.zulu-7u285-jre-headless        | 21 ++++++++++
 docker/debian9/Dockerfile.zulu-8u275-jdk      | 21 ++++++++++
 docker/debian9/Dockerfile.zulu-8u275-jre      | 21 ++++++++++
 .../Dockerfile.zulu-8u275-jre-headless        | 21 ++++++++++
 docker/debian9/Dockerfile.zulu-8u275-maven    | 31 ++++++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-15u1-jdk  |  2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-15u1-jre  |  2 +-
 .../Dockerfile.zulu-15u1-jre-headless         |  2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-7u285-jdk | 21 ++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-7u285-jre | 21 ++++++++++
 .../Dockerfile.zulu-7u285-jre-headless        | 21 ++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-8u275-jdk | 21 ++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-8u275-jre | 21 ++++++++++
 .../Dockerfile.zulu-8u275-jre-headless        | 21 ++++++++++
 docker/ubuntu/Dockerfile.zulu-15u1-jdk        |  2 +-
 docker/ubuntu/Dockerfile.zulu-15u1-jre        |  2 +-
 .../ubuntu/Dockerfile.zulu-15u1-jre-headless  |  2 +-
 docker/ubuntu/Dockerfile.zulu-7u285-jdk       | 21 ++++++++++
 docker/ubuntu/Dockerfile.zulu-7u285-jre       | 21 ++++++++++
 .../ubuntu/Dockerfile.zulu-7u285-jre-headless | 21 ++++++++++
 docker/ubuntu/Dockerfile.zulu-8u275-jdk       | 21 ++++++++++
 docker/ubuntu/Dockerfile.zulu-8u275-jre       | 21 ++++++++++
 .../ubuntu/Dockerfile.zulu-8u275-jre-headless | 21 ++++++++++
 .../Dockerfile.zulu-15u1-jdk                  |  4 +-
 .../Dockerfile.zulu-15u1-jre                  |  4 +-
 .../Dockerfile.zulu-7u285-jdk                 | 17 ++++++++
 .../Dockerfile.zulu-7u285-jre                 | 16 +++++++
 .../Dockerfile.zulu-8u275-jdk                 | 17 ++++++++
 .../Dockerfile.zulu-8u275-jre                 | 16 +++++++
 65 files changed, 1040 insertions(+), 27 deletions(-)
 create mode 100644 docker/alpine/Dockerfile.zulu-7u285-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-7u285-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-7u285-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-8u275-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-8u275-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-8u275-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-8u275-jre-headless-tools
 create mode 100644 docker/centos/Dockerfile.zulu-7u285-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-7u285-jre
 create mode 100644 docker/centos/Dockerfile.zulu-7u285-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-8u275-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-8u275-jre
 create mode 100644 docker/centos/Dockerfile.zulu-8u275-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-7u285-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-7u285-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-7u285-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-8u275-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-8u275-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-8u275-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-8u275-jre-headless-tools
 create mode 100644 docker/debian10/Dockerfile.zulu-8u275-maven
 create mode 100644 docker/debian9/Dockerfile.zulu-7u285-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-7u285-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-7u285-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-8u275-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-8u275-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-8u275-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-8u275-maven
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u285-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u285-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u285-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u275-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u275-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u275-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-7u285-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-7u285-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-7u285-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u275-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u275-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u275-jre-headless
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-7u285-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-7u285-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-8u275-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-8u275-jre

diff --git a/docker/alpine/Dockerfile.zulu-15u1-jdk b/docker/alpine/Dockerfile.zulu-15u1-jdk
index 364edd29..77a33b3b 100644
--- a/docker/alpine/Dockerfile.zulu-15u1-jdk
+++ b/docker/alpine/Dockerfile.zulu-15u1-jdk
@@ -11,7 +11,7 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-ARG ZULU_DIR=zulu-15-azure-jdk_15.28.13-15.0.1-linux_musl_x64
+ARG ZULU_DIR=zulu-15-azure-jdk_15.28.51-15.0.1-linux_musl_x64
 
 RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.1/zulu-15-azure-jdk_15.28.13-15.0.1-linux_musl_x64.tar.gz && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.1/zulu-15-azure-jdk_15.28.51-15.0.1-linux_musl_x64.tar.gz && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-15u1-jre b/docker/alpine/Dockerfile.zulu-15u1-jre
index 684562cf..c00c5c07 100644
--- a/docker/alpine/Dockerfile.zulu-15u1-jre
+++ b/docker/alpine/Dockerfile.zulu-15u1-jre
@@ -11,7 +11,7 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-ARG ZULU_DIR=zulu-15-azure-jre_15.28.13-15.0.1-linux_musl_x64
+ARG ZULU_DIR=zulu-15-azure-jre_15.28.51-15.0.1-linux_musl_x64
 
 RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.1/zulu-15-azure-jre_15.28.13-15.0.1-linux_musl_x64.tar.gz && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.1/zulu-15-azure-jre_15.28.51-15.0.1-linux_musl_x64.tar.gz && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-15u1-jre-headless b/docker/alpine/Dockerfile.zulu-15u1-jre-headless
index c7ff014e..deed026c 100644
--- a/docker/alpine/Dockerfile.zulu-15u1-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-15u1-jre-headless
@@ -11,7 +11,7 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-ARG ZULU_DIR=zulu-15-azure-jre-headless_15.28.13-15.0.1-linux_musl_x64
+ARG ZULU_DIR=zulu-15-azure-jre-headless_15.28.51-15.0.1-linux_musl_x64
 
 RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.1/zulu-15-azure-jre-headless_15.28.13-15.0.1-linux_musl_x64.tar.gz && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.1/zulu-15-azure-jre-headless_15.28.51-15.0.1-linux_musl_x64.tar.gz && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-15u1-jre-headless-tools b/docker/alpine/Dockerfile.zulu-15u1-jre-headless-tools
index dc75238d..414f74c0 100644
--- a/docker/alpine/Dockerfile.zulu-15u1-jre-headless-tools
+++ b/docker/alpine/Dockerfile.zulu-15u1-jre-headless-tools
@@ -11,7 +11,7 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-ARG ZULU_DIR=zulu-15-azure-jre-headless-tools_15.28.13-15.0.1-linux_musl_x64
+ARG ZULU_DIR=zulu-15-azure-jre-headless-tools_15.28.51-15.0.1-linux_musl_x64
 
 RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.1/zulu-15-azure-jre-headless-tools_15.28.13-15.0.1-linux_musl_x64.tar.gz && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.1/zulu-15-azure-jre-headless-tools_15.28.51-15.0.1-linux_musl_x64.tar.gz && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-7u285-jdk b/docker/alpine/Dockerfile.zulu-7u285-jdk
new file mode 100644
index 00000000..862b20d5
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-7u285-jdk
@@ -0,0 +1,42 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-7-azure-jdk_7.42.0.51-7.0.285-linux_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add binutils ca-certificates wget zstd tar && \
+    apk update && \
+    apk upgrade && \
+    wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+    wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
+    wget -O gcc-libs.tar.zst https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    tar -I zstd -xf gcc-libs.tar.zst -C /tmp && \
+    tar -xJf zlib.tar.xz -C /tmp && \
+    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
+    rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u285/zulu-7-azure-jdk_7.42.0.51-7.0.285-linux_x64.tar.gz && rm /root/.wget-hsts && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-7u285-jre b/docker/alpine/Dockerfile.zulu-7u285-jre
new file mode 100644
index 00000000..69ef5598
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-7u285-jre
@@ -0,0 +1,42 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-7-azure-jre_7.42.0.51-7.0.285-linux_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add binutils ca-certificates wget zstd tar && \
+    apk update && \
+    apk upgrade && \
+    wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+    wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
+    wget -O gcc-libs.tar.zst https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    tar -I zstd -xf gcc-libs.tar.zst -C /tmp && \
+    tar -xJf zlib.tar.xz -C /tmp && \
+    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
+    rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u285/zulu-7-azure-jre_7.42.0.51-7.0.285-linux_x64.tar.gz && rm /root/.wget-hsts && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-7u285-jre-headless b/docker/alpine/Dockerfile.zulu-7u285-jre-headless
new file mode 100644
index 00000000..41e3d13b
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-7u285-jre-headless
@@ -0,0 +1,42 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-7-azure-jre-headless_7.42.0.51-7.0.285-linux_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add binutils ca-certificates wget zstd tar && \
+    apk update && \
+    apk upgrade && \
+    wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+    wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
+    wget -O gcc-libs.tar.zst https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    tar -I zstd -xf gcc-libs.tar.zst -C /tmp && \
+    tar -xJf zlib.tar.xz -C /tmp && \
+    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
+    rm -rf gcc-libs.tar.xz zlib.tar.xz /tmp/usr && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u285/zulu-7-azure-jre-headless_7.42.0.51-7.0.285-linux_x64.tar.gz && rm /root/.wget-hsts && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u275-jdk b/docker/alpine/Dockerfile.zulu-8u275-jdk
new file mode 100644
index 00000000..eadab28c
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u275-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jdk_8.50.0.51-8.0.275-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u275/zulu-8-azure-jdk_8.50.0.51-8.0.275-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u275-jre b/docker/alpine/Dockerfile.zulu-8u275-jre
new file mode 100644
index 00000000..48a465c5
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u275-jre
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre_8.50.0.51-8.0.275-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u275/zulu-8-azure-jre_8.50.0.51-8.0.275-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u275-jre-headless b/docker/alpine/Dockerfile.zulu-8u275-jre-headless
new file mode 100644
index 00000000..bf1b1b3f
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u275-jre-headless
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre-headless_8.50.0.51-8.0.275-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u275/zulu-8-azure-jre-headless_8.50.0.51-8.0.275-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u275-jre-headless-tools b/docker/alpine/Dockerfile.zulu-8u275-jre-headless-tools
new file mode 100644
index 00000000..aecbff59
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u275-jre-headless-tools
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre-headless-tools_8.50.0.51-8.0.275-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u275/zulu-8-azure-jre-headless-tools_8.50.0.51-8.0.275-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/centos/Dockerfile.zulu-15u1-jdk b/docker/centos/Dockerfile.zulu-15u1-jdk
index eb2d00a7..b97a827d 100644
--- a/docker/centos/Dockerfile.zulu-15u1-jdk
+++ b/docker/centos/Dockerfile.zulu-15u1-jdk
@@ -11,7 +11,7 @@ RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
     yum -q -y upgrade && \
-    yum -q -y install zulu-15-azure-jdk-15.28.13
+    yum -q -y install zulu-15-azure-jdk-15.28.51
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure
 
diff --git a/docker/centos/Dockerfile.zulu-15u1-jre b/docker/centos/Dockerfile.zulu-15u1-jre
index d8b2312b..9b3018b6 100644
--- a/docker/centos/Dockerfile.zulu-15u1-jre
+++ b/docker/centos/Dockerfile.zulu-15u1-jre
@@ -11,7 +11,7 @@ RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
     yum -q -y upgrade && \
-    yum -q -y install zulu-15-azure-jre-15.28.13
+    yum -q -y install zulu-15-azure-jre-15.28.51
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure
 
diff --git a/docker/centos/Dockerfile.zulu-15u1-jre-headless b/docker/centos/Dockerfile.zulu-15u1-jre-headless
index c5b33b47..653f3bd8 100644
--- a/docker/centos/Dockerfile.zulu-15u1-jre-headless
+++ b/docker/centos/Dockerfile.zulu-15u1-jre-headless
@@ -11,6 +11,6 @@ RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
     yum -q -y upgrade && \
-    yum -q -y install zulu-15-azure-jre-headless-15.28.13
+    yum -q -y install zulu-15-azure-jre-headless-15.28.51
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure
diff --git a/docker/centos/Dockerfile.zulu-7u285-jdk b/docker/centos/Dockerfile.zulu-7u285-jdk
new file mode 100644
index 00000000..6d4e187d
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-7u285-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-7-azure-jdk-7.42.0.51
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure
+
diff --git a/docker/centos/Dockerfile.zulu-7u285-jre b/docker/centos/Dockerfile.zulu-7u285-jre
new file mode 100644
index 00000000..a43a8cee
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-7u285-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-7-azure-jre-7.42.0.51
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure
+
diff --git a/docker/centos/Dockerfile.zulu-7u285-jre-headless b/docker/centos/Dockerfile.zulu-7u285-jre-headless
new file mode 100644
index 00000000..4d3aef70
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-7u285-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-7-azure-jre-headless-7.42.0.51
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure
diff --git a/docker/centos/Dockerfile.zulu-8u275-jdk b/docker/centos/Dockerfile.zulu-8u275-jdk
new file mode 100644
index 00000000..acaed37e
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u275-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-8-azure-jdk-8.50.0.51
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure
+
diff --git a/docker/centos/Dockerfile.zulu-8u275-jre b/docker/centos/Dockerfile.zulu-8u275-jre
new file mode 100644
index 00000000..343e362f
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u275-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-8-azure-jre-8.50.0.51
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure
+
diff --git a/docker/centos/Dockerfile.zulu-8u275-jre-headless b/docker/centos/Dockerfile.zulu-8u275-jre-headless
new file mode 100644
index 00000000..aae4b11f
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u275-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-8-azure-jre-headless-8.50.0.51
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure
diff --git a/docker/debian10/Dockerfile.zulu-15u1-jdk b/docker/debian10/Dockerfile.zulu-15u1-jdk
index 5047c7f4..2d34774c 100644
--- a/docker/debian10/Dockerfile.zulu-15u1-jdk
+++ b/docker/debian10/Dockerfile.zulu-15u1-jdk
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.28+13* && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.28+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/debian10/Dockerfile.zulu-15u1-jre b/docker/debian10/Dockerfile.zulu-15u1-jre
index 26b96476..d22de142 100644
--- a/docker/debian10/Dockerfile.zulu-15u1-jre
+++ b/docker/debian10/Dockerfile.zulu-15u1-jre
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.28+13* && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.28+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/debian10/Dockerfile.zulu-15u1-jre-headless b/docker/debian10/Dockerfile.zulu-15u1-jre-headless
index d34fb97a..909032a5 100644
--- a/docker/debian10/Dockerfile.zulu-15u1-jre-headless
+++ b/docker/debian10/Dockerfile.zulu-15u1-jre-headless
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.28+13* && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.28+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/debian10/Dockerfile.zulu-7u285-jdk b/docker/debian10/Dockerfile.zulu-7u285-jdk
new file mode 100644
index 00000000..d2755fd3
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-7u285-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.42.0.51* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u285-jre b/docker/debian10/Dockerfile.zulu-7u285-jre
new file mode 100644
index 00000000..c7cc2978
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-7u285-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.42.0.51* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u285-jre-headless b/docker/debian10/Dockerfile.zulu-7u285-jre-headless
new file mode 100644
index 00000000..38bee1cc
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-7u285-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.42.0.51* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u275-jdk b/docker/debian10/Dockerfile.zulu-8u275-jdk
new file mode 100644
index 00000000..fbc0ff7b
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u275-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.50.0.51* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u275-jre b/docker/debian10/Dockerfile.zulu-8u275-jre
new file mode 100644
index 00000000..3caa3214
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u275-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.50.0.51* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u275-jre-headless b/docker/debian10/Dockerfile.zulu-8u275-jre-headless
new file mode 100644
index 00000000..e08de4ae
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u275-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.50.0.51* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u275-jre-headless-tools b/docker/debian10/Dockerfile.zulu-8u275-jre-headless-tools
new file mode 100644
index 00000000..bf1426db
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u275-jre-headless-tools
@@ -0,0 +1,27 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG ZULU_DIR=zulu-8-azure-jre-headless-tools_8.50.0.51-8.0.275-linux_musl_x64
+ARG ZULU_PACK=$ZULU_DIR.tar.gz
+ARG INSTALL_DIR=/usr/lib/jvm
+ARG BIN_DIR=/usr/bin
+ARG MAN_DIR=/usr/share/man/man1
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install ca-certificates curl musl && \
+    mkdir -p ${INSTALL_DIR} && \
+    curl -o /tmp/${ZULU_PACK} https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u275/zulu-8-azure-jre-headless-tools_8.50.0.51-8.0.275-linux_musl_x64.tar.gz && \
+    tar -xf /tmp/${ZULU_PACK} -C ${INSTALL_DIR} && rm -f /tmp/${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \; && \
+    rm -rf /var/lib/apt/lists/* /tmp/*
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-jre-headless-tools_8.50.0.51-8.0.275-linux_musl_x64
diff --git a/docker/debian10/Dockerfile.zulu-8u275-maven b/docker/debian10/Dockerfile.zulu-8u275-maven
new file mode 100644
index 00000000..f1fc2859
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u275-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u275-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian9/Dockerfile.zulu-15u1-jdk b/docker/debian9/Dockerfile.zulu-15u1-jdk
index 2e166944..1d468e2e 100644
--- a/docker/debian9/Dockerfile.zulu-15u1-jdk
+++ b/docker/debian9/Dockerfile.zulu-15u1-jdk
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.28+13* && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.28+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/debian9/Dockerfile.zulu-15u1-jre b/docker/debian9/Dockerfile.zulu-15u1-jre
index 29623c09..e9ba37ae 100644
--- a/docker/debian9/Dockerfile.zulu-15u1-jre
+++ b/docker/debian9/Dockerfile.zulu-15u1-jre
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.28+13* && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.28+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/debian9/Dockerfile.zulu-15u1-jre-headless b/docker/debian9/Dockerfile.zulu-15u1-jre-headless
index 74b63b9b..26ea7ab7 100644
--- a/docker/debian9/Dockerfile.zulu-15u1-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-15u1-jre-headless
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.28+13* && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.28+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/debian9/Dockerfile.zulu-7u285-jdk b/docker/debian9/Dockerfile.zulu-7u285-jdk
new file mode 100644
index 00000000..aff6b01b
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-7u285-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.42.0.51* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u285-jre b/docker/debian9/Dockerfile.zulu-7u285-jre
new file mode 100644
index 00000000..cf9a78fc
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-7u285-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.42.0.51* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u285-jre-headless b/docker/debian9/Dockerfile.zulu-7u285-jre-headless
new file mode 100644
index 00000000..f825b488
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-7u285-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.42.0.51* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u275-jdk b/docker/debian9/Dockerfile.zulu-8u275-jdk
new file mode 100644
index 00000000..9a89d576
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u275-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.50.0.51* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u275-jre b/docker/debian9/Dockerfile.zulu-8u275-jre
new file mode 100644
index 00000000..fad66433
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u275-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.50.0.51* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u275-jre-headless b/docker/debian9/Dockerfile.zulu-8u275-jre-headless
new file mode 100644
index 00000000..ba983974
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u275-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.50.0.51* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u275-maven b/docker/debian9/Dockerfile.zulu-8u275-maven
new file mode 100644
index 00000000..1c40627f
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u275-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u275-zulu-debian9
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jdk
index 42cb0442..01a67cca 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jdk
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jdk
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.28+13* && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.28+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jre b/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jre
index 4c4deab9..d9213e26 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jre
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jre
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.28+13* && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.28+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jre-headless
index e4f9fba2..f84fb7a4 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jre-headless
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jre-headless
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.28+13* && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.28+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u285-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-7u285-jdk
new file mode 100644
index 00000000..0495258c
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u285-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.42.0.51* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u285-jre b/docker/ubuntu-18.04/Dockerfile.zulu-7u285-jre
new file mode 100644
index 00000000..c10c447e
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u285-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.42.0.51* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u285-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-7u285-jre-headless
new file mode 100644
index 00000000..3ead7afc
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u285-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.42.0.51* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u275-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-8u275-jdk
new file mode 100644
index 00000000..914ec3e6
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u275-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.50.0.51* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u275-jre b/docker/ubuntu-18.04/Dockerfile.zulu-8u275-jre
new file mode 100644
index 00000000..0c7e722a
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u275-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.50.0.51* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u275-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-8u275-jre-headless
new file mode 100644
index 00000000..d5d718a1
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u275-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.50.0.51* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-15u1-jdk b/docker/ubuntu/Dockerfile.zulu-15u1-jdk
index 77ec52b0..d344de84 100644
--- a/docker/ubuntu/Dockerfile.zulu-15u1-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-15u1-jdk
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.28+13* && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.28+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/ubuntu/Dockerfile.zulu-15u1-jre b/docker/ubuntu/Dockerfile.zulu-15u1-jre
index f72d41a8..2c48eb0b 100644
--- a/docker/ubuntu/Dockerfile.zulu-15u1-jre
+++ b/docker/ubuntu/Dockerfile.zulu-15u1-jre
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.28+13* && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.28+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/ubuntu/Dockerfile.zulu-15u1-jre-headless b/docker/ubuntu/Dockerfile.zulu-15u1-jre-headless
index ea7e0ef1..152d06d4 100644
--- a/docker/ubuntu/Dockerfile.zulu-15u1-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-15u1-jre-headless
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.28+13* && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.28+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/ubuntu/Dockerfile.zulu-7u285-jdk b/docker/ubuntu/Dockerfile.zulu-7u285-jdk
new file mode 100644
index 00000000..ad6e70ab
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-7u285-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.42.0.51* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u285-jre b/docker/ubuntu/Dockerfile.zulu-7u285-jre
new file mode 100644
index 00000000..e6d02112
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-7u285-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.42.0.51* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u285-jre-headless b/docker/ubuntu/Dockerfile.zulu-7u285-jre-headless
new file mode 100644
index 00000000..b7843ff6
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-7u285-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.42.0.51* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u275-jdk b/docker/ubuntu/Dockerfile.zulu-8u275-jdk
new file mode 100644
index 00000000..e3f2a96c
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u275-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.50.0.51* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u275-jre b/docker/ubuntu/Dockerfile.zulu-8u275-jre
new file mode 100644
index 00000000..d61ebc98
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u275-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.50.0.51* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u275-jre-headless b/docker/ubuntu/Dockerfile.zulu-8u275-jre-headless
new file mode 100644
index 00000000..fa4c56d6
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u275-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.50.0.51* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/windowsservercore/Dockerfile.zulu-15u1-jdk b/docker/windowsservercore/Dockerfile.zulu-15u1-jdk
index d16862cb..13a896a8 100644
--- a/docker/windowsservercore/Dockerfile.zulu-15u1-jdk
+++ b/docker/windowsservercore/Dockerfile.zulu-15u1-jdk
@@ -7,11 +7,11 @@
 FROM microsoft/windowsservercore:ltsc2016
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN setx PACKAGE zulu-15-azure-jdk_15.28.13-15.0.1-win_x64.msi && \
+RUN setx PACKAGE zulu-15-azure-jdk_15.28.51-15.0.1-win_x64.msi && \
     setx PACKAGE_DIR zulu-15/15.0.1 && \
     setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-15"
     
 
-RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.1/zulu-15-azure-jdk_15.28.13-15.0.1-win_x64.msi', 'C:\%PACKAGE%')
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.1/zulu-15-azure-jdk_15.28.51-15.0.1-win_x64.msi', 'C:\%PACKAGE%')
 RUN msiexec /quiet /i C:\%PACKAGE% && \
     del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-15u1-jre b/docker/windowsservercore/Dockerfile.zulu-15u1-jre
index 6d858d19..fc4785e0 100644
--- a/docker/windowsservercore/Dockerfile.zulu-15u1-jre
+++ b/docker/windowsservercore/Dockerfile.zulu-15u1-jre
@@ -7,10 +7,10 @@
 FROM microsoft/windowsservercore:ltsc2016
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN setx PACKAGE zulu-15-azure-jre_15.28.13-15.0.1-win_x64.msi && \
+RUN setx PACKAGE zulu-15-azure-jre_15.28.51-15.0.1-win_x64.msi && \
     setx PACKAGE_DIR zulu-15/15.0.1 && \
     setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-15-jre"
 
-RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.1/zulu-15-azure-jre_15.28.13-15.0.1-win_x64.msi', 'C:\%PACKAGE%')
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.1/zulu-15-azure-jre_15.28.51-15.0.1-win_x64.msi', 'C:\%PACKAGE%')
 RUN msiexec /quiet /i C:\%PACKAGE% && \
     del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-7u285-jdk b/docker/windowsservercore/Dockerfile.zulu-7u285-jdk
new file mode 100644
index 00000000..d5afa5f9
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-7u285-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-7-azure-jdk_7.42.0.51-7.0.285-win_x64.msi && \
+    setx PACKAGE_DIR zulu-7/7u285 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-7"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u285/zulu-7-azure-jdk_7.42.0.51-7.0.285-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-7u285-jre b/docker/windowsservercore/Dockerfile.zulu-7u285-jre
new file mode 100644
index 00000000..9b2a93bc
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-7u285-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-7-azure-jre_7.42.0.51-7.0.285-win_x64.msi && \
+    setx PACKAGE_DIR zulu-7/7u285 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-7-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u285/zulu-7-azure-jre_7.42.0.51-7.0.285-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-8u275-jdk b/docker/windowsservercore/Dockerfile.zulu-8u275-jdk
new file mode 100644
index 00000000..1c7efcd1
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-8u275-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-8-azure-jdk_8.50.0.51-8.0.275-win_x64.msi && \
+    setx PACKAGE_DIR zulu-8/8u275 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-8"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u275/zulu-8-azure-jdk_8.50.0.51-8.0.275-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-8u275-jre b/docker/windowsservercore/Dockerfile.zulu-8u275-jre
new file mode 100644
index 00000000..b8efbb1f
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-8u275-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-8-azure-jre_8.50.0.51-8.0.275-win_x64.msi && \
+    setx PACKAGE_DIR zulu-8/8u275 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-8-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u275/zulu-8-azure-jre_8.50.0.51-8.0.275-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%

From e35b0b5b7c050cd83a3346abd88fef869d062172 Mon Sep 17 00:00:00 2001
From: zulu-ci <zulu-ci@azul.com>
Date: Fri, 4 Dec 2020 11:08:45 +0000
Subject: [PATCH 200/264] respin_part2

---
 docker/alpine/Dockerfile.zulu-11u9-jdk                | 4 ++--
 docker/alpine/Dockerfile.zulu-11u9-jre                | 4 ++--
 docker/alpine/Dockerfile.zulu-11u9-jre-headless       | 4 ++--
 docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools | 4 ++--
 docker/alpine/Dockerfile.zulu-13u5-jdk                | 4 ++--
 docker/alpine/Dockerfile.zulu-13u5-jre                | 4 ++--
 docker/alpine/Dockerfile.zulu-13u5-jre-headless       | 4 ++--
 docker/alpine/Dockerfile.zulu-13u5-jre-headless-tools | 4 ++--
 docker/centos/Dockerfile.zulu-11u9-jdk                | 2 +-
 docker/centos/Dockerfile.zulu-11u9-jre                | 2 +-
 docker/centos/Dockerfile.zulu-11u9-jre-headless       | 2 +-
 docker/centos/Dockerfile.zulu-13u5-jdk                | 2 +-
 docker/centos/Dockerfile.zulu-13u5-jre                | 2 +-
 docker/centos/Dockerfile.zulu-13u5-jre-headless       | 2 +-
 docker/debian10/Dockerfile.zulu-11u9-jdk              | 2 +-
 docker/debian10/Dockerfile.zulu-11u9-jre              | 2 +-
 docker/debian10/Dockerfile.zulu-11u9-jre-headless     | 2 +-
 docker/debian10/Dockerfile.zulu-13u5-jdk              | 2 +-
 docker/debian10/Dockerfile.zulu-13u5-jre              | 2 +-
 docker/debian10/Dockerfile.zulu-13u5-jre-headless     | 2 +-
 docker/debian9/Dockerfile.zulu-11u9-jdk               | 2 +-
 docker/debian9/Dockerfile.zulu-11u9-jre               | 2 +-
 docker/debian9/Dockerfile.zulu-11u9-jre-headless      | 2 +-
 docker/debian9/Dockerfile.zulu-13u5-jdk               | 2 +-
 docker/debian9/Dockerfile.zulu-13u5-jre               | 2 +-
 docker/debian9/Dockerfile.zulu-13u5-jre-headless      | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-11u9-jdk          | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-11u9-jre          | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-11u9-jre-headless | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-13u5-jdk          | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-13u5-jre          | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-13u5-jre-headless | 2 +-
 docker/ubuntu/Dockerfile.zulu-11u9-jdk                | 2 +-
 docker/ubuntu/Dockerfile.zulu-11u9-jre                | 2 +-
 docker/ubuntu/Dockerfile.zulu-11u9-jre-headless       | 2 +-
 docker/ubuntu/Dockerfile.zulu-13u5-jdk                | 2 +-
 docker/ubuntu/Dockerfile.zulu-13u5-jre                | 2 +-
 docker/ubuntu/Dockerfile.zulu-13u5-jre-headless       | 2 +-
 38 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/docker/alpine/Dockerfile.zulu-11u9-jdk b/docker/alpine/Dockerfile.zulu-11u9-jdk
index 155bb0a2..ceae5ab3 100644
--- a/docker/alpine/Dockerfile.zulu-11u9-jdk
+++ b/docker/alpine/Dockerfile.zulu-11u9-jdk
@@ -11,7 +11,7 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-ARG ZULU_DIR=zulu-11-azure-jdk_11.43.21-11.0.9-linux_musl_x64
+ARG ZULU_DIR=zulu-11-azure-jdk_11.43.55-11.0.9.1-linux_musl_x64
 
 RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.9/zulu-11-azure-jdk_11.43.21-11.0.9-linux_musl_x64.tar.gz && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.9.1/zulu-11-azure-jdk_11.43.55-11.0.9.1-linux_musl_x64.tar.gz && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u9-jre b/docker/alpine/Dockerfile.zulu-11u9-jre
index ce2b6aba..cd640366 100644
--- a/docker/alpine/Dockerfile.zulu-11u9-jre
+++ b/docker/alpine/Dockerfile.zulu-11u9-jre
@@ -11,7 +11,7 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-ARG ZULU_DIR=zulu-11-azure-jre_11.43.21-11.0.9-linux_musl_x64
+ARG ZULU_DIR=zulu-11-azure-jre_11.43.55-11.0.9.1-linux_musl_x64
 
 RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.9/zulu-11-azure-jre_11.43.21-11.0.9-linux_musl_x64.tar.gz && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.9.1/zulu-11-azure-jre_11.43.55-11.0.9.1-linux_musl_x64.tar.gz && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u9-jre-headless b/docker/alpine/Dockerfile.zulu-11u9-jre-headless
index c377094f..bf318ee1 100644
--- a/docker/alpine/Dockerfile.zulu-11u9-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-11u9-jre-headless
@@ -11,7 +11,7 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-ARG ZULU_DIR=zulu-11-azure-jre-headless_11.43.21-11.0.9-linux_musl_x64
+ARG ZULU_DIR=zulu-11-azure-jre-headless_11.43.55-11.0.9.1-linux_musl_x64
 
 RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.9/zulu-11-azure-jre-headless_11.43.21-11.0.9-linux_musl_x64.tar.gz && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.9.1/zulu-11-azure-jre-headless_11.43.55-11.0.9.1-linux_musl_x64.tar.gz && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools b/docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools
index 516d8a3f..2beb94c2 100644
--- a/docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools
+++ b/docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools
@@ -11,7 +11,7 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-ARG ZULU_DIR=zulu-11-azure-jre-headless-tools_11.43.21-11.0.9-linux_musl_x64
+ARG ZULU_DIR=zulu-11-azure-jre-headless-tools_11.43.55-11.0.9.1-linux_musl_x64
 
 RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.9/zulu-11-azure-jre-headless-tools_11.43.21-11.0.9-linux_musl_x64.tar.gz && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.9.1/zulu-11-azure-jre-headless-tools_11.43.55-11.0.9.1-linux_musl_x64.tar.gz && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-13u5-jdk b/docker/alpine/Dockerfile.zulu-13u5-jdk
index c3771676..6ec81bce 100644
--- a/docker/alpine/Dockerfile.zulu-13u5-jdk
+++ b/docker/alpine/Dockerfile.zulu-13u5-jdk
@@ -11,7 +11,7 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-ARG ZULU_DIR=zulu-13-azure-jdk_13.35.17-13.0.5-linux_musl_x64
+ARG ZULU_DIR=zulu-13-azure-jdk_13.35.51-13.0.5.1-linux_musl_x64
 
 RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.5/zulu-13-azure-jdk_13.35.17-13.0.5-linux_musl_x64.tar.gz && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.5.1/zulu-13-azure-jdk_13.35.51-13.0.5.1-linux_musl_x64.tar.gz && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-13u5-jre b/docker/alpine/Dockerfile.zulu-13u5-jre
index 346755c4..de52504a 100644
--- a/docker/alpine/Dockerfile.zulu-13u5-jre
+++ b/docker/alpine/Dockerfile.zulu-13u5-jre
@@ -11,7 +11,7 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-ARG ZULU_DIR=zulu-13-azure-jre_13.35.17-13.0.5-linux_musl_x64
+ARG ZULU_DIR=zulu-13-azure-jre_13.35.51-13.0.5.1-linux_musl_x64
 
 RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.5/zulu-13-azure-jre_13.35.17-13.0.5-linux_musl_x64.tar.gz && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.5.1/zulu-13-azure-jre_13.35.51-13.0.5.1-linux_musl_x64.tar.gz && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-13u5-jre-headless b/docker/alpine/Dockerfile.zulu-13u5-jre-headless
index c9f05a92..a9310ce7 100644
--- a/docker/alpine/Dockerfile.zulu-13u5-jre-headless
+++ b/docker/alpine/Dockerfile.zulu-13u5-jre-headless
@@ -11,7 +11,7 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-ARG ZULU_DIR=zulu-13-azure-jre-headless_13.35.17-13.0.5-linux_musl_x64
+ARG ZULU_DIR=zulu-13-azure-jre-headless_13.35.51-13.0.5.1-linux_musl_x64
 
 RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.5/zulu-13-azure-jre-headless_13.35.17-13.0.5-linux_musl_x64.tar.gz && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.5.1/zulu-13-azure-jre-headless_13.35.51-13.0.5.1-linux_musl_x64.tar.gz && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/alpine/Dockerfile.zulu-13u5-jre-headless-tools b/docker/alpine/Dockerfile.zulu-13u5-jre-headless-tools
index fc27f949..fd6772b1 100644
--- a/docker/alpine/Dockerfile.zulu-13u5-jre-headless-tools
+++ b/docker/alpine/Dockerfile.zulu-13u5-jre-headless-tools
@@ -11,7 +11,7 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
-ARG ZULU_DIR=zulu-13-azure-jre-headless-tools_13.35.17-13.0.5-linux_musl_x64
+ARG ZULU_DIR=zulu-13-azure-jre-headless-tools_13.35.51-13.0.5.1-linux_musl_x64
 
 RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     INSTALL_DIR=/usr/lib/jvm && \
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.5/zulu-13-azure-jre-headless-tools_13.35.17-13.0.5-linux_musl_x64.tar.gz && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.5.1/zulu-13-azure-jre-headless-tools_13.35.51-13.0.5.1-linux_musl_x64.tar.gz && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
diff --git a/docker/centos/Dockerfile.zulu-11u9-jdk b/docker/centos/Dockerfile.zulu-11u9-jdk
index 50f162b4..9d540dac 100644
--- a/docker/centos/Dockerfile.zulu-11u9-jdk
+++ b/docker/centos/Dockerfile.zulu-11u9-jdk
@@ -11,7 +11,7 @@ RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
     yum -q -y upgrade && \
-    yum -q -y install zulu-11-azure-jdk-11.43.21
+    yum -q -y install zulu-11-azure-jdk-11.43.55
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure
 
diff --git a/docker/centos/Dockerfile.zulu-11u9-jre b/docker/centos/Dockerfile.zulu-11u9-jre
index 4ab76d29..a6679406 100644
--- a/docker/centos/Dockerfile.zulu-11u9-jre
+++ b/docker/centos/Dockerfile.zulu-11u9-jre
@@ -11,7 +11,7 @@ RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
     yum -q -y upgrade && \
-    yum -q -y install zulu-11-azure-jre-11.43.21
+    yum -q -y install zulu-11-azure-jre-11.43.55
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure
 
diff --git a/docker/centos/Dockerfile.zulu-11u9-jre-headless b/docker/centos/Dockerfile.zulu-11u9-jre-headless
index 3b1320f9..3755001d 100644
--- a/docker/centos/Dockerfile.zulu-11u9-jre-headless
+++ b/docker/centos/Dockerfile.zulu-11u9-jre-headless
@@ -11,6 +11,6 @@ RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
     yum -q -y upgrade && \
-    yum -q -y install zulu-11-azure-jre-headless-11.43.21
+    yum -q -y install zulu-11-azure-jre-headless-11.43.55
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure
diff --git a/docker/centos/Dockerfile.zulu-13u5-jdk b/docker/centos/Dockerfile.zulu-13u5-jdk
index 88c98e06..a730fac2 100644
--- a/docker/centos/Dockerfile.zulu-13u5-jdk
+++ b/docker/centos/Dockerfile.zulu-13u5-jdk
@@ -11,7 +11,7 @@ RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
     yum -q -y upgrade && \
-    yum -q -y install zulu-13-azure-jdk-13.35.17
+    yum -q -y install zulu-13-azure-jdk-13.35.51
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure
 
diff --git a/docker/centos/Dockerfile.zulu-13u5-jre b/docker/centos/Dockerfile.zulu-13u5-jre
index 71ba1092..dc77921c 100644
--- a/docker/centos/Dockerfile.zulu-13u5-jre
+++ b/docker/centos/Dockerfile.zulu-13u5-jre
@@ -11,7 +11,7 @@ RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
     yum -q -y upgrade && \
-    yum -q -y install zulu-13-azure-jre-13.35.17
+    yum -q -y install zulu-13-azure-jre-13.35.51
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure
 
diff --git a/docker/centos/Dockerfile.zulu-13u5-jre-headless b/docker/centos/Dockerfile.zulu-13u5-jre-headless
index 349665b4..f19febdb 100644
--- a/docker/centos/Dockerfile.zulu-13u5-jre-headless
+++ b/docker/centos/Dockerfile.zulu-13u5-jre-headless
@@ -11,6 +11,6 @@ RUN rpm --import http://repos.azul.com/azul-repo.key && \
     curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
     yum -q -y update && \
     yum -q -y upgrade && \
-    yum -q -y install zulu-13-azure-jre-headless-13.35.17
+    yum -q -y install zulu-13-azure-jre-headless-13.35.51
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure
diff --git a/docker/debian10/Dockerfile.zulu-11u9-jdk b/docker/debian10/Dockerfile.zulu-11u9-jdk
index 2c461944..9f634f54 100644
--- a/docker/debian10/Dockerfile.zulu-11u9-jdk
+++ b/docker/debian10/Dockerfile.zulu-11u9-jdk
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.43+21* && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.43+55* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/debian10/Dockerfile.zulu-11u9-jre b/docker/debian10/Dockerfile.zulu-11u9-jre
index 0e737b55..7e7e8035 100644
--- a/docker/debian10/Dockerfile.zulu-11u9-jre
+++ b/docker/debian10/Dockerfile.zulu-11u9-jre
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.43+21* && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.43+55* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/debian10/Dockerfile.zulu-11u9-jre-headless b/docker/debian10/Dockerfile.zulu-11u9-jre-headless
index 9e78159d..643f65c7 100644
--- a/docker/debian10/Dockerfile.zulu-11u9-jre-headless
+++ b/docker/debian10/Dockerfile.zulu-11u9-jre-headless
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.43+21* && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.43+55* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/debian10/Dockerfile.zulu-13u5-jdk b/docker/debian10/Dockerfile.zulu-13u5-jdk
index 9a6a0672..3b88693a 100644
--- a/docker/debian10/Dockerfile.zulu-13u5-jdk
+++ b/docker/debian10/Dockerfile.zulu-13u5-jdk
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.35+17* && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.35+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/debian10/Dockerfile.zulu-13u5-jre b/docker/debian10/Dockerfile.zulu-13u5-jre
index 03628e45..27bdc025 100644
--- a/docker/debian10/Dockerfile.zulu-13u5-jre
+++ b/docker/debian10/Dockerfile.zulu-13u5-jre
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.35+17* && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.35+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/debian10/Dockerfile.zulu-13u5-jre-headless b/docker/debian10/Dockerfile.zulu-13u5-jre-headless
index f4d2ba4f..f7cd6e28 100644
--- a/docker/debian10/Dockerfile.zulu-13u5-jre-headless
+++ b/docker/debian10/Dockerfile.zulu-13u5-jre-headless
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.35+17* && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.35+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/debian9/Dockerfile.zulu-11u9-jdk b/docker/debian9/Dockerfile.zulu-11u9-jdk
index e403d0cc..aa089181 100644
--- a/docker/debian9/Dockerfile.zulu-11u9-jdk
+++ b/docker/debian9/Dockerfile.zulu-11u9-jdk
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.43+21* && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.43+55* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/debian9/Dockerfile.zulu-11u9-jre b/docker/debian9/Dockerfile.zulu-11u9-jre
index 3e0e79fd..34609782 100644
--- a/docker/debian9/Dockerfile.zulu-11u9-jre
+++ b/docker/debian9/Dockerfile.zulu-11u9-jre
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.43+21* && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.43+55* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/debian9/Dockerfile.zulu-11u9-jre-headless b/docker/debian9/Dockerfile.zulu-11u9-jre-headless
index eb331a60..b53aeed6 100644
--- a/docker/debian9/Dockerfile.zulu-11u9-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-11u9-jre-headless
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.43+21* && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.43+55* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/debian9/Dockerfile.zulu-13u5-jdk b/docker/debian9/Dockerfile.zulu-13u5-jdk
index 505f999a..bdf71c56 100644
--- a/docker/debian9/Dockerfile.zulu-13u5-jdk
+++ b/docker/debian9/Dockerfile.zulu-13u5-jdk
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.35+17* && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.35+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/debian9/Dockerfile.zulu-13u5-jre b/docker/debian9/Dockerfile.zulu-13u5-jre
index edc2715e..7e358603 100644
--- a/docker/debian9/Dockerfile.zulu-13u5-jre
+++ b/docker/debian9/Dockerfile.zulu-13u5-jre
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.35+17* && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.35+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/debian9/Dockerfile.zulu-13u5-jre-headless b/docker/debian9/Dockerfile.zulu-13u5-jre-headless
index a5d8c6f6..1447d314 100644
--- a/docker/debian9/Dockerfile.zulu-13u5-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-13u5-jre-headless
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.35+17* && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.35+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jdk
index efa0171b..c136fc20 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jdk
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jdk
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.43+21* && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.43+55* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jre b/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jre
index d138476c..f6a76330 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jre
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jre
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.43+21* && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.43+55* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jre-headless
index 96536ce7..89b86517 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jre-headless
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jre-headless
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.43+21* && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.43+55* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jdk
index 309f344d..f56182a9 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jdk
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jdk
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.35+17* && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.35+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jre b/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jre
index ee575870..65591d95 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jre
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jre
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.35+17* && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.35+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jre-headless
index 86bb5e69..00eba8bf 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jre-headless
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jre-headless
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.35+17* && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.35+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/ubuntu/Dockerfile.zulu-11u9-jdk b/docker/ubuntu/Dockerfile.zulu-11u9-jdk
index 4bce1553..518c4f0e 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u9-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-11u9-jdk
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.43+21* && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.43+55* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/ubuntu/Dockerfile.zulu-11u9-jre b/docker/ubuntu/Dockerfile.zulu-11u9-jre
index 5e60bdc1..dbbfd15f 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u9-jre
+++ b/docker/ubuntu/Dockerfile.zulu-11u9-jre
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.43+21* && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.43+55* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/ubuntu/Dockerfile.zulu-11u9-jre-headless b/docker/ubuntu/Dockerfile.zulu-11u9-jre-headless
index 2ccd7552..f6fb9043 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u9-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-11u9-jre-headless
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.43+21* && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.43+55* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/ubuntu/Dockerfile.zulu-13u5-jdk b/docker/ubuntu/Dockerfile.zulu-13u5-jdk
index bab2436a..8b38484d 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u5-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-13u5-jdk
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.35+17* && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.35+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/ubuntu/Dockerfile.zulu-13u5-jre b/docker/ubuntu/Dockerfile.zulu-13u5-jre
index 6ee415fe..e67c75ea 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u5-jre
+++ b/docker/ubuntu/Dockerfile.zulu-13u5-jre
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.35+17* && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.35+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
diff --git a/docker/ubuntu/Dockerfile.zulu-13u5-jre-headless b/docker/ubuntu/Dockerfile.zulu-13u5-jre-headless
index 14a3fd6e..96e75fcb 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u5-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-13u5-jre-headless
@@ -13,7 +13,7 @@ RUN apt-get -qq update && \
     apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
     apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
-    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.35+17* && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.35+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
     apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*

From 27817d4a449204e60c1c70bedfa83b704e8fe29b Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 4 Dec 2020 09:28:40 -0600
Subject: [PATCH 201/264] Added Dockerfiles for Zulu 8u275

---
 ...file.zulu-8u275-jre-headless-tools-tomcat8 | 67 +++++++++++++++++++
 ...file.zulu-8u275-jre-headless-tools-tomcat9 | 67 +++++++++++++++++++
 2 files changed, 134 insertions(+)
 create mode 100644 docker/alpine/Dockerfile.zulu-8u275-jre-headless-tools-tomcat8
 create mode 100644 docker/alpine/Dockerfile.zulu-8u275-jre-headless-tools-tomcat9

diff --git a/docker/alpine/Dockerfile.zulu-8u275-jre-headless-tools-tomcat8 b/docker/alpine/Dockerfile.zulu-8u275-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..c2546934
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u275-jre-headless-tools-tomcat8
@@ -0,0 +1,67 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u275-zulu-alpine AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u275-zulu-alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-jdk_8.50.0.51-8.0.275-linux_musl_x64
+ARG JRE_DIR=/usr/lib/jvm/zulu-8-azure-jre-headless_8.50.0.51-8.0.275-linux_musl_x64
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.59
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apk add --update openssh-server bash openrc && \
+    apk update && \
+    apk upgrade && \
+    rm -rf /var/cache/apk/* && \
+    # Remove unnecessary services
+    rm -f /etc/init.d/hwdrivers \
+          /etc/init.d/hwclock \
+          /etc/init.d/mtab \
+          /etc/init.d/bootmisc \
+          /etc/init.d/modules \
+          /etc/init.d/modules-load \
+          /etc/init.d/modloop && \
+    # Install Tomcat
+    wget -O /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/alpine/Dockerfile.zulu-8u275-jre-headless-tools-tomcat9 b/docker/alpine/Dockerfile.zulu-8u275-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..70d2d675
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u275-jre-headless-tools-tomcat9
@@ -0,0 +1,67 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u275-zulu-alpine AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u275-zulu-alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-jdk_8.50.0.51-8.0.275-linux_musl_x64
+ARG JRE_DIR=/usr/lib/jvm/zulu-8-azure-jre-headless_8.50.0.51-8.0.275-linux_musl_x64
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.39
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apk add --update openssh-server bash openrc && \
+    apk update && \
+    apk upgrade && \
+    rm -rf /var/cache/apk/* && \
+    # Remove unnecessary services
+    rm -f /etc/init.d/hwdrivers \
+          /etc/init.d/hwclock \
+          /etc/init.d/mtab \
+          /etc/init.d/bootmisc \
+          /etc/init.d/modules \
+          /etc/init.d/modules-load \
+          /etc/init.d/modloop && \
+    # Install Tomcat
+    wget -O /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]

From 58d249554bd4abd01b07b963a9cab22c5d927dc8 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 4 Dec 2020 09:29:21 -0600
Subject: [PATCH 202/264] Added Dockerfiles for Zulu 8u275

---
 ...file.zulu-8u275-jre-headless-tools-tomcat8 | 57 +++++++++++++++++++
 ...file.zulu-8u275-jre-headless-tools-tomcat9 | 57 +++++++++++++++++++
 2 files changed, 114 insertions(+)
 create mode 100644 docker/centos/Dockerfile.zulu-8u275-jre-headless-tools-tomcat8
 create mode 100644 docker/centos/Dockerfile.zulu-8u275-jre-headless-tools-tomcat9

diff --git a/docker/centos/Dockerfile.zulu-8u275-jre-headless-tools-tomcat8 b/docker/centos/Dockerfile.zulu-8u275-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..150995d7
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u275-jre-headless-tools-tomcat8
@@ -0,0 +1,57 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u275-zulu-centos AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u275-zulu-centos
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.59
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+RUN yum -q -y update && \
+    yum -q -y install unzip && \
+    yum -q -y upgrade && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
+       
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/centos/Dockerfile.zulu-8u275-jre-headless-tools-tomcat9 b/docker/centos/Dockerfile.zulu-8u275-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..b99cb47a
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u275-jre-headless-tools-tomcat9
@@ -0,0 +1,57 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u275-zulu-centos AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u275-zulu-centos
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.39
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+RUN yum -q -y update && \
+    yum -q -y install unzip && \
+    yum -q -y upgrade && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
+       
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]

From 5876ce5c77527473b3e5cc83c3fb15a09b6546c0 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 4 Dec 2020 09:30:01 -0600
Subject: [PATCH 203/264] Added Dockerfiles for Zulu 8u275

---
 ...file.zulu-8u275-jre-headless-tools-tomcat8 | 61 +++++++++++++++++++
 ...file.zulu-8u275-jre-headless-tools-tomcat9 | 61 +++++++++++++++++++
 2 files changed, 122 insertions(+)
 create mode 100644 docker/debian10/Dockerfile.zulu-8u275-jre-headless-tools-tomcat8
 create mode 100644 docker/debian10/Dockerfile.zulu-8u275-jre-headless-tools-tomcat9

diff --git a/docker/debian10/Dockerfile.zulu-8u275-jre-headless-tools-tomcat8 b/docker/debian10/Dockerfile.zulu-8u275-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..038dd615
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u275-jre-headless-tools-tomcat8
@@ -0,0 +1,61 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u275-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u275-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.59
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/debian10/Dockerfile.zulu-8u275-jre-headless-tools-tomcat9 b/docker/debian10/Dockerfile.zulu-8u275-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..1763d9b9
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u275-jre-headless-tools-tomcat9
@@ -0,0 +1,61 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u275-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u275-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.39
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]

From ee172b8d9959cbcd5a64a1dac0e593addb15eafd Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 4 Dec 2020 09:30:45 -0600
Subject: [PATCH 204/264] Added Dockerfiles for Zulu 8u275

---
 ...file.zulu-8u275-jre-headless-tools-tomcat8 | 61 +++++++++++++++++++
 ...file.zulu-8u275-jre-headless-tools-tomcat9 | 61 +++++++++++++++++++
 2 files changed, 122 insertions(+)
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u275-jre-headless-tools-tomcat8
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u275-jre-headless-tools-tomcat9

diff --git a/docker/ubuntu/Dockerfile.zulu-8u275-jre-headless-tools-tomcat8 b/docker/ubuntu/Dockerfile.zulu-8u275-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..8754b462
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u275-jre-headless-tools-tomcat8
@@ -0,0 +1,61 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u275-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u275-zulu-ubuntu
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.59
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/ubuntu/Dockerfile.zulu-8u275-jre-headless-tools-tomcat9 b/docker/ubuntu/Dockerfile.zulu-8u275-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..1f87982d
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u275-jre-headless-tools-tomcat9
@@ -0,0 +1,61 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u275-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u275-zulu-ubuntu
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.39
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]

From 0d4a1f804535323206f70c57f81204925fcc8cef Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 4 Dec 2020 13:44:56 -0600
Subject: [PATCH 205/264] Changed Dockerfiles for Zulu 11u9 with Tomcat 8 and 9

---
 docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8 | 4 ++--
 docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8 b/docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8
index 6091851a..25a4a6c2 100644
--- a/docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8
+++ b/docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8
@@ -8,8 +8,8 @@ FROM mcr.microsoft.com/java/jre-headless:11u9-zulu-alpine AS stage1
 FROM mcr.microsoft.com/java/jdk:11u9-zulu-alpine AS stage2
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-jdk_11.43.21-11.0.9-linux_musl_x64
-ARG JRE_DIR=/usr/lib/jvm/zulu-11-azure-jre-headless_11.43.21-11.0.9-linux_musl_x64
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-jdk_11.43.55-11.0.9.1-linux_musl_x64
+ARG JRE_DIR=/usr/lib/jvm/zulu-11-azure-jre-headless_11.43.55-11.0.9.1-linux_musl_x64
 
 COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
 
diff --git a/docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9 b/docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9
index eb48272e..6a438602 100644
--- a/docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9
+++ b/docker/alpine/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9
@@ -8,8 +8,8 @@ FROM mcr.microsoft.com/java/jre-headless:11u9-zulu-alpine AS stage1
 FROM mcr.microsoft.com/java/jdk:11u9-zulu-alpine AS stage2
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-jdk_11.43.21-11.0.9-linux_musl_x64
-ARG JRE_DIR=/usr/lib/jvm/zulu-11-azure-jre-headless_11.43.21-11.0.9-linux_musl_x64
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-jdk_11.43.55-11.0.9.1-linux_musl_x64
+ARG JRE_DIR=/usr/lib/jvm/zulu-11-azure-jre-headless_11.43.55-11.0.9.1-linux_musl_x64
 
 COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
 

From 2f986f06634bfbae2902deb8a124c779eaf80ab2 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Sat, 5 Dec 2020 08:53:23 -0600
Subject: [PATCH 206/264] Changed 11u9 and 13u5 to October respin

---
 .../windowsnanoserver-2004/Dockerfile.zulu-11u9-jre-tools | 8 ++++----
 .../windowsnanoserver-2004/Dockerfile.zulu-13u5-jre-tools | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-11u9-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-11u9-jre-tools
index b822f5fa..485b1018 100644
--- a/docker/windowsnanoserver-2004/Dockerfile.zulu-11u9-jre-tools
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-11u9-jre-tools
@@ -7,9 +7,9 @@
 FROM mcr.microsoft.com/java/jdk:11u9-zulu-windowsservercore AS stage1
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-ARG PACKAGE_DIR=zulu-11/11.0.9
-ARG JRE_PACKAGE=zulu-11-azure-jre_11.43.21-11.0.9-win_x64.msi
-ARG JRE_TOOLS_DIR="C:\zulu-11-azure-jre-tools_11.43.21-11.0.9-win_x64"
+ARG PACKAGE_DIR=zulu-11/11.0.9.1
+ARG JRE_PACKAGE=zulu-11-azure-jre_11.43.55-11.0.9.1-win_x64.msi
+ARG JRE_TOOLS_DIR="C:\zulu-11-azure-jre-tools_11.43.55-11.0.9.1-win_x64"
 ARG JRE_DIR="C:\Program Files\Zulu\zulu-11-jre"
 ARG JDK_DIR="C:\Program Files\Zulu\zulu-11"
 
@@ -28,7 +28,7 @@ RUN jlink --no-header-files --strip-debug --module-path "%JDK_DIR%\jmods" --add-
 
 FROM mcr.microsoft.com/windows/nanoserver:2004
 
-ARG JRE_TOOLS_DIR="C:\zulu-11-azure-jre-tools_11.43.21-11.0.9-win_x64"
+ARG JRE_TOOLS_DIR="C:\zulu-11-azure-jre-tools_11.43.55-11.0.9.1-win_x64"
 
 USER ContainerAdministrator
 RUN setx /m JAVA_HOME "%JRE_TOOLS_DIR%" && \
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-13u5-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-13u5-jre-tools
index 6a2638a2..c222554e 100644
--- a/docker/windowsnanoserver-2004/Dockerfile.zulu-13u5-jre-tools
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-13u5-jre-tools
@@ -7,9 +7,9 @@
 FROM mcr.microsoft.com/java/jdk:13u5-zulu-windowsservercore AS stage1
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-ARG PACKAGE_DIR=zulu-13/13.0.5
-ARG JRE_PACKAGE=zulu-13-azure-jre_13.35.17-13.0.5-win_x64.msi
-ARG JRE_TOOLS_DIR="C:\zulu-13-azure-jre-tools_13.35.17-13.0.5-win_x64"
+ARG PACKAGE_DIR=zulu-13/13.0.5.1
+ARG JRE_PACKAGE=zulu-13-azure-jre_13.35.51-13.0.5.1-win_x64.msi
+ARG JRE_TOOLS_DIR="C:\zulu-13-azure-jre-tools_13.35.51-13.0.5.1-win_x64"
 ARG JRE_DIR="C:\Program Files\Zulu\zulu-13-jre"
 ARG JDK_DIR="C:\Program Files\Zulu\zulu-13"
 
@@ -28,7 +28,7 @@ RUN jlink --no-header-files --strip-debug --module-path "%JDK_DIR%\jmods" --add-
 
 FROM mcr.microsoft.com/windows/nanoserver:2004
 
-ARG JRE_TOOLS_DIR="C:\zulu-13-azure-jre-tools_13.35.17-13.0.5-win_x64"
+ARG JRE_TOOLS_DIR="C:\zulu-13-azure-jre-tools_13.35.51-13.0.5.1-win_x64"
 
 USER ContainerAdministrator
 RUN setx /m JAVA_HOME "%JRE_TOOLS_DIR%" && \

From 9ee199c9e821250ebc9b2713cbfdcbc202dd8a33 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 7 Dec 2020 09:35:28 -0600
Subject: [PATCH 207/264] Fixed Dockerfile.zulu-8u275-jre-headless-tools

---
 .../Dockerfile.zulu-8u275-jre-headless-tools  | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/docker/debian10/Dockerfile.zulu-8u275-jre-headless-tools b/docker/debian10/Dockerfile.zulu-8u275-jre-headless-tools
index bf1426db..44b4cf0e 100644
--- a/docker/debian10/Dockerfile.zulu-8u275-jre-headless-tools
+++ b/docker/debian10/Dockerfile.zulu-8u275-jre-headless-tools
@@ -4,24 +4,19 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM debian:buster
+FROM mcr.microsoft.com/java/jdk:8u275-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u275-zulu-debian10
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-ARG ZULU_DIR=zulu-8-azure-jre-headless-tools_8.50.0.51-8.0.275-linux_musl_x64
-ARG ZULU_PACK=$ZULU_DIR.tar.gz
-ARG INSTALL_DIR=/usr/lib/jvm
-ARG BIN_DIR=/usr/bin
-ARG MAN_DIR=/usr/share/man/man1
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
 
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install ca-certificates curl musl && \
-    mkdir -p ${INSTALL_DIR} && \
-    curl -o /tmp/${ZULU_PACK} https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u275/zulu-8-azure-jre-headless-tools_8.50.0.51-8.0.275-linux_musl_x64.tar.gz && \
-    tar -xf /tmp/${ZULU_PACK} -C ${INSTALL_DIR} && rm -f /tmp/${ZULU_PACK} && \
-    cd ${BIN_DIR} && \
-    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
-    mkdir -p ${MAN_DIR} && \
-    cd ${MAN_DIR} && \
-    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \; && \
-    rm -rf /var/lib/apt/lists/* /tmp/*
-ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-jre-headless-tools_8.50.0.51-8.0.275-linux_musl_x64
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+
+ENV JAVA_HOME=${JRE_DIR}

From b2067ff7e245267291f54dff250cfde9cb1354fc Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 7 Dec 2020 10:23:02 -0600
Subject: [PATCH 208/264] Added Dockerfiles for 8u275 and 11u9 Headless JRE
 with JDK tools

---
 .../Dockerfile.zulu-11u9-jre-headless-tools   | 31 +++++++++++++++++++
 .../Dockerfile.zulu-8u275-jre-headless-tools  | 22 +++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u9-jre-headless-tools
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u275-jre-headless-tools

diff --git a/docker/ubuntu/Dockerfile.zulu-11u9-jre-headless-tools b/docker/ubuntu/Dockerfile.zulu-11u9-jre-headless-tools
new file mode 100644
index 00000000..623553ba
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u9-jre-headless-tools
@@ -0,0 +1,31 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u9-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jdk:11u9-zulu-ubuntu AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG INSTALL_DIR=/usr/lib/jvm
+ARG JDK_DIR=${INSTALL_DIR}/zulu-11-azure-amd64
+ARG JRE_DIR=${INSTALL_DIR}/zre-hl-11-azure-amd64
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_TOOLS_DIR=${INSTALL_DIR}/zre-hl-tools-11-azure-amd64 && \
+    JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_TOOLS_DIR}
+
+FROM debian:buster
+
+ARG JRE_TOOLS_DIR=/usr/lib/jvm/zre-hl-tools-11-azure-amd64
+COPY --from=stage2 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+
+RUN cd /usr/bin && find ${JRE_TOOLS_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=${JRE_TOOLS_DIR}
diff --git a/docker/ubuntu/Dockerfile.zulu-8u275-jre-headless-tools b/docker/ubuntu/Dockerfile.zulu-8u275-jre-headless-tools
new file mode 100644
index 00000000..02b2fee6
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u275-jre-headless-tools
@@ -0,0 +1,22 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u275-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u275-zulu-ubuntu
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+
+ENV JAVA_HOME=${JRE_DIR}

From 530586391f2381a04410e6913a0c25776fb6c2f9 Mon Sep 17 00:00:00 2001
From: Stanislav Drozdov <sdrozdov@azul.com>
Date: Wed, 9 Dec 2020 18:39:01 +0300
Subject: [PATCH 209/264] add executable flag to shell scripts

---
 docker/alpine/Tomcat/v8/startup.sh      | 0
 docker/alpine/Tomcat/v9/startup.sh      | 0
 docker/centos/Tomcat/v8/startup.sh      | 0
 docker/centos/Tomcat/v9/startup.sh      | 0
 docker/debian10/Maven/mvn-entrypoint.sh | 0
 docker/debian10/Tomcat/v8/startup.sh    | 0
 docker/debian10/Tomcat/v9/startup.sh    | 0
 docker/debian9/Maven/mvn-entrypoint.sh  | 0
 docker/ubuntu/Tomcat/v8/startup.sh      | 0
 docker/ubuntu/Tomcat/v9/startup.sh      | 0
 10 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 docker/alpine/Tomcat/v8/startup.sh
 mode change 100644 => 100755 docker/alpine/Tomcat/v9/startup.sh
 mode change 100644 => 100755 docker/centos/Tomcat/v8/startup.sh
 mode change 100644 => 100755 docker/centos/Tomcat/v9/startup.sh
 mode change 100644 => 100755 docker/debian10/Maven/mvn-entrypoint.sh
 mode change 100644 => 100755 docker/debian10/Tomcat/v8/startup.sh
 mode change 100644 => 100755 docker/debian10/Tomcat/v9/startup.sh
 mode change 100644 => 100755 docker/debian9/Maven/mvn-entrypoint.sh
 mode change 100644 => 100755 docker/ubuntu/Tomcat/v8/startup.sh
 mode change 100644 => 100755 docker/ubuntu/Tomcat/v9/startup.sh

diff --git a/docker/alpine/Tomcat/v8/startup.sh b/docker/alpine/Tomcat/v8/startup.sh
old mode 100644
new mode 100755
diff --git a/docker/alpine/Tomcat/v9/startup.sh b/docker/alpine/Tomcat/v9/startup.sh
old mode 100644
new mode 100755
diff --git a/docker/centos/Tomcat/v8/startup.sh b/docker/centos/Tomcat/v8/startup.sh
old mode 100644
new mode 100755
diff --git a/docker/centos/Tomcat/v9/startup.sh b/docker/centos/Tomcat/v9/startup.sh
old mode 100644
new mode 100755
diff --git a/docker/debian10/Maven/mvn-entrypoint.sh b/docker/debian10/Maven/mvn-entrypoint.sh
old mode 100644
new mode 100755
diff --git a/docker/debian10/Tomcat/v8/startup.sh b/docker/debian10/Tomcat/v8/startup.sh
old mode 100644
new mode 100755
diff --git a/docker/debian10/Tomcat/v9/startup.sh b/docker/debian10/Tomcat/v9/startup.sh
old mode 100644
new mode 100755
diff --git a/docker/debian9/Maven/mvn-entrypoint.sh b/docker/debian9/Maven/mvn-entrypoint.sh
old mode 100644
new mode 100755
diff --git a/docker/ubuntu/Tomcat/v8/startup.sh b/docker/ubuntu/Tomcat/v8/startup.sh
old mode 100644
new mode 100755
diff --git a/docker/ubuntu/Tomcat/v9/startup.sh b/docker/ubuntu/Tomcat/v9/startup.sh
old mode 100644
new mode 100755

From 00113a3bd732b5612c4e314fcca726d7c1c5a534 Mon Sep 17 00:00:00 2001
From: zulu-ci <zulu-ci@azul.com>
Date: Wed, 9 Dec 2020 16:39:30 +0000
Subject: [PATCH 210/264] respin windows images for 11u9 and 13u5

---
 docker/windowsservercore/Dockerfile.zulu-11u9-jdk | 6 +++---
 docker/windowsservercore/Dockerfile.zulu-11u9-jre | 6 +++---
 docker/windowsservercore/Dockerfile.zulu-13u5-jdk | 6 +++---
 docker/windowsservercore/Dockerfile.zulu-13u5-jre | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docker/windowsservercore/Dockerfile.zulu-11u9-jdk b/docker/windowsservercore/Dockerfile.zulu-11u9-jdk
index 288f6286..fe71e51d 100644
--- a/docker/windowsservercore/Dockerfile.zulu-11u9-jdk
+++ b/docker/windowsservercore/Dockerfile.zulu-11u9-jdk
@@ -7,11 +7,11 @@
 FROM microsoft/windowsservercore:ltsc2016
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN setx PACKAGE zulu-11-azure-jdk_11.43.21-11.0.9-win_x64.msi && \
-    setx PACKAGE_DIR zulu-11/11.0.9 && \
+RUN setx PACKAGE zulu-11-azure-jdk_11.43.55-11.0.9.1-win_x64.msi && \
+    setx PACKAGE_DIR zulu-11/11.0.9.1 && \
     setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-11"
     
 
-RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.9/zulu-11-azure-jdk_11.43.21-11.0.9-win_x64.msi', 'C:\%PACKAGE%')
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.9.1/zulu-11-azure-jdk_11.43.55-11.0.9.1-win_x64.msi', 'C:\%PACKAGE%')
 RUN msiexec /quiet /i C:\%PACKAGE% && \
     del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-11u9-jre b/docker/windowsservercore/Dockerfile.zulu-11u9-jre
index 87b80f3e..94849d8b 100644
--- a/docker/windowsservercore/Dockerfile.zulu-11u9-jre
+++ b/docker/windowsservercore/Dockerfile.zulu-11u9-jre
@@ -7,10 +7,10 @@
 FROM microsoft/windowsservercore:ltsc2016
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN setx PACKAGE zulu-11-azure-jre_11.43.21-11.0.9-win_x64.msi && \
-    setx PACKAGE_DIR zulu-11/11.0.9 && \
+RUN setx PACKAGE zulu-11-azure-jre_11.43.55-11.0.9.1-win_x64.msi && \
+    setx PACKAGE_DIR zulu-11/11.0.9.1 && \
     setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-11-jre"
 
-RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.9/zulu-11-azure-jre_11.43.21-11.0.9-win_x64.msi', 'C:\%PACKAGE%')
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.9.1/zulu-11-azure-jre_11.43.55-11.0.9.1-win_x64.msi', 'C:\%PACKAGE%')
 RUN msiexec /quiet /i C:\%PACKAGE% && \
     del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-13u5-jdk b/docker/windowsservercore/Dockerfile.zulu-13u5-jdk
index 550932c2..b667880f 100644
--- a/docker/windowsservercore/Dockerfile.zulu-13u5-jdk
+++ b/docker/windowsservercore/Dockerfile.zulu-13u5-jdk
@@ -7,11 +7,11 @@
 FROM microsoft/windowsservercore:ltsc2016
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN setx PACKAGE zulu-13-azure-jdk_13.35.17-13.0.5-win_x64.msi && \
-    setx PACKAGE_DIR zulu-13/13.0.5 && \
+RUN setx PACKAGE zulu-13-azure-jdk_13.35.51-13.0.5.1-win_x64.msi && \
+    setx PACKAGE_DIR zulu-13/13.0.5.1 && \
     setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-13"
     
 
-RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.5/zulu-13-azure-jdk_13.35.17-13.0.5-win_x64.msi', 'C:\%PACKAGE%')
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.5.1/zulu-13-azure-jdk_13.35.51-13.0.5.1-win_x64.msi', 'C:\%PACKAGE%')
 RUN msiexec /quiet /i C:\%PACKAGE% && \
     del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-13u5-jre b/docker/windowsservercore/Dockerfile.zulu-13u5-jre
index 21d1110d..3af56fde 100644
--- a/docker/windowsservercore/Dockerfile.zulu-13u5-jre
+++ b/docker/windowsservercore/Dockerfile.zulu-13u5-jre
@@ -7,10 +7,10 @@
 FROM microsoft/windowsservercore:ltsc2016
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-RUN setx PACKAGE zulu-13-azure-jre_13.35.17-13.0.5-win_x64.msi && \
-    setx PACKAGE_DIR zulu-13/13.0.5 && \
+RUN setx PACKAGE zulu-13-azure-jre_13.35.51-13.0.5.1-win_x64.msi && \
+    setx PACKAGE_DIR zulu-13/13.0.5.1 && \
     setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-13-jre"
 
-RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.5/zulu-13-azure-jre_13.35.17-13.0.5-win_x64.msi', 'C:\%PACKAGE%')
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.5.1/zulu-13-azure-jre_13.35.51-13.0.5.1-win_x64.msi', 'C:\%PACKAGE%')
 RUN msiexec /quiet /i C:\%PACKAGE% && \
     del C:\%PACKAGE%

From c2a4d263ed4d988976a7a02ec28f16a58291b6cb Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 9 Dec 2020 11:27:02 -0600
Subject: [PATCH 211/264] Renamed Dockerfile.zulu-8u275-maven to
 Dockerfile.zulu-8u275-jdk-maven

---
 .../debian9/Dockerfile.zulu-8u275-jdk-maven   | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 docker/debian9/Dockerfile.zulu-8u275-jdk-maven

diff --git a/docker/debian9/Dockerfile.zulu-8u275-jdk-maven b/docker/debian9/Dockerfile.zulu-8u275-jdk-maven
new file mode 100644
index 00000000..1c40627f
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u275-jdk-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u275-zulu-debian9
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]

From 6fd044526b9d8f269a32fdc18493d9738e7ecbd4 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 9 Dec 2020 11:28:56 -0600
Subject: [PATCH 212/264] Renamed Dockerfile.zulu-8u275-maven to
 Dockerfile.zulu-8u275-jdk-maven

---
 .../debian10/Dockerfile.zulu-8u275-jdk-maven  | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 docker/debian10/Dockerfile.zulu-8u275-jdk-maven

diff --git a/docker/debian10/Dockerfile.zulu-8u275-jdk-maven b/docker/debian10/Dockerfile.zulu-8u275-jdk-maven
new file mode 100644
index 00000000..f1fc2859
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u275-jdk-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u275-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]

From 0d0a61d43a5d93a040272948050beea38da47c1e Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 9 Dec 2020 11:29:36 -0600
Subject: [PATCH 213/264] Delete Dockerfile.zulu-8u275-maven

---
 docker/debian9/Dockerfile.zulu-8u275-maven | 31 ----------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 docker/debian9/Dockerfile.zulu-8u275-maven

diff --git a/docker/debian9/Dockerfile.zulu-8u275-maven b/docker/debian9/Dockerfile.zulu-8u275-maven
deleted file mode 100644
index 1c40627f..00000000
--- a/docker/debian9/Dockerfile.zulu-8u275-maven
+++ /dev/null
@@ -1,31 +0,0 @@
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM mcr.microsoft.com/java/jdk:8u275-zulu-debian9
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-ARG MAVEN_VERSION=3.6.3
-ARG USER_HOME_DIR="/root"
-ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
-ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install curl && \
-    mkdir -p /usr/share/maven /usr/share/maven/ref && \
-    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
-    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
-    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
-    rm -f /tmp/apache-maven.tar.gz && \
-    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV MAVEN_HOME /usr/share/maven
-ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
-
-COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY Maven/settings-docker.xml /usr/share/maven/ref/
-
-ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
-CMD ["mvn"]

From 537a5e55ee375b08a185483d287c7036f6c6feda Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Wed, 9 Dec 2020 11:29:58 -0600
Subject: [PATCH 214/264] Delete Dockerfile.zulu-8u275-maven

---
 docker/debian10/Dockerfile.zulu-8u275-maven | 31 ---------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 docker/debian10/Dockerfile.zulu-8u275-maven

diff --git a/docker/debian10/Dockerfile.zulu-8u275-maven b/docker/debian10/Dockerfile.zulu-8u275-maven
deleted file mode 100644
index f1fc2859..00000000
--- a/docker/debian10/Dockerfile.zulu-8u275-maven
+++ /dev/null
@@ -1,31 +0,0 @@
-# This Zulu OpenJDK Dockerfile and corresponding Docker image are
-# to be used solely with Java applications or Java application components
-# that are being developed for deployment on Microsoft Azure or Azure Stack,
-# and are not intended to be used for any other purpose.
-
-FROM mcr.microsoft.com/java/jdk:8u275-zulu-debian10
-MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
-
-ARG MAVEN_VERSION=3.6.3
-ARG USER_HOME_DIR="/root"
-ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
-ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
-
-RUN apt-get -qq update && \
-    apt-get -qq -y --no-install-recommends install curl && \
-    mkdir -p /usr/share/maven /usr/share/maven/ref && \
-    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
-    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
-    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
-    rm -f /tmp/apache-maven.tar.gz && \
-    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV MAVEN_HOME /usr/share/maven
-ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
-
-COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
-COPY Maven/settings-docker.xml /usr/share/maven/ref/
-
-ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
-CMD ["mvn"]

From 2518110da4fc570c94de55b6426a684bf0d7eea4 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Mon, 14 Dec 2020 14:31:28 -0600
Subject: [PATCH 215/264] Added Dockerfiles for 7u285 and 8u275. Changed
 Dockerfile for 15u1

---
 .../Dockerfile.zulu-15u1-jre-tools            |  6 ++--
 .../Dockerfile.zulu-7u285-jre-tools           | 35 +++++++++++++++++++
 .../Dockerfile.zulu-8u275-jre-tools           | 35 +++++++++++++++++++
 3 files changed, 73 insertions(+), 3 deletions(-)
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-7u285-jre-tools
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-8u275-jre-tools

diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-15u1-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-15u1-jre-tools
index 271abb64..2587fa51 100644
--- a/docker/windowsnanoserver-2004/Dockerfile.zulu-15u1-jre-tools
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-15u1-jre-tools
@@ -8,8 +8,8 @@ FROM mcr.microsoft.com/java/jdk:15u1-zulu-windowsservercore AS stage1
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 ARG PACKAGE_DIR=zulu-15/15.0.1
-ARG JRE_PACKAGE=zulu-15-azure-jre_15.28.13-15.0.1-win_x64.msi
-ARG JRE_TOOLS_DIR="C:\zulu-15-azure-jre-tools_15.28.13-15.0.1-win_x64"
+ARG JRE_PACKAGE=zulu-15-azure-jre_15.28.51-15.0.1-win_x64.msi
+ARG JRE_TOOLS_DIR="C:\zulu-15-azure-jre-tools_15.28.51-15.0.1-win_x64"
 ARG JRE_DIR="C:\Program Files\Zulu\zulu-15-jre"
 ARG JDK_DIR="C:\Program Files\Zulu\zulu-15"
 
@@ -28,7 +28,7 @@ RUN jlink --no-header-files --strip-debug --module-path "%JDK_DIR%\jmods" --add-
 
 FROM mcr.microsoft.com/windows/nanoserver:2004
 
-ARG JRE_TOOLS_DIR="C:\zulu-15-azure-jre-tools_15.28.13-15.0.1-win_x64"
+ARG JRE_TOOLS_DIR="C:\zulu-15-azure-jre-tools_15.28.51-15.0.1-win_x64"
 
 USER ContainerAdministrator
 RUN setx /m JAVA_HOME "%JRE_TOOLS_DIR%" && \
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-7u285-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-7u285-jre-tools
new file mode 100644
index 00000000..251c6202
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-7u285-jre-tools
@@ -0,0 +1,35 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:7u285-zulu-windowsservercore AS stage1
+FROM mcr.microsoft.com/windows/nanoserver:2004
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-7/7u285
+ARG JRE_TOOLS_DIR=zulu-7-azure-jre-tools_7.42.0.51-7.0.285-win_x64
+ARG JRE_DIR=zulu-7-azure-jre_7.42.0.51-7.0.285-win_x64
+ARG JRE_PACKAGE=$JRE_DIR.zip
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-7"
+    
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "C:\%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+RUN curl https://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%JRE_PACKAGE% -o %JRE_PACKAGE% && \
+    tar -xf %JRE_PACKAGE% && \
+    del %JRE_PACKAGE% && \
+    move %JRE_DIR% %JRE_TOOLS_DIR%
+
+COPY --from=stage1 ${JDK_DIR}/bin/jstack.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_TOOLS_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/bin/attach.dll ${JRE_TOOLS_DIR}/bin
+
+USER ContainerUser
+RUN echo JAVA_HOME=%JAVA_HOME% && \
+    java -version
+
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-8u275-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-8u275-jre-tools
new file mode 100644
index 00000000..589d2627
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-8u275-jre-tools
@@ -0,0 +1,35 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u275-zulu-windowsservercore AS stage1
+FROM mcr.microsoft.com/windows/nanoserver:2004
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-8/8u275
+ARG JRE_TOOLS_DIR=zulu-8-azure-jre-tools_8.50.0.51-8.0.275-win_x64
+ARG JRE_DIR=zulu-8-azure-jre_8.50.0.51-8.0.275-win_x64
+ARG JRE_PACKAGE=$JRE_DIR.zip
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-8"
+    
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "C:\%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+RUN curl https://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%JRE_PACKAGE% -o %JRE_PACKAGE% && \
+    tar -xf %JRE_PACKAGE% && \
+    del %JRE_PACKAGE% && \
+    move %JRE_DIR% %JRE_TOOLS_DIR%
+
+COPY --from=stage1 ${JDK_DIR}/bin/jstack.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_TOOLS_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/bin/attach.dll ${JRE_TOOLS_DIR}/bin
+
+USER ContainerUser
+RUN echo JAVA_HOME=%JAVA_HOME% && \
+    java -version
+

From 729df14d3b51da72fafc75f6bc0b42394f076ac4 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 19 Jan 2021 08:28:45 -0600
Subject: [PATCH 216/264] Added Tomcat Dockerfiles for January release of Zulu

---
 ...file.zulu-11u10-jre-headless-tools-tomcat8 | 66 +++++++++++++++++++
 ...file.zulu-11u10-jre-headless-tools-tomcat9 | 66 +++++++++++++++++++
 ...file.zulu-8u282-jre-headless-tools-tomcat8 | 61 +++++++++++++++++
 ...file.zulu-8u282-jre-headless-tools-tomcat9 | 61 +++++++++++++++++
 4 files changed, 254 insertions(+)
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9

diff --git a/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8 b/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..4bea14c0
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
@@ -0,0 +1,66 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u10-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jdk:11u10-zulu-ubuntu AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure-amd64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM ubuntu:focal AS stage3
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.59
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install ca-certificates curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9 b/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..e18c4979
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
@@ -0,0 +1,66 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u10-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jdk:11u10-zulu-ubuntu AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure-amd64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM ubuntu:focal AS stage3
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.39
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install ca-certificates curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8 b/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..e3357cf3
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
@@ -0,0 +1,61 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u282-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u282-zulu-ubuntu
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.59
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9 b/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..4da24375
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9
@@ -0,0 +1,61 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u282-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u282-zulu-ubuntu
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.39
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]

From c4c2f8d9cfc7cfd586ecb979e1fe731d4e6f3310 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 19 Jan 2021 08:29:58 -0600
Subject: [PATCH 217/264] Added Tomcat Dockerfiles for January release of Zulu

---
 ...file.zulu-11u10-jre-headless-tools-tomcat8 | 66 +++++++++++++++++++
 ...file.zulu-11u10-jre-headless-tools-tomcat9 | 66 +++++++++++++++++++
 ...file.zulu-8u282-jre-headless-tools-tomcat8 | 61 +++++++++++++++++
 3 files changed, 193 insertions(+)
 create mode 100644 docker/debian10/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
 create mode 100644 docker/debian10/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
 create mode 100644 docker/debian10/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8

diff --git a/docker/debian10/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8 b/docker/debian10/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..22f70af8
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
@@ -0,0 +1,66 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u10-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jdk:11u10-zulu-debian10 AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure-amd64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM debian:buster AS stage3
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.59
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install ca-certificates curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/debian10/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9 b/docker/debian10/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..0fb197b2
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
@@ -0,0 +1,66 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u10-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jdk:11u10-zulu-debian10 AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure-amd64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM debian:buster AS stage3
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.39
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install ca-certificates curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/debian10/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8 b/docker/debian10/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..1e72d1d5
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
@@ -0,0 +1,61 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u282-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u282-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.59
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]

From b3734b51c662c4f16ec14e4f02371a0ab547f860 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 19 Jan 2021 08:31:00 -0600
Subject: [PATCH 218/264] Added Tomcat Dockerfiles for January release of Zulu

---
 ...file.zulu-11u10-jre-headless-tools-tomcat8 | 62 +++++++++++++++++++
 ...file.zulu-11u10-jre-headless-tools-tomcat9 | 62 +++++++++++++++++++
 ...file.zulu-8u282-jre-headless-tools-tomcat8 | 57 +++++++++++++++++
 ...file.zulu-8u282-jre-headless-tools-tomcat9 | 57 +++++++++++++++++
 4 files changed, 238 insertions(+)
 create mode 100644 docker/centos/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
 create mode 100644 docker/centos/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
 create mode 100644 docker/centos/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
 create mode 100644 docker/centos/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9

diff --git a/docker/centos/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8 b/docker/centos/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..b8cc60d0
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
@@ -0,0 +1,62 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u10-zulu-centos AS stage1
+FROM mcr.microsoft.com/java/jdk:11u10-zulu-centos AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM centos:latest AS stage3
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.59
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+RUN yum -q -y update && \
+    yum -q -y install unzip && \
+    yum -q -y upgrade && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
+       
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/centos/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9 b/docker/centos/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..b62d33a4
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
@@ -0,0 +1,62 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u10-zulu-centos AS stage1
+FROM mcr.microsoft.com/java/jdk:11u10-zulu-centos AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM centos:latest AS stage3
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.39
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+RUN yum -q -y update && \
+    yum -q -y install unzip && \
+    yum -q -y upgrade && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
+       
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/centos/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8 b/docker/centos/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..c7632113
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
@@ -0,0 +1,57 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u282-zulu-centos AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u282-zulu-centos
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.59
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+RUN yum -q -y update && \
+    yum -q -y install unzip && \
+    yum -q -y upgrade && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
+       
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/centos/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9 b/docker/centos/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..a2d45555
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9
@@ -0,0 +1,57 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u282-zulu-centos AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u282-zulu-centos
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.39
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+RUN yum -q -y update && \
+    yum -q -y install unzip && \
+    yum -q -y upgrade && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
+       
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]

From 0b19c89b02ae7b96b8744932b970efa50d9444b0 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 19 Jan 2021 08:31:58 -0600
Subject: [PATCH 219/264] Added Tomcat Dockerfiles for January release of Zulu

---
 ...file.zulu-11u10-jre-headless-tools-tomcat8 | 72 +++++++++++++++++++
 ...file.zulu-11u10-jre-headless-tools-tomcat9 | 72 +++++++++++++++++++
 ...file.zulu-8u282-jre-headless-tools-tomcat8 | 67 +++++++++++++++++
 ...file.zulu-8u282-jre-headless-tools-tomcat9 | 67 +++++++++++++++++
 4 files changed, 278 insertions(+)
 create mode 100644 docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
 create mode 100644 docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
 create mode 100644 docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
 create mode 100644 docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9

diff --git a/docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8 b/docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..d65ee06f
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
@@ -0,0 +1,72 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u10-zulu-alpine AS stage1
+FROM mcr.microsoft.com/java/jdk:11u10-zulu-alpine AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-jdk_11.45.28-11.0.10-linux_musl_x64
+ARG JRE_DIR=/usr/lib/jvm/zulu-11-azure-jre-headless_11.45.28-11.0.10-linux_musl_x64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM alpine AS stage3
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.59
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apk add --update openssh-server bash openrc && \
+    apk update && \
+    apk upgrade && \
+    rm -rf /var/cache/apk/* && \
+    # Remove unnecessary services
+    rm -f /etc/init.d/hwdrivers \
+          /etc/init.d/hwclock \
+          /etc/init.d/mtab \
+          /etc/init.d/bootmisc \
+          /etc/init.d/modules \
+          /etc/init.d/modules-load \
+          /etc/init.d/modloop && \
+    # Install Tomcat
+    wget -O /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9 b/docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..55a81380
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
@@ -0,0 +1,72 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u10-zulu-alpine AS stage1
+FROM mcr.microsoft.com/java/jdk:11u10-zulu-alpine AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-jdk_11.45.28-11.0.10-linux_musl_x64
+ARG JRE_DIR=/usr/lib/jvm/zulu-11-azure-jre-headless_11.45.28-11.0.10-linux_musl_x64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM alpine AS stage3
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.39
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apk add --update openssh-server bash openrc && \
+    apk update && \
+    apk upgrade && \
+    rm -rf /var/cache/apk/* && \
+    # Remove unnecessary services
+    rm -f /etc/init.d/hwdrivers \
+          /etc/init.d/hwclock \
+          /etc/init.d/mtab \
+          /etc/init.d/bootmisc \
+          /etc/init.d/modules \
+          /etc/init.d/modules-load \
+          /etc/init.d/modloop && \
+    # Install Tomcat
+    wget -O /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8 b/docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..3b7f41c9
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
@@ -0,0 +1,67 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u282-zulu-alpine AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u282-zulu-alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-jdk_8.52.0.24-8.0.282-linux_musl_x64
+ARG JRE_DIR=/usr/lib/jvm/zulu-8-azure-jre-headless_8.52.0.24-8.0.282-linux_musl_x64
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.59
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apk add --update openssh-server bash openrc && \
+    apk update && \
+    apk upgrade && \
+    rm -rf /var/cache/apk/* && \
+    # Remove unnecessary services
+    rm -f /etc/init.d/hwdrivers \
+          /etc/init.d/hwclock \
+          /etc/init.d/mtab \
+          /etc/init.d/bootmisc \
+          /etc/init.d/modules \
+          /etc/init.d/modules-load \
+          /etc/init.d/modloop && \
+    # Install Tomcat
+    wget -O /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9 b/docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..2001922f
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9
@@ -0,0 +1,67 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u282-zulu-alpine AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u282-zulu-alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-jdk_8.52.0.24-8.0.282-linux_musl_x64
+ARG JRE_DIR=/usr/lib/jvm/zulu-8-azure-jre-headless_8.52.0.24-8.0.282-linux_musl_x64
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.39
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apk add --update openssh-server bash openrc && \
+    apk update && \
+    apk upgrade && \
+    rm -rf /var/cache/apk/* && \
+    # Remove unnecessary services
+    rm -f /etc/init.d/hwdrivers \
+          /etc/init.d/hwclock \
+          /etc/init.d/mtab \
+          /etc/init.d/bootmisc \
+          /etc/init.d/modules \
+          /etc/init.d/modules-load \
+          /etc/init.d/modloop && \
+    # Install Tomcat
+    wget -O /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar xvzf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]

From 9466a2d783273bb3fafee6edaf08db8d638c6496 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 21 Jan 2021 11:59:00 -0600
Subject: [PATCH 220/264] Changed Zulu package filename

---
 .../alpine/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8   | 4 ++--
 .../alpine/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9   | 4 ++--
 .../alpine/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8   | 4 ++--
 .../alpine/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8 b/docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
index d65ee06f..5557e7c6 100644
--- a/docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
+++ b/docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
@@ -8,8 +8,8 @@ FROM mcr.microsoft.com/java/jre-headless:11u10-zulu-alpine AS stage1
 FROM mcr.microsoft.com/java/jdk:11u10-zulu-alpine AS stage2
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-jdk_11.45.28-11.0.10-linux_musl_x64
-ARG JRE_DIR=/usr/lib/jvm/zulu-11-azure-jre-headless_11.45.28-11.0.10-linux_musl_x64
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-jdk_11.45.27-11.0.10-linux_musl_x64
+ARG JRE_DIR=/usr/lib/jvm/zulu-11-azure-jre-headless_11.45.27-11.0.10-linux_musl_x64
 
 COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
 
diff --git a/docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9 b/docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
index 55a81380..52f4ac95 100644
--- a/docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
+++ b/docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
@@ -8,8 +8,8 @@ FROM mcr.microsoft.com/java/jre-headless:11u10-zulu-alpine AS stage1
 FROM mcr.microsoft.com/java/jdk:11u10-zulu-alpine AS stage2
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-jdk_11.45.28-11.0.10-linux_musl_x64
-ARG JRE_DIR=/usr/lib/jvm/zulu-11-azure-jre-headless_11.45.28-11.0.10-linux_musl_x64
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-jdk_11.45.27-11.0.10-linux_musl_x64
+ARG JRE_DIR=/usr/lib/jvm/zulu-11-azure-jre-headless_11.45.27-11.0.10-linux_musl_x64
 
 COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
 
diff --git a/docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8 b/docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
index 3b7f41c9..1f8afb87 100644
--- a/docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
+++ b/docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
@@ -8,8 +8,8 @@ FROM mcr.microsoft.com/java/jdk:8u282-zulu-alpine AS stage1
 FROM mcr.microsoft.com/java/jre-headless:8u282-zulu-alpine
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-jdk_8.52.0.24-8.0.282-linux_musl_x64
-ARG JRE_DIR=/usr/lib/jvm/zulu-8-azure-jre-headless_8.52.0.24-8.0.282-linux_musl_x64
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-jdk_8.52.0.23-8.0.282-linux_musl_x64
+ARG JRE_DIR=/usr/lib/jvm/zulu-8-azure-jre-headless_8.52.0.23-8.0.282-linux_musl_x64
 
 ARG TOMCAT_MAJOR=8
 ARG TOMCAT_VERSION=8.5.59
diff --git a/docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9 b/docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9
index 2001922f..054a23aa 100644
--- a/docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9
+++ b/docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9
@@ -8,8 +8,8 @@ FROM mcr.microsoft.com/java/jdk:8u282-zulu-alpine AS stage1
 FROM mcr.microsoft.com/java/jre-headless:8u282-zulu-alpine
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
-ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-jdk_8.52.0.24-8.0.282-linux_musl_x64
-ARG JRE_DIR=/usr/lib/jvm/zulu-8-azure-jre-headless_8.52.0.24-8.0.282-linux_musl_x64
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-jdk_8.52.0.23-8.0.282-linux_musl_x64
+ARG JRE_DIR=/usr/lib/jvm/zulu-8-azure-jre-headless_8.52.0.23-8.0.282-linux_musl_x64
 
 ARG TOMCAT_MAJOR=9
 ARG TOMCAT_VERSION=9.0.39

From ebc2b283fd6e5e4f5ad1129ee422302e1941a76e Mon Sep 17 00:00:00 2001
From: zulu-ci <zulu-ci@azul.com>
Date: Tue, 26 Jan 2021 11:23:23 +0000
Subject: [PATCH 221/264] january zulu release dockerfiles

---
 docker/alpine/Dockerfile.zulu-11u10-jdk       | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-11u10-jre       | 32 ++++++++++++++
 .../alpine/Dockerfile.zulu-11u10-jre-headless | 32 ++++++++++++++
 .../Dockerfile.zulu-11u10-jre-headless-tools  | 30 +++++++++++++
 docker/alpine/Dockerfile.zulu-13u6-jdk        | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-13u6-jre        | 30 +++++++++++++
 .../alpine/Dockerfile.zulu-13u6-jre-headless  | 30 +++++++++++++
 .../Dockerfile.zulu-13u6-jre-headless-tools   | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-15u2-jdk        | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-15u2-jre        | 30 +++++++++++++
 .../alpine/Dockerfile.zulu-15u2-jre-headless  | 30 +++++++++++++
 docker/alpine/Dockerfile.zulu-7u292-jdk       | 44 +++++++++++++++++++
 docker/alpine/Dockerfile.zulu-7u292-jre       | 44 +++++++++++++++++++
 .../alpine/Dockerfile.zulu-7u292-jre-headless | 44 +++++++++++++++++++
 docker/alpine/Dockerfile.zulu-8u282-jdk       | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-8u282-jre       | 32 ++++++++++++++
 .../alpine/Dockerfile.zulu-8u282-jre-headless | 32 ++++++++++++++
 .../Dockerfile.zulu-8u282-jre-headless-tools  | 32 ++++++++++++++
 docker/centos/Dockerfile.zulu-11u10-jdk       | 17 +++++++
 docker/centos/Dockerfile.zulu-11u10-jre       | 17 +++++++
 .../centos/Dockerfile.zulu-11u10-jre-headless | 16 +++++++
 docker/centos/Dockerfile.zulu-13u6-jdk        | 17 +++++++
 docker/centos/Dockerfile.zulu-13u6-jre        | 17 +++++++
 .../centos/Dockerfile.zulu-13u6-jre-headless  | 16 +++++++
 docker/centos/Dockerfile.zulu-15u2-jdk        | 17 +++++++
 docker/centos/Dockerfile.zulu-15u2-jre        | 17 +++++++
 .../centos/Dockerfile.zulu-15u2-jre-headless  | 16 +++++++
 docker/centos/Dockerfile.zulu-7u292-jdk       | 17 +++++++
 docker/centos/Dockerfile.zulu-7u292-jre       | 17 +++++++
 .../centos/Dockerfile.zulu-7u292-jre-headless | 16 +++++++
 docker/centos/Dockerfile.zulu-8u282-jdk       | 17 +++++++
 docker/centos/Dockerfile.zulu-8u282-jre       | 17 +++++++
 .../centos/Dockerfile.zulu-8u282-jre-headless | 16 +++++++
 docker/debian10/Dockerfile.zulu-11u10-jdk     | 21 +++++++++
 docker/debian10/Dockerfile.zulu-11u10-jre     | 21 +++++++++
 .../Dockerfile.zulu-11u10-jre-headless        | 21 +++++++++
 .../Dockerfile.zulu-11u10-jre-headless-tools  | 30 +++++++++++++
 docker/debian10/Dockerfile.zulu-11u10-maven   | 31 +++++++++++++
 docker/debian10/Dockerfile.zulu-13u6-jdk      | 21 +++++++++
 docker/debian10/Dockerfile.zulu-13u6-jre      | 21 +++++++++
 .../Dockerfile.zulu-13u6-jre-headless         | 21 +++++++++
 docker/debian10/Dockerfile.zulu-15u2-jdk      | 21 +++++++++
 docker/debian10/Dockerfile.zulu-15u2-jre      | 21 +++++++++
 .../Dockerfile.zulu-15u2-jre-headless         | 21 +++++++++
 docker/debian10/Dockerfile.zulu-7u292-jdk     | 21 +++++++++
 docker/debian10/Dockerfile.zulu-7u292-jre     | 21 +++++++++
 .../Dockerfile.zulu-7u292-jre-headless        | 21 +++++++++
 docker/debian10/Dockerfile.zulu-8u282-jdk     | 21 +++++++++
 docker/debian10/Dockerfile.zulu-8u282-jre     | 21 +++++++++
 .../Dockerfile.zulu-8u282-jre-headless        | 21 +++++++++
 .../Dockerfile.zulu-8u282-jre-headless-tools  | 23 ++++++++++
 docker/debian10/Dockerfile.zulu-8u282-maven   | 31 +++++++++++++
 docker/debian9/Dockerfile.zulu-11u10-jdk      | 21 +++++++++
 docker/debian9/Dockerfile.zulu-11u10-jre      | 21 +++++++++
 .../Dockerfile.zulu-11u10-jre-headless        | 21 +++++++++
 docker/debian9/Dockerfile.zulu-11u10-maven    | 31 +++++++++++++
 docker/debian9/Dockerfile.zulu-13u6-jdk       | 21 +++++++++
 docker/debian9/Dockerfile.zulu-13u6-jre       | 21 +++++++++
 .../debian9/Dockerfile.zulu-13u6-jre-headless | 21 +++++++++
 docker/debian9/Dockerfile.zulu-15u2-jdk       | 21 +++++++++
 docker/debian9/Dockerfile.zulu-15u2-jre       | 21 +++++++++
 .../debian9/Dockerfile.zulu-15u2-jre-headless | 21 +++++++++
 docker/debian9/Dockerfile.zulu-7u292-jdk      | 21 +++++++++
 docker/debian9/Dockerfile.zulu-7u292-jre      | 21 +++++++++
 .../Dockerfile.zulu-7u292-jre-headless        | 21 +++++++++
 docker/debian9/Dockerfile.zulu-8u282-jdk      | 21 +++++++++
 docker/debian9/Dockerfile.zulu-8u282-jre      | 21 +++++++++
 .../Dockerfile.zulu-8u282-jre-headless        | 21 +++++++++
 docker/debian9/Dockerfile.zulu-8u282-maven    | 31 +++++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-11u10-jdk | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-11u10-jre | 21 +++++++++
 .../Dockerfile.zulu-11u10-jre-headless        | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-13u6-jdk  | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-13u6-jre  | 21 +++++++++
 .../Dockerfile.zulu-13u6-jre-headless         | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-15u2-jdk  | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-15u2-jre  | 21 +++++++++
 .../Dockerfile.zulu-15u2-jre-headless         | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-7u292-jdk | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-7u292-jre | 21 +++++++++
 .../Dockerfile.zulu-7u292-jre-headless        | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-8u282-jdk | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-8u282-jre | 21 +++++++++
 .../Dockerfile.zulu-8u282-jre-headless        | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-11u10-jdk       | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-11u10-jre       | 21 +++++++++
 .../ubuntu/Dockerfile.zulu-11u10-jre-headless | 21 +++++++++
 .../Dockerfile.zulu-11u10-jre-headless-tools  | 31 +++++++++++++
 docker/ubuntu/Dockerfile.zulu-13u6-jdk        | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-13u6-jre        | 21 +++++++++
 .../ubuntu/Dockerfile.zulu-13u6-jre-headless  | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-15u2-jdk        | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-15u2-jre        | 21 +++++++++
 .../ubuntu/Dockerfile.zulu-15u2-jre-headless  | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-7u292-jdk       | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-7u292-jre       | 21 +++++++++
 .../ubuntu/Dockerfile.zulu-7u292-jre-headless | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-8u282-jdk       | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-8u282-jre       | 21 +++++++++
 .../ubuntu/Dockerfile.zulu-8u282-jre-headless | 21 +++++++++
 .../Dockerfile.zulu-8u282-jre-headless-tools  | 23 ++++++++++
 .../Dockerfile.zulu-11u10-jre-tools           | 38 ++++++++++++++++
 .../Dockerfile.zulu-13u6-jre-tools            | 38 ++++++++++++++++
 .../Dockerfile.zulu-14u2-jre-tools            | 38 ++++++++++++++++
 .../Dockerfile.zulu-15u2-jre-tools            | 38 ++++++++++++++++
 .../Dockerfile.zulu-7u292-jre-tools           | 32 ++++++++++++++
 .../Dockerfile.zulu-8u282-jre-tools           | 32 ++++++++++++++
 .../Dockerfile.zulu-11u10-jdk                 | 17 +++++++
 .../Dockerfile.zulu-11u10-jre                 | 16 +++++++
 .../Dockerfile.zulu-13u6-jdk                  | 17 +++++++
 .../Dockerfile.zulu-13u6-jre                  | 16 +++++++
 .../Dockerfile.zulu-15u2-jdk                  | 17 +++++++
 .../Dockerfile.zulu-15u2-jre                  | 16 +++++++
 .../Dockerfile.zulu-7u292-jdk                 | 17 +++++++
 .../Dockerfile.zulu-7u292-jre                 | 16 +++++++
 .../Dockerfile.zulu-8u282-jdk                 | 17 +++++++
 .../Dockerfile.zulu-8u282-jre                 | 16 +++++++
 117 files changed, 2724 insertions(+)
 create mode 100644 docker/alpine/Dockerfile.zulu-11u10-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-11u10-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-11u10-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools
 create mode 100644 docker/alpine/Dockerfile.zulu-13u6-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-13u6-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-13u6-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-13u6-jre-headless-tools
 create mode 100644 docker/alpine/Dockerfile.zulu-15u2-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-15u2-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-15u2-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-7u292-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-7u292-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-7u292-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-8u282-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-8u282-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-8u282-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools
 create mode 100644 docker/centos/Dockerfile.zulu-11u10-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-11u10-jre
 create mode 100644 docker/centos/Dockerfile.zulu-11u10-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-13u6-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-13u6-jre
 create mode 100644 docker/centos/Dockerfile.zulu-13u6-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-15u2-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-15u2-jre
 create mode 100644 docker/centos/Dockerfile.zulu-15u2-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-7u292-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-7u292-jre
 create mode 100644 docker/centos/Dockerfile.zulu-7u292-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-8u282-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-8u282-jre
 create mode 100644 docker/centos/Dockerfile.zulu-8u282-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-11u10-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-11u10-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-11u10-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-11u10-jre-headless-tools
 create mode 100644 docker/debian10/Dockerfile.zulu-11u10-maven
 create mode 100644 docker/debian10/Dockerfile.zulu-13u6-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-13u6-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-13u6-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-15u2-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-15u2-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-15u2-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-7u292-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-7u292-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-7u292-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-8u282-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-8u282-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-8u282-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-8u282-jre-headless-tools
 create mode 100644 docker/debian10/Dockerfile.zulu-8u282-maven
 create mode 100644 docker/debian9/Dockerfile.zulu-11u10-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-11u10-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-11u10-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-11u10-maven
 create mode 100644 docker/debian9/Dockerfile.zulu-13u6-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-13u6-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-13u6-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-15u2-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-15u2-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-15u2-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-7u292-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-7u292-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-7u292-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-8u282-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-8u282-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-8u282-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-8u282-maven
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-11u10-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-11u10-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-11u10-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-13u6-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-13u6-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-13u6-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-15u2-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-15u2-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-15u2-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u292-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u292-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u292-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u282-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u282-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u282-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u10-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u10-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u10-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools
 create mode 100644 docker/ubuntu/Dockerfile.zulu-13u6-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-13u6-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-13u6-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-15u2-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-15u2-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-15u2-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-7u292-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-7u292-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-7u292-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u282-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u282-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u282-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-11u10-jre-tools
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-13u6-jre-tools
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-14u2-jre-tools
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-15u2-jre-tools
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-7u292-jre-tools
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-8u282-jre-tools
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-11u10-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-11u10-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-13u6-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-13u6-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-15u2-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-15u2-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-7u292-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-7u292-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-8u282-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-8u282-jre

diff --git a/docker/alpine/Dockerfile.zulu-11u10-jdk b/docker/alpine/Dockerfile.zulu-11u10-jdk
new file mode 100644
index 00000000..39b977bb
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u10-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jdk_11.45.27-11.0.10-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.10/zulu-11-azure-jdk_11.45.27-11.0.10-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-11u10-jre b/docker/alpine/Dockerfile.zulu-11u10-jre
new file mode 100644
index 00000000..4ea9d890
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u10-jre
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jre_11.45.27-11.0.10-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.10/zulu-11-azure-jre_11.45.27-11.0.10-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-11u10-jre-headless b/docker/alpine/Dockerfile.zulu-11u10-jre-headless
new file mode 100644
index 00000000..ec37891b
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u10-jre-headless
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jre-headless_11.45.27-11.0.10-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.10/zulu-11-azure-jre-headless_11.45.27-11.0.10-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools b/docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools
new file mode 100644
index 00000000..461dcfd5
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jre-headless-tools_11.45.27-11.0.10-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.10/zulu-11-azure-jre-headless-tools_11.45.27-11.0.10-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-13u6-jdk b/docker/alpine/Dockerfile.zulu-13u6-jdk
new file mode 100644
index 00000000..f1a57d4d
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u6-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jdk_13.37.21-13.0.6-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.6/zulu-13-azure-jdk_13.37.21-13.0.6-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-13u6-jre b/docker/alpine/Dockerfile.zulu-13u6-jre
new file mode 100644
index 00000000..1e1b3387
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u6-jre
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jre_13.37.21-13.0.6-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.6/zulu-13-azure-jre_13.37.21-13.0.6-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-13u6-jre-headless b/docker/alpine/Dockerfile.zulu-13u6-jre-headless
new file mode 100644
index 00000000..954fea72
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u6-jre-headless
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jre-headless_13.37.21-13.0.6-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.6/zulu-13-azure-jre-headless_13.37.21-13.0.6-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-13u6-jre-headless-tools b/docker/alpine/Dockerfile.zulu-13u6-jre-headless-tools
new file mode 100644
index 00000000..f93197fc
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u6-jre-headless-tools
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jre-headless-tools_13.37.21-13.0.6-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.6/zulu-13-azure-jre-headless-tools_13.37.21-13.0.6-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-15u2-jdk b/docker/alpine/Dockerfile.zulu-15u2-jdk
new file mode 100644
index 00000000..4e9675c9
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-15u2-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-15-azure-jdk_15.29.15-15.0.2-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.2/zulu-15-azure-jdk_15.29.15-15.0.2-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-15u2-jre b/docker/alpine/Dockerfile.zulu-15u2-jre
new file mode 100644
index 00000000..14b9610b
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-15u2-jre
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-15-azure-jre_15.29.15-15.0.2-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.2/zulu-15-azure-jre_15.29.15-15.0.2-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-15u2-jre-headless b/docker/alpine/Dockerfile.zulu-15u2-jre-headless
new file mode 100644
index 00000000..cec269f7
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-15u2-jre-headless
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-15-azure-jre-headless_15.29.15-15.0.2-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.2/zulu-15-azure-jre-headless_15.29.15-15.0.2-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-7u292-jdk b/docker/alpine/Dockerfile.zulu-7u292-jdk
new file mode 100644
index 00000000..2a26a6be
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-7u292-jdk
@@ -0,0 +1,44 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-7-azure-jdk_7.44.0.11-7.0.292-linux_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates wget tar && \
+    apk --no-cache --virtual .build-deps add binutils zstd xz && \
+    apk update && \
+    apk upgrade && \
+    wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+    wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
+    wget -q -O gcc-libs.tar.zst https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -q -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    tar -I zstd -xf gcc-libs.tar.zst -C /tmp && \
+    tar -xJf zlib.tar.xz -C /tmp && \
+    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
+    rm -rf gcc-libs.tar.zst zlib.tar.xz /tmp/usr && \
+    apk del .build-deps && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u292/zulu-7-azure-jdk_7.44.0.11-7.0.292-linux_x64.tar.gz && rm /root/.wget-hsts && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-7u292-jre b/docker/alpine/Dockerfile.zulu-7u292-jre
new file mode 100644
index 00000000..6a12f275
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-7u292-jre
@@ -0,0 +1,44 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-7-azure-jre_7.44.0.11-7.0.292-linux_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates wget tar && \
+    apk --no-cache --virtual .build-deps add binutils zstd xz && \
+    apk update && \
+    apk upgrade && \
+    wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+    wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
+    wget -q -O gcc-libs.tar.zst https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -q -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    tar -I zstd -xf gcc-libs.tar.zst -C /tmp && \
+    tar -xJf zlib.tar.xz -C /tmp && \
+    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
+    rm -rf gcc-libs.tar.zst zlib.tar.xz /tmp/usr && \
+    apk del .build-deps && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u292/zulu-7-azure-jre_7.44.0.11-7.0.292-linux_x64.tar.gz && rm /root/.wget-hsts && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-7u292-jre-headless b/docker/alpine/Dockerfile.zulu-7u292-jre-headless
new file mode 100644
index 00000000..7b7d5c0d
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-7u292-jre-headless
@@ -0,0 +1,44 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-7-azure-jre-headless_7.44.0.11-7.0.292-linux_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates wget tar && \
+    apk --no-cache --virtual .build-deps add binutils zstd xz && \
+    apk update && \
+    apk upgrade && \
+    wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+    wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
+    wget -q -O gcc-libs.tar.zst https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -q -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    tar -I zstd -xf gcc-libs.tar.zst -C /tmp && \
+    tar -xJf zlib.tar.xz -C /tmp && \
+    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
+    rm -rf gcc-libs.tar.zst zlib.tar.xz /tmp/usr && \
+    apk del .build-deps && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u292/zulu-7-azure-jre-headless_7.44.0.11-7.0.292-linux_x64.tar.gz && rm /root/.wget-hsts && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u282-jdk b/docker/alpine/Dockerfile.zulu-8u282-jdk
new file mode 100644
index 00000000..4fdbc4f4
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u282-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jdk_8.52.0.23-8.0.282-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u282/zulu-8-azure-jdk_8.52.0.23-8.0.282-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u282-jre b/docker/alpine/Dockerfile.zulu-8u282-jre
new file mode 100644
index 00000000..9ca1b11e
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u282-jre
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre_8.52.0.23-8.0.282-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u282/zulu-8-azure-jre_8.52.0.23-8.0.282-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u282-jre-headless b/docker/alpine/Dockerfile.zulu-8u282-jre-headless
new file mode 100644
index 00000000..7a4d3746
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u282-jre-headless
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre-headless_8.52.0.23-8.0.282-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u282/zulu-8-azure-jre-headless_8.52.0.23-8.0.282-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools b/docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools
new file mode 100644
index 00000000..4829f982
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre-headless-tools_8.52.0.23-8.0.282-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u282/zulu-8-azure-jre-headless-tools_8.52.0.23-8.0.282-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/centos/Dockerfile.zulu-11u10-jdk b/docker/centos/Dockerfile.zulu-11u10-jdk
new file mode 100644
index 00000000..27774ffa
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u10-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-11-azure-jdk-11.45.27
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure
+
diff --git a/docker/centos/Dockerfile.zulu-11u10-jre b/docker/centos/Dockerfile.zulu-11u10-jre
new file mode 100644
index 00000000..046d4161
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u10-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-11-azure-jre-11.45.27
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure
+
diff --git a/docker/centos/Dockerfile.zulu-11u10-jre-headless b/docker/centos/Dockerfile.zulu-11u10-jre-headless
new file mode 100644
index 00000000..6270c084
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u10-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-11-azure-jre-headless-11.45.27
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure
diff --git a/docker/centos/Dockerfile.zulu-13u6-jdk b/docker/centos/Dockerfile.zulu-13u6-jdk
new file mode 100644
index 00000000..21a70163
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-13u6-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-13-azure-jdk-13.37.21
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure
+
diff --git a/docker/centos/Dockerfile.zulu-13u6-jre b/docker/centos/Dockerfile.zulu-13u6-jre
new file mode 100644
index 00000000..7b762d60
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-13u6-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-13-azure-jre-13.37.21
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure
+
diff --git a/docker/centos/Dockerfile.zulu-13u6-jre-headless b/docker/centos/Dockerfile.zulu-13u6-jre-headless
new file mode 100644
index 00000000..af832113
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-13u6-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-13-azure-jre-headless-13.37.21
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure
diff --git a/docker/centos/Dockerfile.zulu-15u2-jdk b/docker/centos/Dockerfile.zulu-15u2-jdk
new file mode 100644
index 00000000..f30140eb
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-15u2-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-15-azure-jdk-15.29.15
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure
+
diff --git a/docker/centos/Dockerfile.zulu-15u2-jre b/docker/centos/Dockerfile.zulu-15u2-jre
new file mode 100644
index 00000000..6535eb11
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-15u2-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-15-azure-jre-15.29.15
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure
+
diff --git a/docker/centos/Dockerfile.zulu-15u2-jre-headless b/docker/centos/Dockerfile.zulu-15u2-jre-headless
new file mode 100644
index 00000000..900d11e3
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-15u2-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-15-azure-jre-headless-15.29.15
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure
diff --git a/docker/centos/Dockerfile.zulu-7u292-jdk b/docker/centos/Dockerfile.zulu-7u292-jdk
new file mode 100644
index 00000000..7bfd093e
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-7u292-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-7-azure-jdk-7.44.0.11
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure
+
diff --git a/docker/centos/Dockerfile.zulu-7u292-jre b/docker/centos/Dockerfile.zulu-7u292-jre
new file mode 100644
index 00000000..197bea25
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-7u292-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-7-azure-jre-7.44.0.11
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure
+
diff --git a/docker/centos/Dockerfile.zulu-7u292-jre-headless b/docker/centos/Dockerfile.zulu-7u292-jre-headless
new file mode 100644
index 00000000..800bf82e
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-7u292-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-7-azure-jre-headless-7.44.0.11
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure
diff --git a/docker/centos/Dockerfile.zulu-8u282-jdk b/docker/centos/Dockerfile.zulu-8u282-jdk
new file mode 100644
index 00000000..f1c91800
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u282-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-8-azure-jdk-8.52.0.23
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure
+
diff --git a/docker/centos/Dockerfile.zulu-8u282-jre b/docker/centos/Dockerfile.zulu-8u282-jre
new file mode 100644
index 00000000..05ce88ff
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u282-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-8-azure-jre-8.52.0.23
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure
+
diff --git a/docker/centos/Dockerfile.zulu-8u282-jre-headless b/docker/centos/Dockerfile.zulu-8u282-jre-headless
new file mode 100644
index 00000000..27244b1b
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u282-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-8-azure-jre-headless-8.52.0.23
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure
diff --git a/docker/debian10/Dockerfile.zulu-11u10-jdk b/docker/debian10/Dockerfile.zulu-11u10-jdk
new file mode 100644
index 00000000..6cedc3b9
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u10-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.45+27* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u10-jre b/docker/debian10/Dockerfile.zulu-11u10-jre
new file mode 100644
index 00000000..d5070221
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u10-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.45+27* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u10-jre-headless b/docker/debian10/Dockerfile.zulu-11u10-jre-headless
new file mode 100644
index 00000000..6a38a3da
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u10-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.45+27* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u10-jre-headless-tools b/docker/debian10/Dockerfile.zulu-11u10-jre-headless-tools
new file mode 100644
index 00000000..cf2127a3
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u10-jre-headless-tools
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u10-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jdk:11u10-zulu-debian10 AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG INSTALL_DIR=/usr/lib/jvm
+ARG JDK_DIR=${INSTALL_DIR}/zulu-11-azure-amd64
+ARG JRE_DIR=${INSTALL_DIR}/zre-hl-11-azure-amd64
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_TOOLS_DIR=${INSTALL_DIR}/zre-hl-tools-11-azure-amd64 && \
+    JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_TOOLS_DIR}
+
+FROM debian:buster
+ARG JRE_TOOLS_DIR=/usr/lib/jvm/zre-hl-tools-11-azure-amd64
+COPY --from=stage2 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+
+RUN cd /usr/bin && find ${JRE_TOOLS_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=${JRE_TOOLS_DIR}
\ No newline at end of file
diff --git a/docker/debian10/Dockerfile.zulu-11u10-maven b/docker/debian10/Dockerfile.zulu-11u10-maven
new file mode 100644
index 00000000..ba58dd21
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u10-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:11u10-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian10/Dockerfile.zulu-13u6-jdk b/docker/debian10/Dockerfile.zulu-13u6-jdk
new file mode 100644
index 00000000..fb2cdd40
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-13u6-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.37+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-13u6-jre b/docker/debian10/Dockerfile.zulu-13u6-jre
new file mode 100644
index 00000000..ed1f6f82
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-13u6-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.37+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-13u6-jre-headless b/docker/debian10/Dockerfile.zulu-13u6-jre-headless
new file mode 100644
index 00000000..fe45160f
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-13u6-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.37+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-15u2-jdk b/docker/debian10/Dockerfile.zulu-15u2-jdk
new file mode 100644
index 00000000..795e91c4
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-15u2-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.29+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-15u2-jre b/docker/debian10/Dockerfile.zulu-15u2-jre
new file mode 100644
index 00000000..66a3aba2
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-15u2-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.29+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-15u2-jre-headless b/docker/debian10/Dockerfile.zulu-15u2-jre-headless
new file mode 100644
index 00000000..40703bb9
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-15u2-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.29+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u292-jdk b/docker/debian10/Dockerfile.zulu-7u292-jdk
new file mode 100644
index 00000000..21eb8e02
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-7u292-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.44.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u292-jre b/docker/debian10/Dockerfile.zulu-7u292-jre
new file mode 100644
index 00000000..cf732758
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-7u292-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.44.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u292-jre-headless b/docker/debian10/Dockerfile.zulu-7u292-jre-headless
new file mode 100644
index 00000000..7ab6e63c
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-7u292-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.44.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u282-jdk b/docker/debian10/Dockerfile.zulu-8u282-jdk
new file mode 100644
index 00000000..7c9e532f
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u282-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.52.0.23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u282-jre b/docker/debian10/Dockerfile.zulu-8u282-jre
new file mode 100644
index 00000000..cffe1525
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u282-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.52.0.23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u282-jre-headless b/docker/debian10/Dockerfile.zulu-8u282-jre-headless
new file mode 100644
index 00000000..5d69911b
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u282-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.52.0.23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u282-jre-headless-tools b/docker/debian10/Dockerfile.zulu-8u282-jre-headless-tools
new file mode 100644
index 00000000..54aebde2
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u282-jre-headless-tools
@@ -0,0 +1,23 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u282-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u282-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG INSTALL_DIR=/usr/lib/jvm
+ARG JDK_DIR=${INSTALL_DIR}/zulu-8-azure-amd64
+ARG JRE_DIR=${INSTALL_DIR}/zre-hl-8-azure-amd64
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+
+ENV JAVA_HOME=${JRE_DIR}
diff --git a/docker/debian10/Dockerfile.zulu-8u282-maven b/docker/debian10/Dockerfile.zulu-8u282-maven
new file mode 100644
index 00000000..39923df2
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u282-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u282-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian9/Dockerfile.zulu-11u10-jdk b/docker/debian9/Dockerfile.zulu-11u10-jdk
new file mode 100644
index 00000000..3ae681dd
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u10-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.45+27* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u10-jre b/docker/debian9/Dockerfile.zulu-11u10-jre
new file mode 100644
index 00000000..725cafa2
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u10-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.45+27* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u10-jre-headless b/docker/debian9/Dockerfile.zulu-11u10-jre-headless
new file mode 100644
index 00000000..4ee23d27
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u10-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.45+27* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u10-maven b/docker/debian9/Dockerfile.zulu-11u10-maven
new file mode 100644
index 00000000..4b94b518
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u10-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:11u10-zulu-debian9
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian9/Dockerfile.zulu-13u6-jdk b/docker/debian9/Dockerfile.zulu-13u6-jdk
new file mode 100644
index 00000000..3b47f994
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-13u6-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.37+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u6-jre b/docker/debian9/Dockerfile.zulu-13u6-jre
new file mode 100644
index 00000000..d69d485d
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-13u6-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.37+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u6-jre-headless b/docker/debian9/Dockerfile.zulu-13u6-jre-headless
new file mode 100644
index 00000000..f7cb0eee
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-13u6-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.37+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-15u2-jdk b/docker/debian9/Dockerfile.zulu-15u2-jdk
new file mode 100644
index 00000000..07b4c477
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-15u2-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.29+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-15u2-jre b/docker/debian9/Dockerfile.zulu-15u2-jre
new file mode 100644
index 00000000..df08bb49
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-15u2-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.29+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-15u2-jre-headless b/docker/debian9/Dockerfile.zulu-15u2-jre-headless
new file mode 100644
index 00000000..3fa2de89
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-15u2-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.29+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u292-jdk b/docker/debian9/Dockerfile.zulu-7u292-jdk
new file mode 100644
index 00000000..6b2f3120
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-7u292-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.44.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u292-jre b/docker/debian9/Dockerfile.zulu-7u292-jre
new file mode 100644
index 00000000..e369ea61
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-7u292-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.44.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u292-jre-headless b/docker/debian9/Dockerfile.zulu-7u292-jre-headless
new file mode 100644
index 00000000..d7d8b96d
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-7u292-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.44.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u282-jdk b/docker/debian9/Dockerfile.zulu-8u282-jdk
new file mode 100644
index 00000000..6b8d949c
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u282-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.52.0.23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u282-jre b/docker/debian9/Dockerfile.zulu-8u282-jre
new file mode 100644
index 00000000..ced31678
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u282-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.52.0.23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u282-jre-headless b/docker/debian9/Dockerfile.zulu-8u282-jre-headless
new file mode 100644
index 00000000..b27cf938
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u282-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.52.0.23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u282-maven b/docker/debian9/Dockerfile.zulu-8u282-maven
new file mode 100644
index 00000000..0bece38d
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u282-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u282-zulu-debian9
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u10-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-11u10-jdk
new file mode 100644
index 00000000..28f6e715
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u10-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.45+27* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u10-jre b/docker/ubuntu-18.04/Dockerfile.zulu-11u10-jre
new file mode 100644
index 00000000..3354900b
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u10-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.45+27* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u10-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-11u10-jre-headless
new file mode 100644
index 00000000..f9998cab
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u10-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.45+27* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u6-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-13u6-jdk
new file mode 100644
index 00000000..2eeef521
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u6-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.37+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u6-jre b/docker/ubuntu-18.04/Dockerfile.zulu-13u6-jre
new file mode 100644
index 00000000..48c041fd
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u6-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.37+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u6-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-13u6-jre-headless
new file mode 100644
index 00000000..f3d30332
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u6-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.37+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u2-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-15u2-jdk
new file mode 100644
index 00000000..c77d803e
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u2-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.29+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u2-jre b/docker/ubuntu-18.04/Dockerfile.zulu-15u2-jre
new file mode 100644
index 00000000..1b3a069d
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u2-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.29+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u2-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-15u2-jre-headless
new file mode 100644
index 00000000..6a3c141b
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u2-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.29+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u292-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-7u292-jdk
new file mode 100644
index 00000000..ec89e468
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u292-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.44.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u292-jre b/docker/ubuntu-18.04/Dockerfile.zulu-7u292-jre
new file mode 100644
index 00000000..d55ead74
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u292-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.44.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u292-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-7u292-jre-headless
new file mode 100644
index 00000000..65c6f029
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u292-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.44.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u282-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-8u282-jdk
new file mode 100644
index 00000000..4a9d3ffe
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u282-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.52.0.23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u282-jre b/docker/ubuntu-18.04/Dockerfile.zulu-8u282-jre
new file mode 100644
index 00000000..bdf4ffa0
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u282-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.52.0.23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u282-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-8u282-jre-headless
new file mode 100644
index 00000000..9536659d
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u282-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.52.0.23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u10-jdk b/docker/ubuntu/Dockerfile.zulu-11u10-jdk
new file mode 100644
index 00000000..66b26d89
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u10-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.45+27* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u10-jre b/docker/ubuntu/Dockerfile.zulu-11u10-jre
new file mode 100644
index 00000000..b120f70a
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u10-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.45+27* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless b/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless
new file mode 100644
index 00000000..cb44f3f7
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.45+27* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools b/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools
new file mode 100644
index 00000000..127494c1
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools
@@ -0,0 +1,31 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u10-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jdk:11u10-zulu-ubuntu AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG INSTALL_DIR=/usr/lib/jvm
+ARG JDK_DIR=${INSTALL_DIR}/zulu-11-azure-amd64
+ARG JRE_DIR=${INSTALL_DIR}/zre-hl-11-azure-amd64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_TOOLS_DIR=${INSTALL_DIR}/zre-hl-tools-11-azure-amd64 && \
+    JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_TOOLS_DIR}
+
+FROM ubuntu:focal
+ARG JRE_TOOLS_DIR=/usr/lib/jvm/zre-hl-tools-11-azure-amd64
+COPY --from=stage2 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+
+RUN cd /usr/bin && find ${JRE_TOOLS_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=${JRE_TOOLS_DIR}
diff --git a/docker/ubuntu/Dockerfile.zulu-13u6-jdk b/docker/ubuntu/Dockerfile.zulu-13u6-jdk
new file mode 100644
index 00000000..2a79f024
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-13u6-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.37+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u6-jre b/docker/ubuntu/Dockerfile.zulu-13u6-jre
new file mode 100644
index 00000000..e1177c56
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-13u6-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.37+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u6-jre-headless b/docker/ubuntu/Dockerfile.zulu-13u6-jre-headless
new file mode 100644
index 00000000..29efe00e
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-13u6-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.37+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-15u2-jdk b/docker/ubuntu/Dockerfile.zulu-15u2-jdk
new file mode 100644
index 00000000..12ee2caf
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-15u2-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.29+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-15u2-jre b/docker/ubuntu/Dockerfile.zulu-15u2-jre
new file mode 100644
index 00000000..e3cf7eff
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-15u2-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.29+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-15u2-jre-headless b/docker/ubuntu/Dockerfile.zulu-15u2-jre-headless
new file mode 100644
index 00000000..8e9ce07f
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-15u2-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.29+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u292-jdk b/docker/ubuntu/Dockerfile.zulu-7u292-jdk
new file mode 100644
index 00000000..37116c5b
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-7u292-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.44.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u292-jre b/docker/ubuntu/Dockerfile.zulu-7u292-jre
new file mode 100644
index 00000000..51850a23
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-7u292-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.44.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u292-jre-headless b/docker/ubuntu/Dockerfile.zulu-7u292-jre-headless
new file mode 100644
index 00000000..fe4b413e
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-7u292-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.44.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u282-jdk b/docker/ubuntu/Dockerfile.zulu-8u282-jdk
new file mode 100644
index 00000000..84e8f756
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u282-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.52.0.23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u282-jre b/docker/ubuntu/Dockerfile.zulu-8u282-jre
new file mode 100644
index 00000000..61affc27
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u282-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.52.0.23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless b/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless
new file mode 100644
index 00000000..4d415317
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.52.0.23* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools b/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools
new file mode 100644
index 00000000..aa12c6ae
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools
@@ -0,0 +1,23 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u282-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u282-zulu-ubuntu
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG INSTALL_DIR=/usr/lib/jvm
+ARG JDK_DIR=${INSTALL_DIR}/zulu-8-azure-amd64
+ARG JRE_DIR=${INSTALL_DIR}/zre-hl-8-azure-amd64
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+
+ENV JAVA_HOME=${JRE_DIR}
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-11u10-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-11u10-jre-tools
new file mode 100644
index 00000000..14b87454
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-11u10-jre-tools
@@ -0,0 +1,38 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:11u10-zulu-windowsservercore AS stage1
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-11/11.0.10
+ARG JRE_PACKAGE=zulu-11-azure-jre_11.45.27-11.0.10-win_x64.msi
+ARG JRE_DIR="C:\Program Files\Zulu\zulu-11-jre"
+ARG JRE_TOOLS_DIR=C:\zulu-11-azure-jre-tools_11.45.27-11.0.10-win_x64
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-11"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.10/zulu-11-azure-jre_11.45.27-11.0.10-win_x64.msi', '%JRE_PACKAGE%') && \
+    msiexec /quiet /i %JRE_PACKAGE% && \
+    del %JRE_PACKAGE%
+
+RUN jimage.exe list "%JRE_DIR%\lib\modules" | findstr "Module: " > modules.out && \
+    powershell -Command "(Get-Content modules.out) -replace 'Module: ', '' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) -join ',' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) + ',jdk.jcmd' | Out-File modules.out" && \
+    for /f %P in ('type modules.out') do setx /m JRE_MODULES %P && \
+    del modules.out
+
+RUN jlink --no-header-files --strip-debug --module-path "%JDK_DIR%\jmods" --add-modules %JRE_MODULES% --output %JRE_TOOLS_DIR%
+
+FROM mcr.microsoft.com/windows/nanoserver:2004
+
+ARG JRE_TOOLS_DIR="C:\zulu-11-azure-jre-tools_11.45.27-11.0.10-win_x64"
+
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+COPY --from=stage1 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+USER ContainerUser
\ No newline at end of file
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-13u6-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-13u6-jre-tools
new file mode 100644
index 00000000..1ea304af
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-13u6-jre-tools
@@ -0,0 +1,38 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:13u6-zulu-windowsservercore AS stage1
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-13/13.0.6
+ARG JRE_PACKAGE=zulu-13-azure-jre_13.37.21-13.0.6-win_x64.msi
+ARG JRE_DIR="C:\Program Files\Zulu\zulu-13-jre"
+ARG JRE_TOOLS_DIR=C:\zulu-13-azure-jre-tools_13.37.21-13.0.6-win_x64
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-13"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.6/zulu-13-azure-jre_13.37.21-13.0.6-win_x64.msi', '%JRE_PACKAGE%') && \
+    msiexec /quiet /i %JRE_PACKAGE% && \
+    del %JRE_PACKAGE%
+
+RUN jimage.exe list "%JRE_DIR%\lib\modules" | findstr "Module: " > modules.out && \
+    powershell -Command "(Get-Content modules.out) -replace 'Module: ', '' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) -join ',' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) + ',jdk.jcmd' | Out-File modules.out" && \
+    for /f %P in ('type modules.out') do setx /m JRE_MODULES %P && \
+    del modules.out
+
+RUN jlink --no-header-files --strip-debug --module-path "%JDK_DIR%\jmods" --add-modules %JRE_MODULES% --output %JRE_TOOLS_DIR%
+
+FROM mcr.microsoft.com/windows/nanoserver:2004
+
+ARG JRE_TOOLS_DIR="C:\zulu-13-azure-jre-tools_13.37.21-13.0.6-win_x64"
+
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+COPY --from=stage1 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+USER ContainerUser
\ No newline at end of file
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-14u2-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-14u2-jre-tools
new file mode 100644
index 00000000..d2643549
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-14u2-jre-tools
@@ -0,0 +1,38 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:14u2-zulu-windowsservercore AS stage1
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-14/14.0.2
+ARG JRE_PACKAGE=zulu-14-azure-jre_14.29.23-14.0.2-win_x64.msi
+ARG JRE_DIR="C:\Program Files\Zulu\zulu-14-jre"
+ARG JRE_TOOLS_DIR=C:\zulu-14-azure-jre-tools_14.29.23-14.0.2-win_x64
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-14"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-14/14.0.2/zulu-14-azure-jre_14.29.23-14.0.2-win_x64.msi', '%JRE_PACKAGE%') && \
+    msiexec /quiet /i %JRE_PACKAGE% && \
+    del %JRE_PACKAGE%
+
+RUN jimage.exe list "%JRE_DIR%\lib\modules" | findstr "Module: " > modules.out && \
+    powershell -Command "(Get-Content modules.out) -replace 'Module: ', '' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) -join ',' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) + ',jdk.jcmd' | Out-File modules.out" && \
+    for /f %P in ('type modules.out') do setx /m JRE_MODULES %P && \
+    del modules.out
+
+RUN jlink --no-header-files --strip-debug --module-path "%JDK_DIR%\jmods" --add-modules %JRE_MODULES% --output %JRE_TOOLS_DIR%
+
+FROM mcr.microsoft.com/windows/nanoserver:2004
+
+ARG JRE_TOOLS_DIR="C:\zulu-14-azure-jre-tools_14.29.23-14.0.2-win_x64"
+
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+COPY --from=stage1 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+USER ContainerUser
\ No newline at end of file
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-15u2-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-15u2-jre-tools
new file mode 100644
index 00000000..4319d1c9
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-15u2-jre-tools
@@ -0,0 +1,38 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:15u2-zulu-windowsservercore AS stage1
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-15/15.0.2
+ARG JRE_PACKAGE=zulu-15-azure-jre_15.29.15-15.0.2-win_x64.msi
+ARG JRE_DIR="C:\Program Files\Zulu\zulu-15-jre"
+ARG JRE_TOOLS_DIR=C:\zulu-15-azure-jre-tools_15.29.15-15.0.2-win_x64
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-15"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.2/zulu-15-azure-jre_15.29.15-15.0.2-win_x64.msi', '%JRE_PACKAGE%') && \
+    msiexec /quiet /i %JRE_PACKAGE% && \
+    del %JRE_PACKAGE%
+
+RUN jimage.exe list "%JRE_DIR%\lib\modules" | findstr "Module: " > modules.out && \
+    powershell -Command "(Get-Content modules.out) -replace 'Module: ', '' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) -join ',' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) + ',jdk.jcmd' | Out-File modules.out" && \
+    for /f %P in ('type modules.out') do setx /m JRE_MODULES %P && \
+    del modules.out
+
+RUN jlink --no-header-files --strip-debug --module-path "%JDK_DIR%\jmods" --add-modules %JRE_MODULES% --output %JRE_TOOLS_DIR%
+
+FROM mcr.microsoft.com/windows/nanoserver:2004
+
+ARG JRE_TOOLS_DIR="C:\zulu-15-azure-jre-tools_15.29.15-15.0.2-win_x64"
+
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+COPY --from=stage1 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+USER ContainerUser
\ No newline at end of file
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-7u292-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-7u292-jre-tools
new file mode 100644
index 00000000..97a040ea
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-7u292-jre-tools
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:7u292-zulu-windowsservercore AS stage1
+FROM mcr.microsoft.com/windows/nanoserver:2004
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-7/7u292
+ARG JRE_TOOLS_DIR=zulu-7-azure-jre-tools_7.44.0.11-7.0.292-win_x64
+ARG JRE_DIR=zulu-7-azure-jre_7.44.0.11-7.0.292-win_x64
+ARG JRE_PACKAGE=$JRE_DIR.zip
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-7"
+
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "C:\%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+RUN curl https://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%JRE_PACKAGE% -o %JRE_PACKAGE% && \
+    tar -xf %JRE_PACKAGE% && \
+    del %JRE_PACKAGE% && \
+    move %JRE_DIR% %JRE_TOOLS_DIR%
+
+COPY --from=stage1 ${JDK_DIR}/bin/jstack.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_TOOLS_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/bin/attach.dll ${JRE_TOOLS_DIR}/bin
+
+USER ContainerUser
\ No newline at end of file
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-8u282-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-8u282-jre-tools
new file mode 100644
index 00000000..05f5f745
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-8u282-jre-tools
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u282-zulu-windowsservercore AS stage1
+FROM mcr.microsoft.com/windows/nanoserver:2004
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-8/8u282
+ARG JRE_TOOLS_DIR=zulu-8-azure-jre-tools_8.52.0.23-8.0.282-win_x64
+ARG JRE_DIR=zulu-8-azure-jre_8.52.0.23-8.0.282-win_x64
+ARG JRE_PACKAGE=$JRE_DIR.zip
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-8"
+
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "C:\%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+RUN curl https://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%JRE_PACKAGE% -o %JRE_PACKAGE% && \
+    tar -xf %JRE_PACKAGE% && \
+    del %JRE_PACKAGE% && \
+    move %JRE_DIR% %JRE_TOOLS_DIR%
+
+COPY --from=stage1 ${JDK_DIR}/bin/jstack.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_TOOLS_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/bin/attach.dll ${JRE_TOOLS_DIR}/bin
+
+USER ContainerUser
\ No newline at end of file
diff --git a/docker/windowsservercore/Dockerfile.zulu-11u10-jdk b/docker/windowsservercore/Dockerfile.zulu-11u10-jdk
new file mode 100644
index 00000000..f2ec5add
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-11u10-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-11-azure-jdk_11.45.27-11.0.10-win_x64.msi && \
+    setx PACKAGE_DIR zulu-11/11.0.10 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-11"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.10/zulu-11-azure-jdk_11.45.27-11.0.10-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-11u10-jre b/docker/windowsservercore/Dockerfile.zulu-11u10-jre
new file mode 100644
index 00000000..9c3ce9a1
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-11u10-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-11-azure-jre_11.45.27-11.0.10-win_x64.msi && \
+    setx PACKAGE_DIR zulu-11/11.0.10 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-11-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.10/zulu-11-azure-jre_11.45.27-11.0.10-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-13u6-jdk b/docker/windowsservercore/Dockerfile.zulu-13u6-jdk
new file mode 100644
index 00000000..296fdc25
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-13u6-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-13-azure-jdk_13.37.21-13.0.6-win_x64.msi && \
+    setx PACKAGE_DIR zulu-13/13.0.6 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-13"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.6/zulu-13-azure-jdk_13.37.21-13.0.6-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-13u6-jre b/docker/windowsservercore/Dockerfile.zulu-13u6-jre
new file mode 100644
index 00000000..8829b2c9
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-13u6-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-13-azure-jre_13.37.21-13.0.6-win_x64.msi && \
+    setx PACKAGE_DIR zulu-13/13.0.6 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-13-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.6/zulu-13-azure-jre_13.37.21-13.0.6-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-15u2-jdk b/docker/windowsservercore/Dockerfile.zulu-15u2-jdk
new file mode 100644
index 00000000..571c698d
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-15u2-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-15-azure-jdk_15.29.15-15.0.2-win_x64.msi && \
+    setx PACKAGE_DIR zulu-15/15.0.2 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-15"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.2/zulu-15-azure-jdk_15.29.15-15.0.2-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-15u2-jre b/docker/windowsservercore/Dockerfile.zulu-15u2-jre
new file mode 100644
index 00000000..3752a3c3
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-15u2-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-15-azure-jre_15.29.15-15.0.2-win_x64.msi && \
+    setx PACKAGE_DIR zulu-15/15.0.2 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-15-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.2/zulu-15-azure-jre_15.29.15-15.0.2-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-7u292-jdk b/docker/windowsservercore/Dockerfile.zulu-7u292-jdk
new file mode 100644
index 00000000..7b3934cc
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-7u292-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-7-azure-jdk_7.44.0.11-7.0.292-win_x64.msi && \
+    setx PACKAGE_DIR zulu-7/7u292 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-7"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u292/zulu-7-azure-jdk_7.44.0.11-7.0.292-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-7u292-jre b/docker/windowsservercore/Dockerfile.zulu-7u292-jre
new file mode 100644
index 00000000..c91a3d90
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-7u292-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-7-azure-jre_7.44.0.11-7.0.292-win_x64.msi && \
+    setx PACKAGE_DIR zulu-7/7u292 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-7-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u292/zulu-7-azure-jre_7.44.0.11-7.0.292-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-8u282-jdk b/docker/windowsservercore/Dockerfile.zulu-8u282-jdk
new file mode 100644
index 00000000..999cb9d2
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-8u282-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-8-azure-jdk_8.52.0.23-8.0.282-win_x64.msi && \
+    setx PACKAGE_DIR zulu-8/8u282 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-8"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u282/zulu-8-azure-jdk_8.52.0.23-8.0.282-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-8u282-jre b/docker/windowsservercore/Dockerfile.zulu-8u282-jre
new file mode 100644
index 00000000..1174e606
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-8u282-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-8-azure-jre_8.52.0.23-8.0.282-win_x64.msi && \
+    setx PACKAGE_DIR zulu-8/8u282 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-8-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u282/zulu-8-azure-jre_8.52.0.23-8.0.282-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%

From 065ac33f6c4b23827dd1d0d76e6807d660b5be50 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Tue, 26 Jan 2021 08:55:25 -0600
Subject: [PATCH 222/264] Some simplification

---
 .../Dockerfile.zulu-11u10-jre-headless-tools  |  4 +--
 .../Dockerfile.zulu-13u6-jre-headless-tools   |  4 +--
 .../Dockerfile.zulu-15u2-jre-headless-tools   | 32 +++++++++++++++++++
 .../Dockerfile.zulu-8u282-jre-headless-tools  |  4 +--
 4 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 docker/alpine/Dockerfile.zulu-15u2-jre-headless-tools

diff --git a/docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools b/docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools
index 461dcfd5..bb21bf86 100644
--- a/docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools
+++ b/docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools
@@ -20,11 +20,11 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.10/zulu-11-azure-jre-headless-tools_11.45.27-11.0.10-linux_musl_x64.tar.gz && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.10/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
     find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
     
 
-ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-13u6-jre-headless-tools b/docker/alpine/Dockerfile.zulu-13u6-jre-headless-tools
index f93197fc..ece62eff 100644
--- a/docker/alpine/Dockerfile.zulu-13u6-jre-headless-tools
+++ b/docker/alpine/Dockerfile.zulu-13u6-jre-headless-tools
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.6/zulu-13-azure-jre-headless-tools_13.37.21-13.0.6-linux_musl_x64.tar.gz && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.6/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
@@ -29,4 +29,4 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     cd ${MAN_DIR} && \
     find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
 
-ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-15u2-jre-headless-tools b/docker/alpine/Dockerfile.zulu-15u2-jre-headless-tools
new file mode 100644
index 00000000..73e99420
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-15u2-jre-headless-tools
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-15-azure-jre-headless-tools_15.29.15-15.0.2-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.2/${ZULU_PACK} && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
diff --git a/docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools b/docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools
index 4829f982..69bbe9a3 100644
--- a/docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools
+++ b/docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools
@@ -20,7 +20,7 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
     apk update && \
     apk upgrade && \
-    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u282/zulu-8-azure-jre-headless-tools_8.52.0.23-8.0.282-linux_musl_x64.tar.gz && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u282/${ZULU_PACK} && \
     mkdir -p ${INSTALL_DIR} && \
     tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
     cd ${BIN_DIR} && \
@@ -29,4 +29,4 @@ RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
     cd ${MAN_DIR} && \
     find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
 
-ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}

From e5262e65ae5b9a405cc229d693e0853479a415c4 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 4 Feb 2021 10:57:40 -0600
Subject: [PATCH 223/264] Upgraded Tomcat versions

---
 .../alpine/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8   | 4 ++--
 .../alpine/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9   | 4 ++--
 .../alpine/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8   | 4 ++--
 .../alpine/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8 b/docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
index 5557e7c6..abe3d0b6 100644
--- a/docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
+++ b/docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
@@ -21,7 +21,7 @@ RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e
 FROM alpine AS stage3
 
 ARG TOMCAT_MAJOR=8
-ARG TOMCAT_VERSION=8.5.59
+ARG TOMCAT_VERSION=8.5.63
 ARG SERVER_XML=server.xml
 ARG LOGGING_PROPERTIES=logging.properties
 ARG CATALINA_PROPERTIES=catalina.properties
@@ -56,7 +56,7 @@ RUN apk add --update openssh-server bash openrc && \
     # Install Tomcat
     wget -O /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
     mkdir /usr/local/tomcat && \
-    tar xvzf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    tar zxf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
     rm -f /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz
 
 COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
diff --git a/docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9 b/docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
index 52f4ac95..be8446f5 100644
--- a/docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
+++ b/docker/alpine/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
@@ -21,7 +21,7 @@ RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e
 FROM alpine AS stage3
 
 ARG TOMCAT_MAJOR=9
-ARG TOMCAT_VERSION=9.0.39
+ARG TOMCAT_VERSION=9.0.43
 ARG SERVER_XML=server.xml
 ARG LOGGING_PROPERTIES=logging.properties
 ARG CATALINA_PROPERTIES=catalina.properties
@@ -56,7 +56,7 @@ RUN apk add --update openssh-server bash openrc && \
     # Install Tomcat
     wget -O /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
     mkdir /usr/local/tomcat && \
-    tar xvzf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    tar zxf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
     rm -f /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz
 
 COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
diff --git a/docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8 b/docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
index 1f8afb87..da8f49fc 100644
--- a/docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
+++ b/docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
@@ -12,7 +12,7 @@ ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-jdk_8.52.0.23-8.0.282-linux_musl_x64
 ARG JRE_DIR=/usr/lib/jvm/zulu-8-azure-jre-headless_8.52.0.23-8.0.282-linux_musl_x64
 
 ARG TOMCAT_MAJOR=8
-ARG TOMCAT_VERSION=8.5.59
+ARG TOMCAT_VERSION=8.5.63
 ARG SERVER_XML=server.xml
 ARG LOGGING_PROPERTIES=logging.properties
 ARG CATALINA_PROPERTIES=catalina.properties
@@ -51,7 +51,7 @@ RUN apk add --update openssh-server bash openrc && \
     # Install Tomcat
     wget -O /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
     mkdir /usr/local/tomcat && \
-    tar xvzf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    tar zxf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
     rm -f /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz
 
 COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
diff --git a/docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9 b/docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9
index 054a23aa..41d930a9 100644
--- a/docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9
+++ b/docker/alpine/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9
@@ -12,7 +12,7 @@ ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-jdk_8.52.0.23-8.0.282-linux_musl_x64
 ARG JRE_DIR=/usr/lib/jvm/zulu-8-azure-jre-headless_8.52.0.23-8.0.282-linux_musl_x64
 
 ARG TOMCAT_MAJOR=9
-ARG TOMCAT_VERSION=9.0.39
+ARG TOMCAT_VERSION=9.0.43
 ARG SERVER_XML=server.xml
 ARG LOGGING_PROPERTIES=logging.properties
 ARG CATALINA_PROPERTIES=catalina.properties
@@ -51,7 +51,7 @@ RUN apk add --update openssh-server bash openrc && \
     # Install Tomcat
     wget -O /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
     mkdir /usr/local/tomcat && \
-    tar xvzf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    tar zxf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
     rm -f /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz
 
 COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml

From 00820be9b650df9517e17c70dfef4d7b1934eace Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 4 Feb 2021 10:58:30 -0600
Subject: [PATCH 224/264] Upgraded Tomcat versions

---
 .../centos/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8   | 4 ++--
 .../centos/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9   | 4 ++--
 .../centos/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8   | 4 ++--
 .../centos/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker/centos/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8 b/docker/centos/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
index b8cc60d0..abdea37a 100644
--- a/docker/centos/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
+++ b/docker/centos/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
@@ -21,7 +21,7 @@ RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e
 FROM centos:latest AS stage3
 
 ARG TOMCAT_MAJOR=8
-ARG TOMCAT_VERSION=8.5.59
+ARG TOMCAT_VERSION=8.5.63
 ARG SERVER_XML=server.xml
 ARG LOGGING_PROPERTIES=logging.properties
 ARG CATALINA_PROPERTIES=catalina.properties
@@ -46,7 +46,7 @@ RUN yum -q -y update && \
 # Install Tomcat
     curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
     mkdir /usr/local/tomcat && \
-    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
        
 COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
diff --git a/docker/centos/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9 b/docker/centos/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
index b62d33a4..7f670b3b 100644
--- a/docker/centos/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
+++ b/docker/centos/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
@@ -21,7 +21,7 @@ RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e
 FROM centos:latest AS stage3
 
 ARG TOMCAT_MAJOR=9
-ARG TOMCAT_VERSION=9.0.39
+ARG TOMCAT_VERSION=9.0.43
 ARG SERVER_XML=server.xml
 ARG LOGGING_PROPERTIES=logging.properties
 ARG CATALINA_PROPERTIES=catalina.properties
@@ -46,7 +46,7 @@ RUN yum -q -y update && \
 # Install Tomcat
     curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
     mkdir /usr/local/tomcat && \
-    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
        
 COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
diff --git a/docker/centos/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8 b/docker/centos/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
index c7632113..70ee3bbb 100644
--- a/docker/centos/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
+++ b/docker/centos/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
@@ -12,7 +12,7 @@ ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure
 ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure
 
 ARG TOMCAT_MAJOR=8
-ARG TOMCAT_VERSION=8.5.59
+ARG TOMCAT_VERSION=8.5.63
 ARG SERVER_XML=server.xml
 ARG LOGGING_PROPERTIES=logging.properties
 ARG CATALINA_PROPERTIES=catalina.properties
@@ -41,7 +41,7 @@ RUN yum -q -y update && \
 # Install Tomcat
     curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
     mkdir /usr/local/tomcat && \
-    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
        
 COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
diff --git a/docker/centos/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9 b/docker/centos/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9
index a2d45555..e4b2001f 100644
--- a/docker/centos/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9
+++ b/docker/centos/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9
@@ -12,7 +12,7 @@ ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure
 ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure
 
 ARG TOMCAT_MAJOR=9
-ARG TOMCAT_VERSION=9.0.39
+ARG TOMCAT_VERSION=9.0.43
 ARG SERVER_XML=server.xml
 ARG LOGGING_PROPERTIES=logging.properties
 ARG CATALINA_PROPERTIES=catalina.properties
@@ -41,7 +41,7 @@ RUN yum -q -y update && \
 # Install Tomcat
     curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
     mkdir /usr/local/tomcat && \
-    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
        
 COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml

From b23802d581c863ee0d864fdb4601e5ddfa886102 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 4 Feb 2021 10:59:14 -0600
Subject: [PATCH 225/264] Upgraded Tomcat versions

---
 ...file.zulu-11u10-jre-headless-tools-tomcat8 |  4 +-
 ...file.zulu-11u10-jre-headless-tools-tomcat9 |  4 +-
 ...file.zulu-8u282-jre-headless-tools-tomcat8 |  4 +-
 ...file.zulu-8u282-jre-headless-tools-tomcat9 | 61 +++++++++++++++++++
 4 files changed, 67 insertions(+), 6 deletions(-)
 create mode 100644 docker/debian10/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9

diff --git a/docker/debian10/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8 b/docker/debian10/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
index 22f70af8..fadf003c 100644
--- a/docker/debian10/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
+++ b/docker/debian10/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
@@ -21,7 +21,7 @@ RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e
 FROM debian:buster AS stage3
 
 ARG TOMCAT_MAJOR=8
-ARG TOMCAT_VERSION=8.5.59
+ARG TOMCAT_VERSION=8.5.63
 ARG SERVER_XML=server.xml
 ARG LOGGING_PROPERTIES=logging.properties
 ARG CATALINA_PROPERTIES=catalina.properties
@@ -46,7 +46,7 @@ RUN apt-get -qq update && \
 # Install Tomcat
     curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
     mkdir /usr/local/tomcat && \
-    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y purge curl && \
diff --git a/docker/debian10/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9 b/docker/debian10/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
index 0fb197b2..1007367a 100644
--- a/docker/debian10/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
+++ b/docker/debian10/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
@@ -21,7 +21,7 @@ RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e
 FROM debian:buster AS stage3
 
 ARG TOMCAT_MAJOR=9
-ARG TOMCAT_VERSION=9.0.39
+ARG TOMCAT_VERSION=9.0.43
 ARG SERVER_XML=server.xml
 ARG LOGGING_PROPERTIES=logging.properties
 ARG CATALINA_PROPERTIES=catalina.properties
@@ -46,7 +46,7 @@ RUN apt-get -qq update && \
 # Install Tomcat
     curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
     mkdir /usr/local/tomcat && \
-    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y purge curl && \
diff --git a/docker/debian10/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8 b/docker/debian10/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
index 1e72d1d5..63a796d9 100644
--- a/docker/debian10/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
+++ b/docker/debian10/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
@@ -12,7 +12,7 @@ ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
 ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
 
 ARG TOMCAT_MAJOR=8
-ARG TOMCAT_VERSION=8.5.59
+ARG TOMCAT_VERSION=8.5.63
 ARG SERVER_XML=server.xml
 ARG LOGGING_PROPERTIES=logging.properties
 ARG CATALINA_PROPERTIES=catalina.properties
@@ -41,7 +41,7 @@ RUN apt-get -qq update && \
 # Install Tomcat
     curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
     mkdir /usr/local/tomcat && \
-    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y purge curl && \
diff --git a/docker/debian10/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9 b/docker/debian10/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..11cde5fd
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9
@@ -0,0 +1,61 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u282-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u282-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.43
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]

From 68673e7aaee1a66ff4901ba80ea1efe49d4c946a Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 4 Feb 2021 11:00:01 -0600
Subject: [PATCH 226/264] Upgraded Tomcat versions

---
 .../ubuntu/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8   | 4 ++--
 .../ubuntu/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9   | 4 ++--
 .../ubuntu/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8   | 4 ++--
 .../ubuntu/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8 b/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
index 4bea14c0..8a8aa343 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
+++ b/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
@@ -21,7 +21,7 @@ RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e
 FROM ubuntu:focal AS stage3
 
 ARG TOMCAT_MAJOR=8
-ARG TOMCAT_VERSION=8.5.59
+ARG TOMCAT_VERSION=8.5.63
 ARG SERVER_XML=server.xml
 ARG LOGGING_PROPERTIES=logging.properties
 ARG CATALINA_PROPERTIES=catalina.properties
@@ -46,7 +46,7 @@ RUN apt-get -qq update && \
 # Install Tomcat
     curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
     mkdir /usr/local/tomcat && \
-    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y purge curl && \
diff --git a/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9 b/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
index e18c4979..f0e879d6 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
+++ b/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
@@ -21,7 +21,7 @@ RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e
 FROM ubuntu:focal AS stage3
 
 ARG TOMCAT_MAJOR=9
-ARG TOMCAT_VERSION=9.0.39
+ARG TOMCAT_VERSION=9.0.43
 ARG SERVER_XML=server.xml
 ARG LOGGING_PROPERTIES=logging.properties
 ARG CATALINA_PROPERTIES=catalina.properties
@@ -46,7 +46,7 @@ RUN apt-get -qq update && \
 # Install Tomcat
     curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
     mkdir /usr/local/tomcat && \
-    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y purge curl && \
diff --git a/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8 b/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
index e3357cf3..83c114ca 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
+++ b/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
@@ -12,7 +12,7 @@ ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
 ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
 
 ARG TOMCAT_MAJOR=8
-ARG TOMCAT_VERSION=8.5.59
+ARG TOMCAT_VERSION=8.5.63
 ARG SERVER_XML=server.xml
 ARG LOGGING_PROPERTIES=logging.properties
 ARG CATALINA_PROPERTIES=catalina.properties
@@ -41,7 +41,7 @@ RUN apt-get -qq update && \
 # Install Tomcat
     curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
     mkdir /usr/local/tomcat && \
-    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y purge curl && \
diff --git a/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9 b/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9
index 4da24375..d57968a0 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9
+++ b/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9
@@ -12,7 +12,7 @@ ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
 ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
 
 ARG TOMCAT_MAJOR=9
-ARG TOMCAT_VERSION=9.0.39
+ARG TOMCAT_VERSION=9.0.43
 ARG SERVER_XML=server.xml
 ARG LOGGING_PROPERTIES=logging.properties
 ARG CATALINA_PROPERTIES=catalina.properties
@@ -41,7 +41,7 @@ RUN apt-get -qq update && \
 # Install Tomcat
     curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
     mkdir /usr/local/tomcat && \
-    tar xvzf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y purge curl && \

From e4c702b3da6cb77322e02b9c2bb8e781589411b5 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 19 Feb 2021 08:47:53 -0600
Subject: [PATCH 227/264] Create Dockerfile.zulu-7u292-jre-tools

---
 docker/windowsnanoserver-20H2/Dockerfile.zulu-7u292-jre-tools | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 docker/windowsnanoserver-20H2/Dockerfile.zulu-7u292-jre-tools

diff --git a/docker/windowsnanoserver-20H2/Dockerfile.zulu-7u292-jre-tools b/docker/windowsnanoserver-20H2/Dockerfile.zulu-7u292-jre-tools
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/docker/windowsnanoserver-20H2/Dockerfile.zulu-7u292-jre-tools
@@ -0,0 +1 @@
+

From 19d907158370145fdb7c801a30910dc3dd2ae4ea Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 19 Feb 2021 08:49:06 -0600
Subject: [PATCH 228/264] Initial Dockerfiles

---
 .../Dockerfile.zulu-11u10-jre-tools           | 39 +++++++++++++++++++
 .../Dockerfile.zulu-13u6-jre-tools            | 39 +++++++++++++++++++
 .../Dockerfile.zulu-15u2-jre-tools            | 39 +++++++++++++++++++
 .../Dockerfile.zulu-7u292-jre-tools           | 31 +++++++++++++++
 .../Dockerfile.zulu-8u282-jre-tools           | 32 +++++++++++++++
 5 files changed, 180 insertions(+)
 create mode 100644 docker/windowsnanoserver-20H2/Dockerfile.zulu-11u10-jre-tools
 create mode 100644 docker/windowsnanoserver-20H2/Dockerfile.zulu-13u6-jre-tools
 create mode 100644 docker/windowsnanoserver-20H2/Dockerfile.zulu-15u2-jre-tools
 create mode 100644 docker/windowsnanoserver-20H2/Dockerfile.zulu-8u282-jre-tools

diff --git a/docker/windowsnanoserver-20H2/Dockerfile.zulu-11u10-jre-tools b/docker/windowsnanoserver-20H2/Dockerfile.zulu-11u10-jre-tools
new file mode 100644
index 00000000..af85938c
--- /dev/null
+++ b/docker/windowsnanoserver-20H2/Dockerfile.zulu-11u10-jre-tools
@@ -0,0 +1,39 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/nanoserver:20H2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-11/11.0.10
+ARG JDK_DIR=zulu-11-azure-jdk_11.45.27-11.0.10-win_x64
+ARG JDK_PACKAGE=$JDK_DIR.zip
+ARG JRE_DIR=zulu-11-azure-jre_11.45.27-11.0.10-win_x64
+ARG JRE_PACKAGE=$JRE_DIR.zip
+ARG JRE_TOOLS_DIR=C:\zulu-11-azure-jre-tools_11.45.27-11.0.10-win_x64
+
+USER ContainerAdministrator
+RUN curl https://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%JDK_PACKAGE% -o %JDK_PACKAGE% && \
+    tar -xf %JDK_PACKAGE% && \
+    del %JDK_PACKAGE%
+
+RUN curl https://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%JRE_PACKAGE% -o %JRE_PACKAGE% && \
+    tar -xf %JRE_PACKAGE% && \
+    del %JRE_PACKAGE%
+
+RUN cmd /V:on /C "%JDK_DIR%\bin\jimage list %JRE_DIR%\lib\modules | findstr "Module: " > modules.out && \
+     @echo off && \
+     set JRE_MODULES= && \
+     (for /f "tokens=2" %a in (modules.out) do set JRE_MODULES=!JRE_MODULES!%a,) && \
+     set JRE_MODULES=!JRE_MODULES!jdk.jcmd && \
+     echo !JRE_MODULES! && \
+     %JDK_DIR%\bin\jlink --no-header-files --strip-debug --module-path %JDK_DIR%\jmods --add-modules !JRE_MODULES! --output %JRE_TOOLS_DIR% && \
+     del modules.out && \
+     rmdir /S /Q %JDK_DIR% && \
+     rmdir /S /Q %JRE_DIR%"
+
+RUN setx /m JAVA_HOME %JRE_TOOLS_DIR% && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
diff --git a/docker/windowsnanoserver-20H2/Dockerfile.zulu-13u6-jre-tools b/docker/windowsnanoserver-20H2/Dockerfile.zulu-13u6-jre-tools
new file mode 100644
index 00000000..46e82ee6
--- /dev/null
+++ b/docker/windowsnanoserver-20H2/Dockerfile.zulu-13u6-jre-tools
@@ -0,0 +1,39 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/nanoserver:20H2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-13/13.0.6
+ARG JDK_DIR=zulu-13-azure-jdk_13.37.21-13.0.6-win_x64
+ARG JDK_PACKAGE=$JDK_DIR.zip
+ARG JRE_DIR=zulu-13-azure-jre_13.37.21-13.0.6-win_x64
+ARG JRE_PACKAGE=$JRE_DIR.zip
+ARG JRE_TOOLS_DIR=C:\zulu-13-azure-jre-tools_13.37.21-13.0.6-win_x64
+
+USER ContainerAdministrator
+RUN curl https://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%JDK_PACKAGE% -o %JDK_PACKAGE% && \
+    tar -xf %JDK_PACKAGE% && \
+    del %JDK_PACKAGE%
+
+RUN curl https://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%JRE_PACKAGE% -o %JRE_PACKAGE% && \
+    tar -xf %JRE_PACKAGE% && \
+    del %JRE_PACKAGE%
+
+RUN cmd /V:on /C "%JDK_DIR%\bin\jimage list %JRE_DIR%\lib\modules | findstr "Module: " > modules.out && \
+     @echo off && \
+     set JRE_MODULES= && \
+     (for /f "tokens=2" %a in (modules.out) do set JRE_MODULES=!JRE_MODULES!%a,) && \
+     set JRE_MODULES=!JRE_MODULES!jdk.jcmd && \
+     echo !JRE_MODULES! && \
+     %JDK_DIR%\bin\jlink --no-header-files --strip-debug --module-path %JDK_DIR%\jmods --add-modules !JRE_MODULES! --output %JRE_TOOLS_DIR% && \
+     del modules.out && \
+     rmdir /S /Q %JDK_DIR% && \
+     rmdir /S /Q %JRE_DIR%"
+
+RUN setx /m JAVA_HOME %JRE_TOOLS_DIR% && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
diff --git a/docker/windowsnanoserver-20H2/Dockerfile.zulu-15u2-jre-tools b/docker/windowsnanoserver-20H2/Dockerfile.zulu-15u2-jre-tools
new file mode 100644
index 00000000..24c92c08
--- /dev/null
+++ b/docker/windowsnanoserver-20H2/Dockerfile.zulu-15u2-jre-tools
@@ -0,0 +1,39 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/nanoserver:20H2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-15/15.0.2
+ARG JDK_DIR=zulu-15-azure-jdk_15.29.15-15.0.2-win_x64
+ARG JDK_PACKAGE=$JDK_DIR.zip
+ARG JRE_DIR=zulu-15-azure-jre_15.29.15-15.0.2-win_x64
+ARG JRE_PACKAGE=$JRE_DIR.zip
+ARG JRE_TOOLS_DIR=C:\zulu-15-azure-jre-tools_15.29.15-15.0.2-win_x64
+
+USER ContainerAdministrator
+RUN curl https://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%JDK_PACKAGE% -o %JDK_PACKAGE% && \
+    tar -xf %JDK_PACKAGE% && \
+    del %JDK_PACKAGE%
+
+RUN curl https://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%JRE_PACKAGE% -o %JRE_PACKAGE% && \
+    tar -xf %JRE_PACKAGE% && \
+    del %JRE_PACKAGE%
+
+RUN cmd /V:on /C "%JDK_DIR%\bin\jimage list %JRE_DIR%\lib\modules | findstr "Module: " > modules.out && \
+     @echo off && \
+     set JRE_MODULES= && \
+     (for /f "tokens=2" %a in (modules.out) do set JRE_MODULES=!JRE_MODULES!%a,) && \
+     set JRE_MODULES=!JRE_MODULES!jdk.jcmd && \
+     echo !JRE_MODULES! && \
+     %JDK_DIR%\bin\jlink --no-header-files --strip-debug --module-path %JDK_DIR%\jmods --add-modules !JRE_MODULES! --output %JRE_TOOLS_DIR% && \
+     del modules.out && \
+     rmdir /S /Q %JDK_DIR% && \
+     rmdir /S /Q %JRE_DIR%"
+
+RUN setx /m JAVA_HOME %JRE_TOOLS_DIR% && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
diff --git a/docker/windowsnanoserver-20H2/Dockerfile.zulu-7u292-jre-tools b/docker/windowsnanoserver-20H2/Dockerfile.zulu-7u292-jre-tools
index 8b137891..324af1ef 100644
--- a/docker/windowsnanoserver-20H2/Dockerfile.zulu-7u292-jre-tools
+++ b/docker/windowsnanoserver-20H2/Dockerfile.zulu-7u292-jre-tools
@@ -1 +1,32 @@
 
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:7u292-zulu-windowsservercore AS stage1
+FROM mcr.microsoft.com/windows/nanoserver:20H2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-7/7u292
+ARG JRE_TOOLS_DIR=zulu-7-azure-jre-tools_7.44.0.11-7.0.292-win_x64
+ARG JRE_DIR=zulu-7-azure-jre_7.44.0.11-7.0.292-win_x64
+ARG JRE_PACKAGE=$JRE_DIR.zip
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-7"
+
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "C:\%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+RUN curl https://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%JRE_PACKAGE% -o %JRE_PACKAGE% && \
+    tar -xf %JRE_PACKAGE% && \
+    del %JRE_PACKAGE% && \
+    move %JRE_DIR% %JRE_TOOLS_DIR%
+
+COPY --from=stage1 ${JDK_DIR}/bin/jstack.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_TOOLS_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/bin/attach.dll ${JRE_TOOLS_DIR}/bin
+
+USER ContainerUser
diff --git a/docker/windowsnanoserver-20H2/Dockerfile.zulu-8u282-jre-tools b/docker/windowsnanoserver-20H2/Dockerfile.zulu-8u282-jre-tools
new file mode 100644
index 00000000..0431829b
--- /dev/null
+++ b/docker/windowsnanoserver-20H2/Dockerfile.zulu-8u282-jre-tools
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u282-zulu-windowsservercore AS stage1
+FROM mcr.microsoft.com/windows/nanoserver:20H2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-8/8u282
+ARG JRE_TOOLS_DIR=zulu-8-azure-jre-tools_8.52.0.23-8.0.282-win_x64
+ARG JRE_DIR=zulu-8-azure-jre_8.52.0.23-8.0.282-win_x64
+ARG JRE_PACKAGE=$JRE_DIR.zip
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-8"
+
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "C:\%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+RUN curl https://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%JRE_PACKAGE% -o %JRE_PACKAGE% && \
+    tar -xf %JRE_PACKAGE% && \
+    del %JRE_PACKAGE% && \
+    move %JRE_DIR% %JRE_TOOLS_DIR%
+
+COPY --from=stage1 ${JDK_DIR}/bin/jstack.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_TOOLS_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/bin/attach.dll ${JRE_TOOLS_DIR}/bin
+
+USER ContainerUser

From c0bb49afd430c460cc112a6a7cef447e850e9a51 Mon Sep 17 00:00:00 2001
From: zulu-ci <zulu-ci@azul.com>
Date: Thu, 18 Mar 2021 17:29:11 +0000
Subject: [PATCH 229/264] java 16 release

---
 docker/centos/Dockerfile.zulu-16u0-jdk        | 17 +++++++++
 docker/centos/Dockerfile.zulu-16u0-jre        | 17 +++++++++
 docker/debian10/Dockerfile.zulu-16u0-jdk      | 21 ++++++++++
 docker/debian10/Dockerfile.zulu-16u0-jre      | 21 ++++++++++
 docker/debian9/Dockerfile.zulu-16u0-jdk       | 21 ++++++++++
 docker/debian9/Dockerfile.zulu-16u0-jre       | 21 ++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-16u0-jdk  | 21 ++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-16u0-jre  | 21 ++++++++++
 docker/ubuntu/Dockerfile.zulu-16u0-jdk        | 21 ++++++++++
 docker/ubuntu/Dockerfile.zulu-16u0-jre        | 21 ++++++++++
 .../Dockerfile.zulu-16u0-jre-tools            | 38 +++++++++++++++++++
 .../Dockerfile.zulu-16u0-jdk                  | 17 +++++++++
 .../Dockerfile.zulu-16u0-jre                  | 16 ++++++++
 13 files changed, 273 insertions(+)
 create mode 100644 docker/centos/Dockerfile.zulu-16u0-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-16u0-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-16u0-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-16u0-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-16u0-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-16u0-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-16u0-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-16u0-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-16u0-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-16u0-jre
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-16u0-jre-tools
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-16u0-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-16u0-jre

diff --git a/docker/centos/Dockerfile.zulu-16u0-jdk b/docker/centos/Dockerfile.zulu-16u0-jdk
new file mode 100644
index 00000000..6473ddae
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-16u0-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-16-azure-jdk-16.28.11
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-16-azure
+
diff --git a/docker/centos/Dockerfile.zulu-16u0-jre b/docker/centos/Dockerfile.zulu-16u0-jre
new file mode 100644
index 00000000..e5e74b4e
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-16u0-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-16-azure-jre-16.28.11
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-16-azure
+
diff --git a/docker/debian10/Dockerfile.zulu-16u0-jdk b/docker/debian10/Dockerfile.zulu-16u0-jdk
new file mode 100644
index 00000000..f1a4cbab
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-16u0-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-16-azure-jdk=16.28+11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-16-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-16u0-jre b/docker/debian10/Dockerfile.zulu-16u0-jre
new file mode 100644
index 00000000..4ecbfc44
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-16u0-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-16-azure-jre=16.28+11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-16-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-16u0-jdk b/docker/debian9/Dockerfile.zulu-16u0-jdk
new file mode 100644
index 00000000..fbd9bb05
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-16u0-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-16-azure-jdk=16.28+11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-16-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-16u0-jre b/docker/debian9/Dockerfile.zulu-16u0-jre
new file mode 100644
index 00000000..e32562b3
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-16u0-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-16-azure-jre=16.28+11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-16-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-16u0-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-16u0-jdk
new file mode 100644
index 00000000..ffdb8569
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-16u0-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-16-azure-jdk=16.28+11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-16-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-16u0-jre b/docker/ubuntu-18.04/Dockerfile.zulu-16u0-jre
new file mode 100644
index 00000000..ebd8540e
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-16u0-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-16-azure-jre=16.28+11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-16-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-16u0-jdk b/docker/ubuntu/Dockerfile.zulu-16u0-jdk
new file mode 100644
index 00000000..65e9d387
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-16u0-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-16-azure-jdk=16.28+11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-16-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-16u0-jre b/docker/ubuntu/Dockerfile.zulu-16u0-jre
new file mode 100644
index 00000000..c575dad3
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-16u0-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-16-azure-jre=16.28+11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-16-azure-amd64
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-16u0-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-16u0-jre-tools
new file mode 100644
index 00000000..a70e3105
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-16u0-jre-tools
@@ -0,0 +1,38 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:16u0-zulu-windowsservercore AS stage1
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-16/16.0.0
+ARG JRE_PACKAGE=zulu-16-azure-jre_16.28.11-16.0.0-win_x64.msi
+ARG JRE_DIR="C:\Program Files\Zulu\zulu-16-jre"
+ARG JRE_TOOLS_DIR=C:\zulu-16-azure-jre-tools_16.28.11-16.0.0-win_x64
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-16"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-16/16/zulu-16-azure-jre_16.28.11-16.0.0-win_x64.msi', '%JRE_PACKAGE%') && \
+    msiexec /quiet /i %JRE_PACKAGE% && \
+    del %JRE_PACKAGE%
+
+RUN jimage.exe list "%JRE_DIR%\lib\modules" | findstr "Module: " > modules.out && \
+    powershell -Command "(Get-Content modules.out) -replace 'Module: ', '' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) -join ',' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) + ',jdk.jcmd' | Out-File modules.out" && \
+    for /f %P in ('type modules.out') do setx /m JRE_MODULES %P && \
+    del modules.out
+
+RUN jlink --no-header-files --strip-debug --module-path "%JDK_DIR%\jmods" --add-modules %JRE_MODULES% --output %JRE_TOOLS_DIR%
+
+FROM mcr.microsoft.com/windows/nanoserver:2004
+
+ARG JRE_TOOLS_DIR="C:\zulu-16-azure-jre-tools_16.28.11-16.0.0-win_x64"
+
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+COPY --from=stage1 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+USER ContainerUser
\ No newline at end of file
diff --git a/docker/windowsservercore/Dockerfile.zulu-16u0-jdk b/docker/windowsservercore/Dockerfile.zulu-16u0-jdk
new file mode 100644
index 00000000..173b8c67
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-16u0-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-16-azure-jdk_16.28.11-16.0.0-win_x64.msi && \
+    setx PACKAGE_DIR zulu-16/16.0.0 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-16"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-16/16/zulu-16-azure-jdk_16.28.11-16.0.0-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-16u0-jre b/docker/windowsservercore/Dockerfile.zulu-16u0-jre
new file mode 100644
index 00000000..1db6ff59
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-16u0-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-16-azure-jre_16.28.11-16.0.0-win_x64.msi && \
+    setx PACKAGE_DIR zulu-16/16.0.0 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-16-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-16/16/zulu-16-azure-jre_16.28.11-16.0.0-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%

From 1fc4bfbc5acf269333115a809bce1bf2d4bb07a8 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 19 Mar 2021 08:20:17 -0500
Subject: [PATCH 230/264] Added --purge to autoremove command

---
 docker/debian10/Dockerfile.zulu-11u10-jdk                       | 2 +-
 docker/debian10/Dockerfile.zulu-11u10-jre                       | 2 +-
 docker/debian10/Dockerfile.zulu-11u10-jre-headless              | 2 +-
 .../debian10/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8   | 2 +-
 .../debian10/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9   | 2 +-
 docker/debian10/Dockerfile.zulu-11u8-jdk                        | 2 +-
 docker/debian10/Dockerfile.zulu-11u8-jre                        | 2 +-
 docker/debian10/Dockerfile.zulu-11u8-jre-headless               | 2 +-
 docker/debian10/Dockerfile.zulu-11u9-jdk                        | 2 +-
 docker/debian10/Dockerfile.zulu-11u9-jre                        | 2 +-
 docker/debian10/Dockerfile.zulu-11u9-jre-headless               | 2 +-
 docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8 | 2 +-
 docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9 | 2 +-
 docker/debian10/Dockerfile.zulu-13u4-jdk                        | 2 +-
 docker/debian10/Dockerfile.zulu-13u4-jre                        | 2 +-
 docker/debian10/Dockerfile.zulu-13u4-jre-headless               | 2 +-
 docker/debian10/Dockerfile.zulu-13u5-jdk                        | 2 +-
 docker/debian10/Dockerfile.zulu-13u5-jre                        | 2 +-
 docker/debian10/Dockerfile.zulu-13u5-jre-headless               | 2 +-
 docker/debian10/Dockerfile.zulu-13u6-jdk                        | 2 +-
 docker/debian10/Dockerfile.zulu-13u6-jre                        | 2 +-
 docker/debian10/Dockerfile.zulu-13u6-jre-headless               | 2 +-
 docker/debian10/Dockerfile.zulu-15u0-jdk                        | 2 +-
 docker/debian10/Dockerfile.zulu-15u0-jre                        | 2 +-
 docker/debian10/Dockerfile.zulu-15u0-jre-headless               | 2 +-
 docker/debian10/Dockerfile.zulu-15u1-jdk                        | 2 +-
 docker/debian10/Dockerfile.zulu-15u1-jre                        | 2 +-
 docker/debian10/Dockerfile.zulu-15u1-jre-headless               | 2 +-
 docker/debian10/Dockerfile.zulu-15u2-jdk                        | 2 +-
 docker/debian10/Dockerfile.zulu-15u2-jre                        | 2 +-
 docker/debian10/Dockerfile.zulu-15u2-jre-headless               | 2 +-
 docker/debian10/Dockerfile.zulu-7u282-jdk                       | 2 +-
 docker/debian10/Dockerfile.zulu-7u282-jre                       | 2 +-
 docker/debian10/Dockerfile.zulu-7u282-jre-headless              | 2 +-
 docker/debian10/Dockerfile.zulu-7u285-jdk                       | 2 +-
 docker/debian10/Dockerfile.zulu-7u285-jre                       | 2 +-
 docker/debian10/Dockerfile.zulu-7u285-jre-headless              | 2 +-
 docker/debian10/Dockerfile.zulu-7u292-jdk                       | 2 +-
 docker/debian10/Dockerfile.zulu-7u292-jre                       | 2 +-
 docker/debian10/Dockerfile.zulu-7u292-jre-headless              | 2 +-
 docker/debian10/Dockerfile.zulu-8u272-jdk                       | 2 +-
 docker/debian10/Dockerfile.zulu-8u272-jre                       | 2 +-
 docker/debian10/Dockerfile.zulu-8u272-jre-headless              | 2 +-
 .../debian10/Dockerfile.zulu-8u272-jre-headless-tools-tomcat8   | 2 +-
 .../debian10/Dockerfile.zulu-8u272-jre-headless-tools-tomcat9   | 2 +-
 docker/debian10/Dockerfile.zulu-8u275-jdk                       | 2 +-
 docker/debian10/Dockerfile.zulu-8u275-jre                       | 2 +-
 docker/debian10/Dockerfile.zulu-8u275-jre-headless              | 2 +-
 .../debian10/Dockerfile.zulu-8u275-jre-headless-tools-tomcat8   | 2 +-
 .../debian10/Dockerfile.zulu-8u275-jre-headless-tools-tomcat9   | 2 +-
 docker/debian10/Dockerfile.zulu-8u282-jdk                       | 2 +-
 docker/debian10/Dockerfile.zulu-8u282-jre                       | 2 +-
 docker/debian10/Dockerfile.zulu-8u282-jre-headless              | 2 +-
 .../debian10/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8   | 2 +-
 .../debian10/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9   | 2 +-
 55 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/docker/debian10/Dockerfile.zulu-11u10-jdk b/docker/debian10/Dockerfile.zulu-11u10-jdk
index 6cedc3b9..403c4df0 100644
--- a/docker/debian10/Dockerfile.zulu-11u10-jdk
+++ b/docker/debian10/Dockerfile.zulu-11u10-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.45+27* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u10-jre b/docker/debian10/Dockerfile.zulu-11u10-jre
index d5070221..8ab80e24 100644
--- a/docker/debian10/Dockerfile.zulu-11u10-jre
+++ b/docker/debian10/Dockerfile.zulu-11u10-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.45+27* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u10-jre-headless b/docker/debian10/Dockerfile.zulu-11u10-jre-headless
index 6a38a3da..97c118ce 100644
--- a/docker/debian10/Dockerfile.zulu-11u10-jre-headless
+++ b/docker/debian10/Dockerfile.zulu-11u10-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.45+27* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8 b/docker/debian10/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
index fadf003c..25c895d6 100644
--- a/docker/debian10/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
+++ b/docker/debian10/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
@@ -50,7 +50,7 @@ RUN apt-get -qq update && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y purge curl && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
diff --git a/docker/debian10/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9 b/docker/debian10/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
index 1007367a..aee46c90 100644
--- a/docker/debian10/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
+++ b/docker/debian10/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
@@ -50,7 +50,7 @@ RUN apt-get -qq update && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y purge curl && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
diff --git a/docker/debian10/Dockerfile.zulu-11u8-jdk b/docker/debian10/Dockerfile.zulu-11u8-jdk
index 60722165..a1cb18a2 100644
--- a/docker/debian10/Dockerfile.zulu-11u8-jdk
+++ b/docker/debian10/Dockerfile.zulu-11u8-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.41+23* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u8-jre b/docker/debian10/Dockerfile.zulu-11u8-jre
index de14eed3..2fa78f9b 100644
--- a/docker/debian10/Dockerfile.zulu-11u8-jre
+++ b/docker/debian10/Dockerfile.zulu-11u8-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.41+23* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u8-jre-headless b/docker/debian10/Dockerfile.zulu-11u8-jre-headless
index 53c29edf..04152b15 100644
--- a/docker/debian10/Dockerfile.zulu-11u8-jre-headless
+++ b/docker/debian10/Dockerfile.zulu-11u8-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.41+23* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u9-jdk b/docker/debian10/Dockerfile.zulu-11u9-jdk
index 9f634f54..0accb488 100644
--- a/docker/debian10/Dockerfile.zulu-11u9-jdk
+++ b/docker/debian10/Dockerfile.zulu-11u9-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.43+55* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u9-jre b/docker/debian10/Dockerfile.zulu-11u9-jre
index 7e7e8035..8bdadb54 100644
--- a/docker/debian10/Dockerfile.zulu-11u9-jre
+++ b/docker/debian10/Dockerfile.zulu-11u9-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.43+55* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u9-jre-headless b/docker/debian10/Dockerfile.zulu-11u9-jre-headless
index 643f65c7..e6b74c82 100644
--- a/docker/debian10/Dockerfile.zulu-11u9-jre-headless
+++ b/docker/debian10/Dockerfile.zulu-11u9-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.43+55* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8 b/docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8
index afbbd8c8..a5616fe6 100644
--- a/docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8
+++ b/docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8
@@ -50,7 +50,7 @@ RUN apt-get -qq update && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y purge curl && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
diff --git a/docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9 b/docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9
index 28cfa0a0..f1f03441 100644
--- a/docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9
+++ b/docker/debian10/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9
@@ -50,7 +50,7 @@ RUN apt-get -qq update && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y purge curl && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
diff --git a/docker/debian10/Dockerfile.zulu-13u4-jdk b/docker/debian10/Dockerfile.zulu-13u4-jdk
index 5e6ea98a..7f6bea07 100644
--- a/docker/debian10/Dockerfile.zulu-13u4-jdk
+++ b/docker/debian10/Dockerfile.zulu-13u4-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.33+25* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-13u4-jre b/docker/debian10/Dockerfile.zulu-13u4-jre
index f2739c0e..acad8532 100644
--- a/docker/debian10/Dockerfile.zulu-13u4-jre
+++ b/docker/debian10/Dockerfile.zulu-13u4-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.33+25* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-13u4-jre-headless b/docker/debian10/Dockerfile.zulu-13u4-jre-headless
index ea8d8b74..fe88d3b5 100644
--- a/docker/debian10/Dockerfile.zulu-13u4-jre-headless
+++ b/docker/debian10/Dockerfile.zulu-13u4-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.33+25* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-13u5-jdk b/docker/debian10/Dockerfile.zulu-13u5-jdk
index 3b88693a..f16ccd2a 100644
--- a/docker/debian10/Dockerfile.zulu-13u5-jdk
+++ b/docker/debian10/Dockerfile.zulu-13u5-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.35+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-13u5-jre b/docker/debian10/Dockerfile.zulu-13u5-jre
index 27bdc025..28180d64 100644
--- a/docker/debian10/Dockerfile.zulu-13u5-jre
+++ b/docker/debian10/Dockerfile.zulu-13u5-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.35+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-13u5-jre-headless b/docker/debian10/Dockerfile.zulu-13u5-jre-headless
index f7cd6e28..55ebe4af 100644
--- a/docker/debian10/Dockerfile.zulu-13u5-jre-headless
+++ b/docker/debian10/Dockerfile.zulu-13u5-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.35+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-13u6-jdk b/docker/debian10/Dockerfile.zulu-13u6-jdk
index fb2cdd40..1052cc8b 100644
--- a/docker/debian10/Dockerfile.zulu-13u6-jdk
+++ b/docker/debian10/Dockerfile.zulu-13u6-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.37+21* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-13u6-jre b/docker/debian10/Dockerfile.zulu-13u6-jre
index ed1f6f82..3981cb59 100644
--- a/docker/debian10/Dockerfile.zulu-13u6-jre
+++ b/docker/debian10/Dockerfile.zulu-13u6-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.37+21* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-13u6-jre-headless b/docker/debian10/Dockerfile.zulu-13u6-jre-headless
index fe45160f..b895eae8 100644
--- a/docker/debian10/Dockerfile.zulu-13u6-jre-headless
+++ b/docker/debian10/Dockerfile.zulu-13u6-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.37+21* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-15u0-jdk b/docker/debian10/Dockerfile.zulu-15u0-jdk
index e8239f62..d550ff84 100644
--- a/docker/debian10/Dockerfile.zulu-15u0-jdk
+++ b/docker/debian10/Dockerfile.zulu-15u0-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.27+17* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-15u0-jre b/docker/debian10/Dockerfile.zulu-15u0-jre
index 973a9bfb..49b7ef9e 100644
--- a/docker/debian10/Dockerfile.zulu-15u0-jre
+++ b/docker/debian10/Dockerfile.zulu-15u0-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.27+17* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-15u0-jre-headless b/docker/debian10/Dockerfile.zulu-15u0-jre-headless
index b3dbb2ae..7c67c2ef 100644
--- a/docker/debian10/Dockerfile.zulu-15u0-jre-headless
+++ b/docker/debian10/Dockerfile.zulu-15u0-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.27+17* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-15u1-jdk b/docker/debian10/Dockerfile.zulu-15u1-jdk
index 2d34774c..b284280d 100644
--- a/docker/debian10/Dockerfile.zulu-15u1-jdk
+++ b/docker/debian10/Dockerfile.zulu-15u1-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.28+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-15u1-jre b/docker/debian10/Dockerfile.zulu-15u1-jre
index d22de142..a36cd945 100644
--- a/docker/debian10/Dockerfile.zulu-15u1-jre
+++ b/docker/debian10/Dockerfile.zulu-15u1-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.28+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-15u1-jre-headless b/docker/debian10/Dockerfile.zulu-15u1-jre-headless
index 909032a5..88c4bdf4 100644
--- a/docker/debian10/Dockerfile.zulu-15u1-jre-headless
+++ b/docker/debian10/Dockerfile.zulu-15u1-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.28+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-15u2-jdk b/docker/debian10/Dockerfile.zulu-15u2-jdk
index 795e91c4..4e663181 100644
--- a/docker/debian10/Dockerfile.zulu-15u2-jdk
+++ b/docker/debian10/Dockerfile.zulu-15u2-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.29+15* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-15u2-jre b/docker/debian10/Dockerfile.zulu-15u2-jre
index 66a3aba2..3b162f60 100644
--- a/docker/debian10/Dockerfile.zulu-15u2-jre
+++ b/docker/debian10/Dockerfile.zulu-15u2-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.29+15* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-15u2-jre-headless b/docker/debian10/Dockerfile.zulu-15u2-jre-headless
index 40703bb9..c90a2dba 100644
--- a/docker/debian10/Dockerfile.zulu-15u2-jre-headless
+++ b/docker/debian10/Dockerfile.zulu-15u2-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.29+15* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u282-jdk b/docker/debian10/Dockerfile.zulu-7u282-jdk
index b297bc38..d289445c 100644
--- a/docker/debian10/Dockerfile.zulu-7u282-jdk
+++ b/docker/debian10/Dockerfile.zulu-7u282-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.42.0.13* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u282-jre b/docker/debian10/Dockerfile.zulu-7u282-jre
index aeeaaa9e..757e2546 100644
--- a/docker/debian10/Dockerfile.zulu-7u282-jre
+++ b/docker/debian10/Dockerfile.zulu-7u282-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.42.0.13* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u282-jre-headless b/docker/debian10/Dockerfile.zulu-7u282-jre-headless
index d9b7879a..81ae04cd 100644
--- a/docker/debian10/Dockerfile.zulu-7u282-jre-headless
+++ b/docker/debian10/Dockerfile.zulu-7u282-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.42.0.13* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u285-jdk b/docker/debian10/Dockerfile.zulu-7u285-jdk
index d2755fd3..fbbd593b 100644
--- a/docker/debian10/Dockerfile.zulu-7u285-jdk
+++ b/docker/debian10/Dockerfile.zulu-7u285-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.42.0.51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u285-jre b/docker/debian10/Dockerfile.zulu-7u285-jre
index c7cc2978..ccbafab5 100644
--- a/docker/debian10/Dockerfile.zulu-7u285-jre
+++ b/docker/debian10/Dockerfile.zulu-7u285-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.42.0.51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u285-jre-headless b/docker/debian10/Dockerfile.zulu-7u285-jre-headless
index 38bee1cc..1bbe2aaa 100644
--- a/docker/debian10/Dockerfile.zulu-7u285-jre-headless
+++ b/docker/debian10/Dockerfile.zulu-7u285-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.42.0.51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u292-jdk b/docker/debian10/Dockerfile.zulu-7u292-jdk
index 21eb8e02..e6171a40 100644
--- a/docker/debian10/Dockerfile.zulu-7u292-jdk
+++ b/docker/debian10/Dockerfile.zulu-7u292-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.44.0.11* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u292-jre b/docker/debian10/Dockerfile.zulu-7u292-jre
index cf732758..c824f551 100644
--- a/docker/debian10/Dockerfile.zulu-7u292-jre
+++ b/docker/debian10/Dockerfile.zulu-7u292-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.44.0.11* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u292-jre-headless b/docker/debian10/Dockerfile.zulu-7u292-jre-headless
index 7ab6e63c..36ed61f3 100644
--- a/docker/debian10/Dockerfile.zulu-7u292-jre-headless
+++ b/docker/debian10/Dockerfile.zulu-7u292-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.44.0.11* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u272-jdk b/docker/debian10/Dockerfile.zulu-8u272-jdk
index 17be60a7..c44ea782 100644
--- a/docker/debian10/Dockerfile.zulu-8u272-jdk
+++ b/docker/debian10/Dockerfile.zulu-8u272-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.50.0.21* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u272-jre b/docker/debian10/Dockerfile.zulu-8u272-jre
index fae5e4d3..46cf0e45 100644
--- a/docker/debian10/Dockerfile.zulu-8u272-jre
+++ b/docker/debian10/Dockerfile.zulu-8u272-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.50.0.21* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u272-jre-headless b/docker/debian10/Dockerfile.zulu-8u272-jre-headless
index acda1339..19cdc635 100644
--- a/docker/debian10/Dockerfile.zulu-8u272-jre-headless
+++ b/docker/debian10/Dockerfile.zulu-8u272-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.50.0.21* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u272-jre-headless-tools-tomcat8 b/docker/debian10/Dockerfile.zulu-8u272-jre-headless-tools-tomcat8
index 4bb54dea..a8c53685 100644
--- a/docker/debian10/Dockerfile.zulu-8u272-jre-headless-tools-tomcat8
+++ b/docker/debian10/Dockerfile.zulu-8u272-jre-headless-tools-tomcat8
@@ -45,7 +45,7 @@ RUN apt-get -qq update && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y purge curl && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
diff --git a/docker/debian10/Dockerfile.zulu-8u272-jre-headless-tools-tomcat9 b/docker/debian10/Dockerfile.zulu-8u272-jre-headless-tools-tomcat9
index 942cf1b8..6a19c74e 100644
--- a/docker/debian10/Dockerfile.zulu-8u272-jre-headless-tools-tomcat9
+++ b/docker/debian10/Dockerfile.zulu-8u272-jre-headless-tools-tomcat9
@@ -45,7 +45,7 @@ RUN apt-get -qq update && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y purge curl && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
diff --git a/docker/debian10/Dockerfile.zulu-8u275-jdk b/docker/debian10/Dockerfile.zulu-8u275-jdk
index fbc0ff7b..b197312f 100644
--- a/docker/debian10/Dockerfile.zulu-8u275-jdk
+++ b/docker/debian10/Dockerfile.zulu-8u275-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.50.0.51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u275-jre b/docker/debian10/Dockerfile.zulu-8u275-jre
index 3caa3214..19c8f741 100644
--- a/docker/debian10/Dockerfile.zulu-8u275-jre
+++ b/docker/debian10/Dockerfile.zulu-8u275-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.50.0.51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u275-jre-headless b/docker/debian10/Dockerfile.zulu-8u275-jre-headless
index e08de4ae..30db0091 100644
--- a/docker/debian10/Dockerfile.zulu-8u275-jre-headless
+++ b/docker/debian10/Dockerfile.zulu-8u275-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.50.0.51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u275-jre-headless-tools-tomcat8 b/docker/debian10/Dockerfile.zulu-8u275-jre-headless-tools-tomcat8
index 038dd615..c935ad6a 100644
--- a/docker/debian10/Dockerfile.zulu-8u275-jre-headless-tools-tomcat8
+++ b/docker/debian10/Dockerfile.zulu-8u275-jre-headless-tools-tomcat8
@@ -45,7 +45,7 @@ RUN apt-get -qq update && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y purge curl && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
diff --git a/docker/debian10/Dockerfile.zulu-8u275-jre-headless-tools-tomcat9 b/docker/debian10/Dockerfile.zulu-8u275-jre-headless-tools-tomcat9
index 1763d9b9..cc121e21 100644
--- a/docker/debian10/Dockerfile.zulu-8u275-jre-headless-tools-tomcat9
+++ b/docker/debian10/Dockerfile.zulu-8u275-jre-headless-tools-tomcat9
@@ -45,7 +45,7 @@ RUN apt-get -qq update && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y purge curl && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
diff --git a/docker/debian10/Dockerfile.zulu-8u282-jdk b/docker/debian10/Dockerfile.zulu-8u282-jdk
index 7c9e532f..a1c3d587 100644
--- a/docker/debian10/Dockerfile.zulu-8u282-jdk
+++ b/docker/debian10/Dockerfile.zulu-8u282-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.52.0.23* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u282-jre b/docker/debian10/Dockerfile.zulu-8u282-jre
index cffe1525..789ae5b9 100644
--- a/docker/debian10/Dockerfile.zulu-8u282-jre
+++ b/docker/debian10/Dockerfile.zulu-8u282-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.52.0.23* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u282-jre-headless b/docker/debian10/Dockerfile.zulu-8u282-jre-headless
index 5d69911b..6ba98d4f 100644
--- a/docker/debian10/Dockerfile.zulu-8u282-jre-headless
+++ b/docker/debian10/Dockerfile.zulu-8u282-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.52.0.23* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8 b/docker/debian10/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
index 63a796d9..d02ef0a7 100644
--- a/docker/debian10/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
+++ b/docker/debian10/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
@@ -45,7 +45,7 @@ RUN apt-get -qq update && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y purge curl && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
diff --git a/docker/debian10/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9 b/docker/debian10/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9
index 11cde5fd..de15dd8a 100644
--- a/docker/debian10/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9
+++ b/docker/debian10/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9
@@ -45,7 +45,7 @@ RUN apt-get -qq update && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y purge curl && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml

From 8525e41722db470823c76a16d73d1d3acd37b2b9 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 19 Mar 2021 08:25:40 -0500
Subject: [PATCH 231/264] Added --purge to autoremove command

---
 docker/debian9/Dockerfile.zulu-11u10-jdk          | 2 +-
 docker/debian9/Dockerfile.zulu-11u10-jre          | 2 +-
 docker/debian9/Dockerfile.zulu-11u10-jre-headless | 2 +-
 docker/debian9/Dockerfile.zulu-11u8-jdk           | 2 +-
 docker/debian9/Dockerfile.zulu-11u8-jre           | 2 +-
 docker/debian9/Dockerfile.zulu-11u8-jre-headless  | 2 +-
 docker/debian9/Dockerfile.zulu-11u9-jdk           | 2 +-
 docker/debian9/Dockerfile.zulu-11u9-jre           | 2 +-
 docker/debian9/Dockerfile.zulu-11u9-jre-headless  | 2 +-
 docker/debian9/Dockerfile.zulu-13u4-jdk           | 2 +-
 docker/debian9/Dockerfile.zulu-13u4-jre           | 2 +-
 docker/debian9/Dockerfile.zulu-13u4-jre-headless  | 2 +-
 docker/debian9/Dockerfile.zulu-13u5-jdk           | 2 +-
 docker/debian9/Dockerfile.zulu-13u5-jre           | 2 +-
 docker/debian9/Dockerfile.zulu-13u5-jre-headless  | 2 +-
 docker/debian9/Dockerfile.zulu-13u6-jdk           | 2 +-
 docker/debian9/Dockerfile.zulu-13u6-jre           | 2 +-
 docker/debian9/Dockerfile.zulu-13u6-jre-headless  | 2 +-
 docker/debian9/Dockerfile.zulu-15u0-jdk           | 2 +-
 docker/debian9/Dockerfile.zulu-15u0-jre           | 2 +-
 docker/debian9/Dockerfile.zulu-15u0-jre-headless  | 2 +-
 docker/debian9/Dockerfile.zulu-15u1-jdk           | 2 +-
 docker/debian9/Dockerfile.zulu-15u1-jre           | 2 +-
 docker/debian9/Dockerfile.zulu-15u1-jre-headless  | 2 +-
 docker/debian9/Dockerfile.zulu-15u2-jdk           | 2 +-
 docker/debian9/Dockerfile.zulu-15u2-jre           | 2 +-
 docker/debian9/Dockerfile.zulu-15u2-jre-headless  | 2 +-
 docker/debian9/Dockerfile.zulu-7u282-jdk          | 2 +-
 docker/debian9/Dockerfile.zulu-7u282-jre          | 2 +-
 docker/debian9/Dockerfile.zulu-7u282-jre-headless | 2 +-
 docker/debian9/Dockerfile.zulu-7u285-jdk          | 2 +-
 docker/debian9/Dockerfile.zulu-7u285-jre          | 2 +-
 docker/debian9/Dockerfile.zulu-7u285-jre-headless | 2 +-
 docker/debian9/Dockerfile.zulu-7u292-jdk          | 2 +-
 docker/debian9/Dockerfile.zulu-7u292-jre          | 2 +-
 docker/debian9/Dockerfile.zulu-7u292-jre-headless | 2 +-
 docker/debian9/Dockerfile.zulu-8u272-jdk          | 2 +-
 docker/debian9/Dockerfile.zulu-8u272-jre          | 2 +-
 docker/debian9/Dockerfile.zulu-8u272-jre-headless | 2 +-
 docker/debian9/Dockerfile.zulu-8u275-jdk          | 2 +-
 docker/debian9/Dockerfile.zulu-8u275-jre          | 2 +-
 docker/debian9/Dockerfile.zulu-8u275-jre-headless | 2 +-
 docker/debian9/Dockerfile.zulu-8u282-jdk          | 2 +-
 docker/debian9/Dockerfile.zulu-8u282-jre          | 2 +-
 docker/debian9/Dockerfile.zulu-8u282-jre-headless | 2 +-
 45 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/docker/debian9/Dockerfile.zulu-11u10-jdk b/docker/debian9/Dockerfile.zulu-11u10-jdk
index 3ae681dd..1b056066 100644
--- a/docker/debian9/Dockerfile.zulu-11u10-jdk
+++ b/docker/debian9/Dockerfile.zulu-11u10-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.45+27* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u10-jre b/docker/debian9/Dockerfile.zulu-11u10-jre
index 725cafa2..884b872b 100644
--- a/docker/debian9/Dockerfile.zulu-11u10-jre
+++ b/docker/debian9/Dockerfile.zulu-11u10-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.45+27* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u10-jre-headless b/docker/debian9/Dockerfile.zulu-11u10-jre-headless
index 4ee23d27..0721f260 100644
--- a/docker/debian9/Dockerfile.zulu-11u10-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-11u10-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.45+27* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u8-jdk b/docker/debian9/Dockerfile.zulu-11u8-jdk
index da753281..170b27f9 100644
--- a/docker/debian9/Dockerfile.zulu-11u8-jdk
+++ b/docker/debian9/Dockerfile.zulu-11u8-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.41+23* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u8-jre b/docker/debian9/Dockerfile.zulu-11u8-jre
index 19ed71a4..e59dd8a9 100644
--- a/docker/debian9/Dockerfile.zulu-11u8-jre
+++ b/docker/debian9/Dockerfile.zulu-11u8-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.41+23* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u8-jre-headless b/docker/debian9/Dockerfile.zulu-11u8-jre-headless
index d345153f..5721e2ac 100644
--- a/docker/debian9/Dockerfile.zulu-11u8-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-11u8-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.41+23* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u9-jdk b/docker/debian9/Dockerfile.zulu-11u9-jdk
index aa089181..ae459cd3 100644
--- a/docker/debian9/Dockerfile.zulu-11u9-jdk
+++ b/docker/debian9/Dockerfile.zulu-11u9-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.43+55* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u9-jre b/docker/debian9/Dockerfile.zulu-11u9-jre
index 34609782..9044e3c2 100644
--- a/docker/debian9/Dockerfile.zulu-11u9-jre
+++ b/docker/debian9/Dockerfile.zulu-11u9-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.43+55* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u9-jre-headless b/docker/debian9/Dockerfile.zulu-11u9-jre-headless
index b53aeed6..0f424b82 100644
--- a/docker/debian9/Dockerfile.zulu-11u9-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-11u9-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.43+55* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u4-jdk b/docker/debian9/Dockerfile.zulu-13u4-jdk
index b41121a8..7ebce76e 100644
--- a/docker/debian9/Dockerfile.zulu-13u4-jdk
+++ b/docker/debian9/Dockerfile.zulu-13u4-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.33+25* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u4-jre b/docker/debian9/Dockerfile.zulu-13u4-jre
index 48d7f709..41dbb582 100644
--- a/docker/debian9/Dockerfile.zulu-13u4-jre
+++ b/docker/debian9/Dockerfile.zulu-13u4-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.33+25* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u4-jre-headless b/docker/debian9/Dockerfile.zulu-13u4-jre-headless
index 1fe1f8d6..90213364 100644
--- a/docker/debian9/Dockerfile.zulu-13u4-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-13u4-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.33+25* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u5-jdk b/docker/debian9/Dockerfile.zulu-13u5-jdk
index bdf71c56..9103f131 100644
--- a/docker/debian9/Dockerfile.zulu-13u5-jdk
+++ b/docker/debian9/Dockerfile.zulu-13u5-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.35+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u5-jre b/docker/debian9/Dockerfile.zulu-13u5-jre
index 7e358603..385acac4 100644
--- a/docker/debian9/Dockerfile.zulu-13u5-jre
+++ b/docker/debian9/Dockerfile.zulu-13u5-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.35+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u5-jre-headless b/docker/debian9/Dockerfile.zulu-13u5-jre-headless
index 1447d314..f1fe4abe 100644
--- a/docker/debian9/Dockerfile.zulu-13u5-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-13u5-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.35+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u6-jdk b/docker/debian9/Dockerfile.zulu-13u6-jdk
index 3b47f994..7bbfcff9 100644
--- a/docker/debian9/Dockerfile.zulu-13u6-jdk
+++ b/docker/debian9/Dockerfile.zulu-13u6-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.37+21* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u6-jre b/docker/debian9/Dockerfile.zulu-13u6-jre
index d69d485d..ede4b618 100644
--- a/docker/debian9/Dockerfile.zulu-13u6-jre
+++ b/docker/debian9/Dockerfile.zulu-13u6-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.37+21* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u6-jre-headless b/docker/debian9/Dockerfile.zulu-13u6-jre-headless
index f7cb0eee..84f4baff 100644
--- a/docker/debian9/Dockerfile.zulu-13u6-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-13u6-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.37+21* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-15u0-jdk b/docker/debian9/Dockerfile.zulu-15u0-jdk
index 1a3f556e..11be6de6 100644
--- a/docker/debian9/Dockerfile.zulu-15u0-jdk
+++ b/docker/debian9/Dockerfile.zulu-15u0-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.27+17* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-15u0-jre b/docker/debian9/Dockerfile.zulu-15u0-jre
index f084c1ee..87a2725e 100644
--- a/docker/debian9/Dockerfile.zulu-15u0-jre
+++ b/docker/debian9/Dockerfile.zulu-15u0-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.27+17* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-15u0-jre-headless b/docker/debian9/Dockerfile.zulu-15u0-jre-headless
index 1390aac8..63a6440d 100644
--- a/docker/debian9/Dockerfile.zulu-15u0-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-15u0-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.27+17* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-15u1-jdk b/docker/debian9/Dockerfile.zulu-15u1-jdk
index 1d468e2e..a84c1ec8 100644
--- a/docker/debian9/Dockerfile.zulu-15u1-jdk
+++ b/docker/debian9/Dockerfile.zulu-15u1-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.28+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-15u1-jre b/docker/debian9/Dockerfile.zulu-15u1-jre
index e9ba37ae..050940aa 100644
--- a/docker/debian9/Dockerfile.zulu-15u1-jre
+++ b/docker/debian9/Dockerfile.zulu-15u1-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.28+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-15u1-jre-headless b/docker/debian9/Dockerfile.zulu-15u1-jre-headless
index 26ea7ab7..a336c524 100644
--- a/docker/debian9/Dockerfile.zulu-15u1-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-15u1-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.28+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-15u2-jdk b/docker/debian9/Dockerfile.zulu-15u2-jdk
index 07b4c477..e6428d46 100644
--- a/docker/debian9/Dockerfile.zulu-15u2-jdk
+++ b/docker/debian9/Dockerfile.zulu-15u2-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.29+15* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-15u2-jre b/docker/debian9/Dockerfile.zulu-15u2-jre
index df08bb49..67c655c3 100644
--- a/docker/debian9/Dockerfile.zulu-15u2-jre
+++ b/docker/debian9/Dockerfile.zulu-15u2-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.29+15* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-15u2-jre-headless b/docker/debian9/Dockerfile.zulu-15u2-jre-headless
index 3fa2de89..5edee81c 100644
--- a/docker/debian9/Dockerfile.zulu-15u2-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-15u2-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.29+15* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u282-jdk b/docker/debian9/Dockerfile.zulu-7u282-jdk
index c8ea49c8..889844d7 100644
--- a/docker/debian9/Dockerfile.zulu-7u282-jdk
+++ b/docker/debian9/Dockerfile.zulu-7u282-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.42.0.13* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u282-jre b/docker/debian9/Dockerfile.zulu-7u282-jre
index 7e6d80ac..87039bf6 100644
--- a/docker/debian9/Dockerfile.zulu-7u282-jre
+++ b/docker/debian9/Dockerfile.zulu-7u282-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.42.0.13* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u282-jre-headless b/docker/debian9/Dockerfile.zulu-7u282-jre-headless
index 5f1fc1b6..0d4fd44d 100644
--- a/docker/debian9/Dockerfile.zulu-7u282-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-7u282-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.42.0.13* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u285-jdk b/docker/debian9/Dockerfile.zulu-7u285-jdk
index aff6b01b..73fd1078 100644
--- a/docker/debian9/Dockerfile.zulu-7u285-jdk
+++ b/docker/debian9/Dockerfile.zulu-7u285-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.42.0.51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u285-jre b/docker/debian9/Dockerfile.zulu-7u285-jre
index cf9a78fc..51097dcc 100644
--- a/docker/debian9/Dockerfile.zulu-7u285-jre
+++ b/docker/debian9/Dockerfile.zulu-7u285-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.42.0.51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u285-jre-headless b/docker/debian9/Dockerfile.zulu-7u285-jre-headless
index f825b488..1495fd03 100644
--- a/docker/debian9/Dockerfile.zulu-7u285-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-7u285-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.42.0.51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u292-jdk b/docker/debian9/Dockerfile.zulu-7u292-jdk
index 6b2f3120..7a871bb6 100644
--- a/docker/debian9/Dockerfile.zulu-7u292-jdk
+++ b/docker/debian9/Dockerfile.zulu-7u292-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.44.0.11* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u292-jre b/docker/debian9/Dockerfile.zulu-7u292-jre
index e369ea61..00f53d6f 100644
--- a/docker/debian9/Dockerfile.zulu-7u292-jre
+++ b/docker/debian9/Dockerfile.zulu-7u292-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.44.0.11* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u292-jre-headless b/docker/debian9/Dockerfile.zulu-7u292-jre-headless
index d7d8b96d..5a1203eb 100644
--- a/docker/debian9/Dockerfile.zulu-7u292-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-7u292-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.44.0.11* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u272-jdk b/docker/debian9/Dockerfile.zulu-8u272-jdk
index 68f4e5e3..e1069157 100644
--- a/docker/debian9/Dockerfile.zulu-8u272-jdk
+++ b/docker/debian9/Dockerfile.zulu-8u272-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.50.0.21* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u272-jre b/docker/debian9/Dockerfile.zulu-8u272-jre
index 1c874c8f..40f77612 100644
--- a/docker/debian9/Dockerfile.zulu-8u272-jre
+++ b/docker/debian9/Dockerfile.zulu-8u272-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.50.0.21* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u272-jre-headless b/docker/debian9/Dockerfile.zulu-8u272-jre-headless
index 9536e852..03845f03 100644
--- a/docker/debian9/Dockerfile.zulu-8u272-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-8u272-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.50.0.21* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u275-jdk b/docker/debian9/Dockerfile.zulu-8u275-jdk
index 9a89d576..8dd9e5c5 100644
--- a/docker/debian9/Dockerfile.zulu-8u275-jdk
+++ b/docker/debian9/Dockerfile.zulu-8u275-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.50.0.51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u275-jre b/docker/debian9/Dockerfile.zulu-8u275-jre
index fad66433..1a5055c5 100644
--- a/docker/debian9/Dockerfile.zulu-8u275-jre
+++ b/docker/debian9/Dockerfile.zulu-8u275-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.50.0.51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u275-jre-headless b/docker/debian9/Dockerfile.zulu-8u275-jre-headless
index ba983974..ded4a6ca 100644
--- a/docker/debian9/Dockerfile.zulu-8u275-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-8u275-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.50.0.51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u282-jdk b/docker/debian9/Dockerfile.zulu-8u282-jdk
index 6b8d949c..4729850c 100644
--- a/docker/debian9/Dockerfile.zulu-8u282-jdk
+++ b/docker/debian9/Dockerfile.zulu-8u282-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.52.0.23* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u282-jre b/docker/debian9/Dockerfile.zulu-8u282-jre
index ced31678..39a8662b 100644
--- a/docker/debian9/Dockerfile.zulu-8u282-jre
+++ b/docker/debian9/Dockerfile.zulu-8u282-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.52.0.23* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u282-jre-headless b/docker/debian9/Dockerfile.zulu-8u282-jre-headless
index b27cf938..2418dbd7 100644
--- a/docker/debian9/Dockerfile.zulu-8u282-jre-headless
+++ b/docker/debian9/Dockerfile.zulu-8u282-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.52.0.23* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64

From b62adc3ce6f96256719f2559af5ed06e066fa95e Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 19 Mar 2021 08:28:54 -0500
Subject: [PATCH 232/264] Added --purge to autoremove command

---
 docker/ubuntu-18.04/Dockerfile.zulu-11u10-jdk          | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-11u10-jre          | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-11u10-jre-headless | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-11u8-jdk           | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-11u8-jre           | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-11u8-jre-headless  | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-11u9-jdk           | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-11u9-jre           | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-11u9-jre-headless  | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-13u4-jdk           | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-13u4-jre           | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-13u4-jre-headless  | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-13u5-jdk           | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-13u5-jre           | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-13u5-jre-headless  | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-13u6-jdk           | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-13u6-jre           | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-13u6-jre-headless  | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-15u0-jdk           | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-15u0-jre           | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-15u0-jre-headless  | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-15u1-jdk           | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-15u1-jre           | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-15u1-jre-headless  | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-15u2-jdk           | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-15u2-jre           | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-15u2-jre-headless  | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-7u282-jdk          | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-7u282-jre          | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-7u282-jre-headless | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-7u285-jdk          | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-7u285-jre          | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-7u285-jre-headless | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-7u292-jdk          | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-7u292-jre          | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-7u292-jre-headless | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-8u272-jdk          | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-8u272-jre          | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-8u272-jre-headless | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-8u275-jdk          | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-8u275-jre          | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-8u275-jre-headless | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-8u282-jdk          | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-8u282-jre          | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-8u282-jre-headless | 2 +-
 45 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u10-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-11u10-jdk
index 28f6e715..34e11fdd 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-11u10-jdk
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u10-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.45+27* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u10-jre b/docker/ubuntu-18.04/Dockerfile.zulu-11u10-jre
index 3354900b..bfdc54c3 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-11u10-jre
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u10-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.45+27* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u10-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-11u10-jre-headless
index f9998cab..3fe92f72 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-11u10-jre-headless
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u10-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.45+27* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u8-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-11u8-jdk
index 7eb8b6a1..35502d3d 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-11u8-jdk
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u8-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.41+23* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u8-jre b/docker/ubuntu-18.04/Dockerfile.zulu-11u8-jre
index 28bf5703..4f9cb48e 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-11u8-jre
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u8-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.41+23* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u8-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-11u8-jre-headless
index ad4e3175..9b688cad 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-11u8-jre-headless
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u8-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.41+23* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jdk
index c136fc20..ccea0b37 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jdk
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.43+55* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jre b/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jre
index f6a76330..208a546e 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jre
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.43+55* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jre-headless
index 89b86517..314cd010 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jre-headless
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u9-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.43+55* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u4-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-13u4-jdk
index b3eff0f4..c0e0f12b 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-13u4-jdk
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u4-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.33+25* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u4-jre b/docker/ubuntu-18.04/Dockerfile.zulu-13u4-jre
index 6648a84c..dc380c24 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-13u4-jre
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u4-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.33+25* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u4-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-13u4-jre-headless
index 95e853a7..62d54c36 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-13u4-jre-headless
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u4-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.33+25* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jdk
index f56182a9..aeff2946 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jdk
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.35+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jre b/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jre
index 65591d95..40a6ceed 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jre
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.35+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jre-headless
index 00eba8bf..03a1be69 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jre-headless
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u5-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.35+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u6-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-13u6-jdk
index 2eeef521..7b10de80 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-13u6-jdk
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u6-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.37+21* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u6-jre b/docker/ubuntu-18.04/Dockerfile.zulu-13u6-jre
index 48c041fd..e1f6b8e1 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-13u6-jre
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u6-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.37+21* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u6-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-13u6-jre-headless
index f3d30332..6bec3b30 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-13u6-jre-headless
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u6-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.37+21* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u0-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-15u0-jdk
index f742cbc3..a2ef99ea 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-15u0-jdk
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u0-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.27+17* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u0-jre b/docker/ubuntu-18.04/Dockerfile.zulu-15u0-jre
index 4dc9f26c..cacb4da9 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-15u0-jre
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u0-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.27+17* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u0-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-15u0-jre-headless
index 366161e9..8999143e 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-15u0-jre-headless
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u0-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.27+17* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jdk
index 01a67cca..9544298a 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jdk
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.28+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jre b/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jre
index d9213e26..9bf5c4f0 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jre
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.28+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jre-headless
index f84fb7a4..01c954f2 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jre-headless
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u1-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.28+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u2-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-15u2-jdk
index c77d803e..bd39f448 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-15u2-jdk
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u2-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.29+15* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u2-jre b/docker/ubuntu-18.04/Dockerfile.zulu-15u2-jre
index 1b3a069d..a52df5d1 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-15u2-jre
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u2-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.29+15* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u2-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-15u2-jre-headless
index 6a3c141b..c8973889 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-15u2-jre-headless
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u2-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.29+15* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u282-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-7u282-jdk
index 77ee374b..64f4948c 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-7u282-jdk
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u282-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.42.0.13* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u282-jre b/docker/ubuntu-18.04/Dockerfile.zulu-7u282-jre
index d692fe0d..39f87b9a 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-7u282-jre
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u282-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.42.0.13* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u282-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-7u282-jre-headless
index 13296089..6bfba88f 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-7u282-jre-headless
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u282-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.42.0.13* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u285-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-7u285-jdk
index 0495258c..10f11d7d 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-7u285-jdk
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u285-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.42.0.51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u285-jre b/docker/ubuntu-18.04/Dockerfile.zulu-7u285-jre
index c10c447e..b11de020 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-7u285-jre
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u285-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.42.0.51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u285-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-7u285-jre-headless
index 3ead7afc..cfc5685a 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-7u285-jre-headless
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u285-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.42.0.51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u292-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-7u292-jdk
index ec89e468..a7cceaf2 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-7u292-jdk
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u292-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.44.0.11* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u292-jre b/docker/ubuntu-18.04/Dockerfile.zulu-7u292-jre
index d55ead74..3d861876 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-7u292-jre
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u292-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.44.0.11* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u292-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-7u292-jre-headless
index 65c6f029..c90fe60a 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-7u292-jre-headless
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u292-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.44.0.11* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u272-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-8u272-jdk
index 5bce82fe..2d86c369 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-8u272-jdk
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u272-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.50.0.21* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u272-jre b/docker/ubuntu-18.04/Dockerfile.zulu-8u272-jre
index 003a027f..4fbf5a80 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-8u272-jre
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u272-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.50.0.21* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u272-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-8u272-jre-headless
index febc9336..9b7faab8 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-8u272-jre-headless
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u272-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.50.0.21* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u275-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-8u275-jdk
index 914ec3e6..6e51e24d 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-8u275-jdk
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u275-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.50.0.51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u275-jre b/docker/ubuntu-18.04/Dockerfile.zulu-8u275-jre
index 0c7e722a..0c29cedc 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-8u275-jre
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u275-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.50.0.51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u275-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-8u275-jre-headless
index d5d718a1..8341ed9f 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-8u275-jre-headless
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u275-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.50.0.51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u282-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-8u282-jdk
index 4a9d3ffe..e3628abd 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-8u282-jdk
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u282-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.52.0.23* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u282-jre b/docker/ubuntu-18.04/Dockerfile.zulu-8u282-jre
index bdf4ffa0..fbaf264f 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-8u282-jre
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u282-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.52.0.23* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u282-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-8u282-jre-headless
index 9536659d..5c125e17 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-8u282-jre-headless
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u282-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.52.0.23* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64

From 002cfef66610aba2b76c43eed3bfe34b91b14dac Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 19 Mar 2021 08:32:54 -0500
Subject: [PATCH 233/264] Added --pruge to autoremove command

---
 docker/ubuntu/Dockerfile.zulu-11u10-jdk                        | 2 +-
 docker/ubuntu/Dockerfile.zulu-11u10-jre                        | 2 +-
 docker/ubuntu/Dockerfile.zulu-11u10-jre-headless               | 2 +-
 docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8 | 2 +-
 docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9 | 2 +-
 docker/ubuntu/Dockerfile.zulu-11u8-jdk                         | 2 +-
 docker/ubuntu/Dockerfile.zulu-11u8-jre                         | 2 +-
 docker/ubuntu/Dockerfile.zulu-11u8-jre-headless                | 2 +-
 docker/ubuntu/Dockerfile.zulu-11u9-jdk                         | 2 +-
 docker/ubuntu/Dockerfile.zulu-11u9-jre                         | 2 +-
 docker/ubuntu/Dockerfile.zulu-11u9-jre-headless                | 2 +-
 docker/ubuntu/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8  | 2 +-
 docker/ubuntu/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9  | 2 +-
 docker/ubuntu/Dockerfile.zulu-13u4-jdk                         | 2 +-
 docker/ubuntu/Dockerfile.zulu-13u4-jre                         | 2 +-
 docker/ubuntu/Dockerfile.zulu-13u4-jre-headless                | 2 +-
 docker/ubuntu/Dockerfile.zulu-13u5-jdk                         | 2 +-
 docker/ubuntu/Dockerfile.zulu-13u5-jre                         | 2 +-
 docker/ubuntu/Dockerfile.zulu-13u5-jre-headless                | 2 +-
 docker/ubuntu/Dockerfile.zulu-13u6-jdk                         | 2 +-
 docker/ubuntu/Dockerfile.zulu-13u6-jre                         | 2 +-
 docker/ubuntu/Dockerfile.zulu-13u6-jre-headless                | 2 +-
 docker/ubuntu/Dockerfile.zulu-15u0-jdk                         | 2 +-
 docker/ubuntu/Dockerfile.zulu-15u0-jre                         | 2 +-
 docker/ubuntu/Dockerfile.zulu-15u0-jre-headless                | 2 +-
 docker/ubuntu/Dockerfile.zulu-15u1-jdk                         | 2 +-
 docker/ubuntu/Dockerfile.zulu-15u1-jre                         | 2 +-
 docker/ubuntu/Dockerfile.zulu-15u1-jre-headless                | 2 +-
 docker/ubuntu/Dockerfile.zulu-15u2-jdk                         | 2 +-
 docker/ubuntu/Dockerfile.zulu-15u2-jre                         | 2 +-
 docker/ubuntu/Dockerfile.zulu-15u2-jre-headless                | 2 +-
 docker/ubuntu/Dockerfile.zulu-7u282-jdk                        | 2 +-
 docker/ubuntu/Dockerfile.zulu-7u282-jre                        | 2 +-
 docker/ubuntu/Dockerfile.zulu-7u282-jre-headless               | 2 +-
 docker/ubuntu/Dockerfile.zulu-7u285-jdk                        | 2 +-
 docker/ubuntu/Dockerfile.zulu-7u285-jre                        | 2 +-
 docker/ubuntu/Dockerfile.zulu-7u285-jre-headless               | 2 +-
 docker/ubuntu/Dockerfile.zulu-7u292-jdk                        | 2 +-
 docker/ubuntu/Dockerfile.zulu-7u292-jre                        | 2 +-
 docker/ubuntu/Dockerfile.zulu-7u292-jre-headless               | 2 +-
 docker/ubuntu/Dockerfile.zulu-8u272-jdk                        | 2 +-
 docker/ubuntu/Dockerfile.zulu-8u272-jre                        | 2 +-
 docker/ubuntu/Dockerfile.zulu-8u272-jre-headless               | 2 +-
 docker/ubuntu/Dockerfile.zulu-8u272-jre-headless-tools-tomcat8 | 2 +-
 docker/ubuntu/Dockerfile.zulu-8u272-jre-headless-tools-tomcat9 | 2 +-
 docker/ubuntu/Dockerfile.zulu-8u275-jdk                        | 2 +-
 docker/ubuntu/Dockerfile.zulu-8u275-jre                        | 2 +-
 docker/ubuntu/Dockerfile.zulu-8u275-jre-headless               | 2 +-
 docker/ubuntu/Dockerfile.zulu-8u275-jre-headless-tools-tomcat8 | 2 +-
 docker/ubuntu/Dockerfile.zulu-8u275-jre-headless-tools-tomcat9 | 2 +-
 docker/ubuntu/Dockerfile.zulu-8u282-jdk                        | 2 +-
 docker/ubuntu/Dockerfile.zulu-8u282-jre                        | 2 +-
 docker/ubuntu/Dockerfile.zulu-8u282-jre-headless               | 2 +-
 docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8 | 2 +-
 docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9 | 2 +-
 55 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/docker/ubuntu/Dockerfile.zulu-11u10-jdk b/docker/ubuntu/Dockerfile.zulu-11u10-jdk
index 66b26d89..302dca39 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u10-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-11u10-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.45+27* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u10-jre b/docker/ubuntu/Dockerfile.zulu-11u10-jre
index b120f70a..f8d8a129 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u10-jre
+++ b/docker/ubuntu/Dockerfile.zulu-11u10-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.45+27* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless b/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless
index cb44f3f7..b436a276 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.45+27* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8 b/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
index 8a8aa343..31342e3c 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
+++ b/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools-tomcat8
@@ -50,7 +50,7 @@ RUN apt-get -qq update && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y purge curl && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
diff --git a/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9 b/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
index f0e879d6..32d733d9 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
+++ b/docker/ubuntu/Dockerfile.zulu-11u10-jre-headless-tools-tomcat9
@@ -50,7 +50,7 @@ RUN apt-get -qq update && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y purge curl && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
diff --git a/docker/ubuntu/Dockerfile.zulu-11u8-jdk b/docker/ubuntu/Dockerfile.zulu-11u8-jdk
index ebdee2cb..26d5effd 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u8-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-11u8-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.41+23* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u8-jre b/docker/ubuntu/Dockerfile.zulu-11u8-jre
index 9fb7903f..2b7e1288 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u8-jre
+++ b/docker/ubuntu/Dockerfile.zulu-11u8-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.41+23* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u8-jre-headless b/docker/ubuntu/Dockerfile.zulu-11u8-jre-headless
index a7e7900a..bce6f8d8 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u8-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-11u8-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.41+23* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u9-jdk b/docker/ubuntu/Dockerfile.zulu-11u9-jdk
index 518c4f0e..b6dd99fa 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u9-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-11u9-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.43+55* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u9-jre b/docker/ubuntu/Dockerfile.zulu-11u9-jre
index dbbfd15f..06bddd1f 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u9-jre
+++ b/docker/ubuntu/Dockerfile.zulu-11u9-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.43+55* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u9-jre-headless b/docker/ubuntu/Dockerfile.zulu-11u9-jre-headless
index f6fb9043..8edacecf 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u9-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-11u9-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.43+55* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8 b/docker/ubuntu/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8
index b9c2a151..7b2c42e0 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8
+++ b/docker/ubuntu/Dockerfile.zulu-11u9-jre-headless-tools-tomcat8
@@ -50,7 +50,7 @@ RUN apt-get -qq update && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y purge curl && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
diff --git a/docker/ubuntu/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9 b/docker/ubuntu/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9
index 36ceb792..92c9983a 100644
--- a/docker/ubuntu/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9
+++ b/docker/ubuntu/Dockerfile.zulu-11u9-jre-headless-tools-tomcat9
@@ -50,7 +50,7 @@ RUN apt-get -qq update && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y purge curl && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
diff --git a/docker/ubuntu/Dockerfile.zulu-13u4-jdk b/docker/ubuntu/Dockerfile.zulu-13u4-jdk
index 897e7811..682267ed 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u4-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-13u4-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.33+25* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u4-jre b/docker/ubuntu/Dockerfile.zulu-13u4-jre
index 6c5b1727..eb939308 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u4-jre
+++ b/docker/ubuntu/Dockerfile.zulu-13u4-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.33+25* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u4-jre-headless b/docker/ubuntu/Dockerfile.zulu-13u4-jre-headless
index e7f3e8d2..a9998631 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u4-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-13u4-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.33+25* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u5-jdk b/docker/ubuntu/Dockerfile.zulu-13u5-jdk
index 8b38484d..c93bf5a4 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u5-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-13u5-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.35+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u5-jre b/docker/ubuntu/Dockerfile.zulu-13u5-jre
index e67c75ea..2cf2e306 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u5-jre
+++ b/docker/ubuntu/Dockerfile.zulu-13u5-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.35+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u5-jre-headless b/docker/ubuntu/Dockerfile.zulu-13u5-jre-headless
index 96e75fcb..53ffdc6b 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u5-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-13u5-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.35+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u6-jdk b/docker/ubuntu/Dockerfile.zulu-13u6-jdk
index 2a79f024..782bbb0a 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u6-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-13u6-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.37+21* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u6-jre b/docker/ubuntu/Dockerfile.zulu-13u6-jre
index e1177c56..5d6c8f6f 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u6-jre
+++ b/docker/ubuntu/Dockerfile.zulu-13u6-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.37+21* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u6-jre-headless b/docker/ubuntu/Dockerfile.zulu-13u6-jre-headless
index 29efe00e..730730ca 100644
--- a/docker/ubuntu/Dockerfile.zulu-13u6-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-13u6-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.37+21* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-15u0-jdk b/docker/ubuntu/Dockerfile.zulu-15u0-jdk
index a0b6529d..1a760afe 100644
--- a/docker/ubuntu/Dockerfile.zulu-15u0-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-15u0-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.27+17* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-15u0-jre b/docker/ubuntu/Dockerfile.zulu-15u0-jre
index 0ec529a6..754405ed 100644
--- a/docker/ubuntu/Dockerfile.zulu-15u0-jre
+++ b/docker/ubuntu/Dockerfile.zulu-15u0-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.27+17* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-15u0-jre-headless b/docker/ubuntu/Dockerfile.zulu-15u0-jre-headless
index b3f90e03..b116d84e 100644
--- a/docker/ubuntu/Dockerfile.zulu-15u0-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-15u0-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.27+17* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-15u1-jdk b/docker/ubuntu/Dockerfile.zulu-15u1-jdk
index d344de84..0f2a5f34 100644
--- a/docker/ubuntu/Dockerfile.zulu-15u1-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-15u1-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.28+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-15u1-jre b/docker/ubuntu/Dockerfile.zulu-15u1-jre
index 2c48eb0b..bc2c6f84 100644
--- a/docker/ubuntu/Dockerfile.zulu-15u1-jre
+++ b/docker/ubuntu/Dockerfile.zulu-15u1-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.28+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-15u1-jre-headless b/docker/ubuntu/Dockerfile.zulu-15u1-jre-headless
index 152d06d4..34e06adf 100644
--- a/docker/ubuntu/Dockerfile.zulu-15u1-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-15u1-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.28+51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-15u2-jdk b/docker/ubuntu/Dockerfile.zulu-15u2-jdk
index 12ee2caf..24a66434 100644
--- a/docker/ubuntu/Dockerfile.zulu-15u2-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-15u2-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.29+15* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-15u2-jre b/docker/ubuntu/Dockerfile.zulu-15u2-jre
index e3cf7eff..36cd44c4 100644
--- a/docker/ubuntu/Dockerfile.zulu-15u2-jre
+++ b/docker/ubuntu/Dockerfile.zulu-15u2-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.29+15* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-15u2-jre-headless b/docker/ubuntu/Dockerfile.zulu-15u2-jre-headless
index 8e9ce07f..204dff18 100644
--- a/docker/ubuntu/Dockerfile.zulu-15u2-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-15u2-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.29+15* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u282-jdk b/docker/ubuntu/Dockerfile.zulu-7u282-jdk
index adf90a44..e7823eb2 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u282-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-7u282-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.42.0.13* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u282-jre b/docker/ubuntu/Dockerfile.zulu-7u282-jre
index 2d2d2f79..e999319e 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u282-jre
+++ b/docker/ubuntu/Dockerfile.zulu-7u282-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.42.0.13* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u282-jre-headless b/docker/ubuntu/Dockerfile.zulu-7u282-jre-headless
index 3ec70ec9..c14b307e 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u282-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-7u282-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.42.0.13* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u285-jdk b/docker/ubuntu/Dockerfile.zulu-7u285-jdk
index ad6e70ab..9478242b 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u285-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-7u285-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.42.0.51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u285-jre b/docker/ubuntu/Dockerfile.zulu-7u285-jre
index e6d02112..2be96f0b 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u285-jre
+++ b/docker/ubuntu/Dockerfile.zulu-7u285-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.42.0.51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u285-jre-headless b/docker/ubuntu/Dockerfile.zulu-7u285-jre-headless
index b7843ff6..1768e79a 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u285-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-7u285-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.42.0.51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u292-jdk b/docker/ubuntu/Dockerfile.zulu-7u292-jdk
index 37116c5b..d0d835cd 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u292-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-7u292-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.44.0.11* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u292-jre b/docker/ubuntu/Dockerfile.zulu-7u292-jre
index 51850a23..b69815b9 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u292-jre
+++ b/docker/ubuntu/Dockerfile.zulu-7u292-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.44.0.11* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u292-jre-headless b/docker/ubuntu/Dockerfile.zulu-7u292-jre-headless
index fe4b413e..fab18edb 100644
--- a/docker/ubuntu/Dockerfile.zulu-7u292-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-7u292-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.44.0.11* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u272-jdk b/docker/ubuntu/Dockerfile.zulu-8u272-jdk
index 37d6458a..1cdf0885 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u272-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-8u272-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.50.0.21* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u272-jre b/docker/ubuntu/Dockerfile.zulu-8u272-jre
index d1c21072..493d5ac7 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u272-jre
+++ b/docker/ubuntu/Dockerfile.zulu-8u272-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.50.0.21* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u272-jre-headless b/docker/ubuntu/Dockerfile.zulu-8u272-jre-headless
index f0d5f81f..5010bca4 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u272-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-8u272-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.50.0.21* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u272-jre-headless-tools-tomcat8 b/docker/ubuntu/Dockerfile.zulu-8u272-jre-headless-tools-tomcat8
index f84270ee..336c1746 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u272-jre-headless-tools-tomcat8
+++ b/docker/ubuntu/Dockerfile.zulu-8u272-jre-headless-tools-tomcat8
@@ -45,7 +45,7 @@ RUN apt-get -qq update && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y purge curl && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
diff --git a/docker/ubuntu/Dockerfile.zulu-8u272-jre-headless-tools-tomcat9 b/docker/ubuntu/Dockerfile.zulu-8u272-jre-headless-tools-tomcat9
index 12fd31d0..45452910 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u272-jre-headless-tools-tomcat9
+++ b/docker/ubuntu/Dockerfile.zulu-8u272-jre-headless-tools-tomcat9
@@ -45,7 +45,7 @@ RUN apt-get -qq update && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y purge curl && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
diff --git a/docker/ubuntu/Dockerfile.zulu-8u275-jdk b/docker/ubuntu/Dockerfile.zulu-8u275-jdk
index e3f2a96c..27e459b5 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u275-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-8u275-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.50.0.51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u275-jre b/docker/ubuntu/Dockerfile.zulu-8u275-jre
index d61ebc98..ace3761a 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u275-jre
+++ b/docker/ubuntu/Dockerfile.zulu-8u275-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.50.0.51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u275-jre-headless b/docker/ubuntu/Dockerfile.zulu-8u275-jre-headless
index fa4c56d6..22f1f79e 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u275-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-8u275-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.50.0.51* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u275-jre-headless-tools-tomcat8 b/docker/ubuntu/Dockerfile.zulu-8u275-jre-headless-tools-tomcat8
index 8754b462..31576c65 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u275-jre-headless-tools-tomcat8
+++ b/docker/ubuntu/Dockerfile.zulu-8u275-jre-headless-tools-tomcat8
@@ -45,7 +45,7 @@ RUN apt-get -qq update && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y purge curl && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
diff --git a/docker/ubuntu/Dockerfile.zulu-8u275-jre-headless-tools-tomcat9 b/docker/ubuntu/Dockerfile.zulu-8u275-jre-headless-tools-tomcat9
index 1f87982d..d5273082 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u275-jre-headless-tools-tomcat9
+++ b/docker/ubuntu/Dockerfile.zulu-8u275-jre-headless-tools-tomcat9
@@ -45,7 +45,7 @@ RUN apt-get -qq update && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y purge curl && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
diff --git a/docker/ubuntu/Dockerfile.zulu-8u282-jdk b/docker/ubuntu/Dockerfile.zulu-8u282-jdk
index 84e8f756..34da463b 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u282-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-8u282-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.52.0.23* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u282-jre b/docker/ubuntu/Dockerfile.zulu-8u282-jre
index 61affc27..35ff0a23 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u282-jre
+++ b/docker/ubuntu/Dockerfile.zulu-8u282-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.52.0.23* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless b/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless
index 4d415317..90586d61 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless
+++ b/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.52.0.23* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8 b/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
index 83c114ca..303af584 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
+++ b/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools-tomcat8
@@ -45,7 +45,7 @@ RUN apt-get -qq update && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y purge curl && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
diff --git a/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9 b/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9
index d57968a0..f771047f 100644
--- a/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9
+++ b/docker/ubuntu/Dockerfile.zulu-8u282-jre-headless-tools-tomcat9
@@ -45,7 +45,7 @@ RUN apt-get -qq update && \
     rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y purge curl && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml

From 61b0ecf71f2ec51617b00eba76a64601e7b51efe Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 19 Mar 2021 08:45:19 -0500
Subject: [PATCH 234/264] Added --purge to autoremove command

---
 docker/debian10/Dockerfile.zulu-16u0-jdk | 2 +-
 docker/debian10/Dockerfile.zulu-16u0-jre | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/debian10/Dockerfile.zulu-16u0-jdk b/docker/debian10/Dockerfile.zulu-16u0-jdk
index f1a4cbab..156bde6f 100644
--- a/docker/debian10/Dockerfile.zulu-16u0-jdk
+++ b/docker/debian10/Dockerfile.zulu-16u0-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-16-azure-jdk=16.28+11* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-16-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-16u0-jre b/docker/debian10/Dockerfile.zulu-16u0-jre
index 4ecbfc44..9bd4886a 100644
--- a/docker/debian10/Dockerfile.zulu-16u0-jre
+++ b/docker/debian10/Dockerfile.zulu-16u0-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-16-azure-jre=16.28+11* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-16-azure-amd64

From 2306e110a5c6b87648f78b8bcfb0b5c8212a752c Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 19 Mar 2021 08:45:57 -0500
Subject: [PATCH 235/264] Added --purge to autoremove command

---
 docker/debian9/Dockerfile.zulu-16u0-jdk | 2 +-
 docker/debian9/Dockerfile.zulu-16u0-jre | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/debian9/Dockerfile.zulu-16u0-jdk b/docker/debian9/Dockerfile.zulu-16u0-jdk
index fbd9bb05..59db4786 100644
--- a/docker/debian9/Dockerfile.zulu-16u0-jdk
+++ b/docker/debian9/Dockerfile.zulu-16u0-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-16-azure-jdk=16.28+11* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-16-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-16u0-jre b/docker/debian9/Dockerfile.zulu-16u0-jre
index e32562b3..73151184 100644
--- a/docker/debian9/Dockerfile.zulu-16u0-jre
+++ b/docker/debian9/Dockerfile.zulu-16u0-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-16-azure-jre=16.28+11* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-16-azure-amd64

From f871de377ab5c27f7601f1aa74c4a484be0b583f Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 19 Mar 2021 08:46:32 -0500
Subject: [PATCH 236/264] Added --purge to autoremove command

---
 docker/ubuntu-18.04/Dockerfile.zulu-16u0-jdk | 2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-16u0-jre | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-16u0-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-16u0-jdk
index ffdb8569..b691c6fe 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-16u0-jdk
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-16u0-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-16-azure-jdk=16.28+11* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-16-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-16u0-jre b/docker/ubuntu-18.04/Dockerfile.zulu-16u0-jre
index ebd8540e..ff3488f2 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-16u0-jre
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-16u0-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-16-azure-jre=16.28+11* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-16-azure-amd64

From 20fbcc2e55985ba63b4b60c26bc1291bb7860db7 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 19 Mar 2021 08:47:02 -0500
Subject: [PATCH 237/264] Added --purge to autoremove command

---
 docker/ubuntu/Dockerfile.zulu-16u0-jdk | 2 +-
 docker/ubuntu/Dockerfile.zulu-16u0-jre | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/ubuntu/Dockerfile.zulu-16u0-jdk b/docker/ubuntu/Dockerfile.zulu-16u0-jdk
index 65e9d387..6055b8a7 100644
--- a/docker/ubuntu/Dockerfile.zulu-16u0-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-16u0-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-16-azure-jdk=16.28+11* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-16-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-16u0-jre b/docker/ubuntu/Dockerfile.zulu-16u0-jre
index c575dad3..8f485ecf 100644
--- a/docker/ubuntu/Dockerfile.zulu-16u0-jre
+++ b/docker/ubuntu/Dockerfile.zulu-16u0-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-16-azure-jre=16.28+11* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove && \
+    apt -y autoremove --purge && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-16-azure-amd64

From fad570fe8decbd02116ab323e437f5254df4b97f Mon Sep 17 00:00:00 2001
From: zulu-ci <zulu-ci@azul.com>
Date: Wed, 21 Apr 2021 14:47:12 +0000
Subject: [PATCH 238/264] April 2021 Zulu release dockerfiles

---
 docker/alpine/Dockerfile.zulu-11u11-jdk       | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-11u11-jre       | 32 ++++++++++++++
 .../alpine/Dockerfile.zulu-11u11-jre-headless | 32 ++++++++++++++
 .../Dockerfile.zulu-11u11-jre-headless-tools  | 30 +++++++++++++
 docker/alpine/Dockerfile.zulu-13u7-jdk        | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-13u7-jre        | 30 +++++++++++++
 .../alpine/Dockerfile.zulu-13u7-jre-headless  | 30 +++++++++++++
 .../Dockerfile.zulu-13u7-jre-headless-tools   | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-15u3-jdk        | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-15u3-jre        | 30 +++++++++++++
 .../alpine/Dockerfile.zulu-15u3-jre-headless  | 30 +++++++++++++
 .../Dockerfile.zulu-15u3-jre-headless-tools   | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-7u302-jdk       | 44 +++++++++++++++++++
 docker/alpine/Dockerfile.zulu-7u302-jre       | 44 +++++++++++++++++++
 .../alpine/Dockerfile.zulu-7u302-jre-headless | 44 +++++++++++++++++++
 docker/alpine/Dockerfile.zulu-8u292-jdk       | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-8u292-jre       | 32 ++++++++++++++
 .../alpine/Dockerfile.zulu-8u292-jre-headless | 32 ++++++++++++++
 .../Dockerfile.zulu-8u292-jre-headless-tools  | 32 ++++++++++++++
 docker/centos/Dockerfile.zulu-11u11-jdk       | 17 +++++++
 docker/centos/Dockerfile.zulu-11u11-jre       | 17 +++++++
 .../centos/Dockerfile.zulu-11u11-jre-headless | 16 +++++++
 docker/centos/Dockerfile.zulu-13u7-jdk        | 17 +++++++
 docker/centos/Dockerfile.zulu-13u7-jre        | 17 +++++++
 .../centos/Dockerfile.zulu-13u7-jre-headless  | 16 +++++++
 docker/centos/Dockerfile.zulu-15u3-jdk        | 17 +++++++
 docker/centos/Dockerfile.zulu-15u3-jre        | 17 +++++++
 .../centos/Dockerfile.zulu-15u3-jre-headless  | 16 +++++++
 docker/centos/Dockerfile.zulu-7u302-jdk       | 17 +++++++
 docker/centos/Dockerfile.zulu-7u302-jre       | 17 +++++++
 .../centos/Dockerfile.zulu-7u302-jre-headless | 16 +++++++
 docker/centos/Dockerfile.zulu-8u292-jdk       | 17 +++++++
 docker/centos/Dockerfile.zulu-8u292-jre       | 17 +++++++
 .../centos/Dockerfile.zulu-8u292-jre-headless | 16 +++++++
 docker/debian10/Dockerfile.zulu-11u11-jdk     | 21 +++++++++
 docker/debian10/Dockerfile.zulu-11u11-jre     | 21 +++++++++
 .../Dockerfile.zulu-11u11-jre-headless        | 21 +++++++++
 .../Dockerfile.zulu-11u11-jre-headless-tools  | 31 +++++++++++++
 docker/debian10/Dockerfile.zulu-11u11-maven   | 31 +++++++++++++
 docker/debian10/Dockerfile.zulu-13u7-jdk      | 21 +++++++++
 docker/debian10/Dockerfile.zulu-13u7-jre      | 21 +++++++++
 .../Dockerfile.zulu-13u7-jre-headless         | 21 +++++++++
 docker/debian10/Dockerfile.zulu-15u3-jdk      | 21 +++++++++
 docker/debian10/Dockerfile.zulu-15u3-jre      | 21 +++++++++
 .../Dockerfile.zulu-15u3-jre-headless         | 21 +++++++++
 docker/debian10/Dockerfile.zulu-16u0-jdk      |  2 +-
 docker/debian10/Dockerfile.zulu-16u0-jre      |  2 +-
 docker/debian10/Dockerfile.zulu-7u302-jdk     | 21 +++++++++
 docker/debian10/Dockerfile.zulu-7u302-jre     | 21 +++++++++
 .../Dockerfile.zulu-7u302-jre-headless        | 21 +++++++++
 docker/debian10/Dockerfile.zulu-8u292-jdk     | 21 +++++++++
 docker/debian10/Dockerfile.zulu-8u292-jre     | 21 +++++++++
 .../Dockerfile.zulu-8u292-jre-headless        | 21 +++++++++
 .../Dockerfile.zulu-8u292-jre-headless-tools  | 23 ++++++++++
 docker/debian10/Dockerfile.zulu-8u292-maven   | 31 +++++++++++++
 docker/debian9/Dockerfile.zulu-11u11-jdk      | 21 +++++++++
 docker/debian9/Dockerfile.zulu-11u11-jre      | 21 +++++++++
 .../Dockerfile.zulu-11u11-jre-headless        | 21 +++++++++
 docker/debian9/Dockerfile.zulu-11u11-maven    | 31 +++++++++++++
 docker/debian9/Dockerfile.zulu-13u7-jdk       | 21 +++++++++
 docker/debian9/Dockerfile.zulu-13u7-jre       | 21 +++++++++
 .../debian9/Dockerfile.zulu-13u7-jre-headless | 21 +++++++++
 docker/debian9/Dockerfile.zulu-15u3-jdk       | 21 +++++++++
 docker/debian9/Dockerfile.zulu-15u3-jre       | 21 +++++++++
 .../debian9/Dockerfile.zulu-15u3-jre-headless | 21 +++++++++
 docker/debian9/Dockerfile.zulu-16u0-jdk       |  2 +-
 docker/debian9/Dockerfile.zulu-16u0-jre       |  2 +-
 docker/debian9/Dockerfile.zulu-7u302-jdk      | 21 +++++++++
 docker/debian9/Dockerfile.zulu-7u302-jre      | 21 +++++++++
 .../Dockerfile.zulu-7u302-jre-headless        | 21 +++++++++
 docker/debian9/Dockerfile.zulu-8u292-jdk      | 21 +++++++++
 docker/debian9/Dockerfile.zulu-8u292-jre      | 21 +++++++++
 .../Dockerfile.zulu-8u292-jre-headless        | 21 +++++++++
 docker/debian9/Dockerfile.zulu-8u292-maven    | 31 +++++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-11u11-jdk | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-11u11-jre | 21 +++++++++
 .../Dockerfile.zulu-11u11-jre-headless        | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-13u7-jdk  | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-13u7-jre  | 21 +++++++++
 .../Dockerfile.zulu-13u7-jre-headless         | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-15u3-jdk  | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-15u3-jre  | 21 +++++++++
 .../Dockerfile.zulu-15u3-jre-headless         | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-16u0-jdk  |  2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-16u0-jre  |  2 +-
 docker/ubuntu-18.04/Dockerfile.zulu-7u302-jdk | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-7u302-jre | 21 +++++++++
 .../Dockerfile.zulu-7u302-jre-headless        | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-8u292-jdk | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-8u292-jre | 21 +++++++++
 .../Dockerfile.zulu-8u292-jre-headless        | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-11u11-jdk       | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-11u11-jre       | 21 +++++++++
 .../ubuntu/Dockerfile.zulu-11u11-jre-headless | 21 +++++++++
 .../Dockerfile.zulu-11u11-jre-headless-tools  | 31 +++++++++++++
 docker/ubuntu/Dockerfile.zulu-13u7-jdk        | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-13u7-jre        | 21 +++++++++
 .../ubuntu/Dockerfile.zulu-13u7-jre-headless  | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-15u3-jdk        | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-15u3-jre        | 21 +++++++++
 .../ubuntu/Dockerfile.zulu-15u3-jre-headless  | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-16u0-jdk        |  2 +-
 docker/ubuntu/Dockerfile.zulu-16u0-jre        |  2 +-
 docker/ubuntu/Dockerfile.zulu-7u302-jdk       | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-7u302-jre       | 21 +++++++++
 .../ubuntu/Dockerfile.zulu-7u302-jre-headless | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-8u292-jdk       | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-8u292-jre       | 21 +++++++++
 .../ubuntu/Dockerfile.zulu-8u292-jre-headless | 21 +++++++++
 .../Dockerfile.zulu-8u292-jre-headless-tools  | 23 ++++++++++
 .../Dockerfile.zulu-11u11-jre-tools           | 38 ++++++++++++++++
 .../Dockerfile.zulu-13u7-jre-tools            | 38 ++++++++++++++++
 .../Dockerfile.zulu-15u3-jre-tools            | 38 ++++++++++++++++
 .../Dockerfile.zulu-7u302-jre-tools           | 31 +++++++++++++
 .../Dockerfile.zulu-8u292-jre-tools           | 31 +++++++++++++
 .../Dockerfile.zulu-11u11-jdk                 | 17 +++++++
 .../Dockerfile.zulu-11u11-jre                 | 16 +++++++
 .../Dockerfile.zulu-11u11-jre-tools           | 16 +++++++
 .../Dockerfile.zulu-13u7-jdk                  | 17 +++++++
 .../Dockerfile.zulu-13u7-jre                  | 16 +++++++
 .../Dockerfile.zulu-13u7-jre-tools            | 16 +++++++
 .../Dockerfile.zulu-14u2-jre-tools            | 16 +++++++
 .../Dockerfile.zulu-15u3-jdk                  | 17 +++++++
 .../Dockerfile.zulu-15u3-jre                  | 16 +++++++
 .../Dockerfile.zulu-15u3-jre-tools            | 16 +++++++
 .../Dockerfile.zulu-16u0-jre-tools            | 16 +++++++
 .../Dockerfile.zulu-7u302-jdk                 | 17 +++++++
 .../Dockerfile.zulu-7u302-jre                 | 16 +++++++
 .../Dockerfile.zulu-7u302-jre-tools           | 16 +++++++
 .../Dockerfile.zulu-8u292-jdk                 | 17 +++++++
 .../Dockerfile.zulu-8u292-jre                 | 16 +++++++
 .../Dockerfile.zulu-8u292-jre-tools           | 16 +++++++
 132 files changed, 2837 insertions(+), 8 deletions(-)
 create mode 100644 docker/alpine/Dockerfile.zulu-11u11-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-11u11-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-11u11-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-11u11-jre-headless-tools
 create mode 100644 docker/alpine/Dockerfile.zulu-13u7-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-13u7-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-13u7-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-13u7-jre-headless-tools
 create mode 100644 docker/alpine/Dockerfile.zulu-15u3-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-15u3-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-15u3-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-15u3-jre-headless-tools
 create mode 100644 docker/alpine/Dockerfile.zulu-7u302-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-7u302-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-7u302-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-8u292-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-8u292-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-8u292-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-8u292-jre-headless-tools
 create mode 100644 docker/centos/Dockerfile.zulu-11u11-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-11u11-jre
 create mode 100644 docker/centos/Dockerfile.zulu-11u11-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-13u7-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-13u7-jre
 create mode 100644 docker/centos/Dockerfile.zulu-13u7-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-15u3-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-15u3-jre
 create mode 100644 docker/centos/Dockerfile.zulu-15u3-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-7u302-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-7u302-jre
 create mode 100644 docker/centos/Dockerfile.zulu-7u302-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-8u292-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-8u292-jre
 create mode 100644 docker/centos/Dockerfile.zulu-8u292-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-11u11-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-11u11-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-11u11-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-11u11-jre-headless-tools
 create mode 100644 docker/debian10/Dockerfile.zulu-11u11-maven
 create mode 100644 docker/debian10/Dockerfile.zulu-13u7-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-13u7-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-13u7-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-15u3-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-15u3-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-15u3-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-7u302-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-7u302-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-7u302-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-8u292-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-8u292-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-8u292-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-8u292-jre-headless-tools
 create mode 100644 docker/debian10/Dockerfile.zulu-8u292-maven
 create mode 100644 docker/debian9/Dockerfile.zulu-11u11-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-11u11-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-11u11-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-11u11-maven
 create mode 100644 docker/debian9/Dockerfile.zulu-13u7-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-13u7-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-13u7-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-15u3-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-15u3-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-15u3-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-7u302-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-7u302-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-7u302-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-8u292-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-8u292-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-8u292-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-8u292-maven
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-11u11-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-11u11-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-11u11-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-13u7-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-13u7-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-13u7-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-15u3-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-15u3-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-15u3-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u302-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u302-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u302-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u292-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u292-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u292-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u11-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u11-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u11-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u11-jre-headless-tools
 create mode 100644 docker/ubuntu/Dockerfile.zulu-13u7-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-13u7-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-13u7-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-15u3-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-15u3-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-15u3-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-7u302-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-7u302-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-7u302-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u292-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u292-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u292-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u292-jre-headless-tools
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-11u11-jre-tools
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-13u7-jre-tools
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-15u3-jre-tools
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-7u302-jre-tools
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-8u292-jre-tools
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-11u11-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-11u11-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-11u11-jre-tools
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-13u7-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-13u7-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-13u7-jre-tools
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-14u2-jre-tools
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-15u3-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-15u3-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-15u3-jre-tools
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-16u0-jre-tools
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-7u302-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-7u302-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-7u302-jre-tools
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-8u292-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-8u292-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-8u292-jre-tools

diff --git a/docker/alpine/Dockerfile.zulu-11u11-jdk b/docker/alpine/Dockerfile.zulu-11u11-jdk
new file mode 100644
index 00000000..2134422b
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u11-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jdk_11.48.21-11.0.11-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.11/zulu-11-azure-jdk_11.48.21-11.0.11-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-11u11-jre b/docker/alpine/Dockerfile.zulu-11u11-jre
new file mode 100644
index 00000000..71a965f6
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u11-jre
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jre_11.48.21-11.0.11-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.11/zulu-11-azure-jre_11.48.21-11.0.11-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-11u11-jre-headless b/docker/alpine/Dockerfile.zulu-11u11-jre-headless
new file mode 100644
index 00000000..0ded0f97
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u11-jre-headless
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jre-headless_11.48.21-11.0.11-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.11/zulu-11-azure-jre-headless_11.48.21-11.0.11-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-11u11-jre-headless-tools b/docker/alpine/Dockerfile.zulu-11u11-jre-headless-tools
new file mode 100644
index 00000000..74b61ddd
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u11-jre-headless-tools
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jre-headless-tools_11.48.21-11.0.11-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.11/zulu-11-azure-jre-headless-tools_11.48.21-11.0.11-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-13u7-jdk b/docker/alpine/Dockerfile.zulu-13u7-jdk
new file mode 100644
index 00000000..cb718d85
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u7-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jdk_13.40.15-13.0.7-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.7/zulu-13-azure-jdk_13.40.15-13.0.7-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-13u7-jre b/docker/alpine/Dockerfile.zulu-13u7-jre
new file mode 100644
index 00000000..87e0b553
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u7-jre
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jre_13.40.15-13.0.7-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.7/zulu-13-azure-jre_13.40.15-13.0.7-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-13u7-jre-headless b/docker/alpine/Dockerfile.zulu-13u7-jre-headless
new file mode 100644
index 00000000..3b5d965e
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u7-jre-headless
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jre-headless_13.40.15-13.0.7-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.7/zulu-13-azure-jre-headless_13.40.15-13.0.7-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-13u7-jre-headless-tools b/docker/alpine/Dockerfile.zulu-13u7-jre-headless-tools
new file mode 100644
index 00000000..7164a576
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u7-jre-headless-tools
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jre-headless-tools_13.40.15-13.0.7-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.7/zulu-13-azure-jre-headless-tools_13.40.15-13.0.7-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-15u3-jdk b/docker/alpine/Dockerfile.zulu-15u3-jdk
new file mode 100644
index 00000000..2ac8f3c7
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-15u3-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-15-azure-jdk_15.32.15-15.0.3-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.3/zulu-15-azure-jdk_15.32.15-15.0.3-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-15u3-jre b/docker/alpine/Dockerfile.zulu-15u3-jre
new file mode 100644
index 00000000..45eeb482
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-15u3-jre
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-15-azure-jre_15.32.15-15.0.3-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.3/zulu-15-azure-jre_15.32.15-15.0.3-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-15u3-jre-headless b/docker/alpine/Dockerfile.zulu-15u3-jre-headless
new file mode 100644
index 00000000..e1e4380f
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-15u3-jre-headless
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-15-azure-jre-headless_15.32.15-15.0.3-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.3/zulu-15-azure-jre-headless_15.32.15-15.0.3-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-15u3-jre-headless-tools b/docker/alpine/Dockerfile.zulu-15u3-jre-headless-tools
new file mode 100644
index 00000000..288bef3a
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-15u3-jre-headless-tools
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-15-azure-jre-headless-tools_15.32.15-15.0.3-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.3/zulu-15-azure-jre-headless-tools_15.32.15-15.0.3-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-7u302-jdk b/docker/alpine/Dockerfile.zulu-7u302-jdk
new file mode 100644
index 00000000..7f51938e
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-7u302-jdk
@@ -0,0 +1,44 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-7-azure-jdk_7.46.0.11-7.0.302-linux_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates wget tar && \
+    apk --no-cache --virtual .build-deps add binutils zstd xz && \
+    apk update && \
+    apk upgrade && \
+    wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+    wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
+    wget -q -O gcc-libs.tar.zst https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -q -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    tar -I zstd -xf gcc-libs.tar.zst -C /tmp && \
+    tar -xJf zlib.tar.xz -C /tmp && \
+    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
+    rm -rf gcc-libs.tar.zst zlib.tar.xz /tmp/usr && \
+    apk del .build-deps && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u302/zulu-7-azure-jdk_7.46.0.11-7.0.302-linux_x64.tar.gz && rm /root/.wget-hsts && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-7u302-jre b/docker/alpine/Dockerfile.zulu-7u302-jre
new file mode 100644
index 00000000..9e22a4f4
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-7u302-jre
@@ -0,0 +1,44 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-7-azure-jre_7.46.0.11-7.0.302-linux_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates wget tar && \
+    apk --no-cache --virtual .build-deps add binutils zstd xz && \
+    apk update && \
+    apk upgrade && \
+    wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+    wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
+    wget -q -O gcc-libs.tar.zst https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -q -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    tar -I zstd -xf gcc-libs.tar.zst -C /tmp && \
+    tar -xJf zlib.tar.xz -C /tmp && \
+    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
+    rm -rf gcc-libs.tar.zst zlib.tar.xz /tmp/usr && \
+    apk del .build-deps && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u302/zulu-7-azure-jre_7.46.0.11-7.0.302-linux_x64.tar.gz && rm /root/.wget-hsts && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-7u302-jre-headless b/docker/alpine/Dockerfile.zulu-7u302-jre-headless
new file mode 100644
index 00000000..01746614
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-7u302-jre-headless
@@ -0,0 +1,44 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-7-azure-jre-headless_7.46.0.11-7.0.302-linux_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates wget tar && \
+    apk --no-cache --virtual .build-deps add binutils zstd xz && \
+    apk update && \
+    apk upgrade && \
+    wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+    wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
+    wget -q -O gcc-libs.tar.zst https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -q -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    tar -I zstd -xf gcc-libs.tar.zst -C /tmp && \
+    tar -xJf zlib.tar.xz -C /tmp && \
+    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
+    rm -rf gcc-libs.tar.zst zlib.tar.xz /tmp/usr && \
+    apk del .build-deps && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u302/zulu-7-azure-jre-headless_7.46.0.11-7.0.302-linux_x64.tar.gz && rm /root/.wget-hsts && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u292-jdk b/docker/alpine/Dockerfile.zulu-8u292-jdk
new file mode 100644
index 00000000..b8dbc29d
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u292-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jdk_8.54.0.21-8.0.292-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u292/zulu-8-azure-jdk_8.54.0.21-8.0.292-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u292-jre b/docker/alpine/Dockerfile.zulu-8u292-jre
new file mode 100644
index 00000000..c44ae90e
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u292-jre
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre_8.54.0.21-8.0.292-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u292/zulu-8-azure-jre_8.54.0.21-8.0.292-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u292-jre-headless b/docker/alpine/Dockerfile.zulu-8u292-jre-headless
new file mode 100644
index 00000000..8731b742
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u292-jre-headless
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre-headless_8.54.0.21-8.0.292-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u292/zulu-8-azure-jre-headless_8.54.0.21-8.0.292-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u292-jre-headless-tools b/docker/alpine/Dockerfile.zulu-8u292-jre-headless-tools
new file mode 100644
index 00000000..da841134
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u292-jre-headless-tools
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre-headless-tools_8.54.0.21-8.0.292-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u292/zulu-8-azure-jre-headless-tools_8.54.0.21-8.0.292-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/centos/Dockerfile.zulu-11u11-jdk b/docker/centos/Dockerfile.zulu-11u11-jdk
new file mode 100644
index 00000000..691c7a08
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u11-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-11-azure-jdk-11.48.21
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure
+
diff --git a/docker/centos/Dockerfile.zulu-11u11-jre b/docker/centos/Dockerfile.zulu-11u11-jre
new file mode 100644
index 00000000..8ef64695
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u11-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-11-azure-jre-11.48.21
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure
+
diff --git a/docker/centos/Dockerfile.zulu-11u11-jre-headless b/docker/centos/Dockerfile.zulu-11u11-jre-headless
new file mode 100644
index 00000000..74dde174
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u11-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-11-azure-jre-headless-11.48.21
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure
diff --git a/docker/centos/Dockerfile.zulu-13u7-jdk b/docker/centos/Dockerfile.zulu-13u7-jdk
new file mode 100644
index 00000000..f503998d
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-13u7-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-13-azure-jdk-13.40.15
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure
+
diff --git a/docker/centos/Dockerfile.zulu-13u7-jre b/docker/centos/Dockerfile.zulu-13u7-jre
new file mode 100644
index 00000000..e10a1b61
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-13u7-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-13-azure-jre-13.40.15
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure
+
diff --git a/docker/centos/Dockerfile.zulu-13u7-jre-headless b/docker/centos/Dockerfile.zulu-13u7-jre-headless
new file mode 100644
index 00000000..67624cfb
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-13u7-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-13-azure-jre-headless-13.40.15
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure
diff --git a/docker/centos/Dockerfile.zulu-15u3-jdk b/docker/centos/Dockerfile.zulu-15u3-jdk
new file mode 100644
index 00000000..3f0912eb
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-15u3-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-15-azure-jdk-15.32.15
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure
+
diff --git a/docker/centos/Dockerfile.zulu-15u3-jre b/docker/centos/Dockerfile.zulu-15u3-jre
new file mode 100644
index 00000000..21a3bb4f
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-15u3-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-15-azure-jre-15.32.15
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure
+
diff --git a/docker/centos/Dockerfile.zulu-15u3-jre-headless b/docker/centos/Dockerfile.zulu-15u3-jre-headless
new file mode 100644
index 00000000..54de7561
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-15u3-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-15-azure-jre-headless-15.32.15
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure
diff --git a/docker/centos/Dockerfile.zulu-7u302-jdk b/docker/centos/Dockerfile.zulu-7u302-jdk
new file mode 100644
index 00000000..1cdd1bb0
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-7u302-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-7-azure-jdk-7.46.0.11
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure
+
diff --git a/docker/centos/Dockerfile.zulu-7u302-jre b/docker/centos/Dockerfile.zulu-7u302-jre
new file mode 100644
index 00000000..ac2ba0f9
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-7u302-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-7-azure-jre-7.46.0.11
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure
+
diff --git a/docker/centos/Dockerfile.zulu-7u302-jre-headless b/docker/centos/Dockerfile.zulu-7u302-jre-headless
new file mode 100644
index 00000000..b0276cf3
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-7u302-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-7-azure-jre-headless-7.46.0.11
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure
diff --git a/docker/centos/Dockerfile.zulu-8u292-jdk b/docker/centos/Dockerfile.zulu-8u292-jdk
new file mode 100644
index 00000000..251cde2b
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u292-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-8-azure-jdk-8.54.0.21
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure
+
diff --git a/docker/centos/Dockerfile.zulu-8u292-jre b/docker/centos/Dockerfile.zulu-8u292-jre
new file mode 100644
index 00000000..87982a8b
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u292-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-8-azure-jre-8.54.0.21
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure
+
diff --git a/docker/centos/Dockerfile.zulu-8u292-jre-headless b/docker/centos/Dockerfile.zulu-8u292-jre-headless
new file mode 100644
index 00000000..3f790586
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u292-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-8-azure-jre-headless-8.54.0.21
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure
diff --git a/docker/debian10/Dockerfile.zulu-11u11-jdk b/docker/debian10/Dockerfile.zulu-11u11-jdk
new file mode 100644
index 00000000..49f1d1f6
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u11-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.48+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u11-jre b/docker/debian10/Dockerfile.zulu-11u11-jre
new file mode 100644
index 00000000..3bebe281
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u11-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.48+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u11-jre-headless b/docker/debian10/Dockerfile.zulu-11u11-jre-headless
new file mode 100644
index 00000000..236c433d
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u11-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.48+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u11-jre-headless-tools b/docker/debian10/Dockerfile.zulu-11u11-jre-headless-tools
new file mode 100644
index 00000000..bf48155c
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u11-jre-headless-tools
@@ -0,0 +1,31 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u11-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jdk:11u11-zulu-debian10 AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG INSTALL_DIR=/usr/lib/jvm
+ARG JDK_DIR=${INSTALL_DIR}/zulu-11-azure-amd64
+ARG JRE_DIR=${INSTALL_DIR}/zre-hl-11-azure-amd64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_TOOLS_DIR=${INSTALL_DIR}/zre-hl-tools-11-azure-amd64 && \
+    JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_TOOLS_DIR}
+
+FROM debian:buster
+ARG JRE_TOOLS_DIR=/usr/lib/jvm/zre-hl-tools-11-azure-amd64
+COPY --from=stage2 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+
+RUN cd /usr/bin && find ${JRE_TOOLS_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=${JRE_TOOLS_DIR}
diff --git a/docker/debian10/Dockerfile.zulu-11u11-maven b/docker/debian10/Dockerfile.zulu-11u11-maven
new file mode 100644
index 00000000..4221d403
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u11-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:11u11-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian10/Dockerfile.zulu-13u7-jdk b/docker/debian10/Dockerfile.zulu-13u7-jdk
new file mode 100644
index 00000000..dcb961c4
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-13u7-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.40+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-13u7-jre b/docker/debian10/Dockerfile.zulu-13u7-jre
new file mode 100644
index 00000000..1421924a
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-13u7-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.40+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-13u7-jre-headless b/docker/debian10/Dockerfile.zulu-13u7-jre-headless
new file mode 100644
index 00000000..dc2101d3
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-13u7-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.40+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-15u3-jdk b/docker/debian10/Dockerfile.zulu-15u3-jdk
new file mode 100644
index 00000000..aecea6d2
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-15u3-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.32+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-15u3-jre b/docker/debian10/Dockerfile.zulu-15u3-jre
new file mode 100644
index 00000000..0adc6db7
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-15u3-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.32+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-15u3-jre-headless b/docker/debian10/Dockerfile.zulu-15u3-jre-headless
new file mode 100644
index 00000000..0b6e27d6
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-15u3-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.32+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-16u0-jdk b/docker/debian10/Dockerfile.zulu-16u0-jdk
index 156bde6f..f1a4cbab 100644
--- a/docker/debian10/Dockerfile.zulu-16u0-jdk
+++ b/docker/debian10/Dockerfile.zulu-16u0-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-16-azure-jdk=16.28+11* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove --purge && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-16-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-16u0-jre b/docker/debian10/Dockerfile.zulu-16u0-jre
index 9bd4886a..4ecbfc44 100644
--- a/docker/debian10/Dockerfile.zulu-16u0-jre
+++ b/docker/debian10/Dockerfile.zulu-16u0-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-16-azure-jre=16.28+11* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove --purge && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-16-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u302-jdk b/docker/debian10/Dockerfile.zulu-7u302-jdk
new file mode 100644
index 00000000..7d19a352
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-7u302-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.46.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u302-jre b/docker/debian10/Dockerfile.zulu-7u302-jre
new file mode 100644
index 00000000..9956882f
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-7u302-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.46.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u302-jre-headless b/docker/debian10/Dockerfile.zulu-7u302-jre-headless
new file mode 100644
index 00000000..531fc75a
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-7u302-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.46.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u292-jdk b/docker/debian10/Dockerfile.zulu-8u292-jdk
new file mode 100644
index 00000000..9b42794a
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u292-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.54.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u292-jre b/docker/debian10/Dockerfile.zulu-8u292-jre
new file mode 100644
index 00000000..8edc7ab0
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u292-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.54.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u292-jre-headless b/docker/debian10/Dockerfile.zulu-8u292-jre-headless
new file mode 100644
index 00000000..c9707b02
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u292-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.54.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u292-jre-headless-tools b/docker/debian10/Dockerfile.zulu-8u292-jre-headless-tools
new file mode 100644
index 00000000..763c317a
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u292-jre-headless-tools
@@ -0,0 +1,23 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u292-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u292-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG INSTALL_DIR=/usr/lib/jvm
+ARG JDK_DIR=${INSTALL_DIR}/zulu-8-azure-amd64
+ARG JRE_DIR=${INSTALL_DIR}/zre-hl-8-azure-amd64
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+
+ENV JAVA_HOME=${JRE_DIR}
diff --git a/docker/debian10/Dockerfile.zulu-8u292-maven b/docker/debian10/Dockerfile.zulu-8u292-maven
new file mode 100644
index 00000000..d054abd4
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u292-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u292-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian9/Dockerfile.zulu-11u11-jdk b/docker/debian9/Dockerfile.zulu-11u11-jdk
new file mode 100644
index 00000000..e77c8b28
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u11-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.48+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u11-jre b/docker/debian9/Dockerfile.zulu-11u11-jre
new file mode 100644
index 00000000..d71d340b
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u11-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.48+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u11-jre-headless b/docker/debian9/Dockerfile.zulu-11u11-jre-headless
new file mode 100644
index 00000000..0b60f77e
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u11-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.48+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u11-maven b/docker/debian9/Dockerfile.zulu-11u11-maven
new file mode 100644
index 00000000..e020ccb9
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u11-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:11u11-zulu-debian9
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian9/Dockerfile.zulu-13u7-jdk b/docker/debian9/Dockerfile.zulu-13u7-jdk
new file mode 100644
index 00000000..33ee8e04
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-13u7-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.40+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u7-jre b/docker/debian9/Dockerfile.zulu-13u7-jre
new file mode 100644
index 00000000..bb35603f
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-13u7-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.40+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u7-jre-headless b/docker/debian9/Dockerfile.zulu-13u7-jre-headless
new file mode 100644
index 00000000..b4d79c92
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-13u7-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.40+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-15u3-jdk b/docker/debian9/Dockerfile.zulu-15u3-jdk
new file mode 100644
index 00000000..e4237111
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-15u3-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.32+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-15u3-jre b/docker/debian9/Dockerfile.zulu-15u3-jre
new file mode 100644
index 00000000..aef2de70
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-15u3-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.32+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-15u3-jre-headless b/docker/debian9/Dockerfile.zulu-15u3-jre-headless
new file mode 100644
index 00000000..8680c3bd
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-15u3-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.32+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-16u0-jdk b/docker/debian9/Dockerfile.zulu-16u0-jdk
index 59db4786..fbd9bb05 100644
--- a/docker/debian9/Dockerfile.zulu-16u0-jdk
+++ b/docker/debian9/Dockerfile.zulu-16u0-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-16-azure-jdk=16.28+11* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove --purge && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-16-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-16u0-jre b/docker/debian9/Dockerfile.zulu-16u0-jre
index 73151184..e32562b3 100644
--- a/docker/debian9/Dockerfile.zulu-16u0-jre
+++ b/docker/debian9/Dockerfile.zulu-16u0-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-16-azure-jre=16.28+11* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove --purge && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-16-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u302-jdk b/docker/debian9/Dockerfile.zulu-7u302-jdk
new file mode 100644
index 00000000..1f5fd19b
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-7u302-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.46.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u302-jre b/docker/debian9/Dockerfile.zulu-7u302-jre
new file mode 100644
index 00000000..7f88a1a3
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-7u302-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.46.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u302-jre-headless b/docker/debian9/Dockerfile.zulu-7u302-jre-headless
new file mode 100644
index 00000000..dbee193f
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-7u302-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.46.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u292-jdk b/docker/debian9/Dockerfile.zulu-8u292-jdk
new file mode 100644
index 00000000..9c96851b
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u292-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.54.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u292-jre b/docker/debian9/Dockerfile.zulu-8u292-jre
new file mode 100644
index 00000000..2ae7868e
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u292-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.54.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u292-jre-headless b/docker/debian9/Dockerfile.zulu-8u292-jre-headless
new file mode 100644
index 00000000..b4d16765
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u292-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.54.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u292-maven b/docker/debian9/Dockerfile.zulu-8u292-maven
new file mode 100644
index 00000000..f3ce18fd
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u292-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u292-zulu-debian9
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u11-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-11u11-jdk
new file mode 100644
index 00000000..18dcadc4
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u11-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.48+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u11-jre b/docker/ubuntu-18.04/Dockerfile.zulu-11u11-jre
new file mode 100644
index 00000000..b68f8906
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u11-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.48+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u11-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-11u11-jre-headless
new file mode 100644
index 00000000..7b6fe183
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u11-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.48+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u7-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-13u7-jdk
new file mode 100644
index 00000000..06045a99
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u7-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.40+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u7-jre b/docker/ubuntu-18.04/Dockerfile.zulu-13u7-jre
new file mode 100644
index 00000000..3c7094fa
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u7-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.40+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u7-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-13u7-jre-headless
new file mode 100644
index 00000000..5837031c
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u7-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.40+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u3-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-15u3-jdk
new file mode 100644
index 00000000..d77de238
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u3-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.32+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u3-jre b/docker/ubuntu-18.04/Dockerfile.zulu-15u3-jre
new file mode 100644
index 00000000..6bc33e69
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u3-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.32+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u3-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-15u3-jre-headless
new file mode 100644
index 00000000..2925fde1
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u3-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.32+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-16u0-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-16u0-jdk
index b691c6fe..ffdb8569 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-16u0-jdk
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-16u0-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-16-azure-jdk=16.28+11* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove --purge && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-16-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-16u0-jre b/docker/ubuntu-18.04/Dockerfile.zulu-16u0-jre
index ff3488f2..ebd8540e 100644
--- a/docker/ubuntu-18.04/Dockerfile.zulu-16u0-jre
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-16u0-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-16-azure-jre=16.28+11* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove --purge && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-16-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u302-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-7u302-jdk
new file mode 100644
index 00000000..0e289869
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u302-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.46.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u302-jre b/docker/ubuntu-18.04/Dockerfile.zulu-7u302-jre
new file mode 100644
index 00000000..0909836b
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u302-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.46.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u302-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-7u302-jre-headless
new file mode 100644
index 00000000..9fc312d5
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u302-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.46.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u292-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-8u292-jdk
new file mode 100644
index 00000000..f5ce5fca
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u292-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.54.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u292-jre b/docker/ubuntu-18.04/Dockerfile.zulu-8u292-jre
new file mode 100644
index 00000000..1e76683e
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u292-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.54.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u292-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-8u292-jre-headless
new file mode 100644
index 00000000..833cf4ca
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u292-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.54.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u11-jdk b/docker/ubuntu/Dockerfile.zulu-11u11-jdk
new file mode 100644
index 00000000..f78d84de
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u11-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.48+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u11-jre b/docker/ubuntu/Dockerfile.zulu-11u11-jre
new file mode 100644
index 00000000..aaf037ba
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u11-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.48+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u11-jre-headless b/docker/ubuntu/Dockerfile.zulu-11u11-jre-headless
new file mode 100644
index 00000000..61019f76
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u11-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.48+21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u11-jre-headless-tools b/docker/ubuntu/Dockerfile.zulu-11u11-jre-headless-tools
new file mode 100644
index 00000000..2b41af52
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u11-jre-headless-tools
@@ -0,0 +1,31 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u11-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jdk:11u11-zulu-ubuntu AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG INSTALL_DIR=/usr/lib/jvm
+ARG JDK_DIR=${INSTALL_DIR}/zulu-11-azure-amd64
+ARG JRE_DIR=${INSTALL_DIR}/zre-hl-11-azure-amd64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_TOOLS_DIR=${INSTALL_DIR}/zre-hl-tools-11-azure-amd64 && \
+    JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_TOOLS_DIR}
+
+FROM ubuntu:focal
+ARG JRE_TOOLS_DIR=/usr/lib/jvm/zre-hl-tools-11-azure-amd64
+COPY --from=stage2 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+
+RUN cd /usr/bin && find ${JRE_TOOLS_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=${JRE_TOOLS_DIR}
diff --git a/docker/ubuntu/Dockerfile.zulu-13u7-jdk b/docker/ubuntu/Dockerfile.zulu-13u7-jdk
new file mode 100644
index 00000000..e9dd0f41
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-13u7-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.40+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u7-jre b/docker/ubuntu/Dockerfile.zulu-13u7-jre
new file mode 100644
index 00000000..bedb1297
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-13u7-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.40+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u7-jre-headless b/docker/ubuntu/Dockerfile.zulu-13u7-jre-headless
new file mode 100644
index 00000000..c5ea373e
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-13u7-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.40+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-15u3-jdk b/docker/ubuntu/Dockerfile.zulu-15u3-jdk
new file mode 100644
index 00000000..caf8e9da
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-15u3-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.32+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-15u3-jre b/docker/ubuntu/Dockerfile.zulu-15u3-jre
new file mode 100644
index 00000000..3c4fafc3
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-15u3-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.32+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-15u3-jre-headless b/docker/ubuntu/Dockerfile.zulu-15u3-jre-headless
new file mode 100644
index 00000000..c21aeee7
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-15u3-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.32+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-16u0-jdk b/docker/ubuntu/Dockerfile.zulu-16u0-jdk
index 6055b8a7..65e9d387 100644
--- a/docker/ubuntu/Dockerfile.zulu-16u0-jdk
+++ b/docker/ubuntu/Dockerfile.zulu-16u0-jdk
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-16-azure-jdk=16.28+11* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove --purge && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zulu-16-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-16u0-jre b/docker/ubuntu/Dockerfile.zulu-16u0-jre
index 8f485ecf..c575dad3 100644
--- a/docker/ubuntu/Dockerfile.zulu-16u0-jre
+++ b/docker/ubuntu/Dockerfile.zulu-16u0-jre
@@ -15,7 +15,7 @@ RUN apt-get -qq update && \
     apt-get -qq -y dist-upgrade && \
     apt-get -qq -y --no-install-recommends install zulu-16-azure-jre=16.28+11* && \
     apt-get -qq -y purge gnupg software-properties-common && \
-    apt -y autoremove --purge && \
+    apt -y autoremove && \
     rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_HOME=/usr/lib/jvm/zre-16-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u302-jdk b/docker/ubuntu/Dockerfile.zulu-7u302-jdk
new file mode 100644
index 00000000..f5583408
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-7u302-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.46.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u302-jre b/docker/ubuntu/Dockerfile.zulu-7u302-jre
new file mode 100644
index 00000000..a5f32961
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-7u302-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.46.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u302-jre-headless b/docker/ubuntu/Dockerfile.zulu-7u302-jre-headless
new file mode 100644
index 00000000..f09d4f54
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-7u302-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.46.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u292-jdk b/docker/ubuntu/Dockerfile.zulu-8u292-jdk
new file mode 100644
index 00000000..43d2466b
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u292-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.54.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u292-jre b/docker/ubuntu/Dockerfile.zulu-8u292-jre
new file mode 100644
index 00000000..49bde304
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u292-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.54.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u292-jre-headless b/docker/ubuntu/Dockerfile.zulu-8u292-jre-headless
new file mode 100644
index 00000000..fe24dc1e
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u292-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.54.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u292-jre-headless-tools b/docker/ubuntu/Dockerfile.zulu-8u292-jre-headless-tools
new file mode 100644
index 00000000..c34d332f
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u292-jre-headless-tools
@@ -0,0 +1,23 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u292-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u292-zulu-ubuntu
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG INSTALL_DIR=/usr/lib/jvm
+ARG JDK_DIR=${INSTALL_DIR}/zulu-8-azure-amd64
+ARG JRE_DIR=${INSTALL_DIR}/zre-hl-8-azure-amd64
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+
+ENV JAVA_HOME=${JRE_DIR}
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-11u11-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-11u11-jre-tools
new file mode 100644
index 00000000..33db28e9
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-11u11-jre-tools
@@ -0,0 +1,38 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:11u11-zulu-windowsservercore AS stage1
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-11/11.0.11
+ARG JRE_PACKAGE=zulu-11-azure-jre_11.48.21-11.0.11-win_x64.msi
+ARG JRE_DIR="C:\Program Files\Zulu\zulu-11-jre"
+ARG JRE_TOOLS_DIR=C:\zulu-11-azure-jre-tools_11.48.21-11.0.11-win_x64
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-11"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.11/zulu-11-azure-jre_11.48.21-11.0.11-win_x64.msi', '%JRE_PACKAGE%') && \
+    msiexec /quiet /i %JRE_PACKAGE% && \
+    del %JRE_PACKAGE%
+
+RUN jimage.exe list "%JRE_DIR%\lib\modules" | findstr "Module: " > modules.out && \
+    powershell -Command "(Get-Content modules.out) -replace 'Module: ', '' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) -join ',' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) + ',jdk.jcmd' | Out-File modules.out" && \
+    for /f %P in ('type modules.out') do setx /m JRE_MODULES %P && \
+    del modules.out
+
+RUN jlink --no-header-files --strip-debug --module-path "%JDK_DIR%\jmods" --add-modules %JRE_MODULES% --output %JRE_TOOLS_DIR%
+
+FROM mcr.microsoft.com/windows/nanoserver:2004
+
+ARG JRE_TOOLS_DIR="C:\zulu-11-azure-jre-tools_11.48.21-11.0.11-win_x64"
+
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+COPY --from=stage1 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+USER ContainerUser
\ No newline at end of file
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-13u7-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-13u7-jre-tools
new file mode 100644
index 00000000..a0ab71fb
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-13u7-jre-tools
@@ -0,0 +1,38 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:13u7-zulu-windowsservercore AS stage1
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-13/13.0.7
+ARG JRE_PACKAGE=zulu-13-azure-jre_13.40.15-13.0.7-win_x64.msi
+ARG JRE_DIR="C:\Program Files\Zulu\zulu-13-jre"
+ARG JRE_TOOLS_DIR=C:\zulu-13-azure-jre-tools_13.40.15-13.0.7-win_x64
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-13"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.7/zulu-13-azure-jre_13.40.15-13.0.7-win_x64.msi', '%JRE_PACKAGE%') && \
+    msiexec /quiet /i %JRE_PACKAGE% && \
+    del %JRE_PACKAGE%
+
+RUN jimage.exe list "%JRE_DIR%\lib\modules" | findstr "Module: " > modules.out && \
+    powershell -Command "(Get-Content modules.out) -replace 'Module: ', '' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) -join ',' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) + ',jdk.jcmd' | Out-File modules.out" && \
+    for /f %P in ('type modules.out') do setx /m JRE_MODULES %P && \
+    del modules.out
+
+RUN jlink --no-header-files --strip-debug --module-path "%JDK_DIR%\jmods" --add-modules %JRE_MODULES% --output %JRE_TOOLS_DIR%
+
+FROM mcr.microsoft.com/windows/nanoserver:2004
+
+ARG JRE_TOOLS_DIR="C:\zulu-13-azure-jre-tools_13.40.15-13.0.7-win_x64"
+
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+COPY --from=stage1 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+USER ContainerUser
\ No newline at end of file
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-15u3-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-15u3-jre-tools
new file mode 100644
index 00000000..382e2a1e
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-15u3-jre-tools
@@ -0,0 +1,38 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:15u3-zulu-windowsservercore AS stage1
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-15/15.0.3
+ARG JRE_PACKAGE=zulu-15-azure-jre_15.32.15-15.0.3-win_x64.msi
+ARG JRE_DIR="C:\Program Files\Zulu\zulu-15-jre"
+ARG JRE_TOOLS_DIR=C:\zulu-15-azure-jre-tools_15.32.15-15.0.3-win_x64
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-15"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.3/zulu-15-azure-jre_15.32.15-15.0.3-win_x64.msi', '%JRE_PACKAGE%') && \
+    msiexec /quiet /i %JRE_PACKAGE% && \
+    del %JRE_PACKAGE%
+
+RUN jimage.exe list "%JRE_DIR%\lib\modules" | findstr "Module: " > modules.out && \
+    powershell -Command "(Get-Content modules.out) -replace 'Module: ', '' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) -join ',' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) + ',jdk.jcmd' | Out-File modules.out" && \
+    for /f %P in ('type modules.out') do setx /m JRE_MODULES %P && \
+    del modules.out
+
+RUN jlink --no-header-files --strip-debug --module-path "%JDK_DIR%\jmods" --add-modules %JRE_MODULES% --output %JRE_TOOLS_DIR%
+
+FROM mcr.microsoft.com/windows/nanoserver:2004
+
+ARG JRE_TOOLS_DIR="C:\zulu-15-azure-jre-tools_15.32.15-15.0.3-win_x64"
+
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+COPY --from=stage1 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+USER ContainerUser
\ No newline at end of file
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-7u302-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-7u302-jre-tools
new file mode 100644
index 00000000..d89a14b2
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-7u302-jre-tools
@@ -0,0 +1,31 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:7u302-zulu-windowsservercore AS stage1
+FROM mcr.microsoft.com/windows/nanoserver:2004
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-7/7u302
+ARG JRE_PACKAGE=zulu-7-azure-jre_7.46.0.11-7.0.302-win_x64.zip
+ARG JRE_DIR=zulu-7-azure-jre_7.46.0.11-7.0.302-win_x64
+ARG JRE_TOOLS_DIR=zulu-7-azure-jre-tools_7.46.0.11-7.0.302-win_x64
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-7"
+
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "C:\%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+RUN curl https://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%JRE_PACKAGE% -o %JRE_PACKAGE% && \
+    tar -xf %JRE_PACKAGE% && \
+    del %JRE_PACKAGE% && \
+    move %JRE_DIR% %JRE_TOOLS_DIR%
+
+COPY --from=stage1 ${JDK_DIR}/bin/jstack.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_TOOLS_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/bin/attach.dll ${JRE_TOOLS_DIR}/bin
+USER ContainerUser
\ No newline at end of file
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-8u292-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-8u292-jre-tools
new file mode 100644
index 00000000..2ebe2085
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-8u292-jre-tools
@@ -0,0 +1,31 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u292-zulu-windowsservercore AS stage1
+FROM mcr.microsoft.com/windows/nanoserver:2004
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-8/8u292
+ARG JRE_PACKAGE=zulu-8-azure-jre_8.54.0.21-8.0.292-win_x64.zip
+ARG JRE_DIR=zulu-8-azure-jre_8.54.0.21-8.0.292-win_x64
+ARG JRE_TOOLS_DIR=zulu-8-azure-jre-tools_8.54.0.21-8.0.292-win_x64
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-8"
+
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "C:\%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+RUN curl https://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%JRE_PACKAGE% -o %JRE_PACKAGE% && \
+    tar -xf %JRE_PACKAGE% && \
+    del %JRE_PACKAGE% && \
+    move %JRE_DIR% %JRE_TOOLS_DIR%
+
+COPY --from=stage1 ${JDK_DIR}/bin/jstack.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_TOOLS_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/bin/attach.dll ${JRE_TOOLS_DIR}/bin
+USER ContainerUser
\ No newline at end of file
diff --git a/docker/windowsservercore/Dockerfile.zulu-11u11-jdk b/docker/windowsservercore/Dockerfile.zulu-11u11-jdk
new file mode 100644
index 00000000..694dc640
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-11u11-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-11-azure-jdk_11.48.21-11.0.11-win_x64.msi && \
+    setx PACKAGE_DIR zulu-11/11.0.11 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-11"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.11/zulu-11-azure-jdk_11.48.21-11.0.11-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-11u11-jre b/docker/windowsservercore/Dockerfile.zulu-11u11-jre
new file mode 100644
index 00000000..e0be4779
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-11u11-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-11-azure-jre_11.48.21-11.0.11-win_x64.msi && \
+    setx PACKAGE_DIR zulu-11/11.0.11 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-11-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.11/zulu-11-azure-jre_11.48.21-11.0.11-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-11u11-jre-tools b/docker/windowsservercore/Dockerfile.zulu-11u11-jre-tools
new file mode 100644
index 00000000..e0be4779
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-11u11-jre-tools
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-11-azure-jre_11.48.21-11.0.11-win_x64.msi && \
+    setx PACKAGE_DIR zulu-11/11.0.11 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-11-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.11/zulu-11-azure-jre_11.48.21-11.0.11-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-13u7-jdk b/docker/windowsservercore/Dockerfile.zulu-13u7-jdk
new file mode 100644
index 00000000..2a12881e
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-13u7-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-13-azure-jdk_13.40.15-13.0.7-win_x64.msi && \
+    setx PACKAGE_DIR zulu-13/13.0.7 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-13"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.7/zulu-13-azure-jdk_13.40.15-13.0.7-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-13u7-jre b/docker/windowsservercore/Dockerfile.zulu-13u7-jre
new file mode 100644
index 00000000..eb1514ba
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-13u7-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-13-azure-jre_13.40.15-13.0.7-win_x64.msi && \
+    setx PACKAGE_DIR zulu-13/13.0.7 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-13-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.7/zulu-13-azure-jre_13.40.15-13.0.7-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-13u7-jre-tools b/docker/windowsservercore/Dockerfile.zulu-13u7-jre-tools
new file mode 100644
index 00000000..eb1514ba
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-13u7-jre-tools
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-13-azure-jre_13.40.15-13.0.7-win_x64.msi && \
+    setx PACKAGE_DIR zulu-13/13.0.7 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-13-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.7/zulu-13-azure-jre_13.40.15-13.0.7-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-14u2-jre-tools b/docker/windowsservercore/Dockerfile.zulu-14u2-jre-tools
new file mode 100644
index 00000000..5159e9f3
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-14u2-jre-tools
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-14-azure-jre_14.29.23-14.0.2-win_x64.msi && \
+    setx PACKAGE_DIR zulu-14/14.0.2 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-14-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-14/14.0.2/zulu-14-azure-jre_14.29.23-14.0.2-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-15u3-jdk b/docker/windowsservercore/Dockerfile.zulu-15u3-jdk
new file mode 100644
index 00000000..eafc5eb5
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-15u3-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-15-azure-jdk_15.32.15-15.0.3-win_x64.msi && \
+    setx PACKAGE_DIR zulu-15/15.0.3 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-15"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.3/zulu-15-azure-jdk_15.32.15-15.0.3-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-15u3-jre b/docker/windowsservercore/Dockerfile.zulu-15u3-jre
new file mode 100644
index 00000000..69349065
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-15u3-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-15-azure-jre_15.32.15-15.0.3-win_x64.msi && \
+    setx PACKAGE_DIR zulu-15/15.0.3 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-15-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.3/zulu-15-azure-jre_15.32.15-15.0.3-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-15u3-jre-tools b/docker/windowsservercore/Dockerfile.zulu-15u3-jre-tools
new file mode 100644
index 00000000..69349065
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-15u3-jre-tools
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-15-azure-jre_15.32.15-15.0.3-win_x64.msi && \
+    setx PACKAGE_DIR zulu-15/15.0.3 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-15-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.3/zulu-15-azure-jre_15.32.15-15.0.3-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-16u0-jre-tools b/docker/windowsservercore/Dockerfile.zulu-16u0-jre-tools
new file mode 100644
index 00000000..1db6ff59
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-16u0-jre-tools
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-16-azure-jre_16.28.11-16.0.0-win_x64.msi && \
+    setx PACKAGE_DIR zulu-16/16.0.0 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-16-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-16/16/zulu-16-azure-jre_16.28.11-16.0.0-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-7u302-jdk b/docker/windowsservercore/Dockerfile.zulu-7u302-jdk
new file mode 100644
index 00000000..ab10220e
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-7u302-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-7-azure-jdk_7.46.0.11-7.0.302-win_x64.msi && \
+    setx PACKAGE_DIR zulu-7/7u302 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-7"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u302/zulu-7-azure-jdk_7.46.0.11-7.0.302-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-7u302-jre b/docker/windowsservercore/Dockerfile.zulu-7u302-jre
new file mode 100644
index 00000000..08241cd6
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-7u302-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-7-azure-jre_7.46.0.11-7.0.302-win_x64.msi && \
+    setx PACKAGE_DIR zulu-7/7u302 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-7-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u302/zulu-7-azure-jre_7.46.0.11-7.0.302-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-7u302-jre-tools b/docker/windowsservercore/Dockerfile.zulu-7u302-jre-tools
new file mode 100644
index 00000000..08241cd6
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-7u302-jre-tools
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-7-azure-jre_7.46.0.11-7.0.302-win_x64.msi && \
+    setx PACKAGE_DIR zulu-7/7u302 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-7-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u302/zulu-7-azure-jre_7.46.0.11-7.0.302-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-8u292-jdk b/docker/windowsservercore/Dockerfile.zulu-8u292-jdk
new file mode 100644
index 00000000..f149d5be
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-8u292-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-8-azure-jdk_8.54.0.21-8.0.292-win_x64.msi && \
+    setx PACKAGE_DIR zulu-8/8u292 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-8"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u292/zulu-8-azure-jdk_8.54.0.21-8.0.292-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-8u292-jre b/docker/windowsservercore/Dockerfile.zulu-8u292-jre
new file mode 100644
index 00000000..a40fab92
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-8u292-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-8-azure-jre_8.54.0.21-8.0.292-win_x64.msi && \
+    setx PACKAGE_DIR zulu-8/8u292 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-8-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u292/zulu-8-azure-jre_8.54.0.21-8.0.292-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-8u292-jre-tools b/docker/windowsservercore/Dockerfile.zulu-8u292-jre-tools
new file mode 100644
index 00000000..a40fab92
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-8u292-jre-tools
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM microsoft/windowsservercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-8-azure-jre_8.54.0.21-8.0.292-win_x64.msi && \
+    setx PACKAGE_DIR zulu-8/8u292 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-8-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u292/zulu-8-azure-jre_8.54.0.21-8.0.292-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%

From 184487bf8212c2ee582d9f55c23f34a905eb68c9 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 23 Apr 2021 16:35:51 -0500
Subject: [PATCH 239/264] Added April 2021 Dockerfiles for Tomcat

---
 ...file.zulu-11u11-jre-headless-tools-tomcat8 | 72 +++++++++++++++++++
 ...file.zulu-11u11-jre-headless-tools-tomcat9 | 72 +++++++++++++++++++
 ...file.zulu-8u292-jre-headless-tools-tomcat8 | 67 +++++++++++++++++
 ...file.zulu-8u292-jre-headless-tools-tomcat9 | 67 +++++++++++++++++
 4 files changed, 278 insertions(+)
 create mode 100644 docker/alpine/Dockerfile.zulu-11u11-jre-headless-tools-tomcat8
 create mode 100644 docker/alpine/Dockerfile.zulu-11u11-jre-headless-tools-tomcat9
 create mode 100644 docker/alpine/Dockerfile.zulu-8u292-jre-headless-tools-tomcat8
 create mode 100644 docker/alpine/Dockerfile.zulu-8u292-jre-headless-tools-tomcat9

diff --git a/docker/alpine/Dockerfile.zulu-11u11-jre-headless-tools-tomcat8 b/docker/alpine/Dockerfile.zulu-11u11-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..94a4a9a6
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u11-jre-headless-tools-tomcat8
@@ -0,0 +1,72 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u11-zulu-alpine AS stage1
+FROM mcr.microsoft.com/java/jdk:11u11-zulu-alpine AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-jdk_11.48.21-11.0.11-linux_musl_x64
+ARG JRE_DIR=/usr/lib/jvm/zulu-11-azure-jre-headless_11.48.21-11.0.11-linux_musl_x64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM alpine AS stage3
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.65
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apk add --update openssh-server bash openrc && \
+    apk update && \
+    apk upgrade && \
+    rm -rf /var/cache/apk/* && \
+    # Remove unnecessary services
+    rm -f /etc/init.d/hwdrivers \
+          /etc/init.d/hwclock \
+          /etc/init.d/mtab \
+          /etc/init.d/bootmisc \
+          /etc/init.d/modules \
+          /etc/init.d/modules-load \
+          /etc/init.d/modloop && \
+    # Install Tomcat
+    wget -O /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/alpine/Dockerfile.zulu-11u11-jre-headless-tools-tomcat9 b/docker/alpine/Dockerfile.zulu-11u11-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..9b37bc8c
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u11-jre-headless-tools-tomcat9
@@ -0,0 +1,72 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u11-zulu-alpine AS stage1
+FROM mcr.microsoft.com/java/jdk:11u11-zulu-alpine AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-jdk_11.48.21-11.0.11-linux_musl_x64
+ARG JRE_DIR=/usr/lib/jvm/zulu-11-azure-jre-headless_11.48.21-11.0.11-linux_musl_x64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM alpine AS stage3
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.45
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apk add --update openssh-server bash openrc && \
+    apk update && \
+    apk upgrade && \
+    rm -rf /var/cache/apk/* && \
+    # Remove unnecessary services
+    rm -f /etc/init.d/hwdrivers \
+          /etc/init.d/hwclock \
+          /etc/init.d/mtab \
+          /etc/init.d/bootmisc \
+          /etc/init.d/modules \
+          /etc/init.d/modules-load \
+          /etc/init.d/modloop && \
+    # Install Tomcat
+    wget -O /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/alpine/Dockerfile.zulu-8u292-jre-headless-tools-tomcat8 b/docker/alpine/Dockerfile.zulu-8u292-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..59e213a5
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u292-jre-headless-tools-tomcat8
@@ -0,0 +1,67 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u292-zulu-alpine AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u292-zulu-alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-jdk_8.54.0.21-8.0.292-linux_musl_x64
+ARG JRE_DIR=/usr/lib/jvm/zulu-8-azure-jre-headless_8.54.0.21-8.0.292-linux_musl_x64
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.65
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apk add --update openssh-server bash openrc && \
+    apk update && \
+    apk upgrade && \
+    rm -rf /var/cache/apk/* && \
+    # Remove unnecessary services
+    rm -f /etc/init.d/hwdrivers \
+          /etc/init.d/hwclock \
+          /etc/init.d/mtab \
+          /etc/init.d/bootmisc \
+          /etc/init.d/modules \
+          /etc/init.d/modules-load \
+          /etc/init.d/modloop && \
+    # Install Tomcat
+    wget -O /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/alpine/Dockerfile.zulu-8u292-jre-headless-tools-tomcat9 b/docker/alpine/Dockerfile.zulu-8u292-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..9c45ac32
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u292-jre-headless-tools-tomcat9
@@ -0,0 +1,67 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u292-zulu-alpine AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u292-zulu-alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-jdk_8.54.0.21-8.0.292-linux_musl_x64
+ARG JRE_DIR=/usr/lib/jvm/zulu-8-azure-jre-headless_8.54.0.21-8.0.292-linux_musl_x64
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.45
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apk add --update openssh-server bash openrc && \
+    apk update && \
+    apk upgrade && \
+    rm -rf /var/cache/apk/* && \
+    # Remove unnecessary services
+    rm -f /etc/init.d/hwdrivers \
+          /etc/init.d/hwclock \
+          /etc/init.d/mtab \
+          /etc/init.d/bootmisc \
+          /etc/init.d/modules \
+          /etc/init.d/modules-load \
+          /etc/init.d/modloop && \
+    # Install Tomcat
+    wget -O /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]

From 889367610c31105b8a7e51086494c712aa24fad6 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 23 Apr 2021 16:36:42 -0500
Subject: [PATCH 240/264] Added April 2021 Dockerfiles for Tomcat

---
 ...file.zulu-11u11-jre-headless-tools-tomcat8 | 62 +++++++++++++++++++
 ...file.zulu-11u11-jre-headless-tools-tomcat9 | 62 +++++++++++++++++++
 ...file.zulu-8u292-jre-headless-tools-tomcat8 | 57 +++++++++++++++++
 ...file.zulu-8u292-jre-headless-tools-tomcat9 | 57 +++++++++++++++++
 4 files changed, 238 insertions(+)
 create mode 100644 docker/centos/Dockerfile.zulu-11u11-jre-headless-tools-tomcat8
 create mode 100644 docker/centos/Dockerfile.zulu-11u11-jre-headless-tools-tomcat9
 create mode 100644 docker/centos/Dockerfile.zulu-8u292-jre-headless-tools-tomcat8
 create mode 100644 docker/centos/Dockerfile.zulu-8u292-jre-headless-tools-tomcat9

diff --git a/docker/centos/Dockerfile.zulu-11u11-jre-headless-tools-tomcat8 b/docker/centos/Dockerfile.zulu-11u11-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..91e11239
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u11-jre-headless-tools-tomcat8
@@ -0,0 +1,62 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u11-zulu-centos AS stage1
+FROM mcr.microsoft.com/java/jdk:11u11-zulu-centos AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM centos:latest AS stage3
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.65
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+RUN yum -q -y update && \
+    yum -q -y install unzip && \
+    yum -q -y upgrade && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
+       
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/centos/Dockerfile.zulu-11u11-jre-headless-tools-tomcat9 b/docker/centos/Dockerfile.zulu-11u11-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..0a7c4ed9
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u11-jre-headless-tools-tomcat9
@@ -0,0 +1,62 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u11-zulu-centos AS stage1
+FROM mcr.microsoft.com/java/jdk:11u11-zulu-centos AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM centos:latest AS stage3
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.45
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+RUN yum -q -y update && \
+    yum -q -y install unzip && \
+    yum -q -y upgrade && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
+       
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/centos/Dockerfile.zulu-8u292-jre-headless-tools-tomcat8 b/docker/centos/Dockerfile.zulu-8u292-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..c3788b44
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u292-jre-headless-tools-tomcat8
@@ -0,0 +1,57 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u292-zulu-centos AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u292-zulu-centos
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.65
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+RUN yum -q -y update && \
+    yum -q -y install unzip && \
+    yum -q -y upgrade && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
+       
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/centos/Dockerfile.zulu-8u292-jre-headless-tools-tomcat9 b/docker/centos/Dockerfile.zulu-8u292-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..81aa3ebe
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u292-jre-headless-tools-tomcat9
@@ -0,0 +1,57 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u292-zulu-centos AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u292-zulu-centos
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.45
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+RUN yum -q -y update && \
+    yum -q -y install unzip && \
+    yum -q -y upgrade && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
+       
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]

From 2ed4721e98df7cef1ea83464089b5126fde41386 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 23 Apr 2021 16:37:46 -0500
Subject: [PATCH 241/264] Added April 2021 Dockerfiles for Tomcat

---
 ...file.zulu-11u11-jre-headless-tools-tomcat8 | 66 +++++++++++++++++++
 ...file.zulu-11u11-jre-headless-tools-tomcat9 | 66 +++++++++++++++++++
 ...file.zulu-8u292-jre-headless-tools-tomcat8 | 61 +++++++++++++++++
 ...file.zulu-8u292-jre-headless-tools-tomcat9 | 61 +++++++++++++++++
 4 files changed, 254 insertions(+)
 create mode 100644 docker/debian10/Dockerfile.zulu-11u11-jre-headless-tools-tomcat8
 create mode 100644 docker/debian10/Dockerfile.zulu-11u11-jre-headless-tools-tomcat9
 create mode 100644 docker/debian10/Dockerfile.zulu-8u292-jre-headless-tools-tomcat8
 create mode 100644 docker/debian10/Dockerfile.zulu-8u292-jre-headless-tools-tomcat9

diff --git a/docker/debian10/Dockerfile.zulu-11u11-jre-headless-tools-tomcat8 b/docker/debian10/Dockerfile.zulu-11u11-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..f24e672c
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u11-jre-headless-tools-tomcat8
@@ -0,0 +1,66 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u11-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jdk:11u11-zulu-debian10 AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure-amd64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM debian:buster AS stage3
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.65
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install ca-certificates curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove --purge && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/debian10/Dockerfile.zulu-11u11-jre-headless-tools-tomcat9 b/docker/debian10/Dockerfile.zulu-11u11-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..5a26d887
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u11-jre-headless-tools-tomcat9
@@ -0,0 +1,66 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u11-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jdk:11u11-zulu-debian10 AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure-amd64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM debian:buster AS stage3
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.45
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install ca-certificates curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove --purge && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/debian10/Dockerfile.zulu-8u292-jre-headless-tools-tomcat8 b/docker/debian10/Dockerfile.zulu-8u292-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..4b3f2660
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u292-jre-headless-tools-tomcat8
@@ -0,0 +1,61 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u292-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u292-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.65
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove --purge && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/debian10/Dockerfile.zulu-8u292-jre-headless-tools-tomcat9 b/docker/debian10/Dockerfile.zulu-8u292-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..73deb02d
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u292-jre-headless-tools-tomcat9
@@ -0,0 +1,61 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u292-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u292-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.45
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove --purge && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]

From 64eca7be99db864de3a49eae479078de4ed9877c Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 23 Apr 2021 16:38:42 -0500
Subject: [PATCH 242/264] Added April 2021 Dockerfiles for Tomcat

---
 ...file.zulu-11u11-jre-headless-tools-tomcat8 | 66 +++++++++++++++++++
 ...file.zulu-11u11-jre-headless-tools-tomcat9 | 66 +++++++++++++++++++
 ...file.zulu-8u292-jre-headless-tools-tomcat8 | 61 +++++++++++++++++
 ...file.zulu-8u292-jre-headless-tools-tomcat9 | 61 +++++++++++++++++
 4 files changed, 254 insertions(+)
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u11-jre-headless-tools-tomcat8
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u11-jre-headless-tools-tomcat9
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u292-jre-headless-tools-tomcat8
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u292-jre-headless-tools-tomcat9

diff --git a/docker/ubuntu/Dockerfile.zulu-11u11-jre-headless-tools-tomcat8 b/docker/ubuntu/Dockerfile.zulu-11u11-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..7c734d49
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u11-jre-headless-tools-tomcat8
@@ -0,0 +1,66 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u11-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jdk:11u11-zulu-ubuntu AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure-amd64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM ubuntu:focal AS stage3
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.65
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install ca-certificates curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove --purge && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/ubuntu/Dockerfile.zulu-11u11-jre-headless-tools-tomcat9 b/docker/ubuntu/Dockerfile.zulu-11u11-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..4176aadb
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u11-jre-headless-tools-tomcat9
@@ -0,0 +1,66 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u11-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jdk:11u11-zulu-ubuntu AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure-amd64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM ubuntu:focal AS stage3
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.45
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install ca-certificates curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove --purge && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/ubuntu/Dockerfile.zulu-8u292-jre-headless-tools-tomcat8 b/docker/ubuntu/Dockerfile.zulu-8u292-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..aa7d3ba0
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u292-jre-headless-tools-tomcat8
@@ -0,0 +1,61 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u292-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u292-zulu-ubuntu
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.65
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove --purge && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/ubuntu/Dockerfile.zulu-8u292-jre-headless-tools-tomcat9 b/docker/ubuntu/Dockerfile.zulu-8u292-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..c2ed117b
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u292-jre-headless-tools-tomcat9
@@ -0,0 +1,61 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u292-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u292-zulu-ubuntu
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.45
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove --purge && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]

From 46ce4b6b57faece4b53ce78719c426371d3ff890 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 22 Jul 2021 08:20:52 -0500
Subject: [PATCH 243/264] Added July 2021 Dockerfiles for Tomcat

---
 ...file.zulu-11u12-jre-headless-tools-tomcat8 | 72 +++++++++++++++++++
 ...file.zulu-11u12-jre-headless-tools-tomcat9 | 72 +++++++++++++++++++
 ...file.zulu-8u302-jre-headless-tools-tomcat8 | 67 +++++++++++++++++
 ...file.zulu-8u302-jre-headless-tools-tomcat9 | 67 +++++++++++++++++
 4 files changed, 278 insertions(+)
 create mode 100644 docker/alpine/Dockerfile.zulu-11u12-jre-headless-tools-tomcat8
 create mode 100644 docker/alpine/Dockerfile.zulu-11u12-jre-headless-tools-tomcat9
 create mode 100644 docker/alpine/Dockerfile.zulu-8u302-jre-headless-tools-tomcat8
 create mode 100644 docker/alpine/Dockerfile.zulu-8u302-jre-headless-tools-tomcat9

diff --git a/docker/alpine/Dockerfile.zulu-11u12-jre-headless-tools-tomcat8 b/docker/alpine/Dockerfile.zulu-11u12-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..b6641a4c
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u12-jre-headless-tools-tomcat8
@@ -0,0 +1,72 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u12-zulu-alpine AS stage1
+FROM mcr.microsoft.com/java/jdk:11u12-zulu-alpine AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-jdk_11.50.19-11.0.12-linux_musl_x64
+ARG JRE_DIR=/usr/lib/jvm/zulu-11-azure-jre-headless_11.50.19-11.0.12-linux_musl_x64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM alpine AS stage3
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.69
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apk add --update openssh-server bash openrc && \
+    apk update && \
+    apk upgrade && \
+    rm -rf /var/cache/apk/* && \
+    # Remove unnecessary services
+    rm -f /etc/init.d/hwdrivers \
+          /etc/init.d/hwclock \
+          /etc/init.d/mtab \
+          /etc/init.d/bootmisc \
+          /etc/init.d/modules \
+          /etc/init.d/modules-load \
+          /etc/init.d/modloop && \
+    # Install Tomcat
+    wget -O /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/alpine/Dockerfile.zulu-11u12-jre-headless-tools-tomcat9 b/docker/alpine/Dockerfile.zulu-11u12-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..cabc3b00
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u12-jre-headless-tools-tomcat9
@@ -0,0 +1,72 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u12-zulu-alpine AS stage1
+FROM mcr.microsoft.com/java/jdk:11u12-zulu-alpine AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-jdk_11.50.19-11.0.12-linux_musl_x64
+ARG JRE_DIR=/usr/lib/jvm/zulu-11-azure-jre-headless_11.50.19-11.0.12-linux_musl_x64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM alpine AS stage3
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.50
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apk add --update openssh-server bash openrc && \
+    apk update && \
+    apk upgrade && \
+    rm -rf /var/cache/apk/* && \
+    # Remove unnecessary services
+    rm -f /etc/init.d/hwdrivers \
+          /etc/init.d/hwclock \
+          /etc/init.d/mtab \
+          /etc/init.d/bootmisc \
+          /etc/init.d/modules \
+          /etc/init.d/modules-load \
+          /etc/init.d/modloop && \
+    # Install Tomcat
+    wget -O /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/alpine/Dockerfile.zulu-8u302-jre-headless-tools-tomcat8 b/docker/alpine/Dockerfile.zulu-8u302-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..0cc91f4d
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u302-jre-headless-tools-tomcat8
@@ -0,0 +1,67 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u302-zulu-alpine AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u302-zulu-alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-jdk_8.56.0.21-8.0.302-linux_musl_x64
+ARG JRE_DIR=/usr/lib/jvm/zulu-8-azure-jre-headless_8.56.0.21-8.0.302-linux_musl_x64
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.69
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apk add --update openssh-server bash openrc && \
+    apk update && \
+    apk upgrade && \
+    rm -rf /var/cache/apk/* && \
+    # Remove unnecessary services
+    rm -f /etc/init.d/hwdrivers \
+          /etc/init.d/hwclock \
+          /etc/init.d/mtab \
+          /etc/init.d/bootmisc \
+          /etc/init.d/modules \
+          /etc/init.d/modules-load \
+          /etc/init.d/modloop && \
+    # Install Tomcat
+    wget -O /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/alpine/Dockerfile.zulu-8u302-jre-headless-tools-tomcat9 b/docker/alpine/Dockerfile.zulu-8u302-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..3883ba16
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u302-jre-headless-tools-tomcat9
@@ -0,0 +1,67 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u302-zulu-alpine AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u302-zulu-alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-jdk_8.56.0.21-8.0.302-linux_musl_x64
+ARG JRE_DIR=/usr/lib/jvm/zulu-8-azure-jre-headless_8.56.0.21-8.0.302-linux_musl_x64
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.50
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apk add --update openssh-server bash openrc && \
+    apk update && \
+    apk upgrade && \
+    rm -rf /var/cache/apk/* && \
+    # Remove unnecessary services
+    rm -f /etc/init.d/hwdrivers \
+          /etc/init.d/hwclock \
+          /etc/init.d/mtab \
+          /etc/init.d/bootmisc \
+          /etc/init.d/modules \
+          /etc/init.d/modules-load \
+          /etc/init.d/modloop && \
+    # Install Tomcat
+    wget -O /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]

From 405beabc18c4c818a90a56a3e300544378fabe1f Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 22 Jul 2021 08:22:04 -0500
Subject: [PATCH 244/264] Added July 2021 Dockerfiles for Tomcat

---
 ...file.zulu-11u12-jre-headless-tools-tomcat8 | 62 +++++++++++++++++++
 ...file.zulu-11u12-jre-headless-tools-tomcat9 | 62 +++++++++++++++++++
 ...file.zulu-8u302-jre-headless-tools-tomcat8 | 57 +++++++++++++++++
 ...file.zulu-8u302-jre-headless-tools-tomcat9 | 57 +++++++++++++++++
 4 files changed, 238 insertions(+)
 create mode 100644 docker/centos/Dockerfile.zulu-11u12-jre-headless-tools-tomcat8
 create mode 100644 docker/centos/Dockerfile.zulu-11u12-jre-headless-tools-tomcat9
 create mode 100644 docker/centos/Dockerfile.zulu-8u302-jre-headless-tools-tomcat8
 create mode 100644 docker/centos/Dockerfile.zulu-8u302-jre-headless-tools-tomcat9

diff --git a/docker/centos/Dockerfile.zulu-11u12-jre-headless-tools-tomcat8 b/docker/centos/Dockerfile.zulu-11u12-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..9e85047d
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u12-jre-headless-tools-tomcat8
@@ -0,0 +1,62 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u12-zulu-centos AS stage1
+FROM mcr.microsoft.com/java/jdk:11u12-zulu-centos AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM centos:latest AS stage3
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.69
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+RUN yum -q -y update && \
+    yum -q -y install unzip && \
+    yum -q -y upgrade && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
+       
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/centos/Dockerfile.zulu-11u12-jre-headless-tools-tomcat9 b/docker/centos/Dockerfile.zulu-11u12-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..244475d4
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u12-jre-headless-tools-tomcat9
@@ -0,0 +1,62 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u12-zulu-centos AS stage1
+FROM mcr.microsoft.com/java/jdk:11u12-zulu-centos AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM centos:latest AS stage3
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.50
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+RUN yum -q -y update && \
+    yum -q -y install unzip && \
+    yum -q -y upgrade && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
+       
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/centos/Dockerfile.zulu-8u302-jre-headless-tools-tomcat8 b/docker/centos/Dockerfile.zulu-8u302-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..3a851308
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u302-jre-headless-tools-tomcat8
@@ -0,0 +1,57 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u302-zulu-centos AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u302-zulu-centos
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.69
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+RUN yum -q -y update && \
+    yum -q -y install unzip && \
+    yum -q -y upgrade && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
+       
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/centos/Dockerfile.zulu-8u302-jre-headless-tools-tomcat9 b/docker/centos/Dockerfile.zulu-8u302-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..db7afa7c
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u302-jre-headless-tools-tomcat9
@@ -0,0 +1,57 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u302-zulu-centos AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u302-zulu-centos
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.50
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+RUN yum -q -y update && \
+    yum -q -y install unzip && \
+    yum -q -y upgrade && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
+       
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]

From 640aa6ae6ac6ddf6a08714f3cda805a19bb20b71 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 22 Jul 2021 08:23:03 -0500
Subject: [PATCH 245/264] Added July 2021 Dockerfiles for Tomcat

---
 ...file.zulu-11u12-jre-headless-tools-tomcat8 | 66 +++++++++++++++++++
 ...file.zulu-11u12-jre-headless-tools-tomcat9 | 66 +++++++++++++++++++
 ...file.zulu-8u302-jre-headless-tools-tomcat8 | 61 +++++++++++++++++
 ...file.zulu-8u302-jre-headless-tools-tomcat9 | 61 +++++++++++++++++
 4 files changed, 254 insertions(+)
 create mode 100644 docker/debian10/Dockerfile.zulu-11u12-jre-headless-tools-tomcat8
 create mode 100644 docker/debian10/Dockerfile.zulu-11u12-jre-headless-tools-tomcat9
 create mode 100644 docker/debian10/Dockerfile.zulu-8u302-jre-headless-tools-tomcat8
 create mode 100644 docker/debian10/Dockerfile.zulu-8u302-jre-headless-tools-tomcat9

diff --git a/docker/debian10/Dockerfile.zulu-11u12-jre-headless-tools-tomcat8 b/docker/debian10/Dockerfile.zulu-11u12-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..a1e792ba
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u12-jre-headless-tools-tomcat8
@@ -0,0 +1,66 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u12-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jdk:11u12-zulu-debian10 AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure-amd64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM debian:buster AS stage3
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.69
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install ca-certificates curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove --purge && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/debian10/Dockerfile.zulu-11u12-jre-headless-tools-tomcat9 b/docker/debian10/Dockerfile.zulu-11u12-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..2d0a28c7
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u12-jre-headless-tools-tomcat9
@@ -0,0 +1,66 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u12-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jdk:11u12-zulu-debian10 AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure-amd64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM debian:buster AS stage3
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.50
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install ca-certificates curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove --purge && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/debian10/Dockerfile.zulu-8u302-jre-headless-tools-tomcat8 b/docker/debian10/Dockerfile.zulu-8u302-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..3a684797
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u302-jre-headless-tools-tomcat8
@@ -0,0 +1,61 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u302-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u302-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.69
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove --purge && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/debian10/Dockerfile.zulu-8u302-jre-headless-tools-tomcat9 b/docker/debian10/Dockerfile.zulu-8u302-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..4dd2ba8e
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u302-jre-headless-tools-tomcat9
@@ -0,0 +1,61 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u302-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u302-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.50
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove --purge && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]

From 84fef2b0b579fd6f15f116527c9fc8a13ac89936 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Thu, 22 Jul 2021 08:24:01 -0500
Subject: [PATCH 246/264] Added July 2021 Dockerfiles for Tomcat

---
 ...file.zulu-11u12-jre-headless-tools-tomcat8 | 66 +++++++++++++++++++
 ...file.zulu-11u12-jre-headless-tools-tomcat9 | 66 +++++++++++++++++++
 ...file.zulu-8u302-jre-headless-tools-tomcat8 | 61 +++++++++++++++++
 ...file.zulu-8u302-jre-headless-tools-tomcat9 | 61 +++++++++++++++++
 4 files changed, 254 insertions(+)
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u12-jre-headless-tools-tomcat8
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u12-jre-headless-tools-tomcat9
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u302-jre-headless-tools-tomcat8
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u302-jre-headless-tools-tomcat9

diff --git a/docker/ubuntu/Dockerfile.zulu-11u12-jre-headless-tools-tomcat8 b/docker/ubuntu/Dockerfile.zulu-11u12-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..9ad2e19c
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u12-jre-headless-tools-tomcat8
@@ -0,0 +1,66 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u12-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jdk:11u12-zulu-ubuntu AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure-amd64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM ubuntu:focal AS stage3
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.69
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install ca-certificates curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove --purge && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/ubuntu/Dockerfile.zulu-11u12-jre-headless-tools-tomcat9 b/docker/ubuntu/Dockerfile.zulu-11u12-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..0b2a0d67
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u12-jre-headless-tools-tomcat9
@@ -0,0 +1,66 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u12-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jdk:11u12-zulu-ubuntu AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure-amd64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM ubuntu:focal AS stage3
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.50
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install ca-certificates curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove --purge && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/ubuntu/Dockerfile.zulu-8u302-jre-headless-tools-tomcat8 b/docker/ubuntu/Dockerfile.zulu-8u302-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..a71a18e6
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u302-jre-headless-tools-tomcat8
@@ -0,0 +1,61 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u302-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u302-zulu-ubuntu
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.69
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove --purge && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/ubuntu/Dockerfile.zulu-8u302-jre-headless-tools-tomcat9 b/docker/ubuntu/Dockerfile.zulu-8u302-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..bea2d4b4
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u302-jre-headless-tools-tomcat9
@@ -0,0 +1,61 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u302-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u302-zulu-ubuntu
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.50
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove --purge && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]

From fc9cb4338af5aa7c8953df34a0b743a6855077c7 Mon Sep 17 00:00:00 2001
From: zulu-ci <zulu-ci@azul.com>
Date: Thu, 22 Jul 2021 15:44:58 +0000
Subject: [PATCH 247/264] July 2021 Zulu release dockerfiles

---
 docker/alpine/Dockerfile.zulu-11u12-jdk       | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-11u12-jre       | 32 ++++++++++++++
 .../alpine/Dockerfile.zulu-11u12-jre-headless | 32 ++++++++++++++
 .../Dockerfile.zulu-11u12-jre-headless-tools  | 30 +++++++++++++
 docker/alpine/Dockerfile.zulu-13u8-jdk        | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-13u8-jre        | 30 +++++++++++++
 .../alpine/Dockerfile.zulu-13u8-jre-headless  | 30 +++++++++++++
 .../Dockerfile.zulu-13u8-jre-headless-tools   | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-15u4-jdk        | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-15u4-jre        | 30 +++++++++++++
 .../alpine/Dockerfile.zulu-15u4-jre-headless  | 30 +++++++++++++
 .../Dockerfile.zulu-15u4-jre-headless-tools   | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-7u312-jdk       | 44 +++++++++++++++++++
 docker/alpine/Dockerfile.zulu-7u312-jre       | 44 +++++++++++++++++++
 .../alpine/Dockerfile.zulu-7u312-jre-headless | 44 +++++++++++++++++++
 docker/alpine/Dockerfile.zulu-8u302-jdk       | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-8u302-jre       | 32 ++++++++++++++
 .../alpine/Dockerfile.zulu-8u302-jre-headless | 32 ++++++++++++++
 .../Dockerfile.zulu-8u302-jre-headless-tools  | 32 ++++++++++++++
 docker/centos/Dockerfile.zulu-11u12-jdk       | 17 +++++++
 docker/centos/Dockerfile.zulu-11u12-jre       | 17 +++++++
 .../centos/Dockerfile.zulu-11u12-jre-headless | 16 +++++++
 docker/centos/Dockerfile.zulu-13u8-jdk        | 17 +++++++
 docker/centos/Dockerfile.zulu-13u8-jre        | 17 +++++++
 .../centos/Dockerfile.zulu-13u8-jre-headless  | 16 +++++++
 docker/centos/Dockerfile.zulu-15u4-jdk        | 17 +++++++
 docker/centos/Dockerfile.zulu-15u4-jre        | 17 +++++++
 .../centos/Dockerfile.zulu-15u4-jre-headless  | 16 +++++++
 docker/centos/Dockerfile.zulu-16u1-jdk        | 17 +++++++
 docker/centos/Dockerfile.zulu-7u312-jdk       | 17 +++++++
 docker/centos/Dockerfile.zulu-7u312-jre       | 17 +++++++
 .../centos/Dockerfile.zulu-7u312-jre-headless | 16 +++++++
 docker/centos/Dockerfile.zulu-8u302-jdk       | 17 +++++++
 docker/centos/Dockerfile.zulu-8u302-jre       | 17 +++++++
 .../centos/Dockerfile.zulu-8u302-jre-headless | 16 +++++++
 docker/debian10/Dockerfile.zulu-11u12-jdk     | 21 +++++++++
 docker/debian10/Dockerfile.zulu-11u12-jre     | 21 +++++++++
 .../Dockerfile.zulu-11u12-jre-headless        | 21 +++++++++
 .../Dockerfile.zulu-11u12-jre-headless-tools  | 31 +++++++++++++
 docker/debian10/Dockerfile.zulu-11u12-maven   | 31 +++++++++++++
 docker/debian10/Dockerfile.zulu-13u8-jdk      | 21 +++++++++
 docker/debian10/Dockerfile.zulu-13u8-jre      | 21 +++++++++
 .../Dockerfile.zulu-13u8-jre-headless         | 21 +++++++++
 docker/debian10/Dockerfile.zulu-15u4-jdk      | 21 +++++++++
 docker/debian10/Dockerfile.zulu-15u4-jre      | 21 +++++++++
 .../Dockerfile.zulu-15u4-jre-headless         | 21 +++++++++
 docker/debian10/Dockerfile.zulu-16u1-jdk      | 21 +++++++++
 docker/debian10/Dockerfile.zulu-16u1-jre      | 21 +++++++++
 docker/debian10/Dockerfile.zulu-7u312-jdk     | 21 +++++++++
 docker/debian10/Dockerfile.zulu-7u312-jre     | 21 +++++++++
 .../Dockerfile.zulu-7u312-jre-headless        | 21 +++++++++
 docker/debian10/Dockerfile.zulu-8u302-jdk     | 21 +++++++++
 docker/debian10/Dockerfile.zulu-8u302-jre     | 21 +++++++++
 .../Dockerfile.zulu-8u302-jre-headless        | 21 +++++++++
 .../Dockerfile.zulu-8u302-jre-headless-tools  | 23 ++++++++++
 docker/debian10/Dockerfile.zulu-8u302-maven   | 31 +++++++++++++
 docker/debian9/Dockerfile.zulu-11u12-jdk      | 21 +++++++++
 docker/debian9/Dockerfile.zulu-11u12-jre      | 21 +++++++++
 .../Dockerfile.zulu-11u12-jre-headless        | 21 +++++++++
 docker/debian9/Dockerfile.zulu-11u12-maven    | 31 +++++++++++++
 docker/debian9/Dockerfile.zulu-13u8-jdk       | 21 +++++++++
 docker/debian9/Dockerfile.zulu-13u8-jre       | 21 +++++++++
 .../debian9/Dockerfile.zulu-13u8-jre-headless | 21 +++++++++
 docker/debian9/Dockerfile.zulu-15u4-jdk       | 21 +++++++++
 docker/debian9/Dockerfile.zulu-15u4-jre       | 21 +++++++++
 .../debian9/Dockerfile.zulu-15u4-jre-headless | 21 +++++++++
 docker/debian9/Dockerfile.zulu-16u1-jdk       | 21 +++++++++
 docker/debian9/Dockerfile.zulu-16u1-jre       | 21 +++++++++
 docker/debian9/Dockerfile.zulu-7u312-jdk      | 21 +++++++++
 docker/debian9/Dockerfile.zulu-7u312-jre      | 21 +++++++++
 .../Dockerfile.zulu-7u312-jre-headless        | 21 +++++++++
 docker/debian9/Dockerfile.zulu-8u302-jdk      | 21 +++++++++
 docker/debian9/Dockerfile.zulu-8u302-jre      | 21 +++++++++
 .../Dockerfile.zulu-8u302-jre-headless        | 21 +++++++++
 docker/debian9/Dockerfile.zulu-8u302-maven    | 31 +++++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-11u12-jdk | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-11u12-jre | 21 +++++++++
 .../Dockerfile.zulu-11u12-jre-headless        | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-13u8-jdk  | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-13u8-jre  | 21 +++++++++
 .../Dockerfile.zulu-13u8-jre-headless         | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-15u4-jdk  | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-15u4-jre  | 21 +++++++++
 .../Dockerfile.zulu-15u4-jre-headless         | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-16u1-jdk  | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-7u312-jdk | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-7u312-jre | 21 +++++++++
 .../Dockerfile.zulu-7u312-jre-headless        | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-8u302-jdk | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-8u302-jre | 21 +++++++++
 .../Dockerfile.zulu-8u302-jre-headless        | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-11u12-jdk       | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-11u12-jre       | 21 +++++++++
 .../ubuntu/Dockerfile.zulu-11u12-jre-headless | 21 +++++++++
 .../Dockerfile.zulu-11u12-jre-headless-tools  | 31 +++++++++++++
 docker/ubuntu/Dockerfile.zulu-13u8-jdk        | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-13u8-jre        | 21 +++++++++
 .../ubuntu/Dockerfile.zulu-13u8-jre-headless  | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-15u4-jdk        | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-15u4-jre        | 21 +++++++++
 .../ubuntu/Dockerfile.zulu-15u4-jre-headless  | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-16u1-jdk        | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-16u1-jre        | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-7u312-jdk       | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-7u312-jre       | 21 +++++++++
 .../ubuntu/Dockerfile.zulu-7u312-jre-headless | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-8u302-jdk       | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-8u302-jre       | 21 +++++++++
 .../ubuntu/Dockerfile.zulu-8u302-jre-headless | 21 +++++++++
 .../Dockerfile.zulu-8u302-jre-headless-tools  | 23 ++++++++++
 .../Dockerfile.zulu-11u12-jre-tools           | 38 ++++++++++++++++
 .../Dockerfile.zulu-13u8-jre-tools            | 38 ++++++++++++++++
 .../Dockerfile.zulu-15u4-jre-tools            | 38 ++++++++++++++++
 .../Dockerfile.zulu-7u312-jre-tools           | 31 +++++++++++++
 .../Dockerfile.zulu-8u302-jre-tools           | 31 +++++++++++++
 .../Dockerfile.zulu-11u12-jdk                 | 17 +++++++
 .../Dockerfile.zulu-11u12-jre                 | 16 +++++++
 .../Dockerfile.zulu-11u12-jre-tools           | 16 +++++++
 .../Dockerfile.zulu-13u8-jdk                  | 17 +++++++
 .../Dockerfile.zulu-13u8-jre                  | 16 +++++++
 .../Dockerfile.zulu-13u8-jre-tools            | 16 +++++++
 .../Dockerfile.zulu-14u2-jdk                  |  2 +-
 .../Dockerfile.zulu-14u2-jre                  |  2 +-
 .../Dockerfile.zulu-14u2-jre-tools            |  2 +-
 .../Dockerfile.zulu-15u4-jdk                  | 17 +++++++
 .../Dockerfile.zulu-15u4-jre                  | 16 +++++++
 .../Dockerfile.zulu-15u4-jre-tools            | 16 +++++++
 .../Dockerfile.zulu-7u312-jdk                 | 17 +++++++
 .../Dockerfile.zulu-7u312-jre                 | 16 +++++++
 .../Dockerfile.zulu-7u312-jre-tools           | 16 +++++++
 .../Dockerfile.zulu-8u302-jdk                 | 17 +++++++
 .../Dockerfile.zulu-8u302-jre                 | 16 +++++++
 .../Dockerfile.zulu-8u302-jre-tools           | 16 +++++++
 133 files changed, 2964 insertions(+), 3 deletions(-)
 create mode 100644 docker/alpine/Dockerfile.zulu-11u12-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-11u12-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-11u12-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-11u12-jre-headless-tools
 create mode 100644 docker/alpine/Dockerfile.zulu-13u8-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-13u8-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-13u8-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-13u8-jre-headless-tools
 create mode 100644 docker/alpine/Dockerfile.zulu-15u4-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-15u4-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-15u4-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-15u4-jre-headless-tools
 create mode 100644 docker/alpine/Dockerfile.zulu-7u312-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-7u312-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-7u312-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-8u302-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-8u302-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-8u302-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-8u302-jre-headless-tools
 create mode 100644 docker/centos/Dockerfile.zulu-11u12-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-11u12-jre
 create mode 100644 docker/centos/Dockerfile.zulu-11u12-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-13u8-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-13u8-jre
 create mode 100644 docker/centos/Dockerfile.zulu-13u8-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-15u4-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-15u4-jre
 create mode 100644 docker/centos/Dockerfile.zulu-15u4-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-16u1-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-7u312-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-7u312-jre
 create mode 100644 docker/centos/Dockerfile.zulu-7u312-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-8u302-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-8u302-jre
 create mode 100644 docker/centos/Dockerfile.zulu-8u302-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-11u12-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-11u12-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-11u12-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-11u12-jre-headless-tools
 create mode 100644 docker/debian10/Dockerfile.zulu-11u12-maven
 create mode 100644 docker/debian10/Dockerfile.zulu-13u8-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-13u8-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-13u8-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-15u4-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-15u4-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-15u4-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-16u1-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-16u1-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-7u312-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-7u312-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-7u312-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-8u302-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-8u302-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-8u302-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-8u302-jre-headless-tools
 create mode 100644 docker/debian10/Dockerfile.zulu-8u302-maven
 create mode 100644 docker/debian9/Dockerfile.zulu-11u12-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-11u12-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-11u12-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-11u12-maven
 create mode 100644 docker/debian9/Dockerfile.zulu-13u8-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-13u8-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-13u8-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-15u4-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-15u4-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-15u4-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-16u1-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-16u1-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-7u312-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-7u312-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-7u312-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-8u302-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-8u302-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-8u302-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-8u302-maven
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-11u12-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-11u12-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-11u12-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-13u8-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-13u8-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-13u8-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-15u4-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-15u4-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-15u4-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-16u1-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u312-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u312-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u312-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u302-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u302-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u302-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u12-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u12-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u12-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u12-jre-headless-tools
 create mode 100644 docker/ubuntu/Dockerfile.zulu-13u8-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-13u8-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-13u8-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-15u4-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-15u4-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-15u4-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-16u1-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-16u1-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-7u312-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-7u312-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-7u312-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u302-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u302-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u302-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u302-jre-headless-tools
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-11u12-jre-tools
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-13u8-jre-tools
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-15u4-jre-tools
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-7u312-jre-tools
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-8u302-jre-tools
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-11u12-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-11u12-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-11u12-jre-tools
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-13u8-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-13u8-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-13u8-jre-tools
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-15u4-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-15u4-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-15u4-jre-tools
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-7u312-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-7u312-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-7u312-jre-tools
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-8u302-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-8u302-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-8u302-jre-tools

diff --git a/docker/alpine/Dockerfile.zulu-11u12-jdk b/docker/alpine/Dockerfile.zulu-11u12-jdk
new file mode 100644
index 00000000..e12947c2
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u12-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jdk_11.50.19-11.0.12-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.12/zulu-11-azure-jdk_11.50.19-11.0.12-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-11u12-jre b/docker/alpine/Dockerfile.zulu-11u12-jre
new file mode 100644
index 00000000..15a206bb
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u12-jre
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jre_11.50.19-11.0.12-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.12/zulu-11-azure-jre_11.50.19-11.0.12-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-11u12-jre-headless b/docker/alpine/Dockerfile.zulu-11u12-jre-headless
new file mode 100644
index 00000000..8943a430
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u12-jre-headless
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jre-headless_11.50.19-11.0.12-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.12/zulu-11-azure-jre-headless_11.50.19-11.0.12-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-11u12-jre-headless-tools b/docker/alpine/Dockerfile.zulu-11u12-jre-headless-tools
new file mode 100644
index 00000000..4acd57ee
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u12-jre-headless-tools
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jre-headless-tools_11.50.19-11.0.12-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.12/zulu-11-azure-jre-headless-tools_11.50.19-11.0.12-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-13u8-jdk b/docker/alpine/Dockerfile.zulu-13u8-jdk
new file mode 100644
index 00000000..010ca9d2
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u8-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jdk_13.42.17-13.0.8-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.8/zulu-13-azure-jdk_13.42.17-13.0.8-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-13u8-jre b/docker/alpine/Dockerfile.zulu-13u8-jre
new file mode 100644
index 00000000..77acc1dd
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u8-jre
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jre_13.42.17-13.0.8-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.8/zulu-13-azure-jre_13.42.17-13.0.8-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-13u8-jre-headless b/docker/alpine/Dockerfile.zulu-13u8-jre-headless
new file mode 100644
index 00000000..88d6c42e
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u8-jre-headless
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jre-headless_13.42.17-13.0.8-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.8/zulu-13-azure-jre-headless_13.42.17-13.0.8-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-13u8-jre-headless-tools b/docker/alpine/Dockerfile.zulu-13u8-jre-headless-tools
new file mode 100644
index 00000000..825f4159
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u8-jre-headless-tools
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jre-headless-tools_13.42.17-13.0.8-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.8/zulu-13-azure-jre-headless-tools_13.42.17-13.0.8-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-15u4-jdk b/docker/alpine/Dockerfile.zulu-15u4-jdk
new file mode 100644
index 00000000..5a91466e
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-15u4-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-15-azure-jdk_15.34.17-15.0.4-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.4/zulu-15-azure-jdk_15.34.17-15.0.4-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-15u4-jre b/docker/alpine/Dockerfile.zulu-15u4-jre
new file mode 100644
index 00000000..5b42b8d7
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-15u4-jre
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-15-azure-jre_15.34.17-15.0.4-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.4/zulu-15-azure-jre_15.34.17-15.0.4-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-15u4-jre-headless b/docker/alpine/Dockerfile.zulu-15u4-jre-headless
new file mode 100644
index 00000000..33e00681
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-15u4-jre-headless
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-15-azure-jre-headless_15.34.17-15.0.4-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.4/zulu-15-azure-jre-headless_15.34.17-15.0.4-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-15u4-jre-headless-tools b/docker/alpine/Dockerfile.zulu-15u4-jre-headless-tools
new file mode 100644
index 00000000..28ada374
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-15u4-jre-headless-tools
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-15-azure-jre-headless-tools_15.34.17-15.0.4-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.4/zulu-15-azure-jre-headless-tools_15.34.17-15.0.4-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-7u312-jdk b/docker/alpine/Dockerfile.zulu-7u312-jdk
new file mode 100644
index 00000000..91c64610
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-7u312-jdk
@@ -0,0 +1,44 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-7-azure-jdk_7.48.0.11-7.0.312-linux_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates wget tar && \
+    apk --no-cache --virtual .build-deps add binutils zstd xz && \
+    apk update && \
+    apk upgrade && \
+    wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+    wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
+    wget -q -O gcc-libs.tar.zst https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -q -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    tar -I zstd -xf gcc-libs.tar.zst -C /tmp && \
+    tar -xJf zlib.tar.xz -C /tmp && \
+    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
+    rm -rf gcc-libs.tar.zst zlib.tar.xz /tmp/usr && \
+    apk del .build-deps && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u312/zulu-7-azure-jdk_7.48.0.11-7.0.312-linux_x64.tar.gz && rm /root/.wget-hsts && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-7u312-jre b/docker/alpine/Dockerfile.zulu-7u312-jre
new file mode 100644
index 00000000..f239bf79
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-7u312-jre
@@ -0,0 +1,44 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-7-azure-jre_7.48.0.11-7.0.312-linux_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates wget tar && \
+    apk --no-cache --virtual .build-deps add binutils zstd xz && \
+    apk update && \
+    apk upgrade && \
+    wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+    wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
+    wget -q -O gcc-libs.tar.zst https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -q -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    tar -I zstd -xf gcc-libs.tar.zst -C /tmp && \
+    tar -xJf zlib.tar.xz -C /tmp && \
+    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
+    rm -rf gcc-libs.tar.zst zlib.tar.xz /tmp/usr && \
+    apk del .build-deps && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u312/zulu-7-azure-jre_7.48.0.11-7.0.312-linux_x64.tar.gz && rm /root/.wget-hsts && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-7u312-jre-headless b/docker/alpine/Dockerfile.zulu-7u312-jre-headless
new file mode 100644
index 00000000..d1a0b7e8
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-7u312-jre-headless
@@ -0,0 +1,44 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-7-azure-jre-headless_7.48.0.11-7.0.312-linux_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates wget tar && \
+    apk --no-cache --virtual .build-deps add binutils zstd xz && \
+    apk update && \
+    apk upgrade && \
+    wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+    wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
+    wget -q -O gcc-libs.tar.zst https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -q -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    tar -I zstd -xf gcc-libs.tar.zst -C /tmp && \
+    tar -xJf zlib.tar.xz -C /tmp && \
+    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
+    rm -rf gcc-libs.tar.zst zlib.tar.xz /tmp/usr && \
+    apk del .build-deps && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u312/zulu-7-azure-jre-headless_7.48.0.11-7.0.312-linux_x64.tar.gz && rm /root/.wget-hsts && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u302-jdk b/docker/alpine/Dockerfile.zulu-8u302-jdk
new file mode 100644
index 00000000..a2bd0441
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u302-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jdk_8.56.0.21-8.0.302-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u302/zulu-8-azure-jdk_8.56.0.21-8.0.302-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u302-jre b/docker/alpine/Dockerfile.zulu-8u302-jre
new file mode 100644
index 00000000..dbb18a12
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u302-jre
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre_8.56.0.21-8.0.302-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u302/zulu-8-azure-jre_8.56.0.21-8.0.302-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u302-jre-headless b/docker/alpine/Dockerfile.zulu-8u302-jre-headless
new file mode 100644
index 00000000..e379b60f
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u302-jre-headless
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre-headless_8.56.0.21-8.0.302-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u302/zulu-8-azure-jre-headless_8.56.0.21-8.0.302-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u302-jre-headless-tools b/docker/alpine/Dockerfile.zulu-8u302-jre-headless-tools
new file mode 100644
index 00000000..7edc6784
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u302-jre-headless-tools
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre-headless-tools_8.56.0.21-8.0.302-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u302/zulu-8-azure-jre-headless-tools_8.56.0.21-8.0.302-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/centos/Dockerfile.zulu-11u12-jdk b/docker/centos/Dockerfile.zulu-11u12-jdk
new file mode 100644
index 00000000..56838d97
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u12-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-11-azure-jdk-11.50.19
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure
+
diff --git a/docker/centos/Dockerfile.zulu-11u12-jre b/docker/centos/Dockerfile.zulu-11u12-jre
new file mode 100644
index 00000000..e72b0a48
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u12-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-11-azure-jre-11.50.19
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure
+
diff --git a/docker/centos/Dockerfile.zulu-11u12-jre-headless b/docker/centos/Dockerfile.zulu-11u12-jre-headless
new file mode 100644
index 00000000..f7968dcf
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u12-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-11-azure-jre-headless-11.50.19
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure
diff --git a/docker/centos/Dockerfile.zulu-13u8-jdk b/docker/centos/Dockerfile.zulu-13u8-jdk
new file mode 100644
index 00000000..58495dd4
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-13u8-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-13-azure-jdk-13.42.17
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure
+
diff --git a/docker/centos/Dockerfile.zulu-13u8-jre b/docker/centos/Dockerfile.zulu-13u8-jre
new file mode 100644
index 00000000..252d4c42
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-13u8-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-13-azure-jre-13.42.17
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure
+
diff --git a/docker/centos/Dockerfile.zulu-13u8-jre-headless b/docker/centos/Dockerfile.zulu-13u8-jre-headless
new file mode 100644
index 00000000..74e2503e
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-13u8-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-13-azure-jre-headless-13.42.17
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure
diff --git a/docker/centos/Dockerfile.zulu-15u4-jdk b/docker/centos/Dockerfile.zulu-15u4-jdk
new file mode 100644
index 00000000..9a44c59a
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-15u4-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-15-azure-jdk-15.34.17
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure
+
diff --git a/docker/centos/Dockerfile.zulu-15u4-jre b/docker/centos/Dockerfile.zulu-15u4-jre
new file mode 100644
index 00000000..7eb70f8c
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-15u4-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-15-azure-jre-15.34.17
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure
+
diff --git a/docker/centos/Dockerfile.zulu-15u4-jre-headless b/docker/centos/Dockerfile.zulu-15u4-jre-headless
new file mode 100644
index 00000000..bade1455
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-15u4-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-15-azure-jre-headless-15.34.17
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure
diff --git a/docker/centos/Dockerfile.zulu-16u1-jdk b/docker/centos/Dockerfile.zulu-16u1-jdk
new file mode 100644
index 00000000..b39b6a7a
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-16u1-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-16-azure-jdk-16.30.15
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-16-azure
+
diff --git a/docker/centos/Dockerfile.zulu-7u312-jdk b/docker/centos/Dockerfile.zulu-7u312-jdk
new file mode 100644
index 00000000..c0a9bddb
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-7u312-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-7-azure-jdk-7.48.0.11
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure
+
diff --git a/docker/centos/Dockerfile.zulu-7u312-jre b/docker/centos/Dockerfile.zulu-7u312-jre
new file mode 100644
index 00000000..21b494d2
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-7u312-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-7-azure-jre-7.48.0.11
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure
+
diff --git a/docker/centos/Dockerfile.zulu-7u312-jre-headless b/docker/centos/Dockerfile.zulu-7u312-jre-headless
new file mode 100644
index 00000000..c7b631ad
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-7u312-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-7-azure-jre-headless-7.48.0.11
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure
diff --git a/docker/centos/Dockerfile.zulu-8u302-jdk b/docker/centos/Dockerfile.zulu-8u302-jdk
new file mode 100644
index 00000000..00ba8903
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u302-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-8-azure-jdk-8.56.0.21
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure
+
diff --git a/docker/centos/Dockerfile.zulu-8u302-jre b/docker/centos/Dockerfile.zulu-8u302-jre
new file mode 100644
index 00000000..a8335316
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u302-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-8-azure-jre-8.56.0.21
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure
+
diff --git a/docker/centos/Dockerfile.zulu-8u302-jre-headless b/docker/centos/Dockerfile.zulu-8u302-jre-headless
new file mode 100644
index 00000000..c63f6c5e
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u302-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-8-azure-jre-headless-8.56.0.21
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure
diff --git a/docker/debian10/Dockerfile.zulu-11u12-jdk b/docker/debian10/Dockerfile.zulu-11u12-jdk
new file mode 100644
index 00000000..6af01b21
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u12-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.50+19* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u12-jre b/docker/debian10/Dockerfile.zulu-11u12-jre
new file mode 100644
index 00000000..099e3c51
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u12-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.50+19* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u12-jre-headless b/docker/debian10/Dockerfile.zulu-11u12-jre-headless
new file mode 100644
index 00000000..d393ab20
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u12-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.50+19* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u12-jre-headless-tools b/docker/debian10/Dockerfile.zulu-11u12-jre-headless-tools
new file mode 100644
index 00000000..973fa422
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u12-jre-headless-tools
@@ -0,0 +1,31 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u12-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jdk:11u12-zulu-debian10 AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG INSTALL_DIR=/usr/lib/jvm
+ARG JDK_DIR=${INSTALL_DIR}/zulu-11-azure-amd64
+ARG JRE_DIR=${INSTALL_DIR}/zre-hl-11-azure-amd64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_TOOLS_DIR=${INSTALL_DIR}/zre-hl-tools-11-azure-amd64 && \
+    JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_TOOLS_DIR}
+
+FROM debian:buster
+ARG JRE_TOOLS_DIR=/usr/lib/jvm/zre-hl-tools-11-azure-amd64
+COPY --from=stage2 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+
+RUN cd /usr/bin && find ${JRE_TOOLS_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=${JRE_TOOLS_DIR}
diff --git a/docker/debian10/Dockerfile.zulu-11u12-maven b/docker/debian10/Dockerfile.zulu-11u12-maven
new file mode 100644
index 00000000..2b32152b
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u12-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:11u12-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian10/Dockerfile.zulu-13u8-jdk b/docker/debian10/Dockerfile.zulu-13u8-jdk
new file mode 100644
index 00000000..25d422fe
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-13u8-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.42+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-13u8-jre b/docker/debian10/Dockerfile.zulu-13u8-jre
new file mode 100644
index 00000000..6206ae02
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-13u8-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.42+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-13u8-jre-headless b/docker/debian10/Dockerfile.zulu-13u8-jre-headless
new file mode 100644
index 00000000..5eb6f8cf
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-13u8-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.42+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-15u4-jdk b/docker/debian10/Dockerfile.zulu-15u4-jdk
new file mode 100644
index 00000000..586f4d41
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-15u4-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.34+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-15u4-jre b/docker/debian10/Dockerfile.zulu-15u4-jre
new file mode 100644
index 00000000..5538c49b
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-15u4-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.34+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-15u4-jre-headless b/docker/debian10/Dockerfile.zulu-15u4-jre-headless
new file mode 100644
index 00000000..6e162823
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-15u4-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.34+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-16u1-jdk b/docker/debian10/Dockerfile.zulu-16u1-jdk
new file mode 100644
index 00000000..72c47695
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-16u1-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-16-azure-jdk=16.30+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-16-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-16u1-jre b/docker/debian10/Dockerfile.zulu-16u1-jre
new file mode 100644
index 00000000..38be3fd7
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-16u1-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-16-azure-jre=16.30+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-16-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u312-jdk b/docker/debian10/Dockerfile.zulu-7u312-jdk
new file mode 100644
index 00000000..40d27f72
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-7u312-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.48.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u312-jre b/docker/debian10/Dockerfile.zulu-7u312-jre
new file mode 100644
index 00000000..c7eaf5d0
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-7u312-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.48.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u312-jre-headless b/docker/debian10/Dockerfile.zulu-7u312-jre-headless
new file mode 100644
index 00000000..139e0383
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-7u312-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.48.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u302-jdk b/docker/debian10/Dockerfile.zulu-8u302-jdk
new file mode 100644
index 00000000..4a5042e7
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u302-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.56.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u302-jre b/docker/debian10/Dockerfile.zulu-8u302-jre
new file mode 100644
index 00000000..469c8a74
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u302-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.56.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u302-jre-headless b/docker/debian10/Dockerfile.zulu-8u302-jre-headless
new file mode 100644
index 00000000..f043e2d1
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u302-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.56.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u302-jre-headless-tools b/docker/debian10/Dockerfile.zulu-8u302-jre-headless-tools
new file mode 100644
index 00000000..a61e1c70
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u302-jre-headless-tools
@@ -0,0 +1,23 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u302-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u302-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG INSTALL_DIR=/usr/lib/jvm
+ARG JDK_DIR=${INSTALL_DIR}/zulu-8-azure-amd64
+ARG JRE_DIR=${INSTALL_DIR}/zre-hl-8-azure-amd64
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+
+ENV JAVA_HOME=${JRE_DIR}
diff --git a/docker/debian10/Dockerfile.zulu-8u302-maven b/docker/debian10/Dockerfile.zulu-8u302-maven
new file mode 100644
index 00000000..25e773f0
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u302-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u302-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian9/Dockerfile.zulu-11u12-jdk b/docker/debian9/Dockerfile.zulu-11u12-jdk
new file mode 100644
index 00000000..d46c16d7
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u12-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.50+19* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u12-jre b/docker/debian9/Dockerfile.zulu-11u12-jre
new file mode 100644
index 00000000..bdf7f71d
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u12-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.50+19* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u12-jre-headless b/docker/debian9/Dockerfile.zulu-11u12-jre-headless
new file mode 100644
index 00000000..11a16c1d
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u12-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.50+19* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u12-maven b/docker/debian9/Dockerfile.zulu-11u12-maven
new file mode 100644
index 00000000..a5f24ddc
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u12-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:11u12-zulu-debian9
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian9/Dockerfile.zulu-13u8-jdk b/docker/debian9/Dockerfile.zulu-13u8-jdk
new file mode 100644
index 00000000..85197897
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-13u8-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.42+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u8-jre b/docker/debian9/Dockerfile.zulu-13u8-jre
new file mode 100644
index 00000000..e9ea0528
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-13u8-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.42+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u8-jre-headless b/docker/debian9/Dockerfile.zulu-13u8-jre-headless
new file mode 100644
index 00000000..a2e8c8bb
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-13u8-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.42+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-15u4-jdk b/docker/debian9/Dockerfile.zulu-15u4-jdk
new file mode 100644
index 00000000..0ccb7dae
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-15u4-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.34+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-15u4-jre b/docker/debian9/Dockerfile.zulu-15u4-jre
new file mode 100644
index 00000000..5db4b956
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-15u4-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.34+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-15u4-jre-headless b/docker/debian9/Dockerfile.zulu-15u4-jre-headless
new file mode 100644
index 00000000..4236f7ec
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-15u4-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.34+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-16u1-jdk b/docker/debian9/Dockerfile.zulu-16u1-jdk
new file mode 100644
index 00000000..7d45cf36
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-16u1-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-16-azure-jdk=16.30+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-16-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-16u1-jre b/docker/debian9/Dockerfile.zulu-16u1-jre
new file mode 100644
index 00000000..4d68e323
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-16u1-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-16-azure-jre=16.30+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-16-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u312-jdk b/docker/debian9/Dockerfile.zulu-7u312-jdk
new file mode 100644
index 00000000..1d67a2b5
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-7u312-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.48.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u312-jre b/docker/debian9/Dockerfile.zulu-7u312-jre
new file mode 100644
index 00000000..11ad1bb0
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-7u312-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.48.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u312-jre-headless b/docker/debian9/Dockerfile.zulu-7u312-jre-headless
new file mode 100644
index 00000000..e75a96d0
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-7u312-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.48.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u302-jdk b/docker/debian9/Dockerfile.zulu-8u302-jdk
new file mode 100644
index 00000000..91dfbccb
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u302-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.56.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u302-jre b/docker/debian9/Dockerfile.zulu-8u302-jre
new file mode 100644
index 00000000..a590b2df
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u302-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.56.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u302-jre-headless b/docker/debian9/Dockerfile.zulu-8u302-jre-headless
new file mode 100644
index 00000000..7c75f7d7
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u302-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.56.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u302-maven b/docker/debian9/Dockerfile.zulu-8u302-maven
new file mode 100644
index 00000000..f48aad58
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u302-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u302-zulu-debian9
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u12-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-11u12-jdk
new file mode 100644
index 00000000..56556a8a
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u12-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.50+19* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u12-jre b/docker/ubuntu-18.04/Dockerfile.zulu-11u12-jre
new file mode 100644
index 00000000..5d7ee32b
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u12-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.50+19* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u12-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-11u12-jre-headless
new file mode 100644
index 00000000..93368b5b
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u12-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.50+19* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u8-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-13u8-jdk
new file mode 100644
index 00000000..058539e5
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u8-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.42+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u8-jre b/docker/ubuntu-18.04/Dockerfile.zulu-13u8-jre
new file mode 100644
index 00000000..35ce66eb
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u8-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.42+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u8-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-13u8-jre-headless
new file mode 100644
index 00000000..59357077
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u8-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.42+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u4-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-15u4-jdk
new file mode 100644
index 00000000..594fe55e
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u4-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.34+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u4-jre b/docker/ubuntu-18.04/Dockerfile.zulu-15u4-jre
new file mode 100644
index 00000000..a965753d
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u4-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.34+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u4-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-15u4-jre-headless
new file mode 100644
index 00000000..7882e309
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u4-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.34+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-16u1-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-16u1-jdk
new file mode 100644
index 00000000..b55d6f08
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-16u1-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-16-azure-jdk=16.30+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-16-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u312-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-7u312-jdk
new file mode 100644
index 00000000..169ea7af
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u312-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.48.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u312-jre b/docker/ubuntu-18.04/Dockerfile.zulu-7u312-jre
new file mode 100644
index 00000000..6e9d55f4
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u312-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.48.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u312-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-7u312-jre-headless
new file mode 100644
index 00000000..5ffffb07
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u312-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.48.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u302-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-8u302-jdk
new file mode 100644
index 00000000..7fd8587c
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u302-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.56.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u302-jre b/docker/ubuntu-18.04/Dockerfile.zulu-8u302-jre
new file mode 100644
index 00000000..579e5356
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u302-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.56.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u302-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-8u302-jre-headless
new file mode 100644
index 00000000..f73ea8cc
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u302-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.56.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u12-jdk b/docker/ubuntu/Dockerfile.zulu-11u12-jdk
new file mode 100644
index 00000000..e1ad6b76
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u12-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.50+19* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u12-jre b/docker/ubuntu/Dockerfile.zulu-11u12-jre
new file mode 100644
index 00000000..2e4acba2
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u12-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.50+19* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u12-jre-headless b/docker/ubuntu/Dockerfile.zulu-11u12-jre-headless
new file mode 100644
index 00000000..ef0a5532
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u12-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.50+19* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u12-jre-headless-tools b/docker/ubuntu/Dockerfile.zulu-11u12-jre-headless-tools
new file mode 100644
index 00000000..3f0cc12b
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u12-jre-headless-tools
@@ -0,0 +1,31 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u12-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jdk:11u12-zulu-ubuntu AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG INSTALL_DIR=/usr/lib/jvm
+ARG JDK_DIR=${INSTALL_DIR}/zulu-11-azure-amd64
+ARG JRE_DIR=${INSTALL_DIR}/zre-hl-11-azure-amd64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_TOOLS_DIR=${INSTALL_DIR}/zre-hl-tools-11-azure-amd64 && \
+    JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_TOOLS_DIR}
+
+FROM ubuntu:focal
+ARG JRE_TOOLS_DIR=/usr/lib/jvm/zre-hl-tools-11-azure-amd64
+COPY --from=stage2 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+
+RUN cd /usr/bin && find ${JRE_TOOLS_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=${JRE_TOOLS_DIR}
diff --git a/docker/ubuntu/Dockerfile.zulu-13u8-jdk b/docker/ubuntu/Dockerfile.zulu-13u8-jdk
new file mode 100644
index 00000000..8af6d984
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-13u8-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.42+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u8-jre b/docker/ubuntu/Dockerfile.zulu-13u8-jre
new file mode 100644
index 00000000..f9d8afca
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-13u8-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.42+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u8-jre-headless b/docker/ubuntu/Dockerfile.zulu-13u8-jre-headless
new file mode 100644
index 00000000..a05e1a70
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-13u8-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.42+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-15u4-jdk b/docker/ubuntu/Dockerfile.zulu-15u4-jdk
new file mode 100644
index 00000000..aa27adbc
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-15u4-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.34+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-15u4-jre b/docker/ubuntu/Dockerfile.zulu-15u4-jre
new file mode 100644
index 00000000..3b962c14
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-15u4-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.34+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-15u4-jre-headless b/docker/ubuntu/Dockerfile.zulu-15u4-jre-headless
new file mode 100644
index 00000000..1820db83
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-15u4-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.34+17* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-16u1-jdk b/docker/ubuntu/Dockerfile.zulu-16u1-jdk
new file mode 100644
index 00000000..99d770d5
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-16u1-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-16-azure-jdk=16.30+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-16-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-16u1-jre b/docker/ubuntu/Dockerfile.zulu-16u1-jre
new file mode 100644
index 00000000..eebcf836
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-16u1-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-16-azure-jre=16.30+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-16-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u312-jdk b/docker/ubuntu/Dockerfile.zulu-7u312-jdk
new file mode 100644
index 00000000..efd01fb7
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-7u312-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.48.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u312-jre b/docker/ubuntu/Dockerfile.zulu-7u312-jre
new file mode 100644
index 00000000..9d8a0ff5
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-7u312-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.48.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u312-jre-headless b/docker/ubuntu/Dockerfile.zulu-7u312-jre-headless
new file mode 100644
index 00000000..9f73b9a0
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-7u312-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.48.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u302-jdk b/docker/ubuntu/Dockerfile.zulu-8u302-jdk
new file mode 100644
index 00000000..e2e7e6b7
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u302-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.56.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u302-jre b/docker/ubuntu/Dockerfile.zulu-8u302-jre
new file mode 100644
index 00000000..617e3327
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u302-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.56.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u302-jre-headless b/docker/ubuntu/Dockerfile.zulu-8u302-jre-headless
new file mode 100644
index 00000000..619b7ee2
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u302-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.56.0.21* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u302-jre-headless-tools b/docker/ubuntu/Dockerfile.zulu-8u302-jre-headless-tools
new file mode 100644
index 00000000..ddbb8782
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u302-jre-headless-tools
@@ -0,0 +1,23 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u302-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u302-zulu-ubuntu
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG INSTALL_DIR=/usr/lib/jvm
+ARG JDK_DIR=${INSTALL_DIR}/zulu-8-azure-amd64
+ARG JRE_DIR=${INSTALL_DIR}/zre-hl-8-azure-amd64
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+
+ENV JAVA_HOME=${JRE_DIR}
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-11u12-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-11u12-jre-tools
new file mode 100644
index 00000000..7c5fe546
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-11u12-jre-tools
@@ -0,0 +1,38 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:11u12-zulu-windowsservercore AS stage1
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-11/11.0.12
+ARG JRE_PACKAGE=zulu-11-azure-jre_11.50.19-11.0.12-win_x64.msi
+ARG JRE_DIR="C:\Program Files\Zulu\zulu-11-jre"
+ARG JRE_TOOLS_DIR=C:\zulu-11-azure-jre-tools_11.50.19-11.0.12-win_x64
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-11"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.12/zulu-11-azure-jre_11.50.19-11.0.12-win_x64.msi', '%JRE_PACKAGE%') && \
+    msiexec /quiet /i %JRE_PACKAGE% && \
+    del %JRE_PACKAGE%
+
+RUN jimage.exe list "%JRE_DIR%\lib\modules" | findstr "Module: " > modules.out && \
+    powershell -Command "(Get-Content modules.out) -replace 'Module: ', '' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) -join ',' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) + ',jdk.jcmd' | Out-File modules.out" && \
+    for /f %P in ('type modules.out') do setx /m JRE_MODULES %P && \
+    del modules.out
+
+RUN jlink --no-header-files --strip-debug --module-path "%JDK_DIR%\jmods" --add-modules %JRE_MODULES% --output %JRE_TOOLS_DIR%
+
+FROM mcr.microsoft.com/windows/nanoserver:2004
+
+ARG JRE_TOOLS_DIR="C:\zulu-11-azure-jre-tools_11.50.19-11.0.12-win_x64"
+
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+COPY --from=stage1 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+USER ContainerUser
\ No newline at end of file
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-13u8-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-13u8-jre-tools
new file mode 100644
index 00000000..c2a86ec3
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-13u8-jre-tools
@@ -0,0 +1,38 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:13u8-zulu-windowsservercore AS stage1
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-13/13.0.8
+ARG JRE_PACKAGE=zulu-13-azure-jre_13.42.17-13.0.8-win_x64.msi
+ARG JRE_DIR="C:\Program Files\Zulu\zulu-13-jre"
+ARG JRE_TOOLS_DIR=C:\zulu-13-azure-jre-tools_13.42.17-13.0.8-win_x64
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-13"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.8/zulu-13-azure-jre_13.42.17-13.0.8-win_x64.msi', '%JRE_PACKAGE%') && \
+    msiexec /quiet /i %JRE_PACKAGE% && \
+    del %JRE_PACKAGE%
+
+RUN jimage.exe list "%JRE_DIR%\lib\modules" | findstr "Module: " > modules.out && \
+    powershell -Command "(Get-Content modules.out) -replace 'Module: ', '' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) -join ',' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) + ',jdk.jcmd' | Out-File modules.out" && \
+    for /f %P in ('type modules.out') do setx /m JRE_MODULES %P && \
+    del modules.out
+
+RUN jlink --no-header-files --strip-debug --module-path "%JDK_DIR%\jmods" --add-modules %JRE_MODULES% --output %JRE_TOOLS_DIR%
+
+FROM mcr.microsoft.com/windows/nanoserver:2004
+
+ARG JRE_TOOLS_DIR="C:\zulu-13-azure-jre-tools_13.42.17-13.0.8-win_x64"
+
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+COPY --from=stage1 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+USER ContainerUser
\ No newline at end of file
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-15u4-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-15u4-jre-tools
new file mode 100644
index 00000000..55607f83
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-15u4-jre-tools
@@ -0,0 +1,38 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:15u4-zulu-windowsservercore AS stage1
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-15/15.0.4
+ARG JRE_PACKAGE=zulu-15-azure-jre_15.34.17-15.0.4-win_x64.msi
+ARG JRE_DIR="C:\Program Files\Zulu\zulu-15-jre"
+ARG JRE_TOOLS_DIR=C:\zulu-15-azure-jre-tools_15.34.17-15.0.4-win_x64
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-15"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.4/zulu-15-azure-jre_15.34.17-15.0.4-win_x64.msi', '%JRE_PACKAGE%') && \
+    msiexec /quiet /i %JRE_PACKAGE% && \
+    del %JRE_PACKAGE%
+
+RUN jimage.exe list "%JRE_DIR%\lib\modules" | findstr "Module: " > modules.out && \
+    powershell -Command "(Get-Content modules.out) -replace 'Module: ', '' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) -join ',' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) + ',jdk.jcmd' | Out-File modules.out" && \
+    for /f %P in ('type modules.out') do setx /m JRE_MODULES %P && \
+    del modules.out
+
+RUN jlink --no-header-files --strip-debug --module-path "%JDK_DIR%\jmods" --add-modules %JRE_MODULES% --output %JRE_TOOLS_DIR%
+
+FROM mcr.microsoft.com/windows/nanoserver:2004
+
+ARG JRE_TOOLS_DIR="C:\zulu-15-azure-jre-tools_15.34.17-15.0.4-win_x64"
+
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+COPY --from=stage1 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+USER ContainerUser
\ No newline at end of file
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-7u312-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-7u312-jre-tools
new file mode 100644
index 00000000..fbf5e58b
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-7u312-jre-tools
@@ -0,0 +1,31 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:7u312-zulu-windowsservercore AS stage1
+FROM mcr.microsoft.com/windows/nanoserver:2004
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-7/7u312
+ARG JRE_PACKAGE=zulu-7-azure-jre_7.48.0.11-7.0.312-win_x64.zip
+ARG JRE_DIR=zulu-7-azure-jre_7.48.0.11-7.0.312-win_x64
+ARG JRE_TOOLS_DIR=zulu-7-azure-jre-tools_7.48.0.11-7.0.312-win_x64
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-7"
+
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "C:\%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+RUN curl https://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%JRE_PACKAGE% -o %JRE_PACKAGE% && \
+    tar -xf %JRE_PACKAGE% && \
+    del %JRE_PACKAGE% && \
+    move %JRE_DIR% %JRE_TOOLS_DIR%
+
+COPY --from=stage1 ${JDK_DIR}/bin/jstack.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_TOOLS_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/bin/attach.dll ${JRE_TOOLS_DIR}/bin
+USER ContainerUser
\ No newline at end of file
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-8u302-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-8u302-jre-tools
new file mode 100644
index 00000000..2ad6d01d
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-8u302-jre-tools
@@ -0,0 +1,31 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u302-zulu-windowsservercore AS stage1
+FROM mcr.microsoft.com/windows/nanoserver:2004
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-8/8u302
+ARG JRE_PACKAGE=zulu-8-azure-jre_8.56.0.21-8.0.302-win_x64.zip
+ARG JRE_DIR=zulu-8-azure-jre_8.56.0.21-8.0.302-win_x64
+ARG JRE_TOOLS_DIR=zulu-8-azure-jre-tools_8.56.0.21-8.0.302-win_x64
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-8"
+
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "C:\%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+RUN curl https://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%JRE_PACKAGE% -o %JRE_PACKAGE% && \
+    tar -xf %JRE_PACKAGE% && \
+    del %JRE_PACKAGE% && \
+    move %JRE_DIR% %JRE_TOOLS_DIR%
+
+COPY --from=stage1 ${JDK_DIR}/bin/jstack.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_TOOLS_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/bin/attach.dll ${JRE_TOOLS_DIR}/bin
+USER ContainerUser
\ No newline at end of file
diff --git a/docker/windowsservercore/Dockerfile.zulu-11u12-jdk b/docker/windowsservercore/Dockerfile.zulu-11u12-jdk
new file mode 100644
index 00000000..e2284d79
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-11u12-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-11-azure-jdk_11.50.19-11.0.12-win_x64.msi && \
+    setx PACKAGE_DIR zulu-11/11.0.12 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-11"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.12/zulu-11-azure-jdk_11.50.19-11.0.12-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-11u12-jre b/docker/windowsservercore/Dockerfile.zulu-11u12-jre
new file mode 100644
index 00000000..e4e802c0
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-11u12-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-11-azure-jre_11.50.19-11.0.12-win_x64.msi && \
+    setx PACKAGE_DIR zulu-11/11.0.12 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-11-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.12/zulu-11-azure-jre_11.50.19-11.0.12-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-11u12-jre-tools b/docker/windowsservercore/Dockerfile.zulu-11u12-jre-tools
new file mode 100644
index 00000000..e4e802c0
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-11u12-jre-tools
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-11-azure-jre_11.50.19-11.0.12-win_x64.msi && \
+    setx PACKAGE_DIR zulu-11/11.0.12 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-11-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.12/zulu-11-azure-jre_11.50.19-11.0.12-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-13u8-jdk b/docker/windowsservercore/Dockerfile.zulu-13u8-jdk
new file mode 100644
index 00000000..37e5e69a
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-13u8-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-13-azure-jdk_13.42.17-13.0.8-win_x64.msi && \
+    setx PACKAGE_DIR zulu-13/13.0.8 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-13"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.8/zulu-13-azure-jdk_13.42.17-13.0.8-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-13u8-jre b/docker/windowsservercore/Dockerfile.zulu-13u8-jre
new file mode 100644
index 00000000..92914c34
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-13u8-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-13-azure-jre_13.42.17-13.0.8-win_x64.msi && \
+    setx PACKAGE_DIR zulu-13/13.0.8 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-13-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.8/zulu-13-azure-jre_13.42.17-13.0.8-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-13u8-jre-tools b/docker/windowsservercore/Dockerfile.zulu-13u8-jre-tools
new file mode 100644
index 00000000..92914c34
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-13u8-jre-tools
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-13-azure-jre_13.42.17-13.0.8-win_x64.msi && \
+    setx PACKAGE_DIR zulu-13/13.0.8 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-13-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.8/zulu-13-azure-jre_13.42.17-13.0.8-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-14u2-jdk b/docker/windowsservercore/Dockerfile.zulu-14u2-jdk
index 0934084c..fc9822d8 100644
--- a/docker/windowsservercore/Dockerfile.zulu-14u2-jdk
+++ b/docker/windowsservercore/Dockerfile.zulu-14u2-jdk
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM microsoft/windowsservercore:ltsc2016
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN setx PACKAGE zulu-14-azure-jdk_14.29.23-14.0.2-win_x64.msi && \
diff --git a/docker/windowsservercore/Dockerfile.zulu-14u2-jre b/docker/windowsservercore/Dockerfile.zulu-14u2-jre
index 5159e9f3..30b357e6 100644
--- a/docker/windowsservercore/Dockerfile.zulu-14u2-jre
+++ b/docker/windowsservercore/Dockerfile.zulu-14u2-jre
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM microsoft/windowsservercore:ltsc2016
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN setx PACKAGE zulu-14-azure-jre_14.29.23-14.0.2-win_x64.msi && \
diff --git a/docker/windowsservercore/Dockerfile.zulu-14u2-jre-tools b/docker/windowsservercore/Dockerfile.zulu-14u2-jre-tools
index 5159e9f3..30b357e6 100644
--- a/docker/windowsservercore/Dockerfile.zulu-14u2-jre-tools
+++ b/docker/windowsservercore/Dockerfile.zulu-14u2-jre-tools
@@ -4,7 +4,7 @@
 # that are being developed for deployment on Microsoft Azure or Azure Stack,
 # and are not intended to be used for any other purpose.
 
-FROM microsoft/windowsservercore:ltsc2016
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
 MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
 
 RUN setx PACKAGE zulu-14-azure-jre_14.29.23-14.0.2-win_x64.msi && \
diff --git a/docker/windowsservercore/Dockerfile.zulu-15u4-jdk b/docker/windowsservercore/Dockerfile.zulu-15u4-jdk
new file mode 100644
index 00000000..c0cd226c
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-15u4-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-15-azure-jdk_15.34.17-15.0.4-win_x64.msi && \
+    setx PACKAGE_DIR zulu-15/15.0.4 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-15"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.4/zulu-15-azure-jdk_15.34.17-15.0.4-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-15u4-jre b/docker/windowsservercore/Dockerfile.zulu-15u4-jre
new file mode 100644
index 00000000..c915d0ae
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-15u4-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-15-azure-jre_15.34.17-15.0.4-win_x64.msi && \
+    setx PACKAGE_DIR zulu-15/15.0.4 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-15-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.4/zulu-15-azure-jre_15.34.17-15.0.4-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-15u4-jre-tools b/docker/windowsservercore/Dockerfile.zulu-15u4-jre-tools
new file mode 100644
index 00000000..c915d0ae
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-15u4-jre-tools
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-15-azure-jre_15.34.17-15.0.4-win_x64.msi && \
+    setx PACKAGE_DIR zulu-15/15.0.4 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-15-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.4/zulu-15-azure-jre_15.34.17-15.0.4-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-7u312-jdk b/docker/windowsservercore/Dockerfile.zulu-7u312-jdk
new file mode 100644
index 00000000..884cdcf8
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-7u312-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-7-azure-jdk_7.48.0.11-7.0.312-win_x64.msi && \
+    setx PACKAGE_DIR zulu-7/7u312 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-7"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u312/zulu-7-azure-jdk_7.48.0.11-7.0.312-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-7u312-jre b/docker/windowsservercore/Dockerfile.zulu-7u312-jre
new file mode 100644
index 00000000..4349d040
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-7u312-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-7-azure-jre_7.48.0.11-7.0.312-win_x64.msi && \
+    setx PACKAGE_DIR zulu-7/7u312 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-7-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u312/zulu-7-azure-jre_7.48.0.11-7.0.312-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-7u312-jre-tools b/docker/windowsservercore/Dockerfile.zulu-7u312-jre-tools
new file mode 100644
index 00000000..4349d040
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-7u312-jre-tools
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-7-azure-jre_7.48.0.11-7.0.312-win_x64.msi && \
+    setx PACKAGE_DIR zulu-7/7u312 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-7-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u312/zulu-7-azure-jre_7.48.0.11-7.0.312-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-8u302-jdk b/docker/windowsservercore/Dockerfile.zulu-8u302-jdk
new file mode 100644
index 00000000..3f0f9b77
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-8u302-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-8-azure-jdk_8.56.0.21-8.0.302-win_x64.msi && \
+    setx PACKAGE_DIR zulu-8/8u302 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-8"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u302/zulu-8-azure-jdk_8.56.0.21-8.0.302-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-8u302-jre b/docker/windowsservercore/Dockerfile.zulu-8u302-jre
new file mode 100644
index 00000000..2fdc529d
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-8u302-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-8-azure-jre_8.56.0.21-8.0.302-win_x64.msi && \
+    setx PACKAGE_DIR zulu-8/8u302 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-8-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u302/zulu-8-azure-jre_8.56.0.21-8.0.302-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-8u302-jre-tools b/docker/windowsservercore/Dockerfile.zulu-8u302-jre-tools
new file mode 100644
index 00000000..2fdc529d
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-8u302-jre-tools
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-8-azure-jre_8.56.0.21-8.0.302-win_x64.msi && \
+    setx PACKAGE_DIR zulu-8/8u302 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-8-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u302/zulu-8-azure-jre_8.56.0.21-8.0.302-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%

From d99b585e8d186803748936dd55a2a4cf7fc567c6 Mon Sep 17 00:00:00 2001
From: zulu-ci <zulu-ci@azul.com>
Date: Tue, 27 Jul 2021 22:45:09 +0000
Subject: [PATCH 248/264] publishing Zulu 16.32.15

---
 docker/centos/Dockerfile.zulu-16u2-jdk        | 17 +++++++++
 docker/centos/Dockerfile.zulu-16u2-jre        | 17 +++++++++
 docker/debian10/Dockerfile.zulu-16u2-jdk      | 21 ++++++++++
 docker/debian10/Dockerfile.zulu-16u2-jre      | 21 ++++++++++
 docker/debian9/Dockerfile.zulu-16u2-jdk       | 21 ++++++++++
 docker/debian9/Dockerfile.zulu-16u2-jre       | 21 ++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-16u2-jdk  | 21 ++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-16u2-jre  | 21 ++++++++++
 docker/ubuntu/Dockerfile.zulu-16u2-jdk        | 21 ++++++++++
 docker/ubuntu/Dockerfile.zulu-16u2-jre        | 21 ++++++++++
 .../Dockerfile.zulu-16u2-jre-tools            | 38 +++++++++++++++++++
 .../Dockerfile.zulu-16u2-jdk                  | 17 +++++++++
 .../Dockerfile.zulu-16u2-jre                  | 16 ++++++++
 .../Dockerfile.zulu-16u2-jre-tools            | 16 ++++++++
 14 files changed, 289 insertions(+)
 create mode 100644 docker/centos/Dockerfile.zulu-16u2-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-16u2-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-16u2-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-16u2-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-16u2-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-16u2-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-16u2-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-16u2-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-16u2-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-16u2-jre
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-16u2-jre-tools
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-16u2-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-16u2-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-16u2-jre-tools

diff --git a/docker/centos/Dockerfile.zulu-16u2-jdk b/docker/centos/Dockerfile.zulu-16u2-jdk
new file mode 100644
index 00000000..d7de6769
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-16u2-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-16-azure-jdk-16.32.15
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-16-azure
+
diff --git a/docker/centos/Dockerfile.zulu-16u2-jre b/docker/centos/Dockerfile.zulu-16u2-jre
new file mode 100644
index 00000000..28678109
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-16u2-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-16-azure-jre-16.32.15
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-16-azure
+
diff --git a/docker/debian10/Dockerfile.zulu-16u2-jdk b/docker/debian10/Dockerfile.zulu-16u2-jdk
new file mode 100644
index 00000000..9d95be9d
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-16u2-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-16-azure-jdk=16.32+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-16-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-16u2-jre b/docker/debian10/Dockerfile.zulu-16u2-jre
new file mode 100644
index 00000000..ea2a2ca8
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-16u2-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-16-azure-jre=16.32+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-16-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-16u2-jdk b/docker/debian9/Dockerfile.zulu-16u2-jdk
new file mode 100644
index 00000000..58c0d2dc
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-16u2-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-16-azure-jdk=16.32+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-16-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-16u2-jre b/docker/debian9/Dockerfile.zulu-16u2-jre
new file mode 100644
index 00000000..ea463a48
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-16u2-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-16-azure-jre=16.32+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-16-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-16u2-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-16u2-jdk
new file mode 100644
index 00000000..58c16fef
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-16u2-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-16-azure-jdk=16.32+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-16-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-16u2-jre b/docker/ubuntu-18.04/Dockerfile.zulu-16u2-jre
new file mode 100644
index 00000000..adf5747b
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-16u2-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-16-azure-jre=16.32+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-16-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-16u2-jdk b/docker/ubuntu/Dockerfile.zulu-16u2-jdk
new file mode 100644
index 00000000..6ab8f3b6
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-16u2-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-16-azure-jdk=16.32+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-16-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-16u2-jre b/docker/ubuntu/Dockerfile.zulu-16u2-jre
new file mode 100644
index 00000000..62405680
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-16u2-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-16-azure-jre=16.32+15* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-16-azure-amd64
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-16u2-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-16u2-jre-tools
new file mode 100644
index 00000000..30f71663
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-16u2-jre-tools
@@ -0,0 +1,38 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:16u2-zulu-windowsservercore AS stage1
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-16/16.0.2
+ARG JRE_PACKAGE=zulu-16-azure-jre_16.32.15-16.0.2-win_x64.msi
+ARG JRE_DIR="C:\Program Files\Zulu\zulu-16-jre"
+ARG JRE_TOOLS_DIR=C:\zulu-16-azure-jre-tools_16.32.15-16.0.2-win_x64
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-16"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-16/16.0.2/zulu-16-azure-jre_16.32.15-16.0.2-win_x64.msi', '%JRE_PACKAGE%') && \
+    msiexec /quiet /i %JRE_PACKAGE% && \
+    del %JRE_PACKAGE%
+
+RUN jimage.exe list "%JRE_DIR%\lib\modules" | findstr "Module: " > modules.out && \
+    powershell -Command "(Get-Content modules.out) -replace 'Module: ', '' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) -join ',' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) + ',jdk.jcmd' | Out-File modules.out" && \
+    for /f %P in ('type modules.out') do setx /m JRE_MODULES %P && \
+    del modules.out
+
+RUN jlink --no-header-files --strip-debug --module-path "%JDK_DIR%\jmods" --add-modules %JRE_MODULES% --output %JRE_TOOLS_DIR%
+
+FROM mcr.microsoft.com/windows/nanoserver:2004
+
+ARG JRE_TOOLS_DIR="C:\zulu-16-azure-jre-tools_16.32.15-16.0.2-win_x64"
+
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+COPY --from=stage1 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+USER ContainerUser
\ No newline at end of file
diff --git a/docker/windowsservercore/Dockerfile.zulu-16u2-jdk b/docker/windowsservercore/Dockerfile.zulu-16u2-jdk
new file mode 100644
index 00000000..3ef9bc27
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-16u2-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-16-azure-jdk_16.32.15-16.0.2-win_x64.msi && \
+    setx PACKAGE_DIR zulu-16/16.0.2 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-16"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-16/16.0.2/zulu-16-azure-jdk_16.32.15-16.0.2-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-16u2-jre b/docker/windowsservercore/Dockerfile.zulu-16u2-jre
new file mode 100644
index 00000000..d1f7ed7f
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-16u2-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-16-azure-jre_16.32.15-16.0.2-win_x64.msi && \
+    setx PACKAGE_DIR zulu-16/16.0.2 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-16-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-16/16.0.2/zulu-16-azure-jre_16.32.15-16.0.2-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-16u2-jre-tools b/docker/windowsservercore/Dockerfile.zulu-16u2-jre-tools
new file mode 100644
index 00000000..d1f7ed7f
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-16u2-jre-tools
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-16-azure-jre_16.32.15-16.0.2-win_x64.msi && \
+    setx PACKAGE_DIR zulu-16/16.0.2 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-16-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-16/16.0.2/zulu-16-azure-jre_16.32.15-16.0.2-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%

From a1135ba94fa0b727652cc9598f0cf0413b2f9d88 Mon Sep 17 00:00:00 2001
From: zulu-ci <zulu-ci@azul.com>
Date: Mon, 20 Sep 2021 16:17:38 +0000
Subject: [PATCH 249/264] Zulu 17 release

---
 docker/alpine/Dockerfile.zulu-17u0-jdk        | 32 +++++++++++++++++++
 docker/alpine/Dockerfile.zulu-17u0-jre        | 30 +++++++++++++++++
 .../alpine/Dockerfile.zulu-17u0-jre-headless  | 30 +++++++++++++++++
 .../Dockerfile.zulu-17u0-jre-headless-tools   | 32 +++++++++++++++++++
 docker/centos/Dockerfile.zulu-17u0-jdk        | 17 ++++++++++
 docker/centos/Dockerfile.zulu-17u0-jre        | 17 ++++++++++
 .../centos/Dockerfile.zulu-17u0-jre-headless  | 16 ++++++++++
 docker/debian10/Dockerfile.zulu-17u0-jdk      | 21 ++++++++++++
 docker/debian10/Dockerfile.zulu-17u0-jre      | 21 ++++++++++++
 .../Dockerfile.zulu-17u0-jre-headless         | 21 ++++++++++++
 docker/debian9/Dockerfile.zulu-17u0-jdk       | 21 ++++++++++++
 docker/debian9/Dockerfile.zulu-17u0-jre       | 21 ++++++++++++
 .../debian9/Dockerfile.zulu-17u0-jre-headless | 21 ++++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-17u0-jdk  | 21 ++++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-17u0-jre  | 21 ++++++++++++
 .../Dockerfile.zulu-17u0-jre-headless         | 21 ++++++++++++
 docker/ubuntu/Dockerfile.zulu-17u0-jdk        | 21 ++++++++++++
 docker/ubuntu/Dockerfile.zulu-17u0-jre        | 21 ++++++++++++
 .../ubuntu/Dockerfile.zulu-17u0-jre-headless  | 21 ++++++++++++
 .../Dockerfile.zulu-17u0-jdk                  | 17 ++++++++++
 .../Dockerfile.zulu-17u0-jre                  | 16 ++++++++++
 .../Dockerfile.zulu-17u0-jre-tools            | 16 ++++++++++
 22 files changed, 475 insertions(+)
 create mode 100644 docker/alpine/Dockerfile.zulu-17u0-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-17u0-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-17u0-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-17u0-jre-headless-tools
 create mode 100644 docker/centos/Dockerfile.zulu-17u0-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-17u0-jre
 create mode 100644 docker/centos/Dockerfile.zulu-17u0-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-17u0-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-17u0-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-17u0-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-17u0-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-17u0-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-17u0-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-17u0-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-17u0-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-17u0-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-17u0-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-17u0-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-17u0-jre-headless
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-17u0-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-17u0-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-17u0-jre-tools

diff --git a/docker/alpine/Dockerfile.zulu-17u0-jdk b/docker/alpine/Dockerfile.zulu-17u0-jdk
new file mode 100644
index 00000000..bd2da414
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-17u0-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-17-azure-jdk_17.28.13-17.0.0-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-17/17/zulu-17-azure-jdk_17.28.13-17.0.0-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-17u0-jre b/docker/alpine/Dockerfile.zulu-17u0-jre
new file mode 100644
index 00000000..4c854e8e
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-17u0-jre
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-17-azure-jre_17.28.13-17.0.0-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-17/17/zulu-17-azure-jre_17.28.13-17.0.0-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-17u0-jre-headless b/docker/alpine/Dockerfile.zulu-17u0-jre-headless
new file mode 100644
index 00000000..12c03817
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-17u0-jre-headless
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-17-azure-jre-headless_17.28.13-17.0.0-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-17/17/zulu-17-azure-jre-headless_17.28.13-17.0.0-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-17u0-jre-headless-tools b/docker/alpine/Dockerfile.zulu-17u0-jre-headless-tools
new file mode 100644
index 00000000..020791c8
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-17u0-jre-headless-tools
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-17-azure-jre-headless-tools_17.28.13-17.0.0-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-17/17/zulu-17-azure-jre-headless-tools_17.28.13-17.0.0-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/centos/Dockerfile.zulu-17u0-jdk b/docker/centos/Dockerfile.zulu-17u0-jdk
new file mode 100644
index 00000000..2afd0be6
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-17u0-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-17-azure-jdk-17.28.13
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-17-azure
+
diff --git a/docker/centos/Dockerfile.zulu-17u0-jre b/docker/centos/Dockerfile.zulu-17u0-jre
new file mode 100644
index 00000000..d5f36954
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-17u0-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-17-azure-jre-17.28.13
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-17-azure
+
diff --git a/docker/centos/Dockerfile.zulu-17u0-jre-headless b/docker/centos/Dockerfile.zulu-17u0-jre-headless
new file mode 100644
index 00000000..b27e7fc1
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-17u0-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-17-azure-jre-headless-17.28.13
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-17-azure
diff --git a/docker/debian10/Dockerfile.zulu-17u0-jdk b/docker/debian10/Dockerfile.zulu-17u0-jdk
new file mode 100644
index 00000000..e5a70cc2
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-17u0-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-17-azure-jdk=17.28+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-17-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-17u0-jre b/docker/debian10/Dockerfile.zulu-17u0-jre
new file mode 100644
index 00000000..f74457af
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-17u0-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-17-azure-jre=17.28+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-17-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-17u0-jre-headless b/docker/debian10/Dockerfile.zulu-17u0-jre-headless
new file mode 100644
index 00000000..0b352045
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-17u0-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-17-azure-jre-headless=17.28+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-17-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-17u0-jdk b/docker/debian9/Dockerfile.zulu-17u0-jdk
new file mode 100644
index 00000000..1988e0d2
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-17u0-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-17-azure-jdk=17.28+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-17-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-17u0-jre b/docker/debian9/Dockerfile.zulu-17u0-jre
new file mode 100644
index 00000000..3002b89d
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-17u0-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-17-azure-jre=17.28+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-17-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-17u0-jre-headless b/docker/debian9/Dockerfile.zulu-17u0-jre-headless
new file mode 100644
index 00000000..4080b5dd
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-17u0-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-17-azure-jre-headless=17.28+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-17-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-17u0-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-17u0-jdk
new file mode 100644
index 00000000..e83e8f04
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-17u0-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-17-azure-jdk=17.28+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-17-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-17u0-jre b/docker/ubuntu-18.04/Dockerfile.zulu-17u0-jre
new file mode 100644
index 00000000..d2978acb
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-17u0-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-17-azure-jre=17.28+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-17-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-17u0-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-17u0-jre-headless
new file mode 100644
index 00000000..bb9d4821
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-17u0-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-17-azure-jre-headless=17.28+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-17-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-17u0-jdk b/docker/ubuntu/Dockerfile.zulu-17u0-jdk
new file mode 100644
index 00000000..521c1300
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-17u0-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-17-azure-jdk=17.28+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-17-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-17u0-jre b/docker/ubuntu/Dockerfile.zulu-17u0-jre
new file mode 100644
index 00000000..ec35444e
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-17u0-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-17-azure-jre=17.28+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-17-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-17u0-jre-headless b/docker/ubuntu/Dockerfile.zulu-17u0-jre-headless
new file mode 100644
index 00000000..80a4cf74
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-17u0-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-17-azure-jre-headless=17.28+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-17-azure-amd64
diff --git a/docker/windowsservercore/Dockerfile.zulu-17u0-jdk b/docker/windowsservercore/Dockerfile.zulu-17u0-jdk
new file mode 100644
index 00000000..2768a8b5
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-17u0-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-17-azure-jdk_17.28.13-17.0.0-win_x64.msi && \
+    setx PACKAGE_DIR zulu-17/17.0.0 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-17"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-17/17/zulu-17-azure-jdk_17.28.13-17.0.0-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-17u0-jre b/docker/windowsservercore/Dockerfile.zulu-17u0-jre
new file mode 100644
index 00000000..fef1a3d2
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-17u0-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-17-azure-jre_17.28.13-17.0.0-win_x64.msi && \
+    setx PACKAGE_DIR zulu-17/17.0.0 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-17-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-17/17/zulu-17-azure-jre_17.28.13-17.0.0-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-17u0-jre-tools b/docker/windowsservercore/Dockerfile.zulu-17u0-jre-tools
new file mode 100644
index 00000000..fef1a3d2
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-17u0-jre-tools
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-17-azure-jre_17.28.13-17.0.0-win_x64.msi && \
+    setx PACKAGE_DIR zulu-17/17.0.0 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-17-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-17/17/zulu-17-azure-jre_17.28.13-17.0.0-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%

From 29a77b3566b090075958507640481f6c0aa4fd26 Mon Sep 17 00:00:00 2001
From: zulu-ci <zulu-ci@azul.com>
Date: Wed, 20 Oct 2021 18:18:22 +0000
Subject: [PATCH 250/264] October Zulu release

---
 docker/alpine/Dockerfile.zulu-11u13-jdk       | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-11u13-jre       | 32 ++++++++++++++
 .../alpine/Dockerfile.zulu-11u13-jre-headless | 32 ++++++++++++++
 .../Dockerfile.zulu-11u13-jre-headless-tools  | 30 +++++++++++++
 docker/alpine/Dockerfile.zulu-13u9-jdk        | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-13u9-jre        | 30 +++++++++++++
 .../alpine/Dockerfile.zulu-13u9-jre-headless  | 30 +++++++++++++
 .../Dockerfile.zulu-13u9-jre-headless-tools   | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-15u5-jdk        | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-15u5-jre        | 30 +++++++++++++
 .../alpine/Dockerfile.zulu-15u5-jre-headless  | 30 +++++++++++++
 .../Dockerfile.zulu-15u5-jre-headless-tools   | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-7u322-jdk       | 44 +++++++++++++++++++
 docker/alpine/Dockerfile.zulu-7u322-jre       | 44 +++++++++++++++++++
 .../alpine/Dockerfile.zulu-7u322-jre-headless | 44 +++++++++++++++++++
 docker/alpine/Dockerfile.zulu-8u312-jdk       | 32 ++++++++++++++
 docker/alpine/Dockerfile.zulu-8u312-jre       | 32 ++++++++++++++
 .../alpine/Dockerfile.zulu-8u312-jre-headless | 32 ++++++++++++++
 .../Dockerfile.zulu-8u312-jre-headless-tools  | 32 ++++++++++++++
 docker/centos/Dockerfile.zulu-11u13-jdk       | 17 +++++++
 docker/centos/Dockerfile.zulu-11u13-jre       | 17 +++++++
 .../centos/Dockerfile.zulu-11u13-jre-headless | 16 +++++++
 docker/centos/Dockerfile.zulu-13u9-jdk        | 17 +++++++
 docker/centos/Dockerfile.zulu-13u9-jre        | 17 +++++++
 .../centos/Dockerfile.zulu-13u9-jre-headless  | 16 +++++++
 docker/centos/Dockerfile.zulu-15u5-jdk        | 17 +++++++
 docker/centos/Dockerfile.zulu-15u5-jre        | 17 +++++++
 .../centos/Dockerfile.zulu-15u5-jre-headless  | 16 +++++++
 docker/centos/Dockerfile.zulu-7u322-jdk       | 17 +++++++
 docker/centos/Dockerfile.zulu-7u322-jre       | 17 +++++++
 .../centos/Dockerfile.zulu-7u322-jre-headless | 16 +++++++
 docker/centos/Dockerfile.zulu-8u312-jdk       | 17 +++++++
 docker/centos/Dockerfile.zulu-8u312-jre       | 17 +++++++
 .../centos/Dockerfile.zulu-8u312-jre-headless | 16 +++++++
 docker/debian10/Dockerfile.zulu-11u13-jdk     | 21 +++++++++
 docker/debian10/Dockerfile.zulu-11u13-jre     | 21 +++++++++
 .../Dockerfile.zulu-11u13-jre-headless        | 21 +++++++++
 .../Dockerfile.zulu-11u13-jre-headless-tools  | 31 +++++++++++++
 docker/debian10/Dockerfile.zulu-11u13-maven   | 31 +++++++++++++
 docker/debian10/Dockerfile.zulu-13u9-jdk      | 21 +++++++++
 docker/debian10/Dockerfile.zulu-13u9-jre      | 21 +++++++++
 .../Dockerfile.zulu-13u9-jre-headless         | 21 +++++++++
 docker/debian10/Dockerfile.zulu-15u5-jdk      | 21 +++++++++
 docker/debian10/Dockerfile.zulu-15u5-jre      | 21 +++++++++
 .../Dockerfile.zulu-15u5-jre-headless         | 21 +++++++++
 docker/debian10/Dockerfile.zulu-7u322-jdk     | 21 +++++++++
 docker/debian10/Dockerfile.zulu-7u322-jre     | 21 +++++++++
 .../Dockerfile.zulu-7u322-jre-headless        | 21 +++++++++
 docker/debian10/Dockerfile.zulu-8u312-jdk     | 21 +++++++++
 docker/debian10/Dockerfile.zulu-8u312-jre     | 21 +++++++++
 .../Dockerfile.zulu-8u312-jre-headless        | 21 +++++++++
 .../Dockerfile.zulu-8u312-jre-headless-tools  | 23 ++++++++++
 docker/debian10/Dockerfile.zulu-8u312-maven   | 31 +++++++++++++
 docker/debian9/Dockerfile.zulu-11u13-jdk      | 21 +++++++++
 docker/debian9/Dockerfile.zulu-11u13-jre      | 21 +++++++++
 .../Dockerfile.zulu-11u13-jre-headless        | 21 +++++++++
 docker/debian9/Dockerfile.zulu-11u13-maven    | 31 +++++++++++++
 docker/debian9/Dockerfile.zulu-13u9-jdk       | 21 +++++++++
 docker/debian9/Dockerfile.zulu-13u9-jre       | 21 +++++++++
 .../debian9/Dockerfile.zulu-13u9-jre-headless | 21 +++++++++
 docker/debian9/Dockerfile.zulu-15u5-jdk       | 21 +++++++++
 docker/debian9/Dockerfile.zulu-15u5-jre       | 21 +++++++++
 .../debian9/Dockerfile.zulu-15u5-jre-headless | 21 +++++++++
 docker/debian9/Dockerfile.zulu-7u322-jdk      | 21 +++++++++
 docker/debian9/Dockerfile.zulu-7u322-jre      | 21 +++++++++
 .../Dockerfile.zulu-7u322-jre-headless        | 21 +++++++++
 docker/debian9/Dockerfile.zulu-8u312-jdk      | 21 +++++++++
 docker/debian9/Dockerfile.zulu-8u312-jre      | 21 +++++++++
 .../Dockerfile.zulu-8u312-jre-headless        | 21 +++++++++
 docker/debian9/Dockerfile.zulu-8u312-maven    | 31 +++++++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-11u13-jdk | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-11u13-jre | 21 +++++++++
 .../Dockerfile.zulu-11u13-jre-headless        | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-13u9-jdk  | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-13u9-jre  | 21 +++++++++
 .../Dockerfile.zulu-13u9-jre-headless         | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-15u5-jdk  | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-15u5-jre  | 21 +++++++++
 .../Dockerfile.zulu-15u5-jre-headless         | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-7u322-jdk | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-7u322-jre | 21 +++++++++
 .../Dockerfile.zulu-7u322-jre-headless        | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-8u312-jdk | 21 +++++++++
 docker/ubuntu-18.04/Dockerfile.zulu-8u312-jre | 21 +++++++++
 .../Dockerfile.zulu-8u312-jre-headless        | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-11u13-jdk       | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-11u13-jre       | 21 +++++++++
 .../ubuntu/Dockerfile.zulu-11u13-jre-headless | 21 +++++++++
 .../Dockerfile.zulu-11u13-jre-headless-tools  | 31 +++++++++++++
 docker/ubuntu/Dockerfile.zulu-13u9-jdk        | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-13u9-jre        | 21 +++++++++
 .../ubuntu/Dockerfile.zulu-13u9-jre-headless  | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-15u5-jdk        | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-15u5-jre        | 21 +++++++++
 .../ubuntu/Dockerfile.zulu-15u5-jre-headless  | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-7u322-jdk       | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-7u322-jre       | 21 +++++++++
 .../ubuntu/Dockerfile.zulu-7u322-jre-headless | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-8u312-jdk       | 21 +++++++++
 docker/ubuntu/Dockerfile.zulu-8u312-jre       | 21 +++++++++
 .../ubuntu/Dockerfile.zulu-8u312-jre-headless | 21 +++++++++
 .../Dockerfile.zulu-8u312-jre-headless-tools  | 23 ++++++++++
 .../Dockerfile.zulu-11u13-jre-tools           | 38 ++++++++++++++++
 .../Dockerfile.zulu-13u9-jre-tools            | 38 ++++++++++++++++
 .../Dockerfile.zulu-15u5-jre-tools            | 38 ++++++++++++++++
 .../Dockerfile.zulu-7u322-jre-tools           | 31 +++++++++++++
 .../Dockerfile.zulu-8u312-jre-tools           | 31 +++++++++++++
 .../Dockerfile.zulu-11u13-jdk                 | 17 +++++++
 .../Dockerfile.zulu-11u13-jre                 | 16 +++++++
 .../Dockerfile.zulu-11u13-jre-tools           | 16 +++++++
 .../Dockerfile.zulu-13u9-jdk                  | 17 +++++++
 .../Dockerfile.zulu-13u9-jre                  | 16 +++++++
 .../Dockerfile.zulu-13u9-jre-tools            | 16 +++++++
 .../Dockerfile.zulu-15u5-jdk                  | 17 +++++++
 .../Dockerfile.zulu-15u5-jre                  | 16 +++++++
 .../Dockerfile.zulu-15u5-jre-tools            | 16 +++++++
 .../Dockerfile.zulu-7u322-jdk                 | 17 +++++++
 .../Dockerfile.zulu-7u322-jre                 | 16 +++++++
 .../Dockerfile.zulu-7u322-jre-tools           | 16 +++++++
 .../Dockerfile.zulu-8u312-jdk                 | 17 +++++++
 .../Dockerfile.zulu-8u312-jre                 | 16 +++++++
 .../Dockerfile.zulu-8u312-jre-tools           | 16 +++++++
 122 files changed, 2797 insertions(+)
 create mode 100644 docker/alpine/Dockerfile.zulu-11u13-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-11u13-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-11u13-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-11u13-jre-headless-tools
 create mode 100644 docker/alpine/Dockerfile.zulu-13u9-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-13u9-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-13u9-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-13u9-jre-headless-tools
 create mode 100644 docker/alpine/Dockerfile.zulu-15u5-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-15u5-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-15u5-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-15u5-jre-headless-tools
 create mode 100644 docker/alpine/Dockerfile.zulu-7u322-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-7u322-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-7u322-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-8u312-jdk
 create mode 100644 docker/alpine/Dockerfile.zulu-8u312-jre
 create mode 100644 docker/alpine/Dockerfile.zulu-8u312-jre-headless
 create mode 100644 docker/alpine/Dockerfile.zulu-8u312-jre-headless-tools
 create mode 100644 docker/centos/Dockerfile.zulu-11u13-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-11u13-jre
 create mode 100644 docker/centos/Dockerfile.zulu-11u13-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-13u9-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-13u9-jre
 create mode 100644 docker/centos/Dockerfile.zulu-13u9-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-15u5-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-15u5-jre
 create mode 100644 docker/centos/Dockerfile.zulu-15u5-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-7u322-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-7u322-jre
 create mode 100644 docker/centos/Dockerfile.zulu-7u322-jre-headless
 create mode 100644 docker/centos/Dockerfile.zulu-8u312-jdk
 create mode 100644 docker/centos/Dockerfile.zulu-8u312-jre
 create mode 100644 docker/centos/Dockerfile.zulu-8u312-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-11u13-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-11u13-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-11u13-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-11u13-jre-headless-tools
 create mode 100644 docker/debian10/Dockerfile.zulu-11u13-maven
 create mode 100644 docker/debian10/Dockerfile.zulu-13u9-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-13u9-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-13u9-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-15u5-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-15u5-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-15u5-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-7u322-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-7u322-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-7u322-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-8u312-jdk
 create mode 100644 docker/debian10/Dockerfile.zulu-8u312-jre
 create mode 100644 docker/debian10/Dockerfile.zulu-8u312-jre-headless
 create mode 100644 docker/debian10/Dockerfile.zulu-8u312-jre-headless-tools
 create mode 100644 docker/debian10/Dockerfile.zulu-8u312-maven
 create mode 100644 docker/debian9/Dockerfile.zulu-11u13-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-11u13-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-11u13-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-11u13-maven
 create mode 100644 docker/debian9/Dockerfile.zulu-13u9-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-13u9-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-13u9-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-15u5-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-15u5-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-15u5-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-7u322-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-7u322-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-7u322-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-8u312-jdk
 create mode 100644 docker/debian9/Dockerfile.zulu-8u312-jre
 create mode 100644 docker/debian9/Dockerfile.zulu-8u312-jre-headless
 create mode 100644 docker/debian9/Dockerfile.zulu-8u312-maven
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-11u13-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-11u13-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-11u13-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-13u9-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-13u9-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-13u9-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-15u5-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-15u5-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-15u5-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u322-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u322-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-7u322-jre-headless
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u312-jdk
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u312-jre
 create mode 100644 docker/ubuntu-18.04/Dockerfile.zulu-8u312-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u13-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u13-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u13-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u13-jre-headless-tools
 create mode 100644 docker/ubuntu/Dockerfile.zulu-13u9-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-13u9-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-13u9-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-15u5-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-15u5-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-15u5-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-7u322-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-7u322-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-7u322-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u312-jdk
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u312-jre
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u312-jre-headless
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u312-jre-headless-tools
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-11u13-jre-tools
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-13u9-jre-tools
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-15u5-jre-tools
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-7u322-jre-tools
 create mode 100644 docker/windowsnanoserver-2004/Dockerfile.zulu-8u312-jre-tools
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-11u13-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-11u13-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-11u13-jre-tools
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-13u9-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-13u9-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-13u9-jre-tools
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-15u5-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-15u5-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-15u5-jre-tools
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-7u322-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-7u322-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-7u322-jre-tools
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-8u312-jdk
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-8u312-jre
 create mode 100644 docker/windowsservercore/Dockerfile.zulu-8u312-jre-tools

diff --git a/docker/alpine/Dockerfile.zulu-11u13-jdk b/docker/alpine/Dockerfile.zulu-11u13-jdk
new file mode 100644
index 00000000..d659e162
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u13-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jdk_11.52.13-11.0.13-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.13/zulu-11-azure-jdk_11.52.13-11.0.13-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-11u13-jre b/docker/alpine/Dockerfile.zulu-11u13-jre
new file mode 100644
index 00000000..198c69db
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u13-jre
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jre_11.52.13-11.0.13-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.13/zulu-11-azure-jre_11.52.13-11.0.13-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-11u13-jre-headless b/docker/alpine/Dockerfile.zulu-11u13-jre-headless
new file mode 100644
index 00000000..20c8c720
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u13-jre-headless
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jre-headless_11.52.13-11.0.13-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.13/zulu-11-azure-jre-headless_11.52.13-11.0.13-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-11u13-jre-headless-tools b/docker/alpine/Dockerfile.zulu-11u13-jre-headless-tools
new file mode 100644
index 00000000..3f7124b2
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u13-jre-headless-tools
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-11-azure-jre-headless-tools_11.52.13-11.0.13-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.13/zulu-11-azure-jre-headless-tools_11.52.13-11.0.13-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-13u9-jdk b/docker/alpine/Dockerfile.zulu-13u9-jdk
new file mode 100644
index 00000000..b7b6259d
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u9-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jdk_13.44.13-13.0.9-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.9/zulu-13-azure-jdk_13.44.13-13.0.9-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-13u9-jre b/docker/alpine/Dockerfile.zulu-13u9-jre
new file mode 100644
index 00000000..c6f61e1a
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u9-jre
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jre_13.44.13-13.0.9-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.9/zulu-13-azure-jre_13.44.13-13.0.9-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-13u9-jre-headless b/docker/alpine/Dockerfile.zulu-13u9-jre-headless
new file mode 100644
index 00000000..9ef35f27
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u9-jre-headless
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jre-headless_13.44.13-13.0.9-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.9/zulu-13-azure-jre-headless_13.44.13-13.0.9-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-13u9-jre-headless-tools b/docker/alpine/Dockerfile.zulu-13u9-jre-headless-tools
new file mode 100644
index 00000000..aff7c95a
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-13u9-jre-headless-tools
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-13-azure-jre-headless-tools_13.44.13-13.0.9-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.9/zulu-13-azure-jre-headless-tools_13.44.13-13.0.9-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-15u5-jdk b/docker/alpine/Dockerfile.zulu-15u5-jdk
new file mode 100644
index 00000000..d6bb0dc9
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-15u5-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-15-azure-jdk_15.36.13-15.0.5-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.5/zulu-15-azure-jdk_15.36.13-15.0.5-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-15u5-jre b/docker/alpine/Dockerfile.zulu-15u5-jre
new file mode 100644
index 00000000..d72f1207
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-15u5-jre
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-15-azure-jre_15.36.13-15.0.5-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.5/zulu-15-azure-jre_15.36.13-15.0.5-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-15u5-jre-headless b/docker/alpine/Dockerfile.zulu-15u5-jre-headless
new file mode 100644
index 00000000..3bd2e721
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-15u5-jre-headless
@@ -0,0 +1,30 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-15-azure-jre-headless_15.36.13-15.0.5-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.5/zulu-15-azure-jre-headless_15.36.13-15.0.5-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+    
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-15u5-jre-headless-tools b/docker/alpine/Dockerfile.zulu-15u5-jre-headless-tools
new file mode 100644
index 00000000..c74d7765
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-15u5-jre-headless-tools
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-15-azure-jre-headless-tools_15.36.13-15.0.5-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.5/zulu-15-azure-jre-headless-tools_15.36.13-15.0.5-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-7u322-jdk b/docker/alpine/Dockerfile.zulu-7u322-jdk
new file mode 100644
index 00000000..1d456431
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-7u322-jdk
@@ -0,0 +1,44 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-7-azure-jdk_7.50.0.11-7.0.322-linux_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates wget tar && \
+    apk --no-cache --virtual .build-deps add binutils zstd xz && \
+    apk update && \
+    apk upgrade && \
+    wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+    wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
+    wget -q -O gcc-libs.tar.zst https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -q -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    tar -I zstd -xf gcc-libs.tar.zst -C /tmp && \
+    tar -xJf zlib.tar.xz -C /tmp && \
+    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
+    rm -rf gcc-libs.tar.zst zlib.tar.xz /tmp/usr && \
+    apk del .build-deps && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u322/zulu-7-azure-jdk_7.50.0.11-7.0.322-linux_x64.tar.gz && rm /root/.wget-hsts && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-7u322-jre b/docker/alpine/Dockerfile.zulu-7u322-jre
new file mode 100644
index 00000000..c94e3b25
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-7u322-jre
@@ -0,0 +1,44 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-7-azure-jre_7.50.0.11-7.0.322-linux_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates wget tar && \
+    apk --no-cache --virtual .build-deps add binutils zstd xz && \
+    apk update && \
+    apk upgrade && \
+    wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+    wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
+    wget -q -O gcc-libs.tar.zst https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -q -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    tar -I zstd -xf gcc-libs.tar.zst -C /tmp && \
+    tar -xJf zlib.tar.xz -C /tmp && \
+    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
+    rm -rf gcc-libs.tar.zst zlib.tar.xz /tmp/usr && \
+    apk del .build-deps && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u322/zulu-7-azure-jre_7.50.0.11-7.0.322-linux_x64.tar.gz && rm /root/.wget-hsts && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-7u322-jre-headless b/docker/alpine/Dockerfile.zulu-7u322-jre-headless
new file mode 100644
index 00000000..389a58b4
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-7u322-jre-headless
@@ -0,0 +1,44 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-7-azure-jre-headless_7.50.0.11-7.0.322-linux_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates wget tar && \
+    apk --no-cache --virtual .build-deps add binutils zstd xz && \
+    apk update && \
+    apk upgrade && \
+    wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
+    wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && \
+    apk add glibc-2.28-r0.apk && rm glibc-2.28-r0.apk && \
+    wget -q -O gcc-libs.tar.zst https://www.archlinux.org/packages/core/x86_64/gcc-libs/download/ && \
+    wget -q -O zlib.tar.xz https://www.archlinux.org/packages/core/x86_64/zlib/download/ && \
+    tar -I zstd -xf gcc-libs.tar.zst -C /tmp && \
+    tar -xJf zlib.tar.xz -C /tmp && \
+    mv /tmp/usr/lib/libgcc_s.so* /tmp/usr/lib/libstdc++.so* /tmp/usr/lib/libz.so* /usr/glibc-compat/lib/ && \
+    strip /usr/glibc-compat/lib/libgcc_s.so.* /usr/glibc-compat/lib/libstdc++.so.* && \
+    rm -rf gcc-libs.tar.zst zlib.tar.xz /tmp/usr && \
+    apk del .build-deps && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u322/zulu-7-azure-jre-headless_7.50.0.11-7.0.322-linux_x64.tar.gz && rm /root/.wget-hsts && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u312-jdk b/docker/alpine/Dockerfile.zulu-8u312-jdk
new file mode 100644
index 00000000..fbdcbb06
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u312-jdk
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jdk_8.58.0.13-8.0.312-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u312/zulu-8-azure-jdk_8.58.0.13-8.0.312-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u312-jre b/docker/alpine/Dockerfile.zulu-8u312-jre
new file mode 100644
index 00000000..f32fe95e
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u312-jre
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre_8.58.0.13-8.0.312-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u312/zulu-8-azure-jre_8.58.0.13-8.0.312-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u312-jre-headless b/docker/alpine/Dockerfile.zulu-8u312-jre-headless
new file mode 100644
index 00000000..f6a7cda3
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u312-jre-headless
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre-headless_8.58.0.13-8.0.312-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u312/zulu-8-azure-jre-headless_8.58.0.13-8.0.312-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/alpine/Dockerfile.zulu-8u312-jre-headless-tools b/docker/alpine/Dockerfile.zulu-8u312-jre-headless-tools
new file mode 100644
index 00000000..c57a7953
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u312-jre-headless-tools
@@ -0,0 +1,32 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+ARG ZULU_DIR=zulu-8-azure-jre-headless-tools_8.58.0.13-8.0.312-linux_musl_x64
+
+RUN ZULU_PACK=${ZULU_DIR}.tar.gz && \
+    INSTALL_DIR=/usr/lib/jvm && \
+    BIN_DIR=/usr/bin && \
+    MAN_DIR=/usr/share/man/man1 && \
+    apk --no-cache add ca-certificates libgcc libstdc++ ttf-dejavu wget && \
+    apk update && \
+    apk upgrade && \
+    wget -q https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u312/zulu-8-azure-jre-headless-tools_8.58.0.13-8.0.312-linux_musl_x64.tar.gz && \
+    mkdir -p ${INSTALL_DIR} && \
+    tar -xf ./${ZULU_PACK} -C ${INSTALL_DIR} && rm -f ${ZULU_PACK} && \
+    cd ${BIN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    mkdir -p ${MAN_DIR} && \
+    cd ${MAN_DIR} && \
+    find ${INSTALL_DIR}/${ZULU_DIR}/man/man1 -type f -name "*.1" -exec ln -s {} . \;
+
+ENV JAVA_HOME=/usr/lib/jvm/${ZULU_DIR}
\ No newline at end of file
diff --git a/docker/centos/Dockerfile.zulu-11u13-jdk b/docker/centos/Dockerfile.zulu-11u13-jdk
new file mode 100644
index 00000000..17a1d7c1
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u13-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-11-azure-jdk-11.52.13
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure
+
diff --git a/docker/centos/Dockerfile.zulu-11u13-jre b/docker/centos/Dockerfile.zulu-11u13-jre
new file mode 100644
index 00000000..1287e885
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u13-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-11-azure-jre-11.52.13
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure
+
diff --git a/docker/centos/Dockerfile.zulu-11u13-jre-headless b/docker/centos/Dockerfile.zulu-11u13-jre-headless
new file mode 100644
index 00000000..0e39332a
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u13-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-11-azure-jre-headless-11.52.13
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure
diff --git a/docker/centos/Dockerfile.zulu-13u9-jdk b/docker/centos/Dockerfile.zulu-13u9-jdk
new file mode 100644
index 00000000..73fca47b
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-13u9-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-13-azure-jdk-13.44.13
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure
+
diff --git a/docker/centos/Dockerfile.zulu-13u9-jre b/docker/centos/Dockerfile.zulu-13u9-jre
new file mode 100644
index 00000000..f32cd8dd
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-13u9-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-13-azure-jre-13.44.13
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure
+
diff --git a/docker/centos/Dockerfile.zulu-13u9-jre-headless b/docker/centos/Dockerfile.zulu-13u9-jre-headless
new file mode 100644
index 00000000..d5c3f5bf
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-13u9-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-13-azure-jre-headless-13.44.13
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure
diff --git a/docker/centos/Dockerfile.zulu-15u5-jdk b/docker/centos/Dockerfile.zulu-15u5-jdk
new file mode 100644
index 00000000..5bd1045f
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-15u5-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-15-azure-jdk-15.36.13
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure
+
diff --git a/docker/centos/Dockerfile.zulu-15u5-jre b/docker/centos/Dockerfile.zulu-15u5-jre
new file mode 100644
index 00000000..9b138fb2
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-15u5-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-15-azure-jre-15.36.13
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure
+
diff --git a/docker/centos/Dockerfile.zulu-15u5-jre-headless b/docker/centos/Dockerfile.zulu-15u5-jre-headless
new file mode 100644
index 00000000..bd749015
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-15u5-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-15-azure-jre-headless-15.36.13
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure
diff --git a/docker/centos/Dockerfile.zulu-7u322-jdk b/docker/centos/Dockerfile.zulu-7u322-jdk
new file mode 100644
index 00000000..e2072e59
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-7u322-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-7-azure-jdk-7.50.0.11
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure
+
diff --git a/docker/centos/Dockerfile.zulu-7u322-jre b/docker/centos/Dockerfile.zulu-7u322-jre
new file mode 100644
index 00000000..f8130918
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-7u322-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-7-azure-jre-7.50.0.11
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure
+
diff --git a/docker/centos/Dockerfile.zulu-7u322-jre-headless b/docker/centos/Dockerfile.zulu-7u322-jre-headless
new file mode 100644
index 00000000..598b19f4
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-7u322-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-7-azure-jre-headless-7.50.0.11
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure
diff --git a/docker/centos/Dockerfile.zulu-8u312-jdk b/docker/centos/Dockerfile.zulu-8u312-jdk
new file mode 100644
index 00000000..df1a9390
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u312-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-8-azure-jdk-8.58.0.13
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure
+
diff --git a/docker/centos/Dockerfile.zulu-8u312-jre b/docker/centos/Dockerfile.zulu-8u312-jre
new file mode 100644
index 00000000..afb6e0cd
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u312-jre
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-8-azure-jre-8.58.0.13
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure
+
diff --git a/docker/centos/Dockerfile.zulu-8u312-jre-headless b/docker/centos/Dockerfile.zulu-8u312-jre-headless
new file mode 100644
index 00000000..5664ab63
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u312-jre-headless
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM centos:latest
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN rpm --import http://repos.azul.com/azul-repo.key && \
+    curl http://repos.azul.com/azure-only/zulu-azure.repo -o /etc/yum.repos.d/zulu-azure.repo && \
+    yum -q -y update && \
+    yum -q -y upgrade && \
+    yum -q -y install zulu-8-azure-jre-headless-8.58.0.13
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure
diff --git a/docker/debian10/Dockerfile.zulu-11u13-jdk b/docker/debian10/Dockerfile.zulu-11u13-jdk
new file mode 100644
index 00000000..138f9bb8
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u13-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.52+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u13-jre b/docker/debian10/Dockerfile.zulu-11u13-jre
new file mode 100644
index 00000000..dd15c615
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u13-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.52+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u13-jre-headless b/docker/debian10/Dockerfile.zulu-11u13-jre-headless
new file mode 100644
index 00000000..67b5885d
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u13-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.52+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-11u13-jre-headless-tools b/docker/debian10/Dockerfile.zulu-11u13-jre-headless-tools
new file mode 100644
index 00000000..3f84564c
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u13-jre-headless-tools
@@ -0,0 +1,31 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u13-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jdk:11u13-zulu-debian10 AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG INSTALL_DIR=/usr/lib/jvm
+ARG JDK_DIR=${INSTALL_DIR}/zulu-11-azure-amd64
+ARG JRE_DIR=${INSTALL_DIR}/zre-hl-11-azure-amd64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_TOOLS_DIR=${INSTALL_DIR}/zre-hl-tools-11-azure-amd64 && \
+    JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_TOOLS_DIR}
+
+FROM debian:buster
+ARG JRE_TOOLS_DIR=/usr/lib/jvm/zre-hl-tools-11-azure-amd64
+COPY --from=stage2 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+
+RUN cd /usr/bin && find ${JRE_TOOLS_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=${JRE_TOOLS_DIR}
diff --git a/docker/debian10/Dockerfile.zulu-11u13-maven b/docker/debian10/Dockerfile.zulu-11u13-maven
new file mode 100644
index 00000000..a8d50ecf
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u13-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:11u13-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian10/Dockerfile.zulu-13u9-jdk b/docker/debian10/Dockerfile.zulu-13u9-jdk
new file mode 100644
index 00000000..c452dd6f
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-13u9-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.44+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-13u9-jre b/docker/debian10/Dockerfile.zulu-13u9-jre
new file mode 100644
index 00000000..5945635a
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-13u9-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.44+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-13u9-jre-headless b/docker/debian10/Dockerfile.zulu-13u9-jre-headless
new file mode 100644
index 00000000..4f69e846
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-13u9-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.44+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-15u5-jdk b/docker/debian10/Dockerfile.zulu-15u5-jdk
new file mode 100644
index 00000000..d1766fbf
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-15u5-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.36+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-15u5-jre b/docker/debian10/Dockerfile.zulu-15u5-jre
new file mode 100644
index 00000000..7d405c1a
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-15u5-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.36+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-15u5-jre-headless b/docker/debian10/Dockerfile.zulu-15u5-jre-headless
new file mode 100644
index 00000000..d05cd285
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-15u5-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.36+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u322-jdk b/docker/debian10/Dockerfile.zulu-7u322-jdk
new file mode 100644
index 00000000..5297125d
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-7u322-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.50.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u322-jre b/docker/debian10/Dockerfile.zulu-7u322-jre
new file mode 100644
index 00000000..f7adc87a
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-7u322-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.50.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-7u322-jre-headless b/docker/debian10/Dockerfile.zulu-7u322-jre-headless
new file mode 100644
index 00000000..2afd82fc
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-7u322-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.50.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u312-jdk b/docker/debian10/Dockerfile.zulu-8u312-jdk
new file mode 100644
index 00000000..9b280d51
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u312-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.58.0.13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u312-jre b/docker/debian10/Dockerfile.zulu-8u312-jre
new file mode 100644
index 00000000..6dcee610
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u312-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.58.0.13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u312-jre-headless b/docker/debian10/Dockerfile.zulu-8u312-jre-headless
new file mode 100644
index 00000000..cbe46350
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u312-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:buster
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.58.0.13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/debian10/Dockerfile.zulu-8u312-jre-headless-tools b/docker/debian10/Dockerfile.zulu-8u312-jre-headless-tools
new file mode 100644
index 00000000..c1f83709
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u312-jre-headless-tools
@@ -0,0 +1,23 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u312-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u312-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG INSTALL_DIR=/usr/lib/jvm
+ARG JDK_DIR=${INSTALL_DIR}/zulu-8-azure-amd64
+ARG JRE_DIR=${INSTALL_DIR}/zre-hl-8-azure-amd64
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+
+ENV JAVA_HOME=${JRE_DIR}
diff --git a/docker/debian10/Dockerfile.zulu-8u312-maven b/docker/debian10/Dockerfile.zulu-8u312-maven
new file mode 100644
index 00000000..3b6bb65e
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u312-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u312-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian9/Dockerfile.zulu-11u13-jdk b/docker/debian9/Dockerfile.zulu-11u13-jdk
new file mode 100644
index 00000000..b8aa8096
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u13-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.52+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u13-jre b/docker/debian9/Dockerfile.zulu-11u13-jre
new file mode 100644
index 00000000..f6f21201
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u13-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.52+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u13-jre-headless b/docker/debian9/Dockerfile.zulu-11u13-jre-headless
new file mode 100644
index 00000000..73da12f6
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u13-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.52+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-11u13-maven b/docker/debian9/Dockerfile.zulu-11u13-maven
new file mode 100644
index 00000000..f14cc1bc
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-11u13-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:11u13-zulu-debian9
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/debian9/Dockerfile.zulu-13u9-jdk b/docker/debian9/Dockerfile.zulu-13u9-jdk
new file mode 100644
index 00000000..558ee0ca
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-13u9-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.44+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u9-jre b/docker/debian9/Dockerfile.zulu-13u9-jre
new file mode 100644
index 00000000..f0a4fa49
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-13u9-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.44+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-13u9-jre-headless b/docker/debian9/Dockerfile.zulu-13u9-jre-headless
new file mode 100644
index 00000000..10bdab40
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-13u9-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.44+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-15u5-jdk b/docker/debian9/Dockerfile.zulu-15u5-jdk
new file mode 100644
index 00000000..da87f3f9
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-15u5-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.36+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-15u5-jre b/docker/debian9/Dockerfile.zulu-15u5-jre
new file mode 100644
index 00000000..50e603bd
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-15u5-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.36+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-15u5-jre-headless b/docker/debian9/Dockerfile.zulu-15u5-jre-headless
new file mode 100644
index 00000000..9febc61b
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-15u5-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.36+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u322-jdk b/docker/debian9/Dockerfile.zulu-7u322-jdk
new file mode 100644
index 00000000..717cc517
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-7u322-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.50.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u322-jre b/docker/debian9/Dockerfile.zulu-7u322-jre
new file mode 100644
index 00000000..bf6ef2be
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-7u322-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.50.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-7u322-jre-headless b/docker/debian9/Dockerfile.zulu-7u322-jre-headless
new file mode 100644
index 00000000..4ac404ee
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-7u322-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.50.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u312-jdk b/docker/debian9/Dockerfile.zulu-8u312-jdk
new file mode 100644
index 00000000..3cf62b68
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u312-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.58.0.13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u312-jre b/docker/debian9/Dockerfile.zulu-8u312-jre
new file mode 100644
index 00000000..3165a26e
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u312-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.58.0.13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u312-jre-headless b/docker/debian9/Dockerfile.zulu-8u312-jre-headless
new file mode 100644
index 00000000..e21a6401
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u312-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM debian:stretch
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install dirmngr gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.58.0.13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/debian9/Dockerfile.zulu-8u312-maven b/docker/debian9/Dockerfile.zulu-8u312-maven
new file mode 100644
index 00000000..d39d4d41
--- /dev/null
+++ b/docker/debian9/Dockerfile.zulu-8u312-maven
@@ -0,0 +1,31 @@
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u312-zulu-debian9
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG MAVEN_VERSION=3.6.3
+ARG USER_HOME_DIR="/root"
+ARG SHA=c35a1803a6e70a126e80b2b3ae33eed961f83ed74d18fcd16909b2d44d7dada3203f1ffe726c17ef8dcca2dcaa9fca676987befeadc9b9f759967a8cb77181c0
+ARG BASE_URL=https://apache.osuosl.org/maven/maven-3/${MAVEN_VERSION}/binaries
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl && \
+    mkdir -p /usr/share/maven /usr/share/maven/ref && \
+    curl -fsSL -o /tmp/apache-maven.tar.gz ${BASE_URL}/apache-maven-${MAVEN_VERSION}-bin.tar.gz && \
+    echo "${SHA}  /tmp/apache-maven.tar.gz" | sha512sum -c - && \
+    tar -xzf /tmp/apache-maven.tar.gz -C /usr/share/maven --strip-components=1 && \
+    rm -f /tmp/apache-maven.tar.gz && \
+    ln -s /usr/share/maven/bin/mvn /usr/bin/mvn && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV MAVEN_HOME /usr/share/maven
+ENV MAVEN_CONFIG "$USER_HOME_DIR/.m2"
+
+COPY Maven/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh
+COPY Maven/settings-docker.xml /usr/share/maven/ref/
+
+ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"]
+CMD ["mvn"]
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u13-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-11u13-jdk
new file mode 100644
index 00000000..33cef178
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u13-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.52+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u13-jre b/docker/ubuntu-18.04/Dockerfile.zulu-11u13-jre
new file mode 100644
index 00000000..6d560ff2
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u13-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.52+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-11u13-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-11u13-jre-headless
new file mode 100644
index 00000000..0f044b44
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-11u13-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.52+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u9-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-13u9-jdk
new file mode 100644
index 00000000..8786e531
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u9-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.44+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u9-jre b/docker/ubuntu-18.04/Dockerfile.zulu-13u9-jre
new file mode 100644
index 00000000..ef972c7a
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u9-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.44+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-13u9-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-13u9-jre-headless
new file mode 100644
index 00000000..fe6784c3
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-13u9-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.44+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u5-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-15u5-jdk
new file mode 100644
index 00000000..9c721305
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u5-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.36+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u5-jre b/docker/ubuntu-18.04/Dockerfile.zulu-15u5-jre
new file mode 100644
index 00000000..58db1c97
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u5-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.36+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-15u5-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-15u5-jre-headless
new file mode 100644
index 00000000..3e46c04a
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-15u5-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.36+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u322-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-7u322-jdk
new file mode 100644
index 00000000..6c4f90c0
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u322-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.50.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u322-jre b/docker/ubuntu-18.04/Dockerfile.zulu-7u322-jre
new file mode 100644
index 00000000..65dd429e
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u322-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.50.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-7u322-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-7u322-jre-headless
new file mode 100644
index 00000000..8ef2b764
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-7u322-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.50.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u312-jdk b/docker/ubuntu-18.04/Dockerfile.zulu-8u312-jdk
new file mode 100644
index 00000000..58d8183e
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u312-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.58.0.13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u312-jre b/docker/ubuntu-18.04/Dockerfile.zulu-8u312-jre
new file mode 100644
index 00000000..73608ca0
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u312-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.58.0.13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu-18.04/Dockerfile.zulu-8u312-jre-headless b/docker/ubuntu-18.04/Dockerfile.zulu-8u312-jre-headless
new file mode 100644
index 00000000..64aa70e5
--- /dev/null
+++ b/docker/ubuntu-18.04/Dockerfile.zulu-8u312-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:bionic
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.58.0.13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u13-jdk b/docker/ubuntu/Dockerfile.zulu-11u13-jdk
new file mode 100644
index 00000000..3a2904d2
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u13-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jdk=11.52+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u13-jre b/docker/ubuntu/Dockerfile.zulu-11u13-jre
new file mode 100644
index 00000000..10629eb0
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u13-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre=11.52+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u13-jre-headless b/docker/ubuntu/Dockerfile.zulu-11u13-jre-headless
new file mode 100644
index 00000000..b4a4283b
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u13-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-11-azure-jre-headless=11.52+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-11-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-11u13-jre-headless-tools b/docker/ubuntu/Dockerfile.zulu-11u13-jre-headless-tools
new file mode 100644
index 00000000..d5b77b43
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u13-jre-headless-tools
@@ -0,0 +1,31 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u13-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jdk:11u13-zulu-ubuntu AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG INSTALL_DIR=/usr/lib/jvm
+ARG JDK_DIR=${INSTALL_DIR}/zulu-11-azure-amd64
+ARG JRE_DIR=${INSTALL_DIR}/zre-hl-11-azure-amd64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_TOOLS_DIR=${INSTALL_DIR}/zre-hl-tools-11-azure-amd64 && \
+    JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_TOOLS_DIR}
+
+FROM ubuntu:focal
+ARG JRE_TOOLS_DIR=/usr/lib/jvm/zre-hl-tools-11-azure-amd64
+COPY --from=stage2 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+
+RUN cd /usr/bin && find ${JRE_TOOLS_DIR}/bin -type f -perm -a=x -exec ln -s {} . \; && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=${JRE_TOOLS_DIR}
diff --git a/docker/ubuntu/Dockerfile.zulu-13u9-jdk b/docker/ubuntu/Dockerfile.zulu-13u9-jdk
new file mode 100644
index 00000000..7d858e52
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-13u9-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jdk=13.44+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u9-jre b/docker/ubuntu/Dockerfile.zulu-13u9-jre
new file mode 100644
index 00000000..08460398
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-13u9-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre=13.44+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-13u9-jre-headless b/docker/ubuntu/Dockerfile.zulu-13u9-jre-headless
new file mode 100644
index 00000000..b5670527
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-13u9-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-13-azure-jre-headless=13.44+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-13-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-15u5-jdk b/docker/ubuntu/Dockerfile.zulu-15u5-jdk
new file mode 100644
index 00000000..1c6cd5af
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-15u5-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jdk=15.36+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-15-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-15u5-jre b/docker/ubuntu/Dockerfile.zulu-15u5-jre
new file mode 100644
index 00000000..2157af40
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-15u5-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre=15.36+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-15-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-15u5-jre-headless b/docker/ubuntu/Dockerfile.zulu-15u5-jre-headless
new file mode 100644
index 00000000..ba1c20d2
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-15u5-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-15-azure-jre-headless=15.36+13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-15-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u322-jdk b/docker/ubuntu/Dockerfile.zulu-7u322-jdk
new file mode 100644
index 00000000..214a53a8
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-7u322-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jdk=7.50.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u322-jre b/docker/ubuntu/Dockerfile.zulu-7u322-jre
new file mode 100644
index 00000000..9dc5d43a
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-7u322-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre=7.50.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-7u322-jre-headless b/docker/ubuntu/Dockerfile.zulu-7u322-jre-headless
new file mode 100644
index 00000000..01c67de3
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-7u322-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-7-azure-jre-headless=7.50.0.11* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-7-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u312-jdk b/docker/ubuntu/Dockerfile.zulu-8u312-jdk
new file mode 100644
index 00000000..1857983c
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u312-jdk
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jdk=8.58.0.13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zulu-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u312-jre b/docker/ubuntu/Dockerfile.zulu-8u312-jre
new file mode 100644
index 00000000..5b8bbc69
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u312-jre
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre=8.58.0.13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u312-jre-headless b/docker/ubuntu/Dockerfile.zulu-8u312-jre-headless
new file mode 100644
index 00000000..bb95cc44
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u312-jre-headless
@@ -0,0 +1,21 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM ubuntu:focal
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install gnupg software-properties-common && \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0x219BD9C9 && \
+    apt-add-repository "deb http://repos.azul.com/azure-only/zulu/apt stable main" && \
+    apt-get -qq update && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y --no-install-recommends install zulu-8-azure-jre-headless=8.58.0.13* && \
+    apt-get -qq -y purge gnupg software-properties-common && \
+    apt -y autoremove && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV JAVA_HOME=/usr/lib/jvm/zre-hl-8-azure-amd64
diff --git a/docker/ubuntu/Dockerfile.zulu-8u312-jre-headless-tools b/docker/ubuntu/Dockerfile.zulu-8u312-jre-headless-tools
new file mode 100644
index 00000000..611f8f4d
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u312-jre-headless-tools
@@ -0,0 +1,23 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u312-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u312-zulu-ubuntu
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG INSTALL_DIR=/usr/lib/jvm
+ARG JDK_DIR=${INSTALL_DIR}/zulu-8-azure-amd64
+ARG JRE_DIR=${INSTALL_DIR}/zre-hl-8-azure-amd64
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -s {} . \;
+
+ENV JAVA_HOME=${JRE_DIR}
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-11u13-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-11u13-jre-tools
new file mode 100644
index 00000000..6a9fb485
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-11u13-jre-tools
@@ -0,0 +1,38 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:11u13-zulu-windowsservercore AS stage1
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-11/11.0.13
+ARG JRE_PACKAGE=zulu-11-azure-jre_11.52.13-11.0.13-win_x64.msi
+ARG JRE_DIR="C:\Program Files\Zulu\zulu-11-jre"
+ARG JRE_TOOLS_DIR=C:\zulu-11-azure-jre-tools_11.52.13-11.0.13-win_x64
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-11"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.13/zulu-11-azure-jre_11.52.13-11.0.13-win_x64.msi', '%JRE_PACKAGE%') && \
+    msiexec /quiet /i %JRE_PACKAGE% && \
+    del %JRE_PACKAGE%
+
+RUN jimage.exe list "%JRE_DIR%\lib\modules" | findstr "Module: " > modules.out && \
+    powershell -Command "(Get-Content modules.out) -replace 'Module: ', '' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) -join ',' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) + ',jdk.jcmd' | Out-File modules.out" && \
+    for /f %P in ('type modules.out') do setx /m JRE_MODULES %P && \
+    del modules.out
+
+RUN jlink --no-header-files --strip-debug --module-path "%JDK_DIR%\jmods" --add-modules %JRE_MODULES% --output %JRE_TOOLS_DIR%
+
+FROM mcr.microsoft.com/windows/nanoserver:2004
+
+ARG JRE_TOOLS_DIR="C:\zulu-11-azure-jre-tools_11.52.13-11.0.13-win_x64"
+
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+COPY --from=stage1 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+USER ContainerUser
\ No newline at end of file
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-13u9-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-13u9-jre-tools
new file mode 100644
index 00000000..c2ad2dee
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-13u9-jre-tools
@@ -0,0 +1,38 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:13u9-zulu-windowsservercore AS stage1
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-13/13.0.9
+ARG JRE_PACKAGE=zulu-13-azure-jre_13.44.13-13.0.9-win_x64.msi
+ARG JRE_DIR="C:\Program Files\Zulu\zulu-13-jre"
+ARG JRE_TOOLS_DIR=C:\zulu-13-azure-jre-tools_13.44.13-13.0.9-win_x64
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-13"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.9/zulu-13-azure-jre_13.44.13-13.0.9-win_x64.msi', '%JRE_PACKAGE%') && \
+    msiexec /quiet /i %JRE_PACKAGE% && \
+    del %JRE_PACKAGE%
+
+RUN jimage.exe list "%JRE_DIR%\lib\modules" | findstr "Module: " > modules.out && \
+    powershell -Command "(Get-Content modules.out) -replace 'Module: ', '' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) -join ',' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) + ',jdk.jcmd' | Out-File modules.out" && \
+    for /f %P in ('type modules.out') do setx /m JRE_MODULES %P && \
+    del modules.out
+
+RUN jlink --no-header-files --strip-debug --module-path "%JDK_DIR%\jmods" --add-modules %JRE_MODULES% --output %JRE_TOOLS_DIR%
+
+FROM mcr.microsoft.com/windows/nanoserver:2004
+
+ARG JRE_TOOLS_DIR="C:\zulu-13-azure-jre-tools_13.44.13-13.0.9-win_x64"
+
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+COPY --from=stage1 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+USER ContainerUser
\ No newline at end of file
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-15u5-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-15u5-jre-tools
new file mode 100644
index 00000000..ed389794
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-15u5-jre-tools
@@ -0,0 +1,38 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:15u5-zulu-windowsservercore AS stage1
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-15/15.0.5
+ARG JRE_PACKAGE=zulu-15-azure-jre_15.36.13-15.0.5-win_x64.msi
+ARG JRE_DIR="C:\Program Files\Zulu\zulu-15-jre"
+ARG JRE_TOOLS_DIR=C:\zulu-15-azure-jre-tools_15.36.13-15.0.5-win_x64
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-15"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.5/zulu-15-azure-jre_15.36.13-15.0.5-win_x64.msi', '%JRE_PACKAGE%') && \
+    msiexec /quiet /i %JRE_PACKAGE% && \
+    del %JRE_PACKAGE%
+
+RUN jimage.exe list "%JRE_DIR%\lib\modules" | findstr "Module: " > modules.out && \
+    powershell -Command "(Get-Content modules.out) -replace 'Module: ', '' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) -join ',' | Out-File modules.out" && \
+    powershell -Command "(Get-Content modules.out) + ',jdk.jcmd' | Out-File modules.out" && \
+    for /f %P in ('type modules.out') do setx /m JRE_MODULES %P && \
+    del modules.out
+
+RUN jlink --no-header-files --strip-debug --module-path "%JDK_DIR%\jmods" --add-modules %JRE_MODULES% --output %JRE_TOOLS_DIR%
+
+FROM mcr.microsoft.com/windows/nanoserver:2004
+
+ARG JRE_TOOLS_DIR="C:\zulu-15-azure-jre-tools_15.36.13-15.0.5-win_x64"
+
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+COPY --from=stage1 ${JRE_TOOLS_DIR} ${JRE_TOOLS_DIR}
+USER ContainerUser
\ No newline at end of file
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-7u322-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-7u322-jre-tools
new file mode 100644
index 00000000..4d150ca3
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-7u322-jre-tools
@@ -0,0 +1,31 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:7u322-zulu-windowsservercore AS stage1
+FROM mcr.microsoft.com/windows/nanoserver:2004
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-7/7u322
+ARG JRE_PACKAGE=zulu-7-azure-jre_7.50.0.11-7.0.322-win_x64.zip
+ARG JRE_DIR=zulu-7-azure-jre_7.50.0.11-7.0.322-win_x64
+ARG JRE_TOOLS_DIR=zulu-7-azure-jre-tools_7.50.0.11-7.0.322-win_x64
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-7"
+
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "C:\%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+RUN curl https://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%JRE_PACKAGE% -o %JRE_PACKAGE% && \
+    tar -xf %JRE_PACKAGE% && \
+    del %JRE_PACKAGE% && \
+    move %JRE_DIR% %JRE_TOOLS_DIR%
+
+COPY --from=stage1 ${JDK_DIR}/bin/jstack.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_TOOLS_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/bin/attach.dll ${JRE_TOOLS_DIR}/bin
+USER ContainerUser
\ No newline at end of file
diff --git a/docker/windowsnanoserver-2004/Dockerfile.zulu-8u312-jre-tools b/docker/windowsnanoserver-2004/Dockerfile.zulu-8u312-jre-tools
new file mode 100644
index 00000000..266ba97c
--- /dev/null
+++ b/docker/windowsnanoserver-2004/Dockerfile.zulu-8u312-jre-tools
@@ -0,0 +1,31 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u312-zulu-windowsservercore AS stage1
+FROM mcr.microsoft.com/windows/nanoserver:2004
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG PACKAGE_DIR=zulu-8/8u312
+ARG JRE_PACKAGE=zulu-8-azure-jre_8.58.0.13-8.0.312-win_x64.zip
+ARG JRE_DIR=zulu-8-azure-jre_8.58.0.13-8.0.312-win_x64
+ARG JRE_TOOLS_DIR=zulu-8-azure-jre-tools_8.58.0.13-8.0.312-win_x64
+ARG JDK_DIR="C:\Program Files\Zulu\zulu-8"
+
+USER ContainerAdministrator
+RUN setx /m JAVA_HOME "C:\%JRE_TOOLS_DIR%" && \
+    setx /m PATH "%PATH%;%JAVA_HOME%\bin"
+
+RUN curl https://repos.azul.com/azure-only/zulu/packages/%PACKAGE_DIR%/%JRE_PACKAGE% -o %JRE_PACKAGE% && \
+    tar -xf %JRE_PACKAGE% && \
+    del %JRE_PACKAGE% && \
+    move %JRE_DIR% %JRE_TOOLS_DIR%
+
+COPY --from=stage1 ${JDK_DIR}/bin/jstack.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd.exe ${JRE_TOOLS_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_TOOLS_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/bin/attach.dll ${JRE_TOOLS_DIR}/bin
+USER ContainerUser
\ No newline at end of file
diff --git a/docker/windowsservercore/Dockerfile.zulu-11u13-jdk b/docker/windowsservercore/Dockerfile.zulu-11u13-jdk
new file mode 100644
index 00000000..7a880f3a
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-11u13-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-11-azure-jdk_11.52.13-11.0.13-win_x64.msi && \
+    setx PACKAGE_DIR zulu-11/11.0.13 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-11"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.13/zulu-11-azure-jdk_11.52.13-11.0.13-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-11u13-jre b/docker/windowsservercore/Dockerfile.zulu-11u13-jre
new file mode 100644
index 00000000..bcc2b34c
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-11u13-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-11-azure-jre_11.52.13-11.0.13-win_x64.msi && \
+    setx PACKAGE_DIR zulu-11/11.0.13 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-11-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.13/zulu-11-azure-jre_11.52.13-11.0.13-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-11u13-jre-tools b/docker/windowsservercore/Dockerfile.zulu-11u13-jre-tools
new file mode 100644
index 00000000..bcc2b34c
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-11u13-jre-tools
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-11-azure-jre_11.52.13-11.0.13-win_x64.msi && \
+    setx PACKAGE_DIR zulu-11/11.0.13 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-11-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-11/11.0.13/zulu-11-azure-jre_11.52.13-11.0.13-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-13u9-jdk b/docker/windowsservercore/Dockerfile.zulu-13u9-jdk
new file mode 100644
index 00000000..63c13ea8
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-13u9-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-13-azure-jdk_13.44.13-13.0.9-win_x64.msi && \
+    setx PACKAGE_DIR zulu-13/13.0.9 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-13"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.9/zulu-13-azure-jdk_13.44.13-13.0.9-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-13u9-jre b/docker/windowsservercore/Dockerfile.zulu-13u9-jre
new file mode 100644
index 00000000..db63f57f
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-13u9-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-13-azure-jre_13.44.13-13.0.9-win_x64.msi && \
+    setx PACKAGE_DIR zulu-13/13.0.9 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-13-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.9/zulu-13-azure-jre_13.44.13-13.0.9-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-13u9-jre-tools b/docker/windowsservercore/Dockerfile.zulu-13u9-jre-tools
new file mode 100644
index 00000000..db63f57f
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-13u9-jre-tools
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-13-azure-jre_13.44.13-13.0.9-win_x64.msi && \
+    setx PACKAGE_DIR zulu-13/13.0.9 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-13-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-13/13.0.9/zulu-13-azure-jre_13.44.13-13.0.9-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-15u5-jdk b/docker/windowsservercore/Dockerfile.zulu-15u5-jdk
new file mode 100644
index 00000000..15866b56
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-15u5-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-15-azure-jdk_15.36.13-15.0.5-win_x64.msi && \
+    setx PACKAGE_DIR zulu-15/15.0.5 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-15"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.5/zulu-15-azure-jdk_15.36.13-15.0.5-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-15u5-jre b/docker/windowsservercore/Dockerfile.zulu-15u5-jre
new file mode 100644
index 00000000..cb1b8ec3
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-15u5-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-15-azure-jre_15.36.13-15.0.5-win_x64.msi && \
+    setx PACKAGE_DIR zulu-15/15.0.5 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-15-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.5/zulu-15-azure-jre_15.36.13-15.0.5-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-15u5-jre-tools b/docker/windowsservercore/Dockerfile.zulu-15u5-jre-tools
new file mode 100644
index 00000000..cb1b8ec3
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-15u5-jre-tools
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-15-azure-jre_15.36.13-15.0.5-win_x64.msi && \
+    setx PACKAGE_DIR zulu-15/15.0.5 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-15-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-15/15.0.5/zulu-15-azure-jre_15.36.13-15.0.5-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-7u322-jdk b/docker/windowsservercore/Dockerfile.zulu-7u322-jdk
new file mode 100644
index 00000000..c4d1493f
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-7u322-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-7-azure-jdk_7.50.0.11-7.0.322-win_x64.msi && \
+    setx PACKAGE_DIR zulu-7/7u322 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-7"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u322/zulu-7-azure-jdk_7.50.0.11-7.0.322-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-7u322-jre b/docker/windowsservercore/Dockerfile.zulu-7u322-jre
new file mode 100644
index 00000000..7f3be12a
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-7u322-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-7-azure-jre_7.50.0.11-7.0.322-win_x64.msi && \
+    setx PACKAGE_DIR zulu-7/7u322 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-7-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u322/zulu-7-azure-jre_7.50.0.11-7.0.322-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-7u322-jre-tools b/docker/windowsservercore/Dockerfile.zulu-7u322-jre-tools
new file mode 100644
index 00000000..7f3be12a
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-7u322-jre-tools
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-7-azure-jre_7.50.0.11-7.0.322-win_x64.msi && \
+    setx PACKAGE_DIR zulu-7/7u322 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-7-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-7/7u322/zulu-7-azure-jre_7.50.0.11-7.0.322-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-8u312-jdk b/docker/windowsservercore/Dockerfile.zulu-8u312-jdk
new file mode 100644
index 00000000..1ab657b3
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-8u312-jdk
@@ -0,0 +1,17 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-8-azure-jdk_8.58.0.13-8.0.312-win_x64.msi && \
+    setx PACKAGE_DIR zulu-8/8u312 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-8"
+    
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u312/zulu-8-azure-jdk_8.58.0.13-8.0.312-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-8u312-jre b/docker/windowsservercore/Dockerfile.zulu-8u312-jre
new file mode 100644
index 00000000..655c79d1
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-8u312-jre
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-8-azure-jre_8.58.0.13-8.0.312-win_x64.msi && \
+    setx PACKAGE_DIR zulu-8/8u312 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-8-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u312/zulu-8-azure-jre_8.58.0.13-8.0.312-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%
diff --git a/docker/windowsservercore/Dockerfile.zulu-8u312-jre-tools b/docker/windowsservercore/Dockerfile.zulu-8u312-jre-tools
new file mode 100644
index 00000000..655c79d1
--- /dev/null
+++ b/docker/windowsservercore/Dockerfile.zulu-8u312-jre-tools
@@ -0,0 +1,16 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/windows/servercore:ltsc2016
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+RUN setx PACKAGE zulu-8-azure-jre_8.58.0.13-8.0.312-win_x64.msi && \
+    setx PACKAGE_DIR zulu-8/8u312 && \
+    setx /m JAVA_HOME "C:\Program Files\Zulu\zulu-8-jre"
+
+RUN powershell -Command [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;(new-object System.Net.WebClient).DownloadFile('https://repos.azul.com/azure-only/zulu/packages/zulu-8/8u312/zulu-8-azure-jre_8.58.0.13-8.0.312-win_x64.msi', 'C:\%PACKAGE%')
+RUN msiexec /quiet /i C:\%PACKAGE% && \
+    del C:\%PACKAGE%

From b2383d547e362bb0c601c2d0ab79877472dd2bdf Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 22 Oct 2021 11:17:13 -0500
Subject: [PATCH 251/264] Added Dockerfiles for October release of Zulu with
 Tomcat

---
 ...file.zulu-11u13-jre-headless-tools-tomcat8 | 72 +++++++++++++++++++
 ...file.zulu-11u13-jre-headless-tools-tomcat9 | 72 +++++++++++++++++++
 ...file.zulu-8u312-jre-headless-tools-tomcat8 | 67 +++++++++++++++++
 ...file.zulu-8u312-jre-headless-tools-tomcat9 | 67 +++++++++++++++++
 4 files changed, 278 insertions(+)
 create mode 100644 docker/alpine/Dockerfile.zulu-11u13-jre-headless-tools-tomcat8
 create mode 100644 docker/alpine/Dockerfile.zulu-11u13-jre-headless-tools-tomcat9
 create mode 100644 docker/alpine/Dockerfile.zulu-8u312-jre-headless-tools-tomcat8
 create mode 100644 docker/alpine/Dockerfile.zulu-8u312-jre-headless-tools-tomcat9

diff --git a/docker/alpine/Dockerfile.zulu-11u13-jre-headless-tools-tomcat8 b/docker/alpine/Dockerfile.zulu-11u13-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..604c39f6
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u13-jre-headless-tools-tomcat8
@@ -0,0 +1,72 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u13-zulu-alpine AS stage1
+FROM mcr.microsoft.com/java/jdk:11u13-zulu-alpine AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-jdk_11.52.13-11.0.13-linux_musl_x64
+ARG JRE_DIR=/usr/lib/jvm/zulu-11-azure-jre-headless_11.52.13-11.0.13-linux_musl_x64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM alpine AS stage3
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.72
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apk add --update openssh-server bash openrc && \
+    apk update && \
+    apk upgrade && \
+    rm -rf /var/cache/apk/* && \
+    # Remove unnecessary services
+    rm -f /etc/init.d/hwdrivers \
+          /etc/init.d/hwclock \
+          /etc/init.d/mtab \
+          /etc/init.d/bootmisc \
+          /etc/init.d/modules \
+          /etc/init.d/modules-load \
+          /etc/init.d/modloop && \
+    # Install Tomcat
+    wget -O /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/alpine/Dockerfile.zulu-11u13-jre-headless-tools-tomcat9 b/docker/alpine/Dockerfile.zulu-11u13-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..76711a08
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-11u13-jre-headless-tools-tomcat9
@@ -0,0 +1,72 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u13-zulu-alpine AS stage1
+FROM mcr.microsoft.com/java/jdk:11u13-zulu-alpine AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-jdk_11.52.13-11.0.13-linux_musl_x64
+ARG JRE_DIR=/usr/lib/jvm/zulu-11-azure-jre-headless_11.52.13-11.0.13-linux_musl_x64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM alpine AS stage3
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.54
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apk add --update openssh-server bash openrc && \
+    apk update && \
+    apk upgrade && \
+    rm -rf /var/cache/apk/* && \
+    # Remove unnecessary services
+    rm -f /etc/init.d/hwdrivers \
+          /etc/init.d/hwclock \
+          /etc/init.d/mtab \
+          /etc/init.d/bootmisc \
+          /etc/init.d/modules \
+          /etc/init.d/modules-load \
+          /etc/init.d/modloop && \
+    # Install Tomcat
+    wget -O /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/alpine/Dockerfile.zulu-8u312-jre-headless-tools-tomcat8 b/docker/alpine/Dockerfile.zulu-8u312-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..bdd748b9
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u312-jre-headless-tools-tomcat8
@@ -0,0 +1,67 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u312-zulu-alpine AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u312-zulu-alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-jdk_8.58.0.13-8.0.312-linux_musl_x64
+ARG JRE_DIR=/usr/lib/jvm/zulu-8-azure-jre-headless_8.58.0.13-8.0.312-linux_musl_x64
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.72
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apk add --update openssh-server bash openrc && \
+    apk update && \
+    apk upgrade && \
+    rm -rf /var/cache/apk/* && \
+    # Remove unnecessary services
+    rm -f /etc/init.d/hwdrivers \
+          /etc/init.d/hwclock \
+          /etc/init.d/mtab \
+          /etc/init.d/bootmisc \
+          /etc/init.d/modules \
+          /etc/init.d/modules-load \
+          /etc/init.d/modloop && \
+    # Install Tomcat
+    wget -O /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/alpine/Dockerfile.zulu-8u312-jre-headless-tools-tomcat9 b/docker/alpine/Dockerfile.zulu-8u312-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..27c9ab53
--- /dev/null
+++ b/docker/alpine/Dockerfile.zulu-8u312-jre-headless-tools-tomcat9
@@ -0,0 +1,67 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u312-zulu-alpine AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u312-zulu-alpine
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-jdk_8.58.0.13-8.0.312-linux_musl_x64
+ARG JRE_DIR=/usr/lib/jvm/zulu-8-azure-jre-headless_8.58.0.13-8.0.312-linux_musl_x64
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.54
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apk add --update openssh-server bash openrc && \
+    apk update && \
+    apk upgrade && \
+    rm -rf /var/cache/apk/* && \
+    # Remove unnecessary services
+    rm -f /etc/init.d/hwdrivers \
+          /etc/init.d/hwclock \
+          /etc/init.d/mtab \
+          /etc/init.d/bootmisc \
+          /etc/init.d/modules \
+          /etc/init.d/modules-load \
+          /etc/init.d/modloop && \
+    # Install Tomcat
+    wget -O /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f /tmp/apache-tomcat-${TOMCAT_VERSION}.tar.gz
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]

From 6cceea0d60d1418e849279039f7a7f14c06756b8 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 22 Oct 2021 11:18:32 -0500
Subject: [PATCH 252/264] Added Dockerfiles for October release of Zulu with
 Tomcat

---
 ...file.zulu-11u13-jre-headless-tools-tomcat8 | 62 +++++++++++++++++++
 ...file.zulu-11u13-jre-headless-tools-tomcat9 | 62 +++++++++++++++++++
 ...file.zulu-8u312-jre-headless-tools-tomcat8 | 57 +++++++++++++++++
 ...file.zulu-8u312-jre-headless-tools-tomcat9 | 57 +++++++++++++++++
 4 files changed, 238 insertions(+)
 create mode 100644 docker/centos/Dockerfile.zulu-11u13-jre-headless-tools-tomcat8
 create mode 100644 docker/centos/Dockerfile.zulu-11u13-jre-headless-tools-tomcat9
 create mode 100644 docker/centos/Dockerfile.zulu-8u312-jre-headless-tools-tomcat8
 create mode 100644 docker/centos/Dockerfile.zulu-8u312-jre-headless-tools-tomcat9

diff --git a/docker/centos/Dockerfile.zulu-11u13-jre-headless-tools-tomcat8 b/docker/centos/Dockerfile.zulu-11u13-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..837d7970
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u13-jre-headless-tools-tomcat8
@@ -0,0 +1,62 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u13-zulu-centos AS stage1
+FROM mcr.microsoft.com/java/jdk:11u13-zulu-centos AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM centos:latest AS stage3
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.72
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+RUN yum -q -y update && \
+    yum -q -y install unzip && \
+    yum -q -y upgrade && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
+       
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/centos/Dockerfile.zulu-11u13-jre-headless-tools-tomcat9 b/docker/centos/Dockerfile.zulu-11u13-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..026cf09b
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-11u13-jre-headless-tools-tomcat9
@@ -0,0 +1,62 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u13-zulu-centos AS stage1
+FROM mcr.microsoft.com/java/jdk:11u13-zulu-centos AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM centos:latest AS stage3
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.54
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+RUN yum -q -y update && \
+    yum -q -y install unzip && \
+    yum -q -y upgrade && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
+       
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/centos/Dockerfile.zulu-8u312-jre-headless-tools-tomcat8 b/docker/centos/Dockerfile.zulu-8u312-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..ede4cf8c
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u312-jre-headless-tools-tomcat8
@@ -0,0 +1,57 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u312-zulu-centos AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u312-zulu-centos
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.72
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+RUN yum -q -y update && \
+    yum -q -y install unzip && \
+    yum -q -y upgrade && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
+       
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/centos/Dockerfile.zulu-8u312-jre-headless-tools-tomcat9 b/docker/centos/Dockerfile.zulu-8u312-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..101c7686
--- /dev/null
+++ b/docker/centos/Dockerfile.zulu-8u312-jre-headless-tools-tomcat9
@@ -0,0 +1,57 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u312-zulu-centos AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u312-zulu-centos
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.54
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+RUN yum -q -y update && \
+    yum -q -y install unzip && \
+    yum -q -y upgrade && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz
+       
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]

From e9c2b3e8def1a1fe7297db32b597d89f5962155c Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 22 Oct 2021 11:19:33 -0500
Subject: [PATCH 253/264] Added Dockerfiles for October release of Zulu with
 Tomcat

---
 ...file.zulu-11u13-jre-headless-tools-tomcat8 | 66 +++++++++++++++++++
 ...file.zulu-11u13-jre-headless-tools-tomcat9 | 66 +++++++++++++++++++
 ...file.zulu-8u312-jre-headless-tools-tomcat8 | 61 +++++++++++++++++
 ...file.zulu-8u312-jre-headless-tools-tomcat9 | 61 +++++++++++++++++
 4 files changed, 254 insertions(+)
 create mode 100644 docker/debian10/Dockerfile.zulu-11u13-jre-headless-tools-tomcat8
 create mode 100644 docker/debian10/Dockerfile.zulu-11u13-jre-headless-tools-tomcat9
 create mode 100644 docker/debian10/Dockerfile.zulu-8u312-jre-headless-tools-tomcat8
 create mode 100644 docker/debian10/Dockerfile.zulu-8u312-jre-headless-tools-tomcat9

diff --git a/docker/debian10/Dockerfile.zulu-11u13-jre-headless-tools-tomcat8 b/docker/debian10/Dockerfile.zulu-11u13-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..913463d3
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u13-jre-headless-tools-tomcat8
@@ -0,0 +1,66 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u13-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jdk:11u13-zulu-debian10 AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure-amd64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM debian:buster AS stage3
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.72
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install ca-certificates curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove --purge && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/debian10/Dockerfile.zulu-11u13-jre-headless-tools-tomcat9 b/docker/debian10/Dockerfile.zulu-11u13-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..fd6f712f
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-11u13-jre-headless-tools-tomcat9
@@ -0,0 +1,66 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u13-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jdk:11u13-zulu-debian10 AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure-amd64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM debian:buster AS stage3
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.54
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install ca-certificates curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove --purge && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/debian10/Dockerfile.zulu-8u312-jre-headless-tools-tomcat8 b/docker/debian10/Dockerfile.zulu-8u312-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..56ecc5b6
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u312-jre-headless-tools-tomcat8
@@ -0,0 +1,61 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u312-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u312-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.72
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove --purge && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/debian10/Dockerfile.zulu-8u312-jre-headless-tools-tomcat9 b/docker/debian10/Dockerfile.zulu-8u312-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..9cacecf8
--- /dev/null
+++ b/docker/debian10/Dockerfile.zulu-8u312-jre-headless-tools-tomcat9
@@ -0,0 +1,61 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u312-zulu-debian10 AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u312-zulu-debian10
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.54
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove --purge && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]

From 5de7c9c3928e6d107484ca0e6a12e52bd9ae00d8 Mon Sep 17 00:00:00 2001
From: Tom Karbowski <tkarbowski@azul.com>
Date: Fri, 22 Oct 2021 11:21:11 -0500
Subject: [PATCH 254/264] Added Dockerfiles for October release of Zulu with
 Tomcat

---
 ...file.zulu-11u13-jre-headless-tools-tomcat8 | 66 +++++++++++++++++++
 ...file.zulu-11u13-jre-headless-tools-tomcat9 | 66 +++++++++++++++++++
 ...file.zulu-8u312-jre-headless-tools-tomcat8 | 61 +++++++++++++++++
 ...file.zulu-8u312-jre-headless-tools-tomcat9 | 61 +++++++++++++++++
 4 files changed, 254 insertions(+)
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u13-jre-headless-tools-tomcat8
 create mode 100644 docker/ubuntu/Dockerfile.zulu-11u13-jre-headless-tools-tomcat9
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u312-jre-headless-tools-tomcat8
 create mode 100644 docker/ubuntu/Dockerfile.zulu-8u312-jre-headless-tools-tomcat9

diff --git a/docker/ubuntu/Dockerfile.zulu-11u13-jre-headless-tools-tomcat8 b/docker/ubuntu/Dockerfile.zulu-11u13-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..aa5fccce
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u13-jre-headless-tools-tomcat8
@@ -0,0 +1,66 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u13-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jdk:11u13-zulu-ubuntu AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure-amd64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM ubuntu:focal AS stage3
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.72
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install ca-certificates curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove --purge && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/ubuntu/Dockerfile.zulu-11u13-jre-headless-tools-tomcat9 b/docker/ubuntu/Dockerfile.zulu-11u13-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..7c827557
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-11u13-jre-headless-tools-tomcat9
@@ -0,0 +1,66 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jre-headless:11u13-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jdk:11u13-zulu-ubuntu AS stage2
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-11-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-11-azure-amd64
+
+COPY --from=stage1 ${JRE_DIR} ${JRE_DIR}
+
+RUN JRE_MODULES=$(jimage list ${JRE_DIR}/lib/modules | grep "Module: " | sed -e "s/^Module: //" | tr '\n' ',') && \
+    JRE_MODULES=${JRE_MODULES}jdk.jcmd, && \
+    rm -rf ${JRE_DIR} && \
+    jlink --no-header-files --strip-debug --module-path ${JDK_DIR}/jmods --add-modules ${JRE_MODULES} --output ${JRE_DIR}
+
+FROM ubuntu:focal AS stage3
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.54
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage2 ${JRE_DIR} ${JRE_DIR}
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 11 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install ca-certificates curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove --purge && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/ubuntu/Dockerfile.zulu-8u312-jre-headless-tools-tomcat8 b/docker/ubuntu/Dockerfile.zulu-8u312-jre-headless-tools-tomcat8
new file mode 100644
index 00000000..18af8090
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u312-jre-headless-tools-tomcat8
@@ -0,0 +1,61 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u312-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u312-zulu-ubuntu
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+
+ARG TOMCAT_MAJOR=8
+ARG TOMCAT_VERSION=8.5.72
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove --purge && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v8/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v8/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v8/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v8/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]
diff --git a/docker/ubuntu/Dockerfile.zulu-8u312-jre-headless-tools-tomcat9 b/docker/ubuntu/Dockerfile.zulu-8u312-jre-headless-tools-tomcat9
new file mode 100644
index 00000000..d9cfd0ce
--- /dev/null
+++ b/docker/ubuntu/Dockerfile.zulu-8u312-jre-headless-tools-tomcat9
@@ -0,0 +1,61 @@
+
+# This Zulu OpenJDK Dockerfile and corresponding Docker image are
+# to be used solely with Java applications or Java application components
+# that are being developed for deployment on Microsoft Azure or Azure Stack,
+# and are not intended to be used for any other purpose.
+
+FROM mcr.microsoft.com/java/jdk:8u312-zulu-ubuntu AS stage1
+FROM mcr.microsoft.com/java/jre-headless:8u312-zulu-ubuntu
+MAINTAINER Zulu Enterprise Container Images <azul-zulu-images@microsoft.com>
+
+ARG JDK_DIR=/usr/lib/jvm/zulu-8-azure-amd64
+ARG JRE_DIR=/usr/lib/jvm/zre-hl-8-azure-amd64
+
+ARG TOMCAT_MAJOR=9
+ARG TOMCAT_VERSION=9.0.54
+ARG SERVER_XML=server.xml
+ARG LOGGING_PROPERTIES=logging.properties
+ARG CATALINA_PROPERTIES=catalina.properties
+
+COPY --from=stage1 ${JDK_DIR}/bin/jcmd ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jmap ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/bin/jstack ${JRE_DIR}/bin
+COPY --from=stage1 ${JDK_DIR}/lib/tools.jar ${JRE_DIR}/lib
+COPY --from=stage1 ${JDK_DIR}/jre/lib/amd64/libattach.so ${JRE_DIR}/lib/amd64
+RUN cd /usr/bin && find ${JRE_DIR}/bin -type f -perm -a=x -exec ln -f -s {} . \;
+
+# As provided here, only the access log gets written to this location.
+# Mount to a persistent volume to preserve access logs.
+# Modify this value to specify a different log directory.
+# e.g. /home/logs in Azure App Service
+ENV LOG_ROOT=/tomcat_logs
+
+ENV PATH /usr/local/tomcat/bin:$PATH
+
+# Make Java 8 obey container resource limits, improve performance
+ENV JAVA_OPTS "-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:+UseG1GC -Djava.awt.headless=true"
+
+# Cleanup & Install
+RUN apt-get -qq update && \
+    apt-get -qq -y --no-install-recommends install curl unzip && \
+# Install Tomcat
+    curl -O https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz --no-verbose && \
+    mkdir /usr/local/tomcat && \
+    tar zxf apache-tomcat-${TOMCAT_VERSION}.tar.gz -C /usr/local/tomcat --strip-components 1 && \
+    rm -f apache-tomcat-${TOMCAT_VERSION}.tar.gz && \
+    apt-get -qq -y dist-upgrade && \
+    apt-get -qq -y purge curl && \
+    apt -y autoremove --purge && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY Tomcat/v9/${SERVER_XML} /usr/local/tomcat/conf/server.xml
+COPY Tomcat/v9/${LOGGING_PROPERTIES} /usr/local/tomcat/conf/logging.properties
+COPY Tomcat/v9/${CATALINA_PROPERTIES} /usr/local/tomcat/conf/catalina.properties
+
+# Copy the startup script
+COPY Tomcat/v9/startup.sh /startup.sh
+RUN chmod a+x /startup.sh
+
+EXPOSE 80
+
+ENTRYPOINT ["/startup.sh"]

From 5a24a93a8345562fca246c1a1af87e0274233d5e Mon Sep 17 00:00:00 2001
From: Bruno Borges <brborges@microsoft.com>
Date: Tue, 1 Feb 2022 12:15:15 -0800
Subject: [PATCH 255/264] Delete README.zulu-jdk.md

---
 README.zulu-jdk.md | 34 ----------------------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 README.zulu-jdk.md

diff --git a/README.zulu-jdk.md b/README.zulu-jdk.md
deleted file mode 100644
index 8aa36b6d..00000000
--- a/README.zulu-jdk.md
+++ /dev/null
@@ -1,34 +0,0 @@
-## About
-These Zulu OpenJDK for Azure Docker images and corresponding Dockerfiles are to be used solely with Java applications or Java application components that are being developed for deployment on Microsoft Azure, Azure Functions (anywhere), Azure Stack, or Microsoft SQL Server and are not intended to be used for any other purpose.
-
-## How To Use
-docker pull mcr.microsoft.com/java/jdk:tag<br>
-docker run --rm -it mcr.microsoft.com/java/jdk:tag
-
-## Further Information 
-* [Java SE JDK](https://hub.docker.com/_/microsoft-java-jdk)
-
-## Featured Repos
-https://<span></span>repos.azul.com/azure-only/zulu/yum<br>
-https://<span></span>repos.azul.com/azure-only/zulu/apt
-
-## Quick Reference
-* [Azul Zulu for Azure - Enterprise Edition FAQ](https://assets.azul.com/files/Zulu-for-Azure-FAQ.pdf)
-* [Azul Zulu for Azure - Enterprise Edition](https://www.azul.com/downloads/azure-only/zulu/)
-
-## Support
-For support or general questions [Microsoft Azure Support](https://support.microsoft.com/en-us/help/4026305/sql-contact-microsoft-azure-support)
-
-## Issues
-Please direct all feedback to [Microsoft/Java](https://github.com/Microsoft/java/issues)
-
-## License
-This image is for use with [Zulu for Microsoft Azure Terms of Use](https://www.azul.com/downloads/azure-only/zulu/terms-of-use)
-
-## Further Reading
-* [Java on Azure](https://azure.microsoft.com/en-us/develop/java/)
-* [Azure for Java Developers](https://docs.microsoft.com/en-us/java/azure/?view=azure-java-stable)
-* [Azul](https://www.azul.com/)
-* [Azul Zulu Enterprise](https://www.azul.com/products/zulu-enterprise/)
-* [Azul Zulu Embedded](https://www.azul.com/products/zulu-embedded/)
-

From b4df3961dbc4dce7395fe989d666b8f0d90ea903 Mon Sep 17 00:00:00 2001
From: Bruno Borges <brborges@microsoft.com>
Date: Tue, 1 Feb 2022 12:15:33 -0800
Subject: [PATCH 256/264] Delete README.zulu-jre-headless.md

---
 README.zulu-jre-headless.md | 34 ----------------------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 README.zulu-jre-headless.md

diff --git a/README.zulu-jre-headless.md b/README.zulu-jre-headless.md
deleted file mode 100644
index c27e137b..00000000
--- a/README.zulu-jre-headless.md
+++ /dev/null
@@ -1,34 +0,0 @@
-## About
-These Zulu OpenJDK for Azure Docker images and corresponding Dockerfiles are to be used solely with Java applications or Java application components that are being developed for deployment on Microsoft Azure, Azure Functions (anywhere), Azure Stack, or Microsoft SQL Server and are not intended to be used for any other purpose.
-
-## How To Use
-docker pull mcr.microsoft.com/java/jre-headless:tag<br>
-docker run --rm -it mcr.microsoft.com/java/jre-headless:tag
-
-## Further Information
-* [Java SE Headless JRE](https://hub.docker.com/_/microsoft-java-jre-headless)
-
-## Featured Repos
-https://<span></span>repos.azul.com/azure-only/zulu/yum<br>
-https://<span></span>repos.azul.com/azure-only/zulu/apt
-
-## Quick Reference
-* [Azul Zulu for Azure - Enterprise Edition FAQ](https://assets.azul.com/files/Zulu-for-Azure-FAQ.pdf)
-* [Azul Zulu for Azure - Enterprise Edition](https://www.azul.com/downloads/azure-only/zulu/)
-
-## Support
-For support or general questions [Microsoft Azure Support](https://support.microsoft.com/en-us/help/4026305/sql-contact-microsoft-azure-support)
-
-## Issues
-Please direct all feedback to [Microsoft/Java](https://github.com/Microsoft/java/issues)
-
-## License
-This image is for use with [Zulu for Microsoft Azure Terms of Use](https://www.azul.com/downloads/azure-only/zulu/terms-of-use)
-
-## Further Reading
-* [Java on Azure](https://azure.microsoft.com/en-us/develop/java/)
-* [Azure for Java Developers](https://docs.microsoft.com/en-us/java/azure/?view=azure-java-stable)
-* [Azul](https://www.azul.com/)
-* [Azul Zulu Enterprise](https://www.azul.com/products/zulu-enterprise/)
-* [Azul Zulu Embedded](https://www.azul.com/products/zulu-embedded/)
-

From a33745463c1dd9824a3a664db50be1510283e4c4 Mon Sep 17 00:00:00 2001
From: Bruno Borges <brborges@microsoft.com>
Date: Tue, 1 Feb 2022 12:15:40 -0800
Subject: [PATCH 257/264] Delete README.zulu-jre.md

---
 README.zulu-jre.md | 34 ----------------------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 README.zulu-jre.md

diff --git a/README.zulu-jre.md b/README.zulu-jre.md
deleted file mode 100644
index ab7f9097..00000000
--- a/README.zulu-jre.md
+++ /dev/null
@@ -1,34 +0,0 @@
-## About
-These Zulu OpenJDK for Azure Docker images and corresponding Dockerfiles are to be used solely with Java applications or Java application components that are being developed for deployment on Microsoft Azure, Azure Functions (anywhere), Azure Stack, or Microsoft SQL Server and are not intended to be used for any other purpose.
-
-## How To Use
-docker pull mcr.microsoft.com/java/jre:tag<br>
-docker run --rm -it mcr.microsoft.com/java/jre:tag
-
-## Further Information
-* [Java SE JRE](https://hub.docker.com/_/microsoft-java-jre)
-
-## Featured Repos
-https://<span></span>repos.azul.com/azure-only/zulu/yum<br>
-https://<span></span>repos.azul.com/azure-only/zulu/apt
-
-## Quick Reference
-* [Azul Zulu for Azure - Enterprise Edition FAQ](https://assets.azul.com/files/Zulu-for-Azure-FAQ.pdf)
-* [Azul Zulu for Azure - Enterprise Edition](https://www.azul.com/downloads/azure-only/zulu/)
-
-## Support
-For support or general questions [Microsoft Azure Support](https://support.microsoft.com/en-us/help/4026305/sql-contact-microsoft-azure-support)
-
-## Issues
-Please direct all feedback to [Microsoft/Java](https://github.com/Microsoft/java/issues)
-
-## License
-This image is for use with [Zulu for Microsoft Azure Terms of Use](https://www.azul.com/downloads/azure-only/zulu/terms-of-use)
-
-## Further Reading
-* [Java on Azure](https://azure.microsoft.com/en-us/develop/java/)
-* [Azure for Java Developers](https://docs.microsoft.com/en-us/java/azure/?view=azure-java-stable)
-* [Azul](https://www.azul.com/)
-* [Azul Zulu Enterprise](https://www.azul.com/products/zulu-enterprise/)
-* [Azul Zulu Embedded](https://www.azul.com/products/zulu-embedded/)
-

From 5c1a5a28abbb2dd4c426101b98dda07214aca8c8 Mon Sep 17 00:00:00 2001
From: Bruno Borges <brborges@microsoft.com>
Date: Tue, 1 Feb 2022 12:15:56 -0800
Subject: [PATCH 258/264] Delete README.zulu-maven.md

---
 README.zulu-maven.md | 34 ----------------------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 README.zulu-maven.md

diff --git a/README.zulu-maven.md b/README.zulu-maven.md
deleted file mode 100644
index ad759f7a..00000000
--- a/README.zulu-maven.md
+++ /dev/null
@@ -1,34 +0,0 @@
-## About
-These Zulu OpenJDK for Azure Docker images and corresponding Dockerfiles are to be used solely with Java applications or Java application components that are being developed for deployment on Microsoft Azure, Azure Functions (anywhere), Azure Stack, or Microsoft SQL Server and are not intended to be used for any other purpose.
-
-## How To Use
-docker pull mcr.microsoft.com/java/maven:tag<br>
-docker run --rm -it mcr.microsoft.com/java/maven:tag
-
-## Further Information
-* [Java SE JDK And Apache Maven](https://hub.docker.com/_/microsoft-java-maven)
-
-## Featured Repos
-https://<span></span>repos.azul.com/azure-only/zulu/yum<br>
-https://<span></span>repos.azul.com/azure-only/zulu/apt
-
-## Quick Reference
-* [Azul Zulu for Azure - Enterprise Edition FAQ](https://assets.azul.com/files/Zulu-for-Azure-FAQ.pdf)
-* [Azul Zulu for Azure - Enterprise Edition](https://www.azul.com/downloads/azure-only/zulu/)
-
-## Support
-For support or general questions [Microsoft Azure Support](https://support.microsoft.com/en-us/help/4026305/sql-contact-microsoft-azure-support)
-
-## Issues
-Please direct all feedback to [Microsoft/Java](https://github.com/Microsoft/java/issues)
-
-## License
-This image is for use with [Zulu for Microsoft Azure Terms of Use](https://www.azul.com/downloads/azure-only/zulu/terms-of-use)
-
-## Further Reading
-* [Java on Azure](https://azure.microsoft.com/en-us/develop/java/)
-* [Azure for Java Developers](https://docs.microsoft.com/en-us/java/azure/?view=azure-java-stable)
-* [Azul](https://www.azul.com/)
-* [Azul Zulu Enterprise](https://www.azul.com/products/zulu-enterprise/)
-* [Azul Zulu Embedded](https://www.azul.com/products/zulu-embedded/)
-

From 72692fad3937f503504ee1dfc3b3f4cdfbe99639 Mon Sep 17 00:00:00 2001
From: Bruno Borges <brborges@microsoft.com>
Date: Tue, 1 Feb 2022 12:16:28 -0800
Subject: [PATCH 259/264] Delete CODEOWNERS

---
 CODEOWNERS | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 CODEOWNERS

diff --git a/CODEOWNERS b/CODEOWNERS
deleted file mode 100644
index ecfc9316..00000000
--- a/CODEOWNERS
+++ /dev/null
@@ -1,5 +0,0 @@
-# These owners will be the default owners for everything in
-# the repo. Unless a later match takes precedence,
-# @global-owner1 and @global-owner2 will be requested for
-# review when someone opens a pull request.
-*       @tkarbowski @selvasingh

From 73030db89f63fdd4b87146133eac2f1738960acf Mon Sep 17 00:00:00 2001
From: Bruno Borges <brborges@microsoft.com>
Date: Tue, 1 Feb 2022 12:16:46 -0800
Subject: [PATCH 260/264] Delete README.md

---
 docker/README.md | 22 ----------------------
 1 file changed, 22 deletions(-)
 delete mode 100644 docker/README.md

diff --git a/docker/README.md b/docker/README.md
deleted file mode 100644
index 1da9d630..00000000
--- a/docker/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-## About
-These Zulu OpenJDK for Azure Docker images and corresponding Dockerfiles are to be used solely with Java applications or Java application components that are being developed for deployment on Microsoft Azure, Azure Functions (anywhere), Azure Stack, or Microsoft SQL Server and are not intended to be used for any other purpose.
-
-## Further Information
-* [Java SE JDK](https://hub.docker.com/_/microsoft-java-jdk)
-* [Java SE JRE](https://hub.docker.com/_/microsoft-java-jre)
-* [Java SE Headless JRE](https://hub.docker.com/_/microsoft-java-jre-headless)
-* [Java SE JDK And Apache Maven](https://hub.docker.com/_/microsoft-java-maven)
-* [Java SE JDK And Apache Tomcat](https://hub.docker.com/_/microsoft-java-tomcat)
-
-## Contributing
-This project welcomes contributions and suggestions.  Most contributions require you to agree to a
-Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us
-the rights to use your contribution. For details, visit https://cla.microsoft.com.
- 
-When you submit a pull request, a CLA-bot will automatically determine whether you need to provide
-a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions
-provided by the bot. You will only need to do this once across all repos using our CLA.
- 
-## Code of Conduct
-This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
-

From ba5ee8eea178dbecad6c876357af3812899f2f9c Mon Sep 17 00:00:00 2001
From: Bruno Borges <brborges@microsoft.com>
Date: Tue, 1 Feb 2022 12:17:18 -0800
Subject: [PATCH 261/264] Update README.md

---
 README.md | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1da9d630..0875da9b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,18 @@
-## About
+# End of Updates
+
+As [previously announced](https://devblogs.microsoft.com/java/end-of-updates-support-and-availability-of-zulu-for-azure/) on June 30th 2021, Zulu for Azure binaries are no longer receiving updates or support since January 1st, 2022. Container images are no longer updated. Microsoft products and services are transitioning to [Microsoft Build of OpenJDK](https://docs.microsoft.com/en-us/java/openjdk/install) for JDK 11 and later, and [Eclipse Temurin](https://adoptium.net/releases.html?variant=openjdk8&jvmVariant=hotspot) for JDK 8.
+
+For up to date container images with Microsoft supported builds of OpenJDK, please visit [Container Images for Microsoft Build of OpenJDK](https://docs.microsoft.com/en-us/java/openjdk/containers).
+
+For more information on OpenJDK support on Microsoft Azure, please visit [Java support on Azure and Azure Stack](https://docs.microsoft.com/en-us/azure/developer/java/fundamentals/java-support-on-azure).
+
+## Availability of existing images and migration
+
+Starting **July 1st, 2022**, Zulu for Azure binaries _may no longer be available_ from Azul Zulu for Azure repositories. Docker images _may no longer be available_ on Docker Hub or in the Microsoft Container Registry.
+
+For information on migration to other similar images, please [read the announcement](https://devblogs.microsoft.com/java/end-of-updates-support-and-availability-of-zulu-for-azure/#container-images-availability-timeline).
+
+# About
 These Zulu OpenJDK for Azure Docker images and corresponding Dockerfiles are to be used solely with Java applications or Java application components that are being developed for deployment on Microsoft Azure, Azure Functions (anywhere), Azure Stack, or Microsoft SQL Server and are not intended to be used for any other purpose.
 
 ## Further Information

From e09e2a39f6afab9cd24c0e6c1c29d6713ac3eac4 Mon Sep 17 00:00:00 2001
From: Bruno Borges <brborges@microsoft.com>
Date: Tue, 1 Feb 2022 12:19:30 -0800
Subject: [PATCH 262/264] Update README.md

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 0875da9b..d99b684e 100644
--- a/README.md
+++ b/README.md
@@ -15,12 +15,12 @@ For information on migration to other similar images, please [read the announcem
 # About
 These Zulu OpenJDK for Azure Docker images and corresponding Dockerfiles are to be used solely with Java applications or Java application components that are being developed for deployment on Microsoft Azure, Azure Functions (anywhere), Azure Stack, or Microsoft SQL Server and are not intended to be used for any other purpose.
 
-## Further Information
-* [Java SE JDK](https://hub.docker.com/_/microsoft-java-jdk)
-* [Java SE JRE](https://hub.docker.com/_/microsoft-java-jre)
-* [Java SE Headless JRE](https://hub.docker.com/_/microsoft-java-jre-headless)
-* [Java SE JDK And Apache Maven](https://hub.docker.com/_/microsoft-java-maven)
-* [Java SE JDK And Apache Tomcat](https://hub.docker.com/_/microsoft-java-tomcat)
+## Further Information on Published Images
+* [Zulu for Azure JDK](https://hub.docker.com/_/microsoft-java-jdk)
+* [Zulu for Azure JRE](https://hub.docker.com/_/microsoft-java-jre)
+* [Zulu for Azure Headless JRE](https://hub.docker.com/_/microsoft-java-jre-headless)
+* [Zulu for Azure JDK with Apache Maven](https://hub.docker.com/_/microsoft-java-maven)
+* [Zulu for Azure JDK with Apache Tomcat](https://hub.docker.com/_/microsoft-java-tomcat)
 
 ## Contributing
 This project welcomes contributions and suggestions.  Most contributions require you to agree to a

From f79be17e42de657eabae6d7e83643f7cd34ea894 Mon Sep 17 00:00:00 2001
From: Bruno Borges <brborges@microsoft.com>
Date: Tue, 1 Feb 2022 12:29:58 -0800
Subject: [PATCH 263/264] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d99b684e..460e626e 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ These Zulu OpenJDK for Azure Docker images and corresponding Dockerfiles are to
 * [Zulu for Azure JRE](https://hub.docker.com/_/microsoft-java-jre)
 * [Zulu for Azure Headless JRE](https://hub.docker.com/_/microsoft-java-jre-headless)
 * [Zulu for Azure JDK with Apache Maven](https://hub.docker.com/_/microsoft-java-maven)
-* [Zulu for Azure JDK with Apache Tomcat](https://hub.docker.com/_/microsoft-java-tomcat)
+* [Zulu for Azure JRE with Apache Tomcat](https://hub.docker.com/_/microsoft-java-tomcat)
 
 ## Contributing
 This project welcomes contributions and suggestions.  Most contributions require you to agree to a

From c7da8744bca576b6839c9f1303e4f8c79d6469b6 Mon Sep 17 00:00:00 2001
From: "microsoft-github-policy-service[bot]"
 <77245923+microsoft-github-policy-service[bot]@users.noreply.github.com>
Date: Tue, 2 Aug 2022 16:08:06 +0000
Subject: [PATCH 264/264] Microsoft mandatory file

---
 SECURITY.md | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 SECURITY.md

diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 00000000..869fdfe2
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,41 @@
+<!-- BEGIN MICROSOFT SECURITY.MD V0.0.7 BLOCK -->
+
+## Security
+
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
+
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/opensource/security/definition), please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/opensource/security/create-report).
+
+If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey).
+
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc). 
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Policy
+
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/opensource/security/cvd).
+
+<!-- END MICROSOFT SECURITY.MD BLOCK -->