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-latest/Dockerfile | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'docker/barometer-collectd-latest/Dockerfile') diff --git a/docker/barometer-collectd-latest/Dockerfile b/docker/barometer-collectd-latest/Dockerfile index 4c01c870..b3a7a646 100644 --- a/docker/barometer-collectd-latest/Dockerfile +++ b/docker/barometer-collectd-latest/Dockerfile @@ -1,4 +1,5 @@ -# 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. @@ -14,17 +15,12 @@ # FROM centos:8 -RUN dnf update -y && \ - dnf install -y which sudo git && \ - dnf clean all && \ - git config --global http.sslVerify false +ARG COLLECTD_FLAVOR=latest +ARG WITH_DPDK=y ENV DOCKER y -ENV COLLECTD_FLAVOR latest -ENV WITH_DPDK y ENV repos_dir /src -WORKDIR ${repos_dir} RUN mkdir -p ${repos_dir}/barometer COPY . ${repos_dir}/barometer -- cgit 1.2.3-korg