From 029cdf17b815edb6062f4a0405acb0c3ca29b110 Mon Sep 17 00:00:00 2001 From: Maryam Tahhan Date: Thu, 11 Jan 2018 18:00:56 +0000 Subject: 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 --- docker/barometer-ves/Dockerfile | 35 +++++++++++++++++++++++++++++++++++ docker/barometer-ves/start_ves_app.sh | 22 ++++++++++++++++++++++ docker/ves/start_ves_app.sh | 22 ---------------------- 3 files changed, 57 insertions(+), 22 deletions(-) create mode 100644 docker/barometer-ves/Dockerfile create mode 100644 docker/barometer-ves/start_ves_app.sh delete mode 100644 docker/ves/start_ves_app.sh diff --git a/docker/barometer-ves/Dockerfile b/docker/barometer-ves/Dockerfile new file mode 100644 index 00000000..869a587f --- /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/barometer-ves/start_ves_app.sh b/docker/barometer-ves/start_ves_app.sh new file mode 100644 index 00000000..d61078db --- /dev/null +++ b/docker/barometer-ves/start_ves_app.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# 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. +# 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. + + +YAML_FILE="$1" + +#wait for kafka service to be available +while ! nc localhost 9092 < /dev/null; do sleep 1; done + +python ves_app.py --events-schema="$YAML_FILE" --config=ves_app_config.conf diff --git a/docker/ves/start_ves_app.sh b/docker/ves/start_ves_app.sh deleted file mode 100644 index ad276353..00000000 --- a/docker/ves/start_ves_app.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# Copyright 2017 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. - - -YAML_FILE="$1" - -#wait for kafka service to be available -while ! nc localhost 9092 < /dev/null; do sleep 1; done - -python ves_app.py --events-schema="$YAML_FILE" --config=ves_app_config.conf -- cgit 1.2.3-korg