From ceab8c6a5161712ec5b0faf62407fe0155879afe Mon Sep 17 00:00:00 2001 From: MaxWaldorf Date: Sun, 15 Oct 2023 15:50:13 +0200 Subject: [PATCH 1/5] Update to Tomcat 9.0.82 version --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 14541d7..b12fbaf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -222,8 +222,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/v9.0.80/bin/apache-tomcat-9.0.82.tar.gz /tmp/ +RUN tar xvzf /tmp/apache-tomcat-9.0.82.tar.gz --strip-components 1 --directory /opt/tomcat RUN chmod +x /opt/tomcat/bin/*.sh RUN groupadd tomcat && \ From 742a96c64832f3c64fe109fcdc913c988718cfbf Mon Sep 17 00:00:00 2001 From: MaxWaldorf Date: Sun, 15 Oct 2023 16:14:57 +0200 Subject: [PATCH 2/5] Replace Tomcat version with ENV variable --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b12fbaf..1a78ac8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -180,6 +180,7 @@ ENV \ GUACAMOLE_HOME=/app/guacamole \ CATALINA_HOME=/opt/tomcat \ PG_MAJOR=13 \ + TOMCAT_VER=9.0.82 \ 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.82.tar.gz /tmp/ -RUN tar xvzf /tmp/apache-tomcat-9.0.82.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 && \ From cc858d1f51bc8013cc318549ebd2ceaca8d6de66 Mon Sep 17 00:00:00 2001 From: MaxWaldorf Date: Fri, 17 Nov 2023 19:48:32 +0100 Subject: [PATCH 3/5] Update Apache 9 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1a78ac8..cb9e227 100644 --- a/Dockerfile +++ b/Dockerfile @@ -180,7 +180,7 @@ ENV \ GUACAMOLE_HOME=/app/guacamole \ CATALINA_HOME=/opt/tomcat \ PG_MAJOR=13 \ - TOMCAT_VER=9.0.82 \ + TOMCAT_VER=9.0.83 \ PGDATA=/config/postgres \ POSTGRES_USER=guacamole \ POSTGRES_DB=guacamole_db \ From eccd3dc82db9ef7da796d8634ddde03d665024db Mon Sep 17 00:00:00 2001 From: MaxWaldorf Date: Sat, 9 Dec 2023 01:05:28 +0100 Subject: [PATCH 4/5] update openssl dev package --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cb9e227..a7c7b51 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 \ From 55366e0277cbb5c73933e95cf8e442849ad4ba77 Mon Sep 17 00:00:00 2001 From: MaxWaldorf Date: Tue, 12 Dec 2023 11:45:51 +0100 Subject: [PATCH 5/5] Update to guacamole 1.5.4 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a7c7b51..7859606 100644 --- a/Dockerfile +++ b/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 \ @@ -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}" \