Merge "Support non-namespaced objects in generic plugin"

[multicloud/k8s.git] / deployments / docker-compose.yml

diff --git a/deployments/docker-compose.yml b/deployments/docker-compose.yml
index 6ae7b4e..c4faa53 100644 (file)
--- a/deployments/docker-compose.yml
+++ b/deployments/docker-compose.yml
@@ -13,29 +13,49 @@ version: '2'
 
 services:
   multicloud-k8s:
-    image: nexus3.onap.org:10003/onap/multicloud/k8plugin
+    image: ${IMAGE_NAME}
+    networks:
+      multicloud_net:
+        ipv4_address: ${PLUGIN_IP}
     build:
       context: ./
       args:
-        - HTTP_PROXY=$HTTP_PROXY
-        - HTTPS_PROXY=$HTTPS_PROXY
+        - HTTP_PROXY=${HTTP_PROXY}
+        - HTTPS_PROXY=${HTTPS_PROXY}
+        - NO_PROXY=${NO_PROXY}
     ports:
       - "8081:8081"
     environment:
-      - CSAR_DIR=/opt/csar
-      - KUBE_CONFIG_DIR=/opt/kubeconfig
-      - DATABASE_TYPE=consul
-      - DATABASE_IP=consul-svr
+      - CSAR_DIR=${CSAR_DIR}
+      - KUBE_CONFIG_DIR=${KUBE_CONFIG_DIR}
+      - DATABASE_TYPE=${DATABASE_TYPE}
+      - DATABASE_IP=${DATABASE_IP}
+      - PLUGINS_DIR=${PLUGINS_DIR}
+      - HTTP_PROXY=${HTTP_PROXY}
+      - HTTPS_PROXY=${HTTPS_PROXY}
+      - NO_PROXY=${NO_PROXY},${DATABASE_IP}
     depends_on:
-      - "consul"
+      - mongo
+    links:
+      - mongo
     volumes:
       - /opt/csar:/opt/csar
       - /opt/kubeconfig:/opt/kubeconfig
-  consul:
-    image: consul
-    hostname: consul-svr
+  mongo:
+    image: mongo
+    networks:
+      multicloud_net:
+        ipv4_address: ${DATABASE_IP}
     environment:
-      - CONSUL_LOCAL_CONFIG={"datacenter":"us_west","server":true}
-    command: ["agent", "-server", "-bootstrap-expect=1"]
-    volumes:
-      - /opt/consul/config:/consul/config
+      - HTTP_PROXY=${HTTP_PROXY}
+      - HTTPS_PROXY=${HTTPS_PROXY}
+      - NO_PROXY=${NO_PROXY}
+
+networks:
+  multicloud_net:
+    driver: bridge
+    ipam:
+      driver: default
+      config:
+      -
+        subnet: 172.19.0.0/27