From 5560c122f820a8a5ecabc4c24a6e9fd444163910 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Tue, 17 Nov 2020 13:58:22 +0000 Subject: [container][latest] Rename and update barometer-collectd-latest Collectd changed the upstream default to main, and Barometer added a few changes to incorporate this. One change was renaming the `barometer-collectd-master` container to `barometer-collectd-latest`, since `barometer-collectd-main` didn't make sense semantically, as we use the stable container as the "main" reference. At the time, we didn't have the changes made in releng to build the new container, so container renaming was paused. Now that the change is merged in releng (and has been for a while), and the containers are being updated, this change should happen, so that the container gets published. Signed-off-by: Emma Foley Change-Id: I4ee91c289b9e7477157bea148452be58343dc733 --- docker/README_collectd | 18 +++++----- docker/barometer-collectd-latest/Dockerfile | 40 +++++++++++++++++++++ docker/barometer-collectd-latest/run_collectd.sh | 16 +++++++++ docker/barometer-collectd-master/Dockerfile | 45 ------------------------ docker/barometer-collectd-master/run_collectd.sh | 16 --------- 5 files changed, 65 insertions(+), 70 deletions(-) create mode 100644 docker/barometer-collectd-latest/Dockerfile create mode 100644 docker/barometer-collectd-latest/run_collectd.sh delete mode 100644 docker/barometer-collectd-master/Dockerfile delete mode 100644 docker/barometer-collectd-master/run_collectd.sh (limited to 'docker') diff --git a/docker/README_collectd b/docker/README_collectd index baa0ff6e..cf497105 100644 --- a/docker/README_collectd +++ b/docker/README_collectd @@ -9,7 +9,7 @@ Table of content: 1. DESCRIPTION 2. SYSTEM REQUIREMENTS 3. INSTALLATION NOTES - barometer-collectd -4. INSTALLATION NOTES - barometer-collectd-master +4. INSTALLATION NOTES - barometer-collectd-latest 5. ADDITIONAL STEPS ------------------------------------------------------------------------------ @@ -18,7 +18,7 @@ Table of content: This Dockerfile provides instruction for building collect in isolated container. There are currently two variants of collectd container: - barometer-collectd - it is based on stable collect release - - barometer-collectd-master - development container that is based on + - barometer-collectd-latest - development container that is based on latest 'main' branch for collectd project. It contains all available collectd plugins and features that are available on 'main' branch but some issues with configuration or stability may occur @@ -46,22 +46,22 @@ sudo docker run -ti --net=host -v `pwd`/src/collectd/collectd_sample_configs:/op /opt/collectd/sbin/collectd -f ------------------------------------------------------------------------------ -4. INSTALLATION NOTES: barometer-collectd-master (development container) +4. INSTALLATION NOTES: barometer-collectd-latest (development container) -To build docker barometer-collectd-master container run (it is based on main branch from collectd): -sudo docker build -f ./docker/barometer-collectd-master/Dockerfile . +To build docker barometer-collectd-latest container run (it is based on main branch from collectd): +sudo docker build -f ./docker/barometer-collectd-latest/Dockerfile . from root barometer folder. To run builded image run sudo docker images # get docker image id -sudo docker run -ti --net=host -v `pwd`/src/collectd/collectd_sample_configs-master:/opt/collectd/etc/collectd.conf.d \ +sudo docker run -ti --net=host -v `pwd`/src/collectd/collectd_sample_configs-latest:/opt/collectd/etc/collectd.conf.d \ -v /var/run:/var/run -v /tmp:/tmp --privileged -NOTE: barometer-collectd-master container uses a different sample configurations files -compared to regular barometer-collectd container (src/collectd/collectd_sample_configs-master) +NOTE: barometer-collectd-latest container uses a different sample configurations files +compared to regular barometer-collectd container (src/collectd/collectd_sample_configs-latest) To make some changes run -sudo docker run -ti --net=host -v `pwd`/src/collectd/collectd_sample_configs-master:/opt/collectd/etc/collectd.conf.d \ +sudo docker run -ti --net=host -v `pwd`/src/collectd/collectd_sample_configs-latest:/opt/collectd/etc/collectd.conf.d \ -v /var/run:/var/run -v /tmp:/tmp --privileged --entrypoint=/bin/bash /opt/collectd/sbin/collectd -f diff --git a/docker/barometer-collectd-latest/Dockerfile b/docker/barometer-collectd-latest/Dockerfile new file mode 100644 index 00000000..4c01c870 --- /dev/null +++ b/docker/barometer-collectd-latest/Dockerfile @@ -0,0 +1,40 @@ +# Copyright 2017-2019 Intel Corporation and OPNFV. All rights reserved. +# +# 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:8 +RUN dnf update -y && \ + dnf install -y which sudo git && \ + dnf clean all && \ + git config --global http.sslVerify false + +ENV DOCKER y +ENV COLLECTD_FLAVOR latest +ENV WITH_DPDK y +ENV repos_dir /src + +WORKDIR ${repos_dir} +RUN mkdir -p ${repos_dir}/barometer +COPY . ${repos_dir}/barometer + +WORKDIR ${repos_dir}/barometer/systems +RUN sh ./build_base_machine.sh && \ + dnf clean all && rm -rf /var/cache/dnf && \ + useradd -ms /bin/bash collectd_exec && \ + echo "collectd_exec ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers + +COPY docker/barometer-collectd-latest/run_collectd.sh /run_collectd.sh +RUN chmod +x /run_collectd.sh + +ENTRYPOINT ["/run_collectd.sh"] diff --git a/docker/barometer-collectd-latest/run_collectd.sh b/docker/barometer-collectd-latest/run_collectd.sh new file mode 100644 index 00000000..5920248a --- /dev/null +++ b/docker/barometer-collectd-latest/run_collectd.sh @@ -0,0 +1,16 @@ +#!/bin/bash +# Copyright 2016-2019 Intel Corporation and OPNFV. All rights reserved. +# +# 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. +# +/opt/collectd/sbin/collectd -f diff --git a/docker/barometer-collectd-master/Dockerfile b/docker/barometer-collectd-master/Dockerfile deleted file mode 100644 index 9637a486..00000000 --- a/docker/barometer-collectd-master/Dockerfile +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 2017-2019 Intel Corporation and OPNFV. All rights reserved. -# -# 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 which sudo git && \ - yum clean all && \ - git config --global http.sslVerify false - -ENV DOCKER y -ENV COLLECTD_FLAVOR master -ENV WITH_DPDK y -ENV repos_dir /src -ENV openstack_plugins /src/barometer/src/collectd-openstack-plugins - -WORKDIR ${repos_dir} -RUN mkdir -p ${repos_dir}/barometer -COPY . ${repos_dir}/barometer - -WORKDIR ${repos_dir}/barometer/systems -RUN sh ./build_base_machine.sh && \ - useradd -ms /bin/bash collectd_exec && \ - echo "collectd_exec ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers - -WORKDIR ${openstack_plugins} -RUN make && \ - pip install --upgrade pip && \ - pip install -r ${openstack_plugins}/collectd-openstack-plugins/requirements.txt - -COPY docker/barometer-collectd-master/run_collectd.sh /run_collectd.sh -RUN chmod +x /run_collectd.sh - -ENTRYPOINT ["/run_collectd.sh"] diff --git a/docker/barometer-collectd-master/run_collectd.sh b/docker/barometer-collectd-master/run_collectd.sh deleted file mode 100644 index 5920248a..00000000 --- a/docker/barometer-collectd-master/run_collectd.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -# Copyright 2016-2019 Intel Corporation and OPNFV. All rights reserved. -# -# 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. -# -/opt/collectd/sbin/collectd -f -- cgit 1.2.3-korg