Demo Multicluster

docker/demo/docker-compose.dev2.yml

@@ -25,6 +25,7 @@ services:
     environment:
       - ME_CONFIG_BASICAUTH_USERNAME=test
       - ME_CONFIG_BASICAUTH_PASSWORD=test
+      - ME_CONFIG_MONGODB_SERVER=mongo2
   nats2:
     image: 'nats:latest'
     container_name: nats2
@@ -142,14 +143,14 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
   oc-datacenter2:
-    env_file:
-    - path: ./env.env
-      required: false
     environment:
-      - MONGO_DATABASE=DC_myDC
-      - KUBE_CA=${KUBE_CA:-}
-      - KUBE_CERT=${KUBE_CERT:-}
-      - KUBE_DATA=${KUBE_DATA:-}
+      - OC_MONGO_DATABASE=DC_myDC
+      - OC_MONGO_URL=mongodb://mongo2:27017/
+      - OC_NATS_URL=nats://nats2:4222
+      - OC_LOKI_URL=http://loki2:3100
+      - OC_KUBE_CA=${KUBE_CA:-}
+      - OC_KUBE_CERT=${KUBE_CERT:-}
+      - OC_KUBE_DATA=${KUBE_DATA:-}
     image: '${REGISTRY:-opencloudregistry/}oc-datacenter:latest'
     ports:
       - 9092:8080
@@ -171,10 +172,13 @@ services:
       - oc2
   oc-scheduler2:
     environment:
-      - MONGO_DATABASE=DC_myDC
-      - KUBE_CA=${KUBE_CA:-}
-      - KUBE_CERT=${KUBE_CERT:-}
-      - KUBE_DATA=${KUBE_DATA:-}
+      - OC_MONGO_DATABASE=DC_myDC
+      - OC_MONGO_URL=mongodb://mongo2:27017/
+      - OC_LOKI_URL=http://loki2:3100
+      - OC_NATS_URL=nats://nats2:4222
+      - OC_KUBE_CA=${KUBE_CA:-}
+      - OC_KUBE_CERT=${KUBE_CERT:-}
+      - OC_KUBE_DATA=${KUBE_DATA:-}
     image: '${REGISTRY:-opencloudregistry/}oc-scheduler:latest'
     labels:
         - "traefik.stack=peer2"
@@ -196,7 +200,10 @@ services:
       - oc2
   oc-catalog2:
     environment:
-      - MONGO_DATABASE=DC_myDC
+      - OC_MONGO_DATABASE=DC_myDC
+      - OC_LOKI_URL=http://loki2:3100
+      - OC_MONGO_URL=mongodb://mongo2:27017/
+      - OC_NATS_URL=nats://nats2:4222
     image: '${REGISTRY:-opencloudregistry/}oc-catalog:latest'
     ports:
       - 9087:8080
@@ -218,7 +225,10 @@ services:
         - "traefik.http.middlewares.auth-catalog2.forwardauth.authResponseHeaders=X-Auth-Request-User,X-Auth-Request-Email"
   oc-workspace2:
     environment:
-      - MONGO_DATABASE=DC_myDC
+      - OC_MONGO_DATABASE=DC_myDC
+      - OC_LOKI_URL=http://loki2:3100
+      - OC_MONGO_URL=mongodb://mongo2:27017/
+      - OC_NATS_URL=nats://nats2:4222
     image: '${REGISTRY:-opencloudregistry/}oc-workspace:latest'
     ports:
       - 9089:8080
@@ -240,7 +250,10 @@ services:
       - oc2
   oc-peer2:
     environment:
-      - MONGO_DATABASE=DC_myDC
+      - OC_MONGO_DATABASE=DC_myDC
+      - OC_LOKI_URL=http://loki2:3100
+      - OC_MONGO_URL=mongodb://mongo2:27017/
+      - OC_NATS_URL=nats://nats2:4222
     image: '${REGISTRY:-opencloudregistry/}oc-peer:latest'
     labels:
         - "traefik.stack=peer2"
@@ -278,14 +291,17 @@ services:
       - "traefik.http.middlewares.auth-auth-sec2.forwardauth.trustForwardHeader=true"
       - "traefik.http.middlewares.auth-auth-sec2.forwardauth.authResponseHeaders=X-Auth-Request-User,X-Auth-Request-Email"
     environment:
-          LDAP_ENDPOINTS: ldap2:389
-          LDAP_BINDDN: cn=admin,dc=example,dc=com
-          LDAP_BINDPW: password
-          LDAP_BASEDN: "dc=example,dc=com"
-          LDAP_USER_BASEDN: "ou=users,dc=example,dc=com"
-          LDAP_ROLE_BASEDN: "ou=AppRoles,dc=example,dc=com"
-          ADMIN_ORIGIN: "http://localhost:9000"
-          OAUTH_REDIRECT_URI: "http://localhost:9000"
+          OC_MONGO_URL : mongodb://mongo2:27017/
+          OC_NATS_URL: nats://nats2:4222
+          OC_LDAP_ENDPOINTS: ldap2:389
+          OC_LOKI_UR : http://loki2:3100
+          OC_LDAP_BINDDN: cn=admin,dc=example,dc=com
+          OC_LDAP_BINDPW: password
+          OC_LDAP_BASEDN: "dc=example,dc=com"
+          OC_LDAP_USER_BASEDN: "ou=users,dc=example,dc=com"
+          OC_LDAP_ROLE_BASEDN: "ou=AppRoles,dc=example,dc=com"
+          OC_ADMIN_ORIGIN: "http://localhost:9000"
+          OC_OAUTH_REDIRECT_URI: "http://localhost:9000"
     networks:
       - oc2
     volumes:
@@ -293,7 +309,9 @@ services:
       - ./pem/public4.pem:/keys/public/public.pem
   oc-shared2:
     environment:
-      - MONGO_DATABASE=DC_myDC
+      - OC_MONGO_DATABASE=DC_myDC
+      - OC_MONGO_URL=mongodb://mongo2:27017/
+      - OC_NATS_URL=nats://nats2:4222
     image: '${REGISTRY:-opencloudregistry/}oc-shared:latest'
     ports:
       - 9091:8080
@@ -312,9 +330,9 @@ services:
       - oc2
   oc-workflow2:
     environment:
-      - _OCWORKFLOW_MONGO_DATABASE=DC_myDC
-      - _OCWORKFLOW_MONGO_URL=mongodb://mongo2:27017
-      - _OCWORKFLOW_NATS_URL=nats://nats2:4222
+      - OC_MONGO_URL=mongodb://mongo2:27017/
+      - OC_NATS_URL=nats://nats2:4222
+      - OC_LOKI_URL=http://loki2:3100
     image: '${REGISTRY:-opencloudregistry/}oc-workflow:latest'
     ports:
       - 9088:8080
@@ -336,16 +354,21 @@ services:
       - 4004:4004
     container_name: oc-discovery_4
     networks:
-      - oc2
+      discovery:
+        ipv4_address: 172.40.0.4
+      oc2:
+      oc:
   oc-schedulerd2:
     image: '${REGISTRY:-opencloudregistry/}oc-schedulerd:latest'
     ports:
       - 10006:8080
     environment:
-      - MONGO_DATABASE=DC_myDC
-      - KUBE_CA=${KUBE_CA:-}
-      - KUBE_CERT=${KUBE_CERT:-}
-      - KUBE_DATA=${KUBE_DATA:-}
+      - OC_LOKI_URL=http://loki2:3100
+      - OC_MONGO_DATABASE=DC_myDC
+      - OC_MONGO_URL=mongodb://mongo2:27017/
+      - OC_KUBE_CA=${KUBE_CA:-}
+      - OC_KUBE_CERT=${KUBE_CERT:-}
+      - OC_KUBE_DATA=${KUBE_DATA:-}
     container_name: oc-schedulerd2
     networks:
       - oc2
@@ -367,5 +390,9 @@ volumes:
   oc-data2:
 
 networks:
+  oc:
+    external: true
   oc2:
     external: true
+  discovery:
+    external: true