Project structure update

docker-compose.yml

@@ -1,10 +1,12 @@
 version: "3.4"
 
-x-zammad-vars: &common-zammad-variables
+x-zammad-vars:
+  &common-zammad-variables
   MEMCACHE_SERVERS: "zammad-memcached:11211"
   REDIS_URL: "redis://zammad-redis:6379"
 
-x-metamigo-vars: &common-metamigo-variables
+x-metamigo-vars:
+  &common-metamigo-variables
   DATABASE_HOST: "metamigo-postgresql"
   DATABASE_NAME: "metamigo"
   DATABASE_ROOT_OWNER: "root"
@@ -44,7 +46,7 @@ services:
       - elasticsearch-data:/usr/share/elasticsearch/data
 
   zammad-init:
-    command: ["zammad-init"]
+    command: [ "zammad-init" ]
     depends_on:
       - zammad-postgresql
     environment:
@@ -62,11 +64,9 @@ services:
     restart: ${RESTART}
 
   zammad-nginx:
-    command: ["zammad-nginx"]
+    command: [ "zammad-nginx" ]
     expose:
       - "80"
-    ports:
-      - 127.0.0.1:8001:80
     depends_on:
       - zammad-railsserver
     image: ${ZAMMAD_IMAGE}
@@ -88,7 +88,7 @@ services:
       - postgresql-data:/var/lib/postgresql/data
 
   zammad-railsserver:
-    command: ["zammad-railsserver"]
+    command: [ "zammad-railsserver" ]
     depends_on:
       - zammad-memcached
       - zammad-postgresql
@@ -104,7 +104,7 @@ services:
     restart: ${RESTART}
 
   zammad-scheduler:
-    command: ["zammad-scheduler"]
+    command: [ "zammad-scheduler" ]
     depends_on:
       - zammad-memcached
       - zammad-railsserver
@@ -116,7 +116,7 @@ services:
       - zammad-data:/opt/zammad
 
   zammad-websocket:
-    command: ["zammad-websocket"]
+    command: [ "zammad-websocket" ]
     depends_on:
       - zammad-memcached
       - zammad-railsserver
@@ -131,7 +131,7 @@ services:
     image: ${METAMIGO_IMAGE}
     container_name: metamigo-api
     restart: ${RESTART}
-    command: ["api"]
+    command: [ "api" ]
     expose:
       - "3001"
     environment: *common-metamigo-variables
@@ -142,7 +142,7 @@ services:
     image: ${METAMIGO_IMAGE}
     container_name: metamigo-frontend
     restart: ${RESTART}
-    command: ["frontend"]
+    command: [ "frontend" ]
     expose:
       - "3000"
     ports:
@@ -156,7 +156,7 @@ services:
     image: ${METAMIGO_IMAGE}
     container_name: metamigo-worker
     restart: ${RESTART}
-    command: ["worker"]
+    command: [ "worker" ]
     environment: *common-metamigo-variables
 
   metamigo-postgresql:
@@ -194,14 +194,25 @@ services:
   link-shell:
     build:
       context: .
-      dockerfile: Dockerfile
+      dockerfile: ./link/Dockerfile
     expose:
       - "3000"
     ports:
-      - 127.0.0.1:8003:3000
+      - "8003:3000"
     environment:
       ZAMMAD_URL: ${ZAMMAD_URL}
       ZAMMAD_API_TOKEN: ${ZAMMAD_API_TOKEN}
+      ZAMMAD_VIRUAL_HOST: ${ZAMMAD_VIRTUAL_HOST}
+  zammad-proxy:
+    build:
+      context: .
+      dockerfile: ./zammad-proxy/Dockerfile
+    expose:
+      - "3000"
+    environment:
+      ZAMMAD_URL: ${ZAMMAD_URL}
+      ZAMMAD_API_TOKEN: ${ZAMMAD_API_TOKEN}
+      ZAMMAD_VIRUAL_HOST: ${ZAMMAD_VIRTUAL_HOST}
 
 volumes:
   elasticsearch-data: