diff options
author | 2021-04-21 14:37:13 +0100 | |
---|---|---|
committer | 2021-05-27 18:09:41 +0100 | |
commit | 923175d15112a865f3f51e80dab88922c17340d6 (patch) | |
tree | c44b4701310e0cd148cad4b153d310c43d628725 /systems/ubuntu/16.04 | |
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/ubuntu/16.04')
-rwxr-xr-x | systems/ubuntu/16.04/build_base_machine.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/systems/ubuntu/16.04/build_base_machine.sh b/systems/ubuntu/16.04/build_base_machine.sh index d74ec6d8..d04d587e 100755 --- a/systems/ubuntu/16.04/build_base_machine.sh +++ b/systems/ubuntu/16.04/build_base_machine.sh @@ -15,9 +15,13 @@ # set -eux -apt-get -y install build-essential dh-autoreconf fakeroot devscripts dpkg-dev git wget -apt-get -y install \ +export DEBIAN_FRONTEND=noninteractive + +apt-get -yq update +apt-get -yq install build-essential dh-autoreconf fakeroot devscripts dpkg-dev git-core wget sudo + +apt-get -yq install \ debhelper dpkg-dev po-debconf dh-systemd dh-strip-nondeterminism \ bison flex autotools-dev libltdl-dev pkg-config \ iptables-dev \ |