From 9ff44f3f92384bc29df17568017875c4842cbed9 Mon Sep 17 00:00:00 2001
From: Riccardo Pittau <elfosardo@gmail.com>
Date: Fri, 6 Nov 2020 10:52:35 +0100
Subject: [PATCH] Add a way to install extra packages in the imges

Long due change to provide a way to automatically install extra
packages in the local custom built images.
This can be useful to test different versions of packages or just
test new dependencies or tools.
Also adding a visual separation to some build logic parts.
---
 04_setup_ironic.sh | 15 ++++++++++++++-
 config_example.sh  |  6 ++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/04_setup_ironic.sh b/04_setup_ironic.sh
index 10d42ab1e..3c50be8f0 100755
--- a/04_setup_ironic.sh
+++ b/04_setup_ironic.sh
@@ -38,6 +38,7 @@ fi
 
 for IMAGE_VAR in $(env | grep "_LOCAL_IMAGE=" | grep -o "^[^=]*") ; do
     IMAGE=${!IMAGE_VAR}
+    BUILD_COMMAND_ARGS=""
 
     sudo -E podman pull --authfile $PULL_SECRET_FILE $OPENSHIFT_RELEASE_IMAGE
 
@@ -67,6 +68,17 @@ for IMAGE_VAR in $(env | grep "_LOCAL_IMAGE=" | grep -o "^[^=]*") ; do
                 git fetch origin pull/${IMAGE_PR}/head:pr${IMAGE_PR}
                 git checkout pr${IMAGE_PR}
         fi
+        
+        # If we want to install extra packages, we set the path to a
+        # file containing the packages (one per line) we want to install
+        EXTRA_PKGS_FILE_PATH=${IMAGE_VAR/_LOCAL_IMAGE}_EXTRA_PACKAGES
+        EXTRA_PKGS_FILE=${!EXTRA_PKGS_FILE_PATH:-}
+        EXTRA_PKGS_FILE=$(cd $OLDPWD; realpath $EXTRA_PKGS_FILE)
+        if [[ -n $EXTRA_PKGS_FILE ]]; then
+            cp $EXTRA_PKGS_FILE "$REPOPATH"
+            EXTRA_PKGS_FILE_NAME=$(basename $EXTRA_PKGS_FILE)
+            BUILD_COMMAND_ARGS+=" --build-arg EXTRA_PKGS_LIST=$EXTRA_PKGS_FILE_NAME"
+        fi
 
         # If we built a custom base image, we should use it as a new base in
         # the Dockerfile to prevent discrepancies between locally built images.
@@ -74,7 +86,8 @@ for IMAGE_VAR in $(env | grep "_LOCAL_IMAGE=" | grep -o "^[^=]*") ; do
         if [[ -n ${BASE_IMAGE_DIR:-} ]]; then
             sed -i "s/^FROM [^ ]*/FROM ${BASE_IMAGE_DIR}/g" ${IMAGE_DOCKERFILE}
         fi
-        sudo podman build --authfile $PULL_SECRET_FILE -t ${!IMAGE_VAR} -f $IMAGE_DOCKERFILE .
+        
+        sudo podman build --authfile $PULL_SECRET_FILE $BUILD_COMMAND_ARGS -t ${!IMAGE_VAR} -f $IMAGE_DOCKERFILE .
         cd -
         sudo podman push --tls-verify=false --authfile $PULL_SECRET_FILE ${!IMAGE_VAR} ${!IMAGE_VAR}
     fi
diff --git a/config_example.sh b/config_example.sh
index 5559b3632..3811fd1b4 100755
--- a/config_example.sh
+++ b/config_example.sh
@@ -23,6 +23,12 @@ set -x
 # NOTE: If a checkout already exists in $HOME, it won't be re-created.
 # NOTE: You must set CUSTOM_REPO_FILE to build some OpenShift images, e.g. ironic ones.
 
+# Use <IMAGE_NAME>_EXTRA_PACKAGES to set the path (relative to dev-scripts or
+# absolute) to a file with extra packages to install in the image, one per line.
+# At the moment, this option is supported with ironic-image and ironic-inspector-image
+# For example:
+# export IRONIC_EXTRA_PACKAGES=ironic-extra-pkgs.txt
+
 # Set this variable to point the custom base image to a different location
 # It can be an absolute path or a local path under the dev-scripts dir
 # export BASE_IMAGE_DIR=base-image