diff options
| author |   Emma Foley <efoley@redhat.com> | 2021-04-21 14:37:13 +0100 |
|---|---|---|
| committer | Emma Foley <efoley@redhat.com> | 2021-05-27 18:09:41 +0100 |
| commit | 923175d15112a865f3f51e80dab88922c17340d6 (patch) | |
| tree | c44b4701310e0cd148cad4b153d310c43d628725 /systems/centos | |
| parent | 4de702233e018ad10476db1920ab1c993588a593 (diff) | |
[docker] Reduce the number of build steps in containers
* Move collectd_apply_pull_request.sh to src/collectd/, which is
where the Makefile expects this script to be anyway
* Use ARG instead of ENV in collectd container
for COLLECTD_FLAVOR, COLLECTD_PULL_REQUESTS, WITH_DPDK
* Move the experimental sample configs to src/collectd
The configs are copied into the src/collectd directory within the
container anyway, so this skips a step in the container build.
* Remove initial package installation in containers
Move the installation of these packages to the package install steps
in the build script in systems/ instead.
* Remove unnecessary WORKDIR command
The WORKDIR {repo_dir} is unnecessary, since the following commands
are using absolute paths rather than relative paths.
Signed-off-by: Emma Foley <efoley@redhat.com>
Change-Id: I52b96a651cb5d9b644f11f5407cabf3fb21cb6a9
Diffstat (limited to 'systems/centos')
| -rwxr-xr-x | systems/centos/7/build_base_machine.sh | 6 | ||||
| -rwxr-xr-x | systems/centos/8/build_base_machine.sh | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/systems/centos/7/build_base_machine.sh b/systems/centos/7/build_base_machine.sh index 41595d7e..346160fa 100755 --- a/systems/centos/7/build_base_machine.sh +++ b/systems/centos/7/build_base_machine.sh @@ -2,7 +2,8 @@ # # Build a base machine for CentOS distro # -# 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. @@ -43,7 +44,8 @@ flex bison libtool pkg-config -git +git-core +sudo rpm-build libcap-devel xfsprogs-devel diff --git a/systems/centos/8/build_base_machine.sh b/systems/centos/8/build_base_machine.sh index 8486f3c0..ceb583d7 100755 --- a/systems/centos/8/build_base_machine.sh +++ b/systems/centos/8/build_base_machine.sh @@ -2,7 +2,8 @@ # # Build a base machine for CentOS distro # -# 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. @@ -21,6 +22,7 @@ # Aihua Li, Huawei Technologies. # Martin Klozik, Intel Corporation. # Maryam Tahhan, Intel Corporation. +# Emma Foley, Red Hat. # Synchronize package index files dnf -y update @@ -51,6 +53,7 @@ bison libtool pkg-config git-core +sudo rpm-build libcap-devel xfsprogs-devel @@ -79,6 +82,9 @@ rrdtool-devel dpdk-19.11.3 qpid-proton-c-devel +# ping collectd-6 +liboping-devel + #install epel release required for git-review epel-release python3-libvirt |