diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/README_collectd | 18 | ||||
| -rw-r--r-- | docker/barometer-collectd-latest/Dockerfile (renamed from docker/barometer-collectd-master/Dockerfile) | 19 | ||||
| -rw-r--r-- | docker/barometer-collectd-latest/run_collectd.sh (renamed from docker/barometer-collectd-master/run_collectd.sh) | 0 |
3 files changed, 16 insertions, 21 deletions
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 <image id> -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 <image id> /opt/collectd/sbin/collectd -f diff --git a/docker/barometer-collectd-master/Dockerfile b/docker/barometer-collectd-latest/Dockerfile index 9637a486..4c01c870 100644 --- a/docker/barometer-collectd-master/Dockerfile +++ b/docker/barometer-collectd-latest/Dockerfile @@ -13,17 +13,16 @@ # limitations under the License. # -FROM centos:7 -RUN yum update -y && \ - yum install -y which sudo git && \ - yum clean all && \ +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 master +ENV COLLECTD_FLAVOR latest 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 @@ -31,15 +30,11 @@ 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 -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 +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-master/run_collectd.sh b/docker/barometer-collectd-latest/run_collectd.sh index 5920248a..5920248a 100644 --- a/docker/barometer-collectd-master/run_collectd.sh +++ b/docker/barometer-collectd-latest/run_collectd.sh |