Skip to content

Dev-secure-viz #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
gpeb2 wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Dev-secure-viz #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0dfc780
dev-secure-viz: Bumped stack version number.
gpeb2 May 16, 2025
6cd2145
dev-secure-viz: Bumped the default version of the viz.
gpeb2 May 16, 2025
5438b49
dev-secure-viz: Added a session secret for the viz container.
gpeb2 May 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stack-clients/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion stack-clients/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>com.cmclinnovations</groupId>
<artifactId>stack-clients</artifactId>
<version>1.46.3</version>
<version>1.47.0-secure-vis-SNAPSHOT</version>

<name>Stack Clients</name>
<url>https://theworldavatar.io</url>
Expand Down
2 changes: 1 addition & 1 deletion ...-clients/src/main/java/com/cmclinnovations/stack/clients/core/PasswordEndpointConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
6 changes: 6 additions & 0 deletions stack-clients/src/main/java/com/cmclinnovations/stack/services/VisualisationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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);
}

}
7 changes: 6 additions & 1 deletion ...lients/src/main/resources/com/cmclinnovations/stack/services/built-ins/visualisation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion stack-data-uploader/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions stack-data-uploader/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>com.cmclinnovations</groupId>
<artifactId>stack-data-uploader</artifactId>
<version>1.46.3</version>
<version>1.47.0-secure-vis-SNAPSHOT</version>

<name>Stack Data Uploader</name>
<url>https://theworldavatar.io</url>
Expand Down Expand Up @@ -38,7 +38,7 @@
<dependency>
<groupId>com.cmclinnovations</groupId>
<artifactId>stack-clients</artifactId>
<version>1.46.3</version>
<version>1.47.0-secure-vis-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion stack-manager/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}"
Expand Down
4 changes: 2 additions & 2 deletions stack-manager/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<groupId>com.cmclinnovations</groupId>
<artifactId>stack-manager</artifactId>
<version>1.46.3</version>
<version>1.47.0-secure-vis-SNAPSHOT</version>

<name>Stack Manager</name>
<url>https://theworldavatar.io</url>
Expand Down Expand Up @@ -38,7 +38,7 @@
<dependency>
<groupId>com.cmclinnovations</groupId>
<artifactId>stack-clients</artifactId>
<version>1.46.3</version>
<version>1.47.0-secure-vis-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down