3 files changed, 36 insertions, 16 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000..b5028846
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,30 @@
+version: "2"
+services:
+  zookeeper:
+    image: wurstmeister/zookeeper
+    ports:
+      - "2181:2181"
+  kafka:
+    image: wurstmeister/kafka
+    ports:
+      - "9092:9092"
+    environment:
+      HOSTNAME_COMMAND: "route -n | awk '/UG[ \t]/{print $$2}'"
+      KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'true'
+      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    depends_on:
+      - zookeeper
+  hv-collector:
+    build:
+      context: hv-collector-main
+      dockerfile: Dockerfile
+    ports:
+      - "8081:8081/tcp"
+    depends_on:
+      - kafka
+  xnf-simulator:
+    build:
+      context: hv-collector-client-simulator
+      dockerfile: Dockerfile
+\ No newline at end of file
diff --git a/hv-collector-client-simulator/Dockerfile b/hv-collector-client-simulator/Dockerfile
new file mode 100644
index 00000000..caeec054
--- /dev/null
+++ b/hv-collector-client-simulator/Dockerfile
@@ -0,0 +1,6 @@
+FROM openjdk:10-jre-slim
+
+LABEL copyright="Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved."
+LABEL license.name="The Apache Software License, Version 2.0"
+LABEL license.url="http://www.apache.org/licenses/LICENSE-2.0"
+LABEL maintainer="Nokia Wroclaw ONAP Team"
diff --git a/hv-collector-client-simulator/docker-compose.yml b/hv-collector-client-simulator/docker-compose.yml
deleted file mode 100644
index e26478ff..00000000
--- a/hv-collector-client-simulator/docker-compose.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-version: '2'
-services:
-  zookeeper:
-    image: wurstmeister/zookeeper
-    ports:
-      - "2181:2181"
-  kafka:
-    image: wurstmeister/kafka
-    ports:
-      - "9092:9092"
-    environment:
-      HOSTNAME_COMMAND: "route -n | awk '/UG[ \t]/{print $$2}'"
-      KAFKA_AUTO_CREATE_TOPICS_ENABLE: 'true'
-      KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-\ No newline at end of file