From bc9058686a0d65cc756951af8a9a3f794ecff064 Mon Sep 17 00:00:00 2001
From: Joel Wetzell <jwetzell@yahoo.com>
Date: Wed, 7 Feb 2024 15:58:11 -0600
Subject: [PATCH] update to latest tomcat 9 and ubuntu based images

---
 Dockerfile.amd64        | 14 ++++++++------
 Dockerfile.arm64        | 13 +++++++------
 Dockerfile.raspberry-pi | 11 ++++++-----
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/Dockerfile.amd64 b/Dockerfile.amd64
index d15d2ce..3e4c945 100644
--- a/Dockerfile.amd64
+++ b/Dockerfile.amd64
@@ -1,4 +1,4 @@
-FROM library/tomcat:9-jre11-openjdk-bullseye
+FROM tomcat:9.0.85-jre11
 
 ENV ARCH=amd64 \
     GUAC_VER=1.5.4 \
@@ -8,11 +8,13 @@ ENV ARCH=amd64 \
     PGDATA=/config/postgres \
     POSTGRES_USER=guacamole \
     POSTGRES_DB=guacamole_db
+    
+RUN rm -rf /usr/local/tomcat/webapps.dist
 
 # Install dependencies
 RUN apt-get update \
  && apt-get install -y curl ca-certificates gnupg \
-    libcairo2-dev libjpeg62-turbo-dev libpng-dev libavformat-dev \
+    libcairo2-dev libjpeg-turbo8-dev libpng-dev libavformat-dev \
     libossp-uuid-dev libavcodec-dev libavutil-dev \
     libswscale-dev freerdp2-dev libfreerdp-client2-2 libpango1.0-dev \
     libtelnet-dev libvncserver-dev \
@@ -41,10 +43,10 @@ RUN tar -xzvf /tmp/postgresql-${PG_VER}.tar.gz \
 RUN useradd postgres
 
 # Apply the s6-overlay
-ADD https://github.com/just-containers/s6-overlay/releases/download/v2.2.0.3/s6-overlay-amd64.tar.gz /tmp
-RUN tar -xzf /tmp/s6-overlay-amd64.tar.gz -C / \
- && tar -xzf /tmp/s6-overlay-amd64.tar.gz -C /usr ./bin \
- && rm -rf /tmp/s6-overlay-amd64.tar.gz
+ADD https://github.com/just-containers/s6-overlay/releases/download/v2.2.0.3/s6-overlay-amd64-installer /tmp/
+RUN chmod +x /tmp/s6-overlay-amd64-installer && /tmp/s6-overlay-amd64-installer / \
+    && rm -rf /tmp/s6-overlay-amd64-installer
+
 
 RUN mkdir -p ${GUACAMOLE_HOME} \
     ${GUACAMOLE_HOME}/lib \
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index 91d95eb..058aa35 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -1,4 +1,4 @@
-FROM library/tomcat:9-jre11-openjdk-bullseye
+FROM tomcat:9.0.85-jre11
 
 ENV GUAC_VER=1.5.4 \
     GUACAMOLE_HOME=/app/guacamole \
@@ -8,10 +8,12 @@ ENV GUAC_VER=1.5.4 \
     POSTGRES_USER=guacamole \
     POSTGRES_DB=guacamole_db
 
+RUN rm -rf /usr/local/tomcat/webapps.dist
+
 # Install dependencies
 RUN apt-get update \
  && apt-get install -y curl ca-certificates gnupg \
-    libcairo2-dev libjpeg62-turbo-dev libpng-dev libavformat-dev \
+    libcairo2-dev libjpeg-turbo8-dev libpng-dev libavformat-dev \
     libossp-uuid-dev libavcodec-dev libavutil-dev \
     libswscale-dev freerdp2-dev libfreerdp-client2-2 libpango1.0-dev \
     libtelnet-dev libvncserver-dev \
@@ -39,10 +41,9 @@ RUN tar -xzvf /tmp/postgresql-${PG_VER}.tar.gz \
 RUN useradd postgres
   
 # Apply the s6-overlay
-ADD https://github.com/just-containers/s6-overlay/releases/download/v2.2.0.3/s6-overlay-armhf.tar.gz /tmp
-RUN tar -xzf /tmp/s6-overlay-armhf.tar.gz -C / \
- && tar -xzf /tmp/s6-overlay-armhf.tar.gz -C /usr ./bin \
- && rm -rf /tmp/s6-overlay-armhf.tar.gz
+ADD https://github.com/just-containers/s6-overlay/releases/download/v2.2.0.3/s6-overlay-armhf-installer /tmp/
+RUN chmod +x /tmp/s6-overlay-armhf-installer && /tmp/s6-overlay-armhf-installer / \
+    && rm -rf /tmp/s6-overlay-armhf-installer
 
 RUN mkdir -p ${GUACAMOLE_HOME} \
     ${GUACAMOLE_HOME}/lib \
diff --git a/Dockerfile.raspberry-pi b/Dockerfile.raspberry-pi
index 4ddef91..40f199f 100644
--- a/Dockerfile.raspberry-pi
+++ b/Dockerfile.raspberry-pi
@@ -1,4 +1,4 @@
-FROM arm32v7/tomcat:9-jre11
+FROM arm32v7/tomcat:9.0.85-jre11
 
 ENV GUAC_VER=1.5.4 \
     GUACAMOLE_HOME=/app/guacamole \
@@ -8,6 +8,8 @@ ENV GUAC_VER=1.5.4 \
     POSTGRES_USER=guacamole \
     POSTGRES_DB=guacamole_db
 
+RUN rm -rf /usr/local/tomcat/webapps.dist
+
 # Install base dependencies
 RUN apt-get update \ 
  && apt-get install -y curl ca-certificates gnupg \
@@ -39,10 +41,9 @@ RUN tar -xzvf /tmp/postgresql-${PG_VER}.tar.gz \
 RUN useradd postgres
 
 # Apply the s6-overlay
-ADD https://github.com/just-containers/s6-overlay/releases/download/v2.2.0.3/s6-overlay-armhf.tar.gz /tmp
-RUN tar -xzf /tmp/s6-overlay-armhf.tar.gz -C / \
- && tar -xzf /tmp/s6-overlay-armhf.tar.gz -C /usr ./bin \
- && rm -rf /tmp/s6-overlay-armhf.tar.gz
+ADD https://github.com/just-containers/s6-overlay/releases/download/v2.2.0.3/s6-overlay-armhf-installer /tmp/
+RUN chmod +x /tmp/s6-overlay-armhf-installer && /tmp/s6-overlay-armhf-installer / \
+    && rm -rf /tmp/s6-overlay-armhf-installer
 
 RUN mkdir -p ${GUACAMOLE_HOME} \
     ${GUACAMOLE_HOME}/lib \