[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

1 files changed, 0 insertions, 41 deletions

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