diff --git a/stack-clients/docker-compose.yml b/stack-clients/docker-compose.yml
index 62b8dec1..98c395ec 100644
--- a/stack-clients/docker-compose.yml
+++ b/stack-clients/docker-compose.yml
@@ -1,6 +1,6 @@
services:
stack-client:
- image: ghcr.io/theworldavatar/stack-client${IMAGE_SUFFIX}:1.46.3
+ image: ghcr.io/theworldavatar/stack-client${IMAGE_SUFFIX}:1.47.0-secure-vis-SNAPSHOT
secrets:
- blazegraph_password
- postgis_password
diff --git a/stack-clients/pom.xml b/stack-clients/pom.xml
index 6126f770..252148aa 100644
--- a/stack-clients/pom.xml
+++ b/stack-clients/pom.xml
@@ -7,7 +7,7 @@
com.cmclinnovations
stack-clients
- 1.46.3
+ 1.47.0-secure-vis-SNAPSHOT
Stack Clients
https://theworldavatar.io
diff --git a/stack-clients/src/main/java/com/cmclinnovations/stack/clients/core/PasswordEndpointConfig.java b/stack-clients/src/main/java/com/cmclinnovations/stack/clients/core/PasswordEndpointConfig.java
index 76479067..5fe03b20 100644
--- a/stack-clients/src/main/java/com/cmclinnovations/stack/clients/core/PasswordEndpointConfig.java
+++ b/stack-clients/src/main/java/com/cmclinnovations/stack/clients/core/PasswordEndpointConfig.java
@@ -10,7 +10,7 @@ public class PasswordEndpointConfig extends AbstractEndpointConfig {
private final String passwordFile;
- protected PasswordEndpointConfig(String name, String passwordFile) {
+ public PasswordEndpointConfig(String name, String passwordFile) {
super(name);
this.passwordFile = passwordFile;
}
diff --git a/stack-clients/src/main/java/com/cmclinnovations/stack/services/VisualisationService.java b/stack-clients/src/main/java/com/cmclinnovations/stack/services/VisualisationService.java
index 9769906b..5f1489c4 100644
--- a/stack-clients/src/main/java/com/cmclinnovations/stack/services/VisualisationService.java
+++ b/stack-clients/src/main/java/com/cmclinnovations/stack/services/VisualisationService.java
@@ -1,5 +1,6 @@
package com.cmclinnovations.stack.services;
+import com.cmclinnovations.stack.clients.core.PasswordEndpointConfig;
import com.cmclinnovations.stack.services.config.ServiceConfig;
public class VisualisationService extends ContainerService {
@@ -14,5 +15,10 @@ public VisualisationService(String stackName, ServiceConfig config) {
protected void doPreStartUpConfiguration() {
ensureOptionalSecret("mapbox_username");
ensureOptionalSecret("mapbox_api_key");
+
+ String sessionSecret = new PasswordEndpointConfig("viz_session_secret", "/run/secrets/viz_session_secret")
+ .getPassword();
+ setEnvironmentVariableIfAbsent("SESSION_SECRET", sessionSecret);
}
+
}
diff --git a/stack-clients/src/main/resources/com/cmclinnovations/stack/services/built-ins/visualisation.json b/stack-clients/src/main/resources/com/cmclinnovations/stack/services/built-ins/visualisation.json
index 86b93fab..2d42e80f 100644
--- a/stack-clients/src/main/resources/com/cmclinnovations/stack/services/built-ins/visualisation.json
+++ b/stack-clients/src/main/resources/com/cmclinnovations/stack/services/built-ins/visualisation.json
@@ -4,12 +4,17 @@
"Name": "visualisation",
"TaskTemplate": {
"ContainerSpec": {
- "Image": "ghcr.io/cambridge-cares/twa-vf:4",
+ "Image": "ghcr.io/theworldavatar/viz:5.25.0-bugfix-SNAPSHOT",
"Mounts": [
{
"Type": "volume",
"Source": "vis-files",
"Target": "/var/www/html"
+ },
+ {
+ "Type": "volume",
+ "Source": "vis-previous-state",
+ "Target": "/twa/.public_hash/previous-state-of-public-folder"
}
],
"Secrets": [
diff --git a/stack-data-uploader/docker-compose.yml b/stack-data-uploader/docker-compose.yml
index fe6da1eb..c03418db 100644
--- a/stack-data-uploader/docker-compose.yml
+++ b/stack-data-uploader/docker-compose.yml
@@ -1,6 +1,6 @@
services:
stack-data-uploader:
- image: ghcr.io/theworldavatar/stack-data-uploader${IMAGE_SUFFIX}:1.46.3
+ image: ghcr.io/theworldavatar/stack-data-uploader${IMAGE_SUFFIX}:1.47.0-secure-vis-SNAPSHOT
secrets:
- blazegraph_password
- postgis_password
diff --git a/stack-data-uploader/pom.xml b/stack-data-uploader/pom.xml
index 943ea09c..16bcc9da 100644
--- a/stack-data-uploader/pom.xml
+++ b/stack-data-uploader/pom.xml
@@ -7,7 +7,7 @@
com.cmclinnovations
stack-data-uploader
- 1.46.3
+ 1.47.0-secure-vis-SNAPSHOT
Stack Data Uploader
https://theworldavatar.io
@@ -38,7 +38,7 @@
com.cmclinnovations
stack-clients
- 1.46.3
+ 1.47.0-secure-vis-SNAPSHOT
diff --git a/stack-manager/docker-compose.yml b/stack-manager/docker-compose.yml
index 126f031d..e31bb4e3 100644
--- a/stack-manager/docker-compose.yml
+++ b/stack-manager/docker-compose.yml
@@ -1,6 +1,6 @@
services:
stack-manager:
- image: ghcr.io/theworldavatar/stack-manager${IMAGE_SUFFIX}:1.46.3
+ image: ghcr.io/theworldavatar/stack-manager${IMAGE_SUFFIX}:1.47.0-secure-vis-SNAPSHOT
environment:
EXTERNAL_PORT: "${EXTERNAL_PORT-3838}"
STACK_BASE_DIR: "${STACK_BASE_DIR}"
diff --git a/stack-manager/pom.xml b/stack-manager/pom.xml
index 38ac0f2d..c6383c9b 100644
--- a/stack-manager/pom.xml
+++ b/stack-manager/pom.xml
@@ -7,7 +7,7 @@
com.cmclinnovations
stack-manager
- 1.46.3
+ 1.47.0-secure-vis-SNAPSHOT
Stack Manager
https://theworldavatar.io
@@ -38,7 +38,7 @@
com.cmclinnovations
stack-clients
- 1.46.3
+ 1.47.0-secure-vis-SNAPSHOT