From 923175d15112a865f3f51e80dab88922c17340d6 Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Wed, 21 Apr 2021 14:37:13 +0100 Subject: [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 Change-Id: I52b96a651cb5d9b644f11f5407cabf3fb21cb6a9 --- systems/ubuntu/16.04/build_base_machine.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'systems/ubuntu') 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 \ -- cgit 1.2.3-korg