From fa8051c8b4ca4cd37405998d41744f93de0a4952 Mon Sep 17 00:00:00 2001
From: Cian Hughes <cian.hughes@dcu.ie>
Date: Tue, 5 Dec 2023 17:24:58 +0000
Subject: [PATCH] Separated into manager and stack

---
 .gitignore          |  2 --
 docker-compose.yaml | 51 -----------------------------------------
 stack.yaml          | 56 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 53 deletions(-)
 create mode 100644 stack.yaml

diff --git a/.gitignore b/.gitignore
index 3f8a9a0..e69de29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +0,0 @@
-.keys
-volumes.yaml
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index ced2a60..49b23fa 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -27,39 +27,6 @@ services:
       placement:
         constraints:
           - node.role == manager
-  # This service runs a grafana instance for hosting dashboards
-  grafana:
-    image: grafana/grafana:latest
-    ports:
-      - "3000:3000"
-    volumes:
-      - grafana:/var/lib/grafana
-    deploy:
-      replicas: 1
-      restart_policy:
-        condition: on-failure
-  # The following service is a simple nginx server that hosts static websites
-  nginx:
-    image: nginx:latest
-    ports:
-      - "80:80"
-    volumes:
-      - web:/usr/share/nginx/html
-    deploy:
-      replicas: 1
-      restart_policy:
-        condition: on-failure
-  # And, finally, we want to add a dataverse instance to the swarm
-  dataverse:
-    image: gdcc/dataverse:alpha
-    ports:
-      - "8080:8080"
-    volumes:
-      - dataverse:/usr/local/glassfish4/glassfish/domains/domain1/autodeploy
-    deploy:
-      replicas: 1
-      restart_policy:
-        condition: on-failure
 
 # This defines the NFS volumes for persistence
 #! This requires nodes to be IP whitelisted in the NAS
@@ -69,22 +36,4 @@ volumes:
     driver_opts:
       type: nfs
       device: ":volume1/portainer_data"
-      o: "addr=I-Form_Data,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
-  web:
-    driver: local
-    driver_opts:
-      type: nfs
-      device: ":volume1/web"
-      o: "addr=I-Form_Data,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
-  grafana:
-    driver: local
-    driver_opts:
-      type: nfs
-      device: ":volume1/grafana"
-      o: "addr=I-Form_Data,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
-  dataverse:
-    driver: local
-    driver_opts:
-      type: nfs
-      device: ":volume1/dataverse"
       o: "addr=I-Form_Data,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
\ No newline at end of file
diff --git a/stack.yaml b/stack.yaml
new file mode 100644
index 0000000..708c3aa
--- /dev/null
+++ b/stack.yaml
@@ -0,0 +1,56 @@
+services:
+  # This service runs a grafana instance for hosting dashboards
+  grafana:
+    image: grafana/grafana:latest
+    ports:
+      - "3000:3000"
+    volumes:
+      - grafana:/var/lib/grafana
+    deploy:
+      replicas: 1
+      restart_policy:
+        condition: on-failure
+  # The following service is a simple nginx server that hosts static websites
+  nginx:
+    image: nginx:latest
+    ports:
+      - "80:80"
+    volumes:
+      - web:/usr/share/nginx/html
+    deploy:
+      replicas: 1
+      restart_policy:
+        condition: on-failure
+  # And, finally, we want to add a dataverse instance to the swarm
+  dataverse:
+    image: gdcc/dataverse:alpha
+    ports:
+      - "8080:8080"
+    volumes:
+      - dataverse:/usr/local/glassfish4/glassfish/domains/domain1/autodeploy
+    deploy:
+      replicas: 1
+      restart_policy:
+        condition: on-failure
+
+# This defines the NFS volumes for persistence
+#! This requires nodes to be IP whitelisted in the NAS
+volumes:
+  web:
+    driver: local
+    driver_opts:
+      type: nfs
+      device: ":volume1/web"
+      o: "addr=I-Form_Data,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
+  grafana:
+    driver: local
+    driver_opts:
+      type: nfs
+      device: ":volume1/grafana"
+      o: "addr=I-Form_Data,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
+  dataverse:
+    driver: local
+    driver_opts:
+      type: nfs
+      device: ":volume1/dataverse"
+      o: "addr=I-Form_Data,rw,noatime,rsize=8192,wsize=8192,tcp,timeo=14,nfsvers=4"
\ No newline at end of file