diff --git a/templates/workspace_services/guacamole/guacamole-server/docker/Dockerfile b/templates/workspace_services/guacamole/guacamole-server/docker/Dockerfile
index bee5402a43..c7adba640c 100644
--- a/templates/workspace_services/guacamole/guacamole-server/docker/Dockerfile
+++ b/templates/workspace_services/guacamole/guacamole-server/docker/Dockerfile
@@ -1,6 +1,9 @@
FROM maven:3-jdk-11-slim AS client_build
COPY ./guacamole-auth-azure/pom.xml /pom.xml
+# cache dependencies in a separate layer
+RUN mvn package -Dmaven.test.skip
+
COPY ./guacamole-auth-azure/src /src
COPY ./docker/maven_package_and_exit_succesfully.sh /tmp/
RUN bash /tmp/maven_package_and_exit_succesfully.sh
@@ -8,9 +11,9 @@ 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.5.1
+FROM guacamole/guacd:1.5.2
-ARG GUACAMOLE_AZURE_VERSION=0.3.0
+ARG GUACAMOLE_AZURE_VERSION=0.3.1
ENV DEBIAN_FRONTEND=noninteractive
@@ -23,7 +26,7 @@ RUN apk add --update --no-cache wget openssh openjdk11-jre \
ENV CATALINA_BASE=/usr/share/tomcat9/
RUN TOMCAT_ARCHIVE="tomcat.tar.gz" && \
- TOMCAT_VER="9.0.73" && \
+ TOMCAT_VER="9.0.75" && \
wget -O "$TOMCAT_ARCHIVE" -N "https://archive.apache.org/dist/tomcat/tomcat-9/v${TOMCAT_VER}/bin/apache-tomcat-${TOMCAT_VER}.tar.gz" --progress=dot:giga && \
tar xzf "$TOMCAT_ARCHIVE" && \
rm -f "$TOMCAT_ARCHIVE" && \
@@ -50,7 +53,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.5.1/binary/guacamole-1.5.1.war" --progress=dot:giga
+RUN wget -O "${GUACAMOLE_HOME}/guacamole.war" "http://apache.org/dyn/closer.cgi?action=download&filename=guacamole/1.5.2/binary/guacamole-1.5.2.war" --progress=dot:giga
ENV OAUTH2_PROXY_HOME=/etc/oauth2-proxy
RUN OAUTH2_PROXY_ARCHIVE=oauth2-proxy.tar.gz && \
@@ -61,7 +64,7 @@ RUN OAUTH2_PROXY_ARCHIVE=oauth2-proxy.tar.gz && \
COPY ./docker/index.jsp "$CATALINA_BASE"/webapps/ROOT/index.jsp
-RUN wget -O "/tmp/applicationinsights-agent.jar" "https://github.com/microsoft/ApplicationInsights-Java/releases/download/3.4.11/applicationinsights-agent-3.4.11.jar" --progress=dot:giga
+RUN wget -O "/tmp/applicationinsights-agent.jar" "https://github.com/microsoft/ApplicationInsights-Java/releases/download/3.4.13/applicationinsights-agent-3.4.13.jar" --progress=dot:giga
ENV CATALINA_OPTS="$CATALINA_OPTS -javaagent:/tmp/applicationinsights-agent.jar"
ENTRYPOINT [ "/init" ]
diff --git a/templates/workspace_services/guacamole/guacamole-server/docker/version.txt b/templates/workspace_services/guacamole/guacamole-server/docker/version.txt
index 49e0fc1e09..a5f830a2c0 100644
--- a/templates/workspace_services/guacamole/guacamole-server/docker/version.txt
+++ b/templates/workspace_services/guacamole/guacamole-server/docker/version.txt
@@ -1 +1 @@
-__version__ = "0.7.0"
+__version__ = "0.7.1"
diff --git a/templates/workspace_services/guacamole/guacamole-server/guacamole-auth-azure/pom.xml b/templates/workspace_services/guacamole/guacamole-server/guacamole-auth-azure/pom.xml
index 1581aac336..d60833ee50 100644
--- a/templates/workspace_services/guacamole/guacamole-server/guacamole-auth-azure/pom.xml
+++ b/templates/workspace_services/guacamole/guacamole-server/guacamole-auth-azure/pom.xml
@@ -6,7 +6,7 @@
org.apache.guacamole
guacamole-auth-tre
- 0.3.0
+ 0.3.1
jar
guacamole-azure-tre
@@ -25,7 +25,7 @@
com.auth0
java-jwt
- 4.3.0
+ 4.4.0
com.google.inject
@@ -41,14 +41,14 @@
org.apache.guacamole
guacamole-ext
- 1.5.1
+ 1.5.2
provided
com.azure
azure-security-keyvault-secrets
- 4.5.2
+ 4.6.2
com.azure
@@ -83,13 +83,13 @@
org.mockito
mockito-inline
- 5.1.1
+ 5.2.0
test
com.squareup.okhttp3
mockwebserver
- 4.10.0
+ 4.11.0
test
@@ -113,20 +113,20 @@
org.junit.jupiter
junit-jupiter-api
- 5.9.1
+ 5.9.3
test
org.junit-pioneer
junit-pioneer
- 2.0.0
+ 2.0.1
test
org.mockito
mockito-junit-jupiter
- 5.1.1
+ 5.3.1
test
diff --git a/templates/workspace_services/guacamole/porter.yaml b/templates/workspace_services/guacamole/porter.yaml
index 09172500af..0143e370b3 100644
--- a/templates/workspace_services/guacamole/porter.yaml
+++ b/templates/workspace_services/guacamole/porter.yaml
@@ -1,7 +1,7 @@
---
schemaVersion: 1.0.0
name: tre-service-guacamole
-version: 0.9.0
+version: 0.9.1
description: "An Azure TRE service for Guacamole"
dockerfile: Dockerfile.tmpl
registry: azuretre
@@ -121,9 +121,8 @@ outputs:
- install
mixins:
- - exec
- terraform:
- clientVersion: 1.4.5
+ clientVersion: 1.4.6
install:
- terraform:
diff --git a/templates/workspace_services/guacamole/terraform/.terraform.lock.hcl b/templates/workspace_services/guacamole/terraform/.terraform.lock.hcl
index abcf373060..7ff7df02ee 100644
--- a/templates/workspace_services/guacamole/terraform/.terraform.lock.hcl
+++ b/templates/workspace_services/guacamole/terraform/.terraform.lock.hcl
@@ -2,21 +2,21 @@
# Manual edits may be lost in future updates.
provider "registry.terraform.io/hashicorp/azurerm" {
- version = "3.52.0"
- constraints = "3.52.0"
+ version = "3.57.0"
+ constraints = "3.57.0"
hashes = [
- "h1:XEJUCnUuDeTuhPgilkiNQ3mCTCmgJ1iEA0wE58IzYX8=",
- "zh:0c3029da7454f2fe7058939d95c458d9930842f06430cfcd0713713f3d788216",
- "zh:826584f11eaaec7f179e85d9cc4833ec7a1d854ed4883c94317427ddfa7ffd11",
- "zh:8fff204176ee1b08d168848d4bd7a051d7fd189688ca8b5f26eb31855ea060a6",
- "zh:a170ebe199b93ea1f20357d848dfd0f5e50538236f09939d1a11a61dfbfded0f",
- "zh:acea54d715186101f8a7725997578b231e4db50eea0fb9f9868ecd867008e6e6",
- "zh:ae0f6a61677282a2f605ca9d0a74a08ae78ae2efeb372a33b9d4c7210fbbfd2c",
- "zh:c2c2329f3864e10ee15993c1a48e79bf72d570bb6d08003038a37b73e551dbf9",
- "zh:c7a4a117628ff0ad24e9c73f1087e9a02b8eca633b0913ee1687b0b4b5c7f377",
- "zh:e1a290e708e7dbbde8747a98680f7a1aace97694a243ba7a11cc5c77e982e9cc",
- "zh:e82aa1c5e8ead3087968d7f44b6f644ef3092a0d243b4b575ff8847616e290b3",
- "zh:f4d57d3c5f3c7fe064b88151036037b7852be6bcfa661e3f4fe0fda2871006d9",
+ "h1:SOBKU/ioGnpuQpAx6dgaD0EzfAM2W+uS9e6p59viSxs=",
+ "zh:028202b0ae01f1262dac076b383cb68b5dd624977669b6db833418c215eb8401",
+ "zh:26fcf9e9b73cb3bbf87a048361a89050d2e52bdc91190a305e624a62be26a3f4",
+ "zh:2f381103953e4513068eee62089a0ec8c60a18ecef2235138b6c29a45920d6a2",
+ "zh:376f016f4b449b2cf38f75e27e7a9157fdcfc925f28198124a30e316abb54f3d",
+ "zh:7d491bab94d5aba91cd9c307dbd4b655dcdc0a6212541e7800b9a902be98befe",
+ "zh:85fa7d8339efd15494f947cda02e9ed127eafa32652e568f54261b2e97d2b3ee",
+ "zh:950e079e55a7e321adbd2f6a0639a4b3b0fac47d2e4bb3a12791e0817b694238",
+ "zh:975260e09379c5c97cad3171327db2f0b4914909861d4c24ab784b0ecd79c54a",
+ "zh:a26bb67ab2d2f20e5fee4d41110584af17357f4b4266d80f9debfad61fa0a4fd",
+ "zh:da0e5d1ec301c69b6fae684e55059fc5e1b91699ed3696229f599d558401556b",
+ "zh:ea11e62ce53caec240cb3a1da25d248805387fa246314001ed3e07e9105f6e12",
"zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c",
]
}
diff --git a/templates/workspace_services/guacamole/terraform/providers.tf b/templates/workspace_services/guacamole/terraform/providers.tf
index 9cb7a988b4..54b8e17efe 100644
--- a/templates/workspace_services/guacamole/terraform/providers.tf
+++ b/templates/workspace_services/guacamole/terraform/providers.tf
@@ -2,7 +2,7 @@ terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
- version = "=3.52.0"
+ version = "=3.57.0"
}
local = {
source = "hashicorp/local"