docker: ves update paths + rename dir

Update the paths in the Dockerfile to copy the bash startup script to
the correct location. Rename the ves directory to barometer-ves.

Change-Id: I13705a6c50d4487581e2ac7a4d0d2f6032db6415
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>

diff --git a/docker/barometer-ves/Dockerfile b/docker/barometer-ves/Dockerfile
new file mode 100644 (file)
index 0000000..869a587
--- /dev/null
+++ b/docker/barometer-ves/Dockerfile
@@ -0,0 +1,35 @@
+# Copyright 2018 Intel Corporation and OPNFV
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM centos:7
+RUN yum update -y && \
+    yum install -y epel-release \
+                   git \
+                   nc
+
+RUN yum install -y python-pip
+RUN pip install pyyaml \
+                kafka-python
+
+ENV repos_dir /src
+ENV ves_dir barometer/3rd_party/collectd-ves-app/ves_app
+
+WORKDIR ${repos_dir}
+RUN git clone https://gerrit.opnfv.org/gerrit/barometer
+WORKDIR ${ves_dir}
+COPY start_ves_app.sh ${ves_dir}/start_ves_app.sh
+RUN chmod +x ${ves_dir}/start_ves_app.sh
+
+ENTRYPOINT ["./barometer/3rd_party/collectd-ves-app/ves_app/start_ves_app.sh"]
+CMD ["host.yaml"]

diff --git a/docker/ves/start_ves_app.sh b/docker/barometer-ves/start_ves_app.sh
similarity index 94%
rename from docker/ves/start_ves_app.sh
rename to docker/barometer-ves/start_ves_app.sh
index ad27635..d61078d 100644 (file)
--- a/docker/ves/start_ves_app.sh
+++ b/docker/barometer-ves/start_ves_app.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2017 OPNFV
+# Copyright 2018 OPNFV and Intel Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.