refactor docker swarm to use just home without workers for now

add caching at nginx level for portainer and gitea

dockerfiles/services/services/datadog/docker-compose.yml

@@ -16,8 +16,8 @@ services:
       API_KEY: ca0faf176c4aedd4f547ed7cf85615eb
       LOG_LEVEL: INFO
       NON_LOCAL_TRAFFIC: "true"
-#    ports:
-#      - "8125:8125/udp"
+    ports:
+      - "8125:8125/udp"
     deploy:
       mode: replicated
       replicas: 1
@@ -32,14 +32,3 @@ services:
       resources:
         limits:
           memory: 512M
-
-networks:
-  default:
-    external:
-      name: prod
-  ingress:
-    external:
-      name: ingress
-  prod:
-    external:
-      name: prod

dockerfiles/services/services/deploy_networks.sh

@@ -0,0 +1,18 @@
+#!/bin/bash -ex
+
+export DOCKER_HOST=dkmanager:2376
+
+NETWORK=prod
+docker network inspect $NETWORK > /dev/null || docker network create -d overlay $NETWORK
+
+NETWORK=prod_ui
+docker network inspect $NETWORK > /dev/null || docker network create -d overlay $NETWORK
+
+NETWORK=prod_db
+docker network inspect $NETWORK > /dev/null || docker network create -d overlay $NETWORK
+
+NETWORK=prod_app
+docker network inspect $NETWORK > /dev/null || docker network create -d overlay $NETWORK
+
+NETWORK=prod_cache
+docker network inspect $NETWORK > /dev/null || docker network create -d overlay $NETWORK

dockerfiles/services/services/dkregistry/docker-compose.yml

@@ -51,17 +51,3 @@ services:
         fluentd-address: "logs.xai-corp.net:24224"
         fluentd-async-connect: 'true'
         tag: dkregistry
-
-    networks:
-      - ingress
-
-networks:
-  default:
-    external:
-      name: prod
-  ingress:
-    external:
-      name: ingress
-  prod:
-    external:
-      name: prod

dockerfiles/services/services/fluentd/docker-compose-prod.yml

@@ -19,8 +19,6 @@ services:
       - "24224:24224"
       - "24224:24224/udp"
       - 24220:24220
-    expose:
-      - "24220"
 
     deploy:
       mode: replicated
@@ -37,18 +35,3 @@ services:
         limits:
           cpus: '1'
           memory: 64M
-
-    networks:
-      - ingress
-      - prod
-
-networks:
-  default:
-    external:
-      name: ingress
-  ingress:
-    external:
-      name: ingress
-  prod:
-    external:
-      name: prod

dockerfiles/services/services/launch_services.sh

@@ -6,23 +6,24 @@ CONFIG=stack.tmp.yml
 SERVICE=services
 #NETWORK=prod
 
-docker stack deploy --with-registry-auth -c dkregistry/docker-compose.yml $SERVICE
+docker stack deploy -c dkregistry/docker-compose.yml $SERVICE
+
+sleep 5
 
 docker login -u richard -p $DKREGISTRY_PASS $DKREGISTRY
 
-docker network inspect $NETWORK > /dev/null || docker network create -d overlay $NETWORK
-
 docker-compose \
     -f network.yml \
-    -f dkregistry/docker-compose.yml \
-    -f fluentd/docker-compose-prod.yml \
-    -f mariadb/docker-compose.yml \
     -f postgres/docker-compose.yml \
+    -f dkregistry/docker-compose.yml \
+    -f mariadb/docker-compose.yml \
+    -f fluentd/docker-compose-prod.yml \
     -f memcached/docker-compose.yml \
     -f redis/docker-compose.yml \
     -f datadog/docker-compose.yml \
     config > $CONFIG
 
+
 docker stack deploy  --prune --with-registry-auth -c $CONFIG $SERVICE
 
 # Cleanup

dockerfiles/services/services/mariadb/docker-compose.yml

@@ -9,7 +9,7 @@ services:
   mysql:
     image: "mariadb:10"
     volumes:
-      - /opt/shared/mariadb/data:/var/lib/mysql
+      - /opt/mariadb/data:/var/lib/mysql
     ports:
       - "3306:3306"
     environment:
@@ -39,5 +39,4 @@ services:
         tag: mariadb
 
     networks:
-      - prod
-      - ingress
+      - prod_db

dockerfiles/services/services/memcached/docker-compose.yml

@@ -38,4 +38,4 @@ services:
           memory: 65M
 
     networks:
-      - prod
+      - prod_cache

dockerfiles/services/services/network.yml

@@ -4,12 +4,18 @@
 version: '3.4'
 
 networks:
-  default:
-    external:
-      name: prod
-  ingress:
-    external:
-      name: ingress
   prod:
     external:
       name: prod
+  prod_ui:
+    external:
+      name: prod_ui
+  prod_db:
+    external:
+      name: prod_db
+  prod_cache:
+    external:
+      name: prod_cache
+  prod_app:
+    external:
+      name: prod_app

dockerfiles/services/services/postgres/docker-compose.yml

@@ -39,4 +39,4 @@ services:
           memory: 128M
 
     networks:
-      - prod
+      - prod_db

dockerfiles/services/services/redis/docker-compose.yml

@@ -34,4 +34,4 @@ services:
         tag: redis
 
     networks:
-      - prod
+      - prod_cache