diff options
author | Emma Foley <efoley@redhat.com> | 2020-11-17 13:58:22 +0000 |
---|---|---|
committer | Emma Foley <efoley@redhat.com> | 2020-11-19 13:41:50 +0000 |
commit | 5560c122f820a8a5ecabc4c24a6e9fd444163910 (patch) | |
tree | b40a3c4d4b87dfae03e7f9f34560015dd8676a64 /docker/barometer-collectd-latest | |
parent | 2847e052aef84d97b674aee3a655c55091844925 (diff) |
[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 <efoley@redhat.com>
Change-Id: I4ee91c289b9e7477157bea148452be58343dc733
Diffstat (limited to 'docker/barometer-collectd-latest')
-rw-r--r-- | docker/barometer-collectd-latest/Dockerfile | 40 | ||||
-rw-r--r-- | docker/barometer-collectd-latest/run_collectd.sh | 16 |
2 files changed, 56 insertions, 0 deletions
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 |