Upgrade Guacamole deps 1.5.1 (#3443)

* Upgrde Guacamole bundle to support version 1.5.1

* changelog

* fix dockerfile linting

* combine run commands

* changelog

.github/linters/.hadolint.yaml

@@ -2,3 +2,4 @@
 ignored:
   # sometimes pinned versions are removed from the package source so we decided to ignore this rule.
   - DL3008
+  - DL3018

CHANGELOG.md

@@ -6,6 +6,7 @@
 FEATURES:
 
 ENHANCEMENTS:
+* Update Guacamole to version 1.5.1 ([#3443](https://github.com/microsoft/AzureTRE/issues/3443))
 
 BUG FIXES:
 
@@ -26,6 +27,7 @@ ENHANCEMENTS:
 * Update Porter (1.0.11), Docker (23.0.3), Terraform (1.4.5) ([#3430](https://github.com/microsoft/AzureTRE/issues/3430))
 * Build, publish and register Databricks bundles in workflow ([#3447](https://github.com/microsoft/AzureTRE/issues/3447))
 
+
 BUG FIXES:
 * Fix ENABLE_SWAGGER configuration being ignored in CI ([#3355](https://github.com/microsoft/AzureTRE/pull/3355))
 * Set yq output format when reading a json file ([#3441](https://github.com/microsoft/AzureTRE/pull/3441))

templates/workspace_services/guacamole/guacamole-server/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM maven:3-jdk-11 AS client_build
+FROM maven:3-jdk-11-slim AS client_build
 
 COPY ./guacamole-auth-azure/pom.xml /pom.xml
 COPY ./guacamole-auth-azure/src /src
@@ -8,27 +8,18 @@ RUN bash /tmp/maven_package_and_exit_succesfully.sh
 FROM scratch as test-results
 COPY --from=client_build /target/surefire-reports/* /
 
-FROM guacamole/guacd:1.4.0
+FROM guacamole/guacd:1.5.1
 
-ARG GUACAMOLE_AZURE_VERSION=0.2.0
+ARG GUACAMOLE_AZURE_VERSION=0.3.0
 
 ENV DEBIAN_FRONTEND=noninteractive
 
 # https://github.com/microsoft/AzureTRE/issues/1937
 # hadolint ignore=DL3002
 USER root
 
-# dependencies
-RUN apt-get update && apt-get install wget curl openssh-server apt-transport-https gnupg -y --no-install-recommends && \
-    apt-get autoclean && apt-get autoremove && rm -rf /var/lib/apt/lists/*
-
-ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
-RUN JAVA_ARCHIVE=java.tar.gz && \
-    wget -O "$JAVA_ARCHIVE" "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.18%2B10/OpenJDK11U-jre_x64_linux_hotspot_11.0.18_10.tar.gz" --progress=dot:giga && \
-    mkdir -p "$JAVA_HOME" && \
-    tar xzf "$JAVA_ARCHIVE" -C "$JAVA_HOME" --strip-components=1 && \
-    rm -f "$JAVA_ARCHIVE" && \
-    export PATH="$JAVA_HOME"/bin:"$PATH" && java -version
+RUN apk add --update --no-cache wget openssh openjdk11-jre \
+    && ssh-keygen -A
 
 ENV CATALINA_BASE=/usr/share/tomcat9/
 RUN TOMCAT_ARCHIVE="tomcat.tar.gz" && \
@@ -59,7 +50,7 @@ COPY ./docker/services /etc/services.d/
 COPY --from=client_build /target/lib/* "${GUACAMOLE_LIB}"
 COPY --from=client_build "/target/guacamole-auth-tre-${GUACAMOLE_AZURE_VERSION}.jar" "${GUACAMOLE_HOME}/extensions/"
 
-RUN wget -O "${GUACAMOLE_HOME}/guacamole.war" "http://apache.org/dyn/closer.cgi?action=download&filename=guacamole/1.4.0/binary/guacamole-1.4.0.war" --progress=dot:giga
+RUN wget -O "${GUACAMOLE_HOME}/guacamole.war" "http://apache.org/dyn/closer.cgi?action=download&filename=guacamole/1.5.1/binary/guacamole-1.5.1.war" --progress=dot:giga
 
 ENV OAUTH2_PROXY_HOME=/etc/oauth2-proxy
 RUN OAUTH2_PROXY_ARCHIVE=oauth2-proxy.tar.gz && \

templates/workspace_services/guacamole/guacamole-server/docker/services/guacd/run

@@ -1,3 +1,3 @@
 #!/usr/bin/with-contenv sh
 echo >&2 "starting guacd"
-exec /usr/local/guacamole/sbin/guacd -f -b 0.0.0.0  -L $GUACD_LOG_LEVEL  -l 4822
+exec /opt/guacamole/sbin/guacd -f -b 0.0.0.0  -L $GUACD_LOG_LEVEL  -l 4822

templates/workspace_services/guacamole/guacamole-server/docker/version.txt

@@ -1 +1 @@
-__version__ = "0.6.3"
+__version__ = "0.7.0"

templates/workspace_services/guacamole/guacamole-server/guacamole-auth-azure/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.apache.guacamole</groupId>
     <artifactId>guacamole-auth-tre</artifactId>
-    <version>0.2.0</version>
+    <version>0.3.0</version>
     <packaging>jar</packaging>
     <name>guacamole-azure-tre</name>
 
@@ -27,7 +27,6 @@
             <artifactId>java-jwt</artifactId>
             <version>4.3.0</version>
         </dependency>
-        <!-- Guice -->
         <dependency>
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
@@ -42,7 +41,7 @@
         <dependency>
             <groupId>org.apache.guacamole</groupId>
             <artifactId>guacamole-ext</artifactId>
-            <version>1.5.0</version>
+            <version>1.5.1</version>
             <scope>provided</scope>
         </dependency>
         <!-- MS Azure dependencies -->

templates/workspace_services/guacamole/porter.yaml

@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-service-guacamole
-version: 0.8.4
+version: 0.9.0
 description: "An Azure TRE service for Guacamole"
 dockerfile: Dockerfile.tmpl
 registry: azuretre
@@ -123,7 +123,7 @@ outputs:
 mixins:
   - exec
   - terraform:
-      clientVersion: 1.3.6
+      clientVersion: 1.4.5
 
 install:
   - terraform:
@@ -187,7 +187,6 @@ upgrade:
         - name: authentication_callback_uri
         - name: web_apps_addresses
 
-
 uninstall:
   - terraform:
       description: "Delete the Guacamole Service"

templates/workspace_services/guacamole/terraform/providers.tf

@@ -2,11 +2,11 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "=3.41.0"
+      version = "=3.52.0"
     }
     local = {
       source  = "hashicorp/local"
-      version = "=2.2.3"
+      version = "=2.4.0"
     }
   }
   backend "azurerm" {