Merge branch 'main' into shell-updates

docker-compose.yml

@@ -1,5 +1,9 @@
 version: "3.4"
 
+x-global-vars:
+  &common-global-variables
+  TZ: Etc/UTC
+
 x-zammad-vars:
   &common-zammad-variables
   MEMCACHE_SERVERS: "zammad-memcached:11211"
@@ -41,10 +45,12 @@ services:
   zammad-elasticsearch:
     container_name: zammad-elasticsearch
     environment:
-      - discovery.type=single-node
-      - ES_JAVA_OPTS=-Xms750m -Xmx750m
-      - xpack.security.enabled=false
+      discovery.type: single-node
+      ES_JAVA_OPTS: -Xms750m -Xmx750m
+      xpack.security.enabled: false
+      <<: *common-global-variables
     build: ./docker/elasticsearch
+    image: registry.gitlab.com/digiresilience/link/link-stack/zammad-elasticsearch
     restart: ${RESTART}
     volumes:
       - elasticsearch-data:/usr/share/elasticsearch/data
@@ -56,10 +62,11 @@ services:
     depends_on:
       - zammad-postgresql
     environment:
-      <<: *common-zammad-variables
+      <<: [ *common-zammad-variables, *common-global-variables ]
       POSTGRESQL_USER: zammad
       POSTGRESQL_PASS: ${ZAMMAD_DATABASE_PASSWORD}
     build: ./docker/zammad
+    image: registry.gitlab.com/digiresilience/link/link-stack/zammad
     restart: on-failure
     volumes:
       - zammad-data:/opt/zammad
@@ -68,7 +75,10 @@ services:
     container_name: zammad-memcached
     command: memcached -m 256M
     build: ./docker/memcached
+    image: registry.gitlab.com/digiresilience/link/link-stack/zammad-memcached
     restart: ${RESTART}
+    environment:
+      <<: *common-global-variables
 
   zammad-nginx:
     platform: linux/x86_64
@@ -81,22 +91,27 @@ services:
     depends_on:
       - zammad-railsserver
     build: ./docker/zammad
+    image: registry.gitlab.com/digiresilience/link/link-stack/zammad
     restart: ${RESTART}
     environment:
+      <<: *common-global-variables
       NGINX_SERVER_SCHEME: https
       VIRTUAL_HOST: ${ZAMMAD_VIRTUAL_HOST}
       VIRTUAL_PORT: 8080
-
     volumes:
       - zammad-data:/opt/zammad
 
   zammad-postgresql:
     container_name: zammad-postgresql
     environment:
-      - POSTGRES_USER=zammad
-      - POSTGRES_PASSWORD=${ZAMMAD_DATABASE_PASSWORD}
+      <<: *common-global-variables
+      POSTGRES_USER: zammad
+      POSTGRES_PASSWORD: ${ZAMMAD_DATABASE_PASSWORD}
     build: ./docker/postgresql
+    image: registry.gitlab.com/digiresilience/link/link-stack/postgresql
     restart: ${RESTART}
+    ports:
+      - 127.0.0.1:5432:5432
     volumes:
       - postgresql-data:/var/lib/postgresql/data
 
@@ -108,8 +123,10 @@ services:
       - zammad-memcached
       - zammad-postgresql
       - zammad-redis
-    environment: *common-zammad-variables
+    environment:
+      <<: [ *common-global-variables, *common-zammad-variables ]
     build: ./docker/zammad
+    image: registry.gitlab.com/digiresilience/link/link-stack/zammad
     restart: ${RESTART}
     volumes:
       - zammad-data:/opt/zammad
@@ -117,7 +134,10 @@ services:
   zammad-redis:
     container_name: zammad-redis
     build: ./docker/redis
+    image: registry.gitlab.com/digiresilience/link/link-stack/zammad-redis
     restart: ${RESTART}
+    environment:
+      <<: *common-global-variables
 
   zammad-scheduler:
     platform: linux/x86_64
@@ -127,8 +147,10 @@ services:
       - zammad-memcached
       - zammad-railsserver
       - zammad-redis
-    environment: *common-zammad-variables
+    environment:
+      <<: [ *common-global-variables, *common-zammad-variables ]
     build: ./docker/zammad
+    image: registry.gitlab.com/digiresilience/link/link-stack/zammad
     restart: ${RESTART}
     volumes:
       - zammad-data:/opt/zammad
@@ -141,67 +163,100 @@ services:
       - zammad-memcached
       - zammad-railsserver
       - zammad-redis
-    environment: *common-zammad-variables
+    environment:
+      <<: [ *common-global-variables, *common-zammad-variables ]
     build: ./docker/zammad
+    image: registry.gitlab.com/digiresilience/link/link-stack/zammad
     restart: ${RESTART}
     volumes:
       - zammad-data:/opt/zammad
 
-  # metamigo-api:
-  #   build: ./apps/metamigo-api
-  #   container_name: metamigo-api
-  #   restart: ${RESTART}
-  #   command: [ "api" ]
-  #   expose:
-  #     - "3001"
-  #   environment: *common-metamigo-variables
-  #   volumes:
-  #     - ./signald:/signald
+  opensearch:
+    container_name: opensearch
+    build: ./docker/opensearch
+    restart: ${RESTART}
+    volumes:
+      - opensearch-data:/usr/share/opensearch/data
 
-  # metamigo-frontend:
-  #   build: ./apps/metamigo-frontend
-  #   container_name: metamigo-frontend
-  #   restart: ${RESTART}
-  #   command: [ "frontend" ]
-  #   expose:
-  #     - "3000"
-  #   ports:
-  #     - 127.0.0.1:8002:3000
-  #   environment:
-  #     <<: *common-metamigo-variables
-  #     VIRTUAL_HOST: ${METAMIGO_VIRTUAL_HOST}
-  #     VIRTUAL_PORT: 3000
+  opensearch-dashboards:
+    container_name: opensearch-dashboards
+    build: ./docker/opensearch-dashboards
+    restart: ${RESTART}
 
-  # metamigo-worker:
-  #   build: ./apps/metamigo-worker
-  #   container_name: metamigo-worker
-  #   restart: ${RESTART}
-  #   command: [ "worker" ]
-  #   environment: *common-metamigo-variables
+  metamigo-postgresql:
+    build: ./docker/postgresql
+    image: registry.gitlab.com/digiresilience/link/link-stack/postgresql
+    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
 
-  # metamigo-postgresql:
-  #   build: ./docker/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"
-  #   expose:
-  #     - "5432"
-  #   ports:
-  #     - 127.0.0.1:5432:5432
+  metamigo-api:
+    build:
+      context: .
+      dockerfile: ./apps/metamigo-cli/Dockerfile
+    image: registry.gitlab.com/digiresilience/link/link-stack/metamigo-cli
+    container_name: metamigo-api
+    restart: ${RESTART}
+    command: [ "api" ]
+    ports:
+      - 127.0.0.1:8004:3001
+    environment: *common-metamigo-variables
+    volumes:
+      - ./signald-state:/signald
+    depends_on:
+      - metamigo-postgresql
+      - signald
+
+  metamigo-frontend:
+    build:
+      context: .
+      dockerfile: ./apps/metamigo-frontend/Dockerfile
+    image: registry.gitlab.com/digiresilience/link/link-stack/metamigo-frontend
+    container_name: metamigo-frontend
+    restart: ${RESTART}
+    command: [ "frontend" ]
+    expose:
+      - "3000"
+    ports:
+      - 127.0.0.1:8002:3000
+    depends_on:
+      - metamigo-api
+    environment:
+      <<: *common-metamigo-variables
+      VIRTUAL_HOST: ${METAMIGO_VIRTUAL_HOST}
+      VIRTUAL_PORT: 3000
+
+  metamigo-worker:
+    build:
+      context: .
+      dockerfile: ./apps/metamigo-cli/Dockerfile
+    image: registry.gitlab.com/digiresilience/link/link-stack/metamigo-cli
+    container_name: metamigo-worker
+    restart: ${RESTART}
+    command: [ "worker" ]
+    environment: *common-metamigo-variables
+    depends_on:
+      - metamigo-api
 
   signald:
     container_name: signald
     build: ./docker/signald
+    image: registry.gitlab.com/digiresilience/link/link-stack/signald
     restart: ${RESTART}
     user: ${CURRENT_UID}
     volumes:
-      - ../signald:/signald
+      - ./signald-state:/signald
+    environment:
+      <<: *common-global-variables
 
   # nginx-proxy:
   #   container_name: nginx-proxy
@@ -265,3 +320,5 @@ volumes:
     driver: local
   metamigo-data:
     driver: local
+  opensearch-data:
+    driver: local