Merge pull request #659 from lukaszstolarczuk/skip-pmdk-and-valgrind-when-not-needed

Add skip flags for additional artifacts built/installed in dockerimages

Author: igchor

utils/docker/images/Dockerfile.fedora-30

@@ -1,5 +1,5 @@
 #
-# Copyright 2016-2019, Intel Corporation
+# Copyright 2016-2020, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -38,6 +38,10 @@
 FROM fedora:30
 MAINTAINER marcin.slusarz@intel.com
 
+# Additional parameters to build docker without building components
+ARG SKIP_VALGRIND_BUILD
+ARG SKIP_PMDK_BUILD
+
 # Install basic tools
 RUN dnf update -y \
  && dnf install -y \

utils/docker/images/Dockerfile.ubuntu-19.04

@@ -1,5 +1,5 @@
 #
-# Copyright 2016-2019, Intel Corporation
+# Copyright 2016-2020, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -38,6 +38,10 @@
 FROM ubuntu:19.04
 MAINTAINER marcin.slusarz@intel.com
 
+# Additional parameters to build docker without building components
+ARG SKIP_VALGRIND_BUILD
+ARG SKIP_PMDK_BUILD
+
 ENV DEBIAN_FRONTEND noninteractive
 
 # Update the Apt cache and install basic tools

utils/docker/images/install-pmdk.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2018-2019, Intel Corporation
+# Copyright 2018-2020, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -36,6 +36,11 @@
 
 set -e
 
+if [ "${SKIP_PMDK_BUILD}" ]; then
+	echo "Variable 'SKIP_PMDK_BUILD' is set; skipping building PMDK"
+	exit
+fi
+
 git clone https://github.com/pmem/pmdk
 cd pmdk
 # stable-1.6: common: fix typo

utils/docker/images/install-valgrind.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2016-2019, Intel Corporation
+# Copyright 2016-2020, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -36,6 +36,11 @@
 
 set -e
 
+if [ "${SKIP_VALGRIND_BUILD}" ]; then
+	echo "Variable 'SKIP_VALGRIND_BUILD' is set; skipping building valgrind (pmem's fork)"
+	exit
+fi
+
 git clone --recursive https://github.com/pmem/valgrind.git
 cd valgrind
 # pmem-3.14: fix memcheck failure on Ubuntu-19.04