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 6c9c85e..c4faa53 100644 (file)
--- a/deployments/docker-compose.yml
+++ b/deployments/docker-compose.yml
@@ -13,48 +13,43 @@ version: '2'
 
 services:
   multicloud-k8s:
-    image: nexus3.onap.org:10003/onap/multicloud/k8plugin
+    image: ${IMAGE_NAME}
     networks:
       multicloud_net:
-        ipv4_address: 172.19.0.3
+        ipv4_address: ${PLUGIN_IP}
     build:
       context: ./
       args:
-        - HTTP_PROXY=$HTTP_PROXY
-        - HTTPS_PROXY=$HTTPS_PROXY
-        - NO_PROXY=$NO_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=172.19.0.2
-      - PLUGINS_DIR=/opt/multicloud/k8s
-      - HTTP_PROXY=$HTTP_PROXY
-      - HTTPS_PROXY=$HTTPS_PROXY
-      - NO_PROXY=$NO_PROXY,172.19.0.2
+      - 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:
-      - consul
+      - mongo
     volumes:
       - /opt/csar:/opt/csar
       - /opt/kubeconfig:/opt/kubeconfig
-  consul:
-    image: consul
+  mongo:
+    image: mongo
     networks:
       multicloud_net:
-        ipv4_address: 172.19.0.2
+        ipv4_address: ${DATABASE_IP}
     environment:
-      CONSUL_CLIENT_INTERFACE: 'eth0'
-      CONSUL_BIND_INTERFACE: 'eth0'
-      HTTP_PROXY: $HTTP_PROXY
-      HTTPS_PROXY: $HTTPS_PROXY
-      NO_PROXY: $NO_PROXY
-    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: