Merge pull request #104 from flcontainers/dev

Update to guacamole v1.5.4

Author: MaxWaldorf

Dockerfile

@@ -1,7 +1,7 @@
 ARG ALPINE_BASE_IMAGE=latest
 FROM alpine:${ALPINE_BASE_IMAGE} AS builder
 
-ARG VERSION="1.5.3"
+ARG VERSION="1.5.4"
 ARG TARGETPLATFORM
 
 ENV \
@@ -32,7 +32,7 @@ RUN apk add --no-cache                \
         libxkbfile-dev                \
         make                          \
         openh264-dev                  \
-        openssl1.1-compat-dev         \
+        openssl-dev                   \
         pango-dev                     \
         pcsc-lite-dev                 \
         pulseaudio-dev                \
@@ -161,7 +161,7 @@ ARG BUILD_RFC3339="2023-04-04T13:00:00Z"
 ARG REVISION="local"
 ARG DESCRIPTION="Fully Packaged and Multi-Arch Guacamole container"
 ARG PACKAGE="flcontainers/guacamole"
-ARG VERSION="1.5.3"
+ARG VERSION="1.5.4"
 ARG POSTGRES_HOST_AUTH_METHOD="trust"
 
 LABEL org.opencontainers.image.ref.name="${PACKAGE}" \
@@ -180,6 +180,7 @@ ENV \
   GUACAMOLE_HOME=/app/guacamole \
   CATALINA_HOME=/opt/tomcat \
   PG_MAJOR=13 \
+  TOMCAT_VER=9.0.83 \
   PGDATA=/config/postgres \
   POSTGRES_USER=guacamole \
   POSTGRES_DB=guacamole_db \
@@ -222,8 +223,8 @@ RUN apk add --no-cache -X https://dl-cdn.alpinelinux.org/alpine/edge/testing gos
 
 # Install tomcat
 RUN mkdir /opt/tomcat
-ADD https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.80/bin/apache-tomcat-9.0.80.tar.gz /tmp/
-RUN tar xvzf /tmp/apache-tomcat-9.0.80.tar.gz --strip-components 1 --directory /opt/tomcat
+ADD https://dlcdn.apache.org/tomcat/tomcat-9/v${TOMCAT_VER}/bin/apache-tomcat-${TOMCAT_VER}.tar.gz /tmp/
+RUN tar xvzf /tmp/apache-tomcat-${TOMCAT_VER}.tar.gz --strip-components 1 --directory /opt/tomcat
 RUN chmod +x /opt/tomcat/bin/*.sh
 
 RUN groupadd tomcat && \