Continue organization

docker-compose.yml

@@ -40,7 +40,7 @@ services:
   zammad-elasticsearch:
     environment:
       - discovery.type=single-node
-    build: ./elasticsearch
+    build: ./docker/elasticsearch
     restart: ${RESTART}
     volumes:
       - elasticsearch-data:/usr/share/elasticsearch/data
@@ -53,14 +53,14 @@ services:
       <<: *common-zammad-variables
       POSTGRESQL_USER: zammad
       POSTGRESQL_PASS: ${ZAMMAD_DATABASE_PASSWORD}
-    build: ./zammad
+    build: ./docker/zammad
     restart: on-failure
     volumes:
       - zammad-data:/opt/zammad
 
   zammad-memcached:
     command: memcached -m 256M
-    build: ./memcached
+    build: ./docker/memcached
     restart: ${RESTART}
 
   zammad-nginx:
@@ -69,7 +69,7 @@ services:
       - "80"
     depends_on:
       - zammad-railsserver
-    build: ./zammad
+    build: ./docker/zammad
     restart: ${RESTART}
     environment:
       VIRTUAL_HOST: ${ZAMMAD_VIRTUAL_HOST}
@@ -82,7 +82,7 @@ services:
     environment:
       - POSTGRES_USER=zammad
       - POSTGRES_PASSWORD=${ZAMMAD_DATABASE_PASSWORD}
-    build: ./postgres
+    build: ./docker/postgresql
     restart: ${RESTART}
     volumes:
       - postgresql-data:/var/lib/postgresql/data
@@ -94,13 +94,13 @@ services:
       - zammad-postgresql
       - zammad-redis
     environment: *common-zammad-variables
-    build: ./zammad
+    build: ./docker/zammad
     restart: ${RESTART}
     volumes:
       - zammad-data:/opt/zammad
 
   zammad-redis:
-    build: ./redis
+    build: ./docker/redis
     restart: ${RESTART}
 
   zammad-scheduler:
@@ -110,7 +110,7 @@ services:
       - zammad-railsserver
       - zammad-redis
     environment: *common-zammad-variables
-    build: ./zammad
+    build: ./docker/zammad
     restart: ${RESTART}
     volumes:
       - zammad-data:/opt/zammad
@@ -122,13 +122,13 @@ services:
       - zammad-railsserver
       - zammad-redis
     environment: *common-zammad-variables
-    build: ./zammad
+    build: ./docker/zammad
     restart: ${RESTART}
     volumes:
       - zammad-data:/opt/zammad
 
   metamigo-api:
-    build: ./metamigo-api
+    build: ./apps/metamigo-api
     container_name: metamigo-api
     restart: ${RESTART}
     command: [ "api" ]
@@ -139,7 +139,7 @@ services:
       - ./signald:/signald
 
   metamigo-frontend:
-    build: ./metamigo-frontend
+    build: ./apps/metamigo-frontend
     container_name: metamigo-frontend
     restart: ${RESTART}
     command: [ "frontend" ]
@@ -153,14 +153,14 @@ services:
       VIRTUAL_PORT: 3000
 
   metamigo-worker:
-    build: ./metamigo-worker
+    build: ./apps/metamigo-worker
     container_name: metamigo-worker
     restart: ${RESTART}
     command: [ "worker" ]
     environment: *common-metamigo-variables
 
   metamigo-postgresql:
-    build: ./postgresql
+    build: ./docker/postgresql
     container_name: metamigo-postgresql
     restart: ${RESTART}
     volumes:
@@ -177,22 +177,22 @@ services:
       - 127.0.0.1:5432:5432
 
   signald:
-    build: ./signald
+    build: ./docker/signald
     restart: ${RESTART}
     user: ${CURRENT_UID}
     volumes:
       - ../signald:/signald
 
   nginx-proxy:
-    build: ./nginx-proxy
+    build: ./docker/nginx-proxy
     restart: ${RESTART}
     ports:
       - "80:80"
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
 
-  link-shell:
-    build: ./link
+  link:
+    build: ./apps/link
     expose:
       - "3000"
     ports:
@@ -204,7 +204,7 @@ services:
       ZAMMAD_VIRUAL_HOST: ${ZAMMAD_VIRTUAL_HOST}
 
   zammad-proxy:
-    build: ./zammad-proxy
+    build: ./apps/zammad-proxy
     expose:
       - "3000"
     ports: