Merge quick-deploy docker compose

docker-compose.yml

@@ -1,40 +1,48 @@
 version: "3.8"
 
 services:
-#  dtd-fuseki:
-#    image: registry.rys.one/dtdesign/fuseki
-#    container_name: dtd-fuseki
-#    networks:
-#      twin:
-#        ipv4_address: 172.50.10.10
-#    dns:
-#      - 192.168.0.11
-#      - 1.1.1.1
-#      - 1.0.0.1
-#      - 8.8.8.8
-#      - 8.8.4.4
-#    #ports:
-#    #  - "3030:3030"
-#    labels:
-#      - traefik.enable=true
-#      - traefik.http.routers.dtd-fuseki.entrypoints=web-secure
-#      - traefik.http.routers.dtd-fuseki.rule=Host(`fuseki.rys.app`)
-#      - traefik.http.routers.dtd-fuseki.tls.certresolver=letsencrypt
-#      - traefik.http.routers.dtd-fuseki.service=dtd-fuseki-svc
-#      - traefik.http.services.dtd-fuseki-svc.loadbalancer.server.port=3030
-#    restart: unless-stopped
-#    volumes:
-#      - "./fuseki:/fuseki"
-#      - "./fuseki-extra:/fuseki-extra"
-#    env_file:
-#      - "./config/fuseki.env"
+  dtd-fuseki:
+    image: registry.rys.one/dtdesign/fuseki
+    container_name: dtd-fuseki
+    networks:
+      web:
+        ipv4_address: 172.30.111.10
+    dns:
+      - 192.168.0.11
+      - 1.1.1.1
+      - 1.0.0.1
+      - 8.8.8.8
+      - 8.8.4.4
+    #ports:
+    #  - "3030:3030"
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.dtd-fuseki.entrypoints=web-secure"
+      - "traefik.http.routers.dtd-fuseki.rule=Host(`fuseki.rys.app`)"
+      #- "traefik.http.routers.dtd-fuseki.rule=Host(`workflow.rys.app`) && PathPrefix(`/sparql`)"
+      #- "traefik.http.middlewares.dtd-fuseki-prefix.stripprefix.prefixes=/sparql"
+      #- "traefik.http.routers.dtd-fuseki.middlewares=dtd-fuseki-prefix@docker"
+      
+      #- "traefik.http.middlewares.dtd-fuseki-cors.headers.accessControlAllowOriginList=https://*.rys.app"
+      #- "traefik.http.middlewares.dtd-fuseki-cors.headers.customResponseHeaders.Access-Control-Allow-Origin=https://*.rys.app"
+      #- "traefik.http.routers.dtd-fuseki.middlewares=dtd-fuseki-cors@docker"
+      
+      - "traefik.http.routers.dtd-fuseki.tls.certresolver=letsencrypt"
+      - "traefik.http.routers.dtd-fuseki.service=dtd-fuseki-svc"
+      - "traefik.http.services.dtd-fuseki-svc.loadbalancer.server.port=3030"
+    restart: unless-stopped
+    volumes:
+      - "./fuseki:/fuseki"
+      #- "./fuseki-extra:/fuseki-extra"
+    env_file:
+      - "./config/fuseki.env"
 
   dtd-spendpoint:
     image: registry.rys.one/dtdesign/spendpoint:dev
     container_name: dtd-spendpoint
     networks:
-      twin:
-        ipv4_address: 172.50.10.20
+      web:
+        ipv4_address: 172.30.111.20
     dns:
       - 192.168.0.11
       - 1.1.1.1
@@ -44,12 +52,12 @@ services:
     #ports:
     #  - "8000:8000"
     labels:
-      - traefik.enable=true
-      - traefik.http.routers.dtd-spendpoint.entrypoints=web-secure
-      - traefik.http.routers.dtd-spendpoint.rule=Host(`spendpoint.rys.app`)
-      - traefik.http.routers.dtd-spendpoint.tls.certresolver=letsencrypt
-      - traefik.http.routers.dtd-spendpoint.service=dtd-spendpoint-svc
-      - traefik.http.services.dtd-spendpoint-svc.loadbalancer.server.port=8000
+      - "traefik.enable=true"
+      - "traefik.http.routers.dtd-spendpoint.entrypoints=web-secure"
+      - "traefik.http.routers.dtd-spendpoint.rule=Host(`spendpoint.rys.app`)"
+      - "traefik.http.routers.dtd-spendpoint.tls.certresolver=letsencrypt"
+      - "traefik.http.routers.dtd-spendpoint.service=dtd-spendpoint-svc"
+      - "traefik.http.services.dtd-spendpoint-svc.loadbalancer.server.port=8000"
     restart: unless-stopped
     volumes:
       - "./spendpoint:/app/data:ro"
@@ -58,8 +66,8 @@ services:
     image: registry.rys.one/dtdesign/dtdesign/outliers:dev
     container_name: dtd-outliers
     networks:
-      twin:
-        ipv4_address: 172.50.10.30
+      web:
+        ipv4_address: 172.30.111.30
     dns:
       - 192.168.0.11
       - 1.1.1.1
@@ -69,12 +77,12 @@ services:
     #ports:
     #  - "9090:9090"
     labels:
-      - traefik.enable=true
-      - traefik.http.routers.dtd-outliers.entrypoints=web-secure
-      - traefik.http.routers.dtd-outliers.rule=Host(`outliers.rys.app`)
-      - traefik.http.routers.dtd-outliers.tls.certresolver=letsencrypt
-      - traefik.http.routers.dtd-outliers.service=dtd-outliers-svc
-      - traefik.http.services.dtd-outliers-svc.loadbalancer.server.port=9090
+      - "traefik.enable=true"
+      - "traefik.http.routers.dtd-outliers.entrypoints=web-secure"
+      - "traefik.http.routers.dtd-outliers.rule=Host(`outliers.rys.app`)"
+      - "traefik.http.routers.dtd-outliers.tls.certresolver=letsencrypt"
+      - "traefik.http.routers.dtd-outliers.service=dtd-outliers-svc"
+      - "traefik.http.services.dtd-outliers-svc.loadbalancer.server.port=9090"
     restart: unless-stopped
     # TODO This needs to be the csv directory and needs to map to the same dir as the backend csv
 #    volumes:
@@ -84,8 +92,8 @@ services:
 #    image: registry.rys.one/dtdesign/models:dev
 #    container_name: dtd-models
 #    networks:
-#      twin:
-#        ipv4_address: 172.50.10.40
+#      web:
+#        ipv4_address: 172.30.111.40
 #    dns:
 #      - 192.168.0.11
 #      - 1.1.1.1
@@ -102,8 +110,8 @@ services:
 #    image: registry.rys.one/dtdesign/graph-exploring-tool
 #    container_name: dtd-graph-exploring-tool
 #    networks:
-#      twin:
-#        ipv4_address: 172.50.10.50
+#      web:
+#        ipv4_address: 172.30.111.50
 #    dns:
 #      - 192.168.0.11
 #      - 1.1.1.1
@@ -123,8 +131,8 @@ services:
     image: registry.rys.one/diagram/drawio:dev
     container_name: dtd-drawio
     networks:
-      twin:
-        ipv4_address: 172.50.10.60
+      web:
+        ipv4_address: 172.30.111.60
     dns:
       - 192.168.0.11
       - 1.1.1.1
@@ -135,15 +143,21 @@ services:
     #  - "8445:8080"
     #  - "8443:8443"
     labels:
-      - traefik.enable=true
-      - traefik.http.routers.dtd-drawio.entrypoints=web-secure
-      - traefik.http.routers.dtd-drawio.rule=Host(`workflow.rys.app`)
-      - traefik.http.routers.dtd-drawio.tls.certresolver=letsencrypt
-      - traefik.http.routers.dtd-drawio.service=dtd-drawio-svc
-      - traefik.http.services.dtd-drawio-svc.loadbalancer.server.port=8080
+      - "traefik.enable=true"
+      - "traefik.http.routers.dtd-drawio.entrypoints=web-secure"
+      - "traefik.http.routers.dtd-drawio.rule=Host(`workflow.rys.app`)"
+      
+      # Don't mess with CORS, just pust the backend on the same subdomain because draw forces certain cors
+      #- "traefik.http.middlewares.dtd-drawio-cors.headers.contentSecurityPolicy=default-src *; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval' *.rys.app"
+      #- "traefik.http.routers.dtd-drawio.middlewares=dtd-drawio-cors@docker"
+      
+      - "traefik.http.routers.dtd-drawio.tls.certresolver=letsencrypt"
+      - "traefik.http.routers.dtd-drawio.service=dtd-drawio-svc"
+      - "traefik.http.services.dtd-drawio-svc.loadbalancer.server.port=8080"
     restart: unless-stopped
     volumes:
-      - "./drawio/dtdesign.js:/usr/local/tomcat/webapps/draw/plugins/dtdesign.js"
+      #- "./drawio/dtdesign.js:/usr/local/tomcat/webapps/draw/plugins/dtdesign.js"
+      - "./drawio/dtdesign.js:/usr/local/tomcat/webapps/draw/myPlugins/dtdesign.js"
       - "./drawio/object.drawio:/usr/local/tomcat/webapps/draw/libraries/object.drawio"
       - "./drawio/meta.drawio:/usr/local/tomcat/webapps/draw/libraries/meta.drawio"
     env_file:
@@ -153,8 +167,8 @@ services:
     image: registry.rys.one/dtdesign/wee:dev
     container_name: dtd-wee
     networks:
-      twin:
-        ipv4_address: 172.50.10.70
+      web:
+        ipv4_address: 172.30.111.70
     dns:
       - 192.168.0.11
       - 1.1.1.1
@@ -164,20 +178,25 @@ services:
     #ports:
     #  - "8081:8081"
     labels:
-      - traefik.enable=true
-      - traefik.http.routers.dtd-wee.entrypoints=web-secure
-      - traefik.http.routers.dtd-wee.rule=Host(`wee.rys.app`)
-      - traefik.http.routers.dtd-wee.tls.certresolver=letsencrypt
-      - traefik.http.routers.dtd-wee.service=dtd-wee-svc
-      - traefik.http.services.dtd-wee-svc.loadbalancer.server.port=8081
+      - "traefik.enable=true"
+      - "traefik.http.routers.dtd-wee.entrypoints=web-secure"
+      - "traefik.http.routers.dtd-wee.rule=Host(`wee.rys.app`)"
+      #- "traefik.http.routers.dtd-wee.rule=Host(`workflow.rys.app`) && PathPrefix(`/wee`)"
+      #- "traefik.http.middlewares.dtd-wee-prefix.stripprefix.prefixes=/wee"
+      #- "traefik.http.routers.dtd-wee.middlewares=dtd-wee-prefix@docker"
+      - "traefik.http.routers.dtd-wee.tls.certresolver=letsencrypt"
+      - "traefik.http.routers.dtd-wee.service=dtd-wee-svc"
+      - "traefik.http.services.dtd-wee-svc.loadbalancer.server.port=8081"
     restart: unless-stopped
-
+    volumes:
+      - "./wee/application.properties:/app/src/main/resources/application.properties"
+ 
   dtd-backend:
     image: registry.rys.one/dtdesign/drawio2oml/backend:dev
     container_name: dtd-backend
     networks:
-      twin:
-        ipv4_address: 172.50.10.80
+      web:
+        ipv4_address: 172.30.111.80
     dns:
       - 192.168.0.11
       - 1.1.1.1
@@ -187,18 +206,15 @@ services:
     #ports:
     #  - "5000:5000"
     labels:
-      - traefik.enable=true
-      - traefik.http.routers.dtd-backend.entrypoints=web-secure
-      - traefik.http.routers.dtd-backend.rule=Host(`git.rys.app`)
-      - traefik.http.routers.dtd-backend.tls.certresolver=letsencrypt
-      - traefik.http.routers.dtd-backend.service=dtd-backend-svc
-      - traefik.http.services.dtd-backend-svc.loadbalancer.server.port=5000
-      
-      - traefik.http.routers.dtd-fuseki.entrypoints=web-secure
-      - traefik.http.routers.dtd-fuseki.rule=Host(`fuseki.rys.app`)
-      - traefik.http.routers.dtd-fuseki.tls.certresolver=letsencrypt
-      - traefik.http.routers.dtd-fuseki.service=dtd-fuseki-svc
-      - traefik.http.services.dtd-fuseki-svc.loadbalancer.server.port=3030
+      - "traefik.enable=true"
+      - "traefik.http.routers.dtd-backend.entrypoints=web-secure"
+      - "traefik.http.routers.dtd-backend.rule=Host(`dtb.rys.app`)"
+      #- "traefik.http.routers.dtd-backend.rule=Host(`workflow.rys.app`) && PathPrefix(`/dtb`)"
+      #- "traefik.http.middlewares.dtd-backend-prefix.stripprefix.prefixes=/dtb"
+      #- "traefik.http.routers.dtd-backend.middlewares=dtd-backend-prefix@docker"
+      - "traefik.http.routers.dtd-backend.tls.certresolver=letsencrypt"
+      - "traefik.http.routers.dtd-backend.service=dtd-backend-svc"
+      - "traefik.http.services.dtd-backend-svc.loadbalancer.server.port=5000"
     restart: unless-stopped
     volumes:
       - "./backend/ontology:/app/ontology"
@@ -206,6 +222,30 @@ services:
     env_file:
       - "./config/backend.env"
 
+  dtd-ontopoint:
+    image: registry.rys.one/dtdesign/ontopoint
+    container_name: dtd-ontopoint
+    user: "1000:1000"
+    networks:
+      web:
+        ipv4_address: 172.30.111.90
+    dns:
+      - 192.168.0.11
+      - 1.1.1.1
+      - 1.0.0.1
+      - 8.8.8.8
+      - 8.8.4.4
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.ontopoint.entrypoints=web-secure"
+      - "traefik.http.routers.ontopoint.rule=Host(`ontology.rys.one`)"
+      - "traefik.http.routers.ontopoint.tls.certresolver=letsencrypt"
+      - "traefik.http.routers.ontopoint.service=ontopoint-svc"
+      - "traefik.http.services.ontopoint-svc.loadbalancer.server.port=80"
+    restart: unless-stopped
+    volumes:
+      - "./data:/app/data"
+
 networks:
-  twin:
+  web:
     external: true