From d50f0e058aa1ff6e8990afb08938d6bfc228fb30 Mon Sep 17 00:00:00 2001
From: Abel Luck <abel@guardianproject.info>
Date: Wed, 9 Aug 2023 09:31:53 +0000
Subject: [PATCH] docker-compose: move signdald to different docker-compose

when developing metamigo you want to run the api, frontend, and worker
locally but want postgres and signald in containers.

this commit moves signald into the postgresql compose (which could be
renamed now i suppose) so you can run just that compose (npm run
docker:metamigo:dev:up) to do local dev on metamigo.
---
 docker-compose.metamigo-postgresql.yml | 16 ++++++++++++++++
 docker-compose.metamigo.yml            | 12 +-----------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/docker-compose.metamigo-postgresql.yml b/docker-compose.metamigo-postgresql.yml
index 1e8086e..5834fc4 100644
--- a/docker-compose.metamigo-postgresql.yml
+++ b/docker-compose.metamigo-postgresql.yml
@@ -1,7 +1,12 @@
 version: "3.4"
 
+x-global-vars:
+  &common-global-variables
+  TZ: Etc/UTC
+
 x-metamigo-vars:
   &common-metamigo-variables
+  <<: *common-global-variables
   DATABASE_HOST: "metamigo-postgresql"
   DATABASE_NAME: "metamigo"
   DATABASE_ROOT_OWNER: "root"
@@ -48,6 +53,17 @@ services:
     ports:
       - 127.0.0.1:5433:5432
 
+  signald:
+    container_name: signald
+    build: ./docker/signald
+    image: registry.gitlab.com/digiresilience/link/link-stack/signald:${LINK_STACK_VERSION}
+    restart: ${RESTART}
+    user: ${CURRENT_UID}
+    volumes:
+      - ./signald-state:/signald
+    environment:
+      <<: *common-global-variables
+
 volumes:
   metamigo-data:
     driver: local
diff --git a/docker-compose.metamigo.yml b/docker-compose.metamigo.yml
index ea4952c..4bee18b 100644
--- a/docker-compose.metamigo.yml
+++ b/docker-compose.metamigo.yml
@@ -6,6 +6,7 @@ x-global-vars:
 
 x-metamigo-vars:
   &common-metamigo-variables
+  <<: *common-global-variables
   DATABASE_HOST: "metamigo-postgresql"
   DATABASE_NAME: "metamigo"
   DATABASE_ROOT_OWNER: "root"
@@ -87,14 +88,3 @@ services:
     depends_on:
       - metamigo-api
 
-  signald:
-    container_name: signald
-    build: ./docker/signald
-    image: registry.gitlab.com/digiresilience/link/link-stack/signald:${LINK_STACK_VERSION}
-    restart: ${RESTART}
-    user: ${CURRENT_UID}
-    volumes:
-      - ./signald-state:/signald
-    environment:
-      <<: *common-global-variables
-