From 39007721bbfdf8712f10ff0ffba97531d918e19b Mon Sep 17 00:00:00 2001
From: Antonio Calanducci <antonio.calanducci@isti.cnr.it>
Date: Wed, 31 Jan 2024 13:16:00 +0100
Subject: [PATCH] Update vremodeler docker image and make volume unique for nfs
 export

---
 roles/vremodeler/defaults/main.yml               | 2 +-
 roles/vremodeler/templates/docker-compose.yml.j2 | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/roles/vremodeler/defaults/main.yml b/roles/vremodeler/defaults/main.yml
index 5d285dc..1cc9c19 100644
--- a/roles/vremodeler/defaults/main.yml
+++ b/roles/vremodeler/defaults/main.yml
@@ -10,7 +10,7 @@ scope_name: '{{ start_scopes | lower | replace(",", "-") }}'
 vremodeler_compose_dir: '/srv/vremodeler-stack-{{ scope_name }}'
 vremodeler_docker_stack_name: 'vremodeler-stack-{{ scope_name }}'
 vremodeler_docker_service_server_name: 'vremodeler-{{ scope_name }}'
-vremodeler_docker_server_image: 'acaland/gcore-vremodeler'
+vremodeler_docker_server_image: 'd4science/gcore-vre-modeler'
 vremodeler_docker_network: 'vremodeler-network'
 #vremodeler_service_port: 8080
 vremodeler_haproxy_public_net: 'haproxy-public'
diff --git a/roles/vremodeler/templates/docker-compose.yml.j2 b/roles/vremodeler/templates/docker-compose.yml.j2
index 110bea4..3bad6bb 100644
--- a/roles/vremodeler/templates/docker-compose.yml.j2
+++ b/roles/vremodeler/templates/docker-compose.yml.j2
@@ -18,13 +18,13 @@ secrets:
 {% endfor %}
 
 volumes:
-  gcore_persisted:
+  gcore_persisted_vremodeler:
     driver: local
     driver_opts:
       type: nfs4
       # o: "nfsvers=4,addr=192.168.1.222,rw,nolock,soft"
       o: "nfsvers=4,addr={{ nfs_server_ip }},rw"
-      device: ":/nfs_{{ service_prefix | replace("-", "_") }}_{{ env }}"
+      device: ":/nfs_{{ service_prefix | replace("-", "_") }}_{{ scope_name }}"
 
 services:
   {{ vremodeler_docker_service_server_name }}:
@@ -33,7 +33,7 @@ services:
       - {{ vremodeler_docker_network }}
       - {{ vremodeler_haproxy_public_net }}
     volumes:
-      - gcore_persisted:/gcube-data
+      - gcore_persisted_vremodeler:/gcube-data
     environment:
       - NFS_GCORE_PATH=/gcube-data/states/{{ gcore_host }}
     secrets: