aboutsummaryrefslogtreecommitdiffstats
path: root/docker/barometer-collectd-experimental
diff options
context:
space:
mode:
Diffstat (limited to 'docker/barometer-collectd-experimental')
-rw-r--r--docker/barometer-collectd-experimental/Dockerfile48
-rwxr-xr-xdocker/barometer-collectd-experimental/collectd_apply_pull_request.sh41
-rw-r--r--docker/barometer-collectd-experimental/experimental-configs/README1
3 files changed, 27 insertions, 63 deletions
diff --git a/docker/barometer-collectd-experimental/Dockerfile b/docker/barometer-collectd-experimental/Dockerfile
index 2cb26825..f051ef35 100644
--- a/docker/barometer-collectd-experimental/Dockerfile
+++ b/docker/barometer-collectd-experimental/Dockerfile
@@ -1,4 +1,5 @@
-# Copyright 2017-2019 Intel Corporation and OPNFV. All rights reserved.
+# Copyright 2017-2021 Intel Corporation, Anuket and others.
+# 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.
@@ -13,36 +14,41 @@
# 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
+FROM quay.io/centos/centos:stream8 as builder
-ENV DOCKER y
-ENV COLLECTD_FLAVOR experimental
+ARG COLLECTD_FLAVOR=experimental
ARG COLLECTD_PULL_REQUESTS
-ENV WITH_DPDK y
+ARG COLLECTD_CONFIG_CMD_ARGS
+ARG COLLECTD_TAG
+ARG WITH_DPDK=n
+
+ENV DOCKER y
ENV repos_dir /src
-WORKDIR ${repos_dir}
RUN mkdir -p ${repos_dir}/barometer
COPY . ${repos_dir}/barometer
-COPY docker/barometer-collectd-experimental/collectd_apply_pull_request.sh \
- ${repos_dir}/barometer/src/collectd/
-
-# copying additional experimental configs on top of configs for 'main'
-# branch release
-COPY docker/barometer-collectd-experimental/experimental-configs/* \
- ${repos_dir}/barometer/src/collectd/collectd_sample_configs-master/
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
+RUN ./build_base_machine.sh && \
+ dnf clean all && rm -rf /var/cache/dnf
+
+FROM quay.io/centos/centos:stream8
COPY docker/barometer-collectd-experimental/run_collectd.sh /run_collectd.sh
RUN chmod +x /run_collectd.sh
+RUN useradd -ms /bin/bash collectd_exec && \
+ echo "collectd_exec ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+
+COPY --from=builder /opt/collectd /opt/collectd
+COPY --from=builder /usr/local/src /usr/local/src
+COPY --from=builder /usr/share/snmp/mibs /usr/share/snmp/mibs
+COPY --from=builder /opt/collectd/share/collectd/types.db /usr/share/collectd/types.db
+
+RUN dnf install -y 'dnf-command(builddep)' centos-release-opstools && \
+ dnf config-manager --set-enabled powertools && \
+ dnf builddep -y https://raw.githubusercontent.com/centos-opstools/collectd/master/collectd.spec && \
+ dnf install -y jansson && \
+ dnf clean all && rm -rf /var/cache/dnf
+
ENTRYPOINT ["/run_collectd.sh"]
diff --git a/docker/barometer-collectd-experimental/collectd_apply_pull_request.sh b/docker/barometer-collectd-experimental/collectd_apply_pull_request.sh
deleted file mode 100755
index dbbc5f26..00000000
--- a/docker/barometer-collectd-experimental/collectd_apply_pull_request.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/bash
-# Copyright 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.
-#
-
-# This files contains list of pull requests to be applied on top
-# of main branch before building collectd included in docker
-# collectd-experimental container
-
-# Use this script with a COLLECTD_PULL_REQUESTS variable defined
-# for example:
-# COLLECTD_PULL_REQUESTS="3027,3028" ./collectd_apply_pull_request.sh
-
-if [ -z "$COLLECTD_PULL_REQUESTS" ];
-then
- echo "COLLECTD_PULL_REQUESTS is unset, exiting"
- exit
-fi
-
-IFS=', ' read -a PULL_REQUESTS <<< "$COLLECTD_PULL_REQUESTS"
-
-# during rebasing/merging git requires email & name to be set
-git config user.email "barometer-experimental@container"
-git config user.name "BarometerExperimental"
-
-for PR_ID in "${PULL_REQUESTS[@]}"
-do
- echo "Applying pull request $PR_ID"
- git pull --rebase origin pull/$PR_ID/head
-done
diff --git a/docker/barometer-collectd-experimental/experimental-configs/README b/docker/barometer-collectd-experimental/experimental-configs/README
deleted file mode 100644
index e4386358..00000000
--- a/docker/barometer-collectd-experimental/experimental-configs/README
+++ /dev/null
@@ -1 +0,0 @@
-Place here configuration files that are required by experimental pull requests