From 1605de87c79efca79dc28f989cc9bb5cd2bed7c5 Mon Sep 17 00:00:00 2001 From: Tamir Kamara <26870601+tamirkamara@users.noreply.github.com> Date: Tue, 4 Jul 2023 05:26:24 +0000 Subject: [PATCH 1/2] Guacamole dependencies update July 2023 --- CHANGELOG.md | 3 ++- .../guacamole/guacamole-server/docker/Dockerfile | 6 +++--- .../guacamole/guacamole-server/docker/version.txt | 2 +- .../guacamole-server/guacamole-auth-azure/pom.xml | 14 +++++++------- templates/workspace_services/guacamole/porter.yaml | 2 +- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a73f192bd9..3d2b4ce0d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,11 +5,12 @@ **BREAKING CHANGES & MIGRATIONS**: FEATURES: +* OHDSI workspace service ([#3562](https://github.com/microsoft/AzureTRE/issues/3562)) ENHANCEMENTS: * Workspace networking peering sync is handled natively by Terraform ([#3534](https://github.com/microsoft/AzureTRE/issues/3534)) * Use SMTP built in connector vs API connector in Airlock Notifier ([#3572](https://github.com/microsoft/AzureTRE/issues/3572)) -* Added OHDSI workspace service ([#3562](https://github.com/microsoft/AzureTRE/issues/3562)) +* Update Guacamole dependencies ([#TBD](https://github.com/microsoft/AzureTRE/issues/TBD)) BUG FIXES: * Nexus might fail to deploy due to wrong identity used in key-vault extension ([#3492](https://github.com/microsoft/AzureTRE/issues/3492)) diff --git a/templates/workspace_services/guacamole/guacamole-server/docker/Dockerfile b/templates/workspace_services/guacamole/guacamole-server/docker/Dockerfile index ab5355455b..f6089ef92a 100644 --- a/templates/workspace_services/guacamole/guacamole-server/docker/Dockerfile +++ b/templates/workspace_services/guacamole/guacamole-server/docker/Dockerfile @@ -13,7 +13,7 @@ COPY --from=client_build /target/surefire-reports/* / FROM guacamole/guacd:1.5.2 -ARG GUACAMOLE_AZURE_VERSION=0.3.2 +ARG GUACAMOLE_AZURE_VERSION=0.3.3 ENV DEBIAN_FRONTEND=noninteractive @@ -26,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.75" && \ + TOMCAT_VER="9.0.76" && \ 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" && \ @@ -64,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.13/applicationinsights-agent-3.4.13.jar" --progress=dot:giga +RUN wget -O "/tmp/applicationinsights-agent.jar" "https://github.com/microsoft/ApplicationInsights-Java/releases/download/3.4.14/applicationinsights-agent-3.4.14.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 bc8c296f6a..4910b9ec3e 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.2" +__version__ = "0.7.3" 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 ffb9d78e88..78ab4dec2d 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.2 + 0.3.3 jar guacamole-azure-tre @@ -48,18 +48,18 @@ com.azure azure-security-keyvault-secrets - 4.6.2 + 4.6.3 com.azure azure-identity - 1.9.0 + 1.9.1 org.json json - 20230227 + 20230618 org.apache.httpcomponents @@ -153,7 +153,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.0 + 3.1.2 @@ -162,12 +162,12 @@ maven-clean-plugin - 3.2.0 + 3.3.1 maven-resources-plugin - 3.3.0 + 3.3.1 maven-compiler-plugin diff --git a/templates/workspace_services/guacamole/porter.yaml b/templates/workspace_services/guacamole/porter.yaml index 2618122c8e..3ba34ac9e2 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.2 +version: 0.9.3 description: "An Azure TRE service for Guacamole" dockerfile: Dockerfile.tmpl registry: azuretre From 468a1c19febc6cb36bb8896cc946680b9dc2042f Mon Sep 17 00:00:00 2001 From: Tamir Kamara <26870601+tamirkamara@users.noreply.github.com> Date: Wed, 5 Jul 2023 08:25:35 +0300 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d2b4ce0d0..ed2d7b7fe8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ FEATURES: ENHANCEMENTS: * Workspace networking peering sync is handled natively by Terraform ([#3534](https://github.com/microsoft/AzureTRE/issues/3534)) * Use SMTP built in connector vs API connector in Airlock Notifier ([#3572](https://github.com/microsoft/AzureTRE/issues/3572)) -* Update Guacamole dependencies ([#TBD](https://github.com/microsoft/AzureTRE/issues/TBD)) +* Update Guacamole dependencies ([#3602](https://github.com/microsoft/AzureTRE/issues/3602)) BUG FIXES: * Nexus might fail to deploy due to wrong identity used in key-vault extension ([#3492](https://github.com/microsoft/AzureTRE/issues/3492))