WIP 4

docker/compose/postgresql.yml

@@ -1,8 +1,24 @@
 version: "3.4"
 
-x-metamigo-vars:
-  &common-metamigo-variables
-  DATABASE_HOST: "metamigo-postgresql"
+x-global-vars: &common-global-variables
+  TZ: Etc/UTC
+
+x-zammad-vars: &common-zammad-variables
+  MEMCACHE_SERVERS: "zammad-memcached:11211"
+  REDIS_URL: "redis://zammad-redis:6379"
+  POSTGRESQL_HOST: "postgresql"
+  POSTGRESQL_PORT: "5432"
+  POSTGRESQL_USER: "zammad"
+  POSTGRESQL_PASS: ${ZAMMAD_DATABASE_PASSWORD}
+  POSTGRESQL_DB: "zammad_production"
+  ELASTICSEARCH_HOST: ${OPENSEARCH_HOST}
+  ELASTICSEARCH_USER: ${OPENSEARCH_USER}
+  ELASTICSEARCH_PASS: ${OPENSEARCH_PASS}
+  ELASTICSEARCH_SSL_VERIFY: false # this doesn't set es_ssl_verify as expected, but ideally it would
+  ELASTICSEARCH_SCHEMA: "https"
+
+x-metamigo-vars: &common-metamigo-variables
+  DATABASE_HOST: "postgresql"
   DATABASE_NAME: "metamigo"
   DATABASE_ROOT_OWNER: "root"
   DATABASE_ROOT_PASSWORD: ${METAMIGO_DATABASE_ROOT_PASSWORD}
@@ -32,22 +48,34 @@ x-metamigo-vars:
   SIGNALD_SOCKET: /signald/signald.sock
 
 services:
-  metamigo-postgresql:
+  postgresql:
+    container_name: postgresql
+    environment:
+      <<:
+        [
+          *common-global-variables,
+          *common-zammad-variables,
+          *common-metamigo-variables,
+        ]
+      POSTGRES_USER: zammad
+      POSTGRES_PASSWORD: ${ZAMMAD_DATABASE_PASSWORD}
     build: ../postgresql
     image: registry.gitlab.com/digiresilience/link/link-stack/postgresql:${LINK_STACK_VERSION}
-    container_name: metamigo-postgresql
     restart: ${RESTART}
-    volumes:
-      - metamigo-data:/var/lib/postgresql/data
-      - ./scripts/bootstrap-metamigo.sh:/docker-entrypoint-initdb.d/bootstrap-metamigo.sh
-    environment:
-      <<: *common-metamigo-variables
-      POSTGRES_PASSWORD: ${METAMIGO_DATABASE_ROOT_PASSWORD}
-      POSTGRES_USER: "root"
-      POSTGRES_DB: "metamigo"
     ports:
-      - 127.0.0.1:5433:5432
+      - 5432:5432
+    volumes:
+      - postgresql-data:/var/lib/postgresql/data
+
+#    volumes:
+#     - metamigo-data:/var/lib/postgresql/data
+#     - ./scripts/bootstrap-metamigo.sh:/docker-entrypoint-initdb.d/bootstrap-metamigo.sh
+#environment:
+# <<: *common-metamigo-variables
+# POSTGRES_PASSWORD: ${METAMIGO_DATABASE_ROOT_PASSWORD}
+#  POSTGRES_USER: "root"
+# POSTGRES_DB: "metamigo"
 
 volumes:
-  metamigo-data:
+  postgresql-data:
     driver: local