Updated Taskchampion Sync Server and Silverbullet container templates

8 files changed, 71 insertions, 20 deletions

diff --git a/stacks/pkm/.env.template b/stacks/pkm/.env.template
new file mode 100644
index 0000000..b607b6b
--- /dev/null
+++ b/stacks/pkm/.env.template
@@ -0,0 +1,15 @@
+#
+#
+# Stack Compose Variables
+
+# Namespaces
+_STACK_0=
+
+# Containers
+_CONTAINER_0=
+
+# Networks
+_NET_0=
+
+# Volumes
+_VOLUME_0=
diff --git a/stacks/pkm/.gitignore b/stacks/pkm/.gitignore
new file mode 100644
index 0000000..360f7cc
--- /dev/null
+++ b/stacks/pkm/.gitignore
@@ -0,0 +1,3 @@
+*.env
+space/
+compose.test.yml
diff --git a/stacks/pkm/.pkm.env.template b/stacks/pkm/.pkm.env.template
new file mode 100644
index 0000000..9f373a5
--- /dev/null
+++ b/stacks/pkm/.pkm.env.template
@@ -0,0 +1,6 @@
+#
+#
+# Stack Runtime Variables
+SB_USER=
+SB_NAME=
+SB_DESCRIPTION=
diff --git a/stacks/pkm/compose.yml b/stacks/pkm/compose.yml
new file mode 100644
index 0000000..68afaf0
--- /dev/null
+++ b/stacks/pkm/compose.yml
@@ -0,0 +1,26 @@
+name: ${_STACK_0}
+
+networks:
+  edge-net:
+    name: ${_NET_0}
+    external: true
+
+volumes:
+  pkm-data:
+    name: ${_VOLUME_0}
+    external: true
+
+services:
+  pkm:
+    container_name: ${_CONTAINER_0}
+    image: ghcr.io/silverbulletmd/silverbullet
+    restart: unless-stopped
+    env_file:
+      - .run.env
+      - .env
+    networks:
+      - edge-net
+    expose:
+      - 3000
+    volumes:
+      - pkm-data:/space
diff --git a/stacks/tss/.env.template b/stacks/tss/.env.template
index fa0eaba..b607b6b 100644
--- a/stacks/tss/.env.template
+++ b/stacks/tss/.env.template
@@ -2,12 +2,14 @@
 #
 # Stack Compose Variables
 
-# Namespace
-_STACK=
-_CONTAINER=
+# Namespaces
+_STACK_0=
 
-# Network
-_NET=
+# Containers
+_CONTAINER_0=
+
+# Networks
+_NET_0=
 
 # Volumes
-_DATA_VOLUME=
+_VOLUME_0=
diff --git a/stacks/tss/.gitignore b/stacks/tss/.gitignore
index c71102c..13fed15 100644
--- a/stacks/tss/.gitignore
+++ b/stacks/tss/.gitignore
@@ -1,4 +1,3 @@
 *.env
-.data/
-.data/**
-compose.local.yml
+data/
+compose.test.yml
diff --git a/stacks/tss/.tss.env.template b/stacks/tss/.run.env.template
index 103c5da..103c5da 100644
--- a/stacks/tss/.tss.env.template
+++ b/stacks/tss/.run.env.template
diff --git a/stacks/tss/compose.yml b/stacks/tss/compose.yml
index cab2a13..63913f0 100644
--- a/stacks/tss/compose.yml
+++ b/stacks/tss/compose.yml
@@ -1,26 +1,26 @@
-name: ${_STACK}
+name: ${_STACK_0}
 
-volumes:
-  data:
-    name: ${_DATA_VOLUME}
+networks:
+  edge-net:
+    name: ${_NET_0}
     external: true
 
-networks:
-  net:
-    name: ${_NET}
+volumes:
+  tss-db:
+    name: ${_VOLUME_0}
     external: true
 
 services:
   tss:
-    container_name: ${_CONTAINER}
+    container_name: ${_CONTAINER_0}
     image: ghcr.io/gothenburgbitfactory/taskchampion-sync-server:latest
     restart: unless-stopped
     env_file:
-      - .tss.env
+      - .run.env
       - .env
     volumes:
-      - data:/var/lib/taskchampion-sync-server/data
+      - tss-db:/var/lib/taskchampion-sync-server/data
     networks:
-      - net
+      - edge-net
     expose:
       - 8080