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 --- docker/barometer-collectd-experimental/experimental-configs/README | 1 - 1 file changed, 1 deletion(-) delete mode 100644 docker/barometer-collectd-experimental/experimental-configs/README (limited to 'docker/barometer-collectd-experimental/experimental-configs/README') 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 -- cgit 1.2.3-korg