Compose updates

.gitpod.yml

@@ -1,10 +0,0 @@
-# This configuration file was automatically generated by Gitpod.
-# Please adjust to your needs (see https://www.gitpod.io/docs/introduction/learn-gitpod/gitpod-yaml)
-# and commit this file to your remote git repository to share the goodness with others.
-
-# Learn more from ready-to-use templates: https://www.gitpod.io/docs/introduction/getting-started/quickstart
-
-tasks:
-  - init: make
-
-

Makefile

@@ -1,6 +1,6 @@
 CURRENT_UID := $(shell id -u):$(shell id -g)
-PACKAGE_NAME ?= $(shell jq -r '.name' link/package.json)
+PACKAGE_NAME ?= $(shell jq -r '.name' package.json)
-PACKAGE_VERSION?= $(shell jq -r '.version' link/package.json)
+PACKAGE_VERSION?= $(shell jq -r '.version' package.json)
 BUILD_DATE   ?=$(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
 DOCKER_ARGS  ?=
 DOCKER_NS    ?= registry.gitlab.com/digiresilience/link/${PACKAGE_NAME}

docker-compose.yml

@@ -38,14 +38,17 @@ x-metamigo-vars:
 
 services:
   zammad-elasticsearch:
+    container_name: zammad-elasticsearch
     environment:
       - discovery.type=single-node
+      - ingest.geoip.downloader.enabled=false
     build: ./docker/elasticsearch
     restart: ${RESTART}
     volumes:
       - elasticsearch-data:/usr/share/elasticsearch/data
 
   zammad-init:
+    container_name: zammad-init
     command: [ "zammad-init" ]
     depends_on:
       - zammad-postgresql
@@ -59,26 +62,32 @@ services:
       - zammad-data:/opt/zammad
 
   zammad-memcached:
+    container_name: zammad-memcached
     command: memcached -m 256M
     build: ./docker/memcached
     restart: ${RESTART}
 
   zammad-nginx:
+    container_name: zammad-nginx
     command: [ "zammad-nginx" ]
     expose:
-      - "80"
+      - "8080"
+    ports:
+      - 127.0.0.1:8001:8080
     depends_on:
       - zammad-railsserver
     build: ./docker/zammad
     restart: ${RESTART}
     environment:
+      NGINX_SERVER_SCHEME: https
       VIRTUAL_HOST: ${ZAMMAD_VIRTUAL_HOST}
-      VIRTUAL_PORT: 80
+      VIRTUAL_PORT: 8080
 
     volumes:
       - zammad-data:/opt/zammad
 
   zammad-postgresql:
+    container_name: zammad-postgresql
     environment:
       - POSTGRES_USER=zammad
       - POSTGRES_PASSWORD=${ZAMMAD_DATABASE_PASSWORD}
@@ -88,6 +97,7 @@ services:
       - postgresql-data:/var/lib/postgresql/data
 
   zammad-railsserver:
+    container_name: zammad-railsserver
     command: [ "zammad-railsserver" ]
     depends_on:
       - zammad-memcached
@@ -100,10 +110,12 @@ services:
       - zammad-data:/opt/zammad
 
   zammad-redis:
+    container_name: zammad-redis
     build: ./docker/redis
     restart: ${RESTART}
 
   zammad-scheduler:
+    container_name: zammad-scheduler
     command: [ "zammad-scheduler" ]
     depends_on:
       - zammad-memcached
@@ -116,6 +128,7 @@ services:
       - zammad-data:/opt/zammad
 
   zammad-websocket:
+    container_name: zammad-websocket
     command: [ "zammad-websocket" ]
     depends_on:
       - zammad-memcached
@@ -127,41 +140,41 @@ services:
     volumes:
       - zammad-data:/opt/zammad
 
-  metamigo-api:
+  # metamigo-api:
-    build: ./apps/metamigo-api
+  #   build: ./apps/metamigo-api
-    container_name: metamigo-api
+  #   container_name: metamigo-api
-    restart: ${RESTART}
+  #   restart: ${RESTART}
-    command: [ "api" ]
+  #   command: [ "api" ]
-    expose:
+  #   expose:
-      - "3001"
+  #     - "3001"
-    environment: *common-metamigo-variables
+  #   environment: *common-metamigo-variables
-    volumes:
+  #   volumes:
-      - ./signald:/signald
+  #     - ./signald:/signald
 
-  metamigo-frontend:
+  # metamigo-frontend:
-    build: ./apps/metamigo-frontend
+  #   build: ./apps/metamigo-frontend
-    container_name: metamigo-frontend
+  #   container_name: metamigo-frontend
-    restart: ${RESTART}
+  #   restart: ${RESTART}
-    command: [ "frontend" ]
+  #   command: [ "frontend" ]
-    expose:
+  #   expose:
-      - "3000"
+  #     - "3000"
-    ports:
+  #   ports:
-      - 127.0.0.1:8002:3000
+  #     - 127.0.0.1:8002:3000
-    environment:
+  #   environment:
-      <<: *common-metamigo-variables
+  #     <<: *common-metamigo-variables
-      VIRTUAL_HOST: ${METAMIGO_VIRTUAL_HOST}
+  #     VIRTUAL_HOST: ${METAMIGO_VIRTUAL_HOST}
-      VIRTUAL_PORT: 3000
+  #     VIRTUAL_PORT: 3000
 
-  metamigo-worker:
+  # metamigo-worker:
-    build: ./apps/metamigo-worker
+  #   build: ./apps/metamigo-worker
-    container_name: metamigo-worker
+  #   container_name: metamigo-worker
-    restart: ${RESTART}
+  #   restart: ${RESTART}
-    command: [ "worker" ]
+  #   command: [ "worker" ]
-    environment: *common-metamigo-variables
+  #   environment: *common-metamigo-variables
 
   metamigo-postgresql:
-    build: ./docker/postgresql
     container_name: metamigo-postgresql
+    build: ./docker/postgresql
     restart: ${RESTART}
     volumes:
       - metamigo-data:/var/lib/postgresql/data
@@ -177,6 +190,7 @@ services:
       - 127.0.0.1:5432:5432
 
   signald:
+    container_name: signald
     build: ./docker/signald
     restart: ${RESTART}
     user: ${CURRENT_UID}
@@ -184,6 +198,7 @@ services:
       - ../signald:/signald
 
   nginx-proxy:
+    container_name: nginx-proxy
     build: ./docker/nginx-proxy
     restart: ${RESTART}
     ports:
@@ -192,6 +207,7 @@ services:
       - /var/run/docker.sock:/tmp/docker.sock:ro
 
   link:
+    container_name: link
     build: ./apps/link
     expose:
       - "3000"
@@ -204,6 +220,7 @@ services:
       ZAMMAD_VIRUAL_HOST: ${ZAMMAD_VIRTUAL_HOST}
 
   zammad-proxy:
+    container_name: zammad-proxy
     build: ./apps/zammad-proxy
     expose:
       - "3000"