Skip to content

Commit

Permalink
Update Guacamole dependencies (#4232)
Browse files Browse the repository at this point in the history
* Update Guacamole dependencies

* update changelog

---------

Co-authored-by: Tamir Kamara <takamara@microsoft.com>
  • Loading branch information
tamirkamara and Tamir Kamara authored Dec 30, 2024
1 parent fdf50f2 commit c199703
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ ENHANCEMENTS:
* Update Admin VM versions ([[#4217](https://github.com/microsoft/AzureTRE/issues/4217)])
* Update devcontainer/RP/API package versions: base image, docker, az cli, YQ ([#4225](https://github.com/microsoft/AzureTRE/pull/4225))
* Disable storage account key usage ([[#4227](https://github.com/microsoft/AzureTRE/issues/4227)])
* Update Guacamole dependencies ([[#4232](https://github.com/microsoft/AzureTRE/issues/4232)])

BUG FIXES:
* Update KeyVault references in API to use the version so Terraform cascades the update ([#4112](https://github.com/microsoft/AzureTRE/pull/4112))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ COPY --from=client_build /target/surefire-reports/* /

FROM guacamole/guacd:1.5.5

ARG GUACAMOLE_AZURE_VERSION=0.4.0
ARG GUACAMOLE_AZURE_VERSION=0.4.1

ENV DEBIAN_FRONTEND=noninteractive

Expand All @@ -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.97" && \
TOMCAT_VER="9.0.98" && \
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" && \
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.9.2"
__version__ = "0.9.3"
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-tre</artifactId>
<version>0.4.0</version>
<version>0.4.1</version>
<packaging>jar</packaging>
<name>guacamole-azure-tre</name>

Expand Down Expand Up @@ -48,12 +48,12 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-security-keyvault-secrets</artifactId>
<version>4.9.0</version>
<version>4.9.1</version>
</dependency>
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
<version>1.14.0</version>
<version>1.14.2</version>
</dependency>
<!-- Http and Json Components -->
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion templates/workspace_services/guacamole/porter.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
schemaVersion: 1.0.0
name: tre-service-guacamole
version: 0.12.4
version: 0.12.5
description: "An Azure TRE service for Guacamole"
dockerfile: Dockerfile.tmpl
registry: azuretre
Expand Down

0 comments on commit c199703

Please sign in to comment.