update

microsoft · Apr 12, 2024 · ba9ae50 · ba9ae50
1 parent 81801f8
commit ba9ae50
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/porter.yaml b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/porter.yaml
@@ -1,7 +1,7 @@
 ---
 schemaVersion: 1.0.0
 name: tre-service-guacamole-linuxvm
-version: 0.6.25
+version: 0.6.26
 description: "An Azure TRE User Resource Template for Guacamole (Linux)"
 dockerfile: Dockerfile.tmpl
 registry: azuretre

diff --git a/...space_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/get_apt_keys.sh b/...space_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/get_apt_keys.sh
@@ -6,6 +6,10 @@ set -o nounset
 # Uncomment this line to see each command for debugging (careful: this will show secrets!)
 # set -o xtrace
 
+#remove key if they already exist
+sudo rm-f /etc/apt/trusted.gpg.d/docker-archive-keyring.gpg || true
+sudo rm-f /etc/apt/trusted.gpg.d/microsoft.gpg || true
+
 # Get Docker Public key from Nexus
 curl -fsSL "${NEXUS_PROXY_URL}"/repository/docker-public-key/gpg | sudo gpg --dearmor -o /etc/apt/trusted.gpg.d/docker-archive-keyring.gpg