Include basic configuration in Docker image

Makes the collector start out of the box, even without valid CBS
configuration.

Note: the basic configuration will need to be changed later.

Issue-ID: DCAEGEN2-1340
Change-Id: I3c2b502f253677e78a4f4990002e683613b8869e
Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>

4 files changed, 31 insertions, 1 deletions

diff --git a/sources/hv-collector-main/Dockerfile b/sources/hv-collector-main/Dockerfile
index 3322059c..a1e89a73 100644
--- a/sources/hv-collector-main/Dockerfile
+++ b/sources/hv-collector-main/Dockerfile
@@ -12,8 +12,11 @@ RUN apt-get update \
 WORKDIR /opt/ves-hv-collector
 
 ENTRYPOINT ["./entry.sh"]
+CMD ["--configuration-file /etc/ves-hv/configuration/base.json"]
 
 COPY target/libs/external/* ./
 COPY target/libs/internal/* ./
-COPY src/main/scripts/*.sh ./
+COPY src/main/docker/*.sh ./
+COPY src/main/docker/base.json /etc/ves-hv/configuration/base.json
+
 COPY target/hv-collector-main-*.jar ./
diff --git a/sources/hv-collector-main/src/main/docker/base.json b/sources/hv-collector-main/src/main/docker/base.json
new file mode 100644
index 00000000..7f88cb6e
--- /dev/null
+++ b/sources/hv-collector-main/src/main/docker/base.json
@@ -0,0 +1,27 @@
+{
+  "logLevel": "INFO",
+  "server": {
+    "listenPort": 6061,
+    "idleTimeoutSec": 60,
+    "maxPayloadSizeBytes": 1048576
+  },
+  "cbs": {
+    "firstRequestDelaySec": 10,
+    "requestIntervalSec": 5
+  },
+  "security": {
+  },
+  "collector": {
+    "dummyMode": false,
+    "maxRequestSizeBytes": 1048576,
+    "kafkaServers": [
+      "message-router-kafka:9092"
+    ],
+    "routing": [
+      {
+        "fromDomain": "perf3gpp",
+        "toTopic": "HV_VES_PERF3GPP"
+      }
+    ]
+  }
+}
diff --git a/sources/hv-collector-main/src/main/scripts/entry.sh b/sources/hv-collector-main/src/main/docker/entry.sh
index a612e393..a612e393 100755
--- a/sources/hv-collector-main/src/main/scripts/entry.sh
+++ b/sources/hv-collector-main/src/main/docker/entry.sh
diff --git a/sources/hv-collector-main/src/main/scripts/healthcheck.sh b/sources/hv-collector-main/src/main/docker/healthcheck.sh
index db62eece..db62eece 100755
--- a/sources/hv-collector-main/src/main/scripts/healthcheck.sh
+++ b/sources/hv-collector-main/src/main/docker/healthcheck.sh