Override oom-cert-service docker container name 85/114585/1
authorBartek Grzybowski <b.grzybowski@partner.samsung.com>
Wed, 4 Nov 2020 11:14:29 +0000 (12:14 +0100)
committerBartek Grzybowski <b.grzybowski@partner.samsung.com>
Wed, 4 Nov 2020 11:14:29 +0000 (12:14 +0100)
Container name for certificate generation tool is hardcoded
as "generate-certs" hence multiple builds couldn't run in parallel.
This change overrides DOCKER_CONTAINER oom-cert-service makefile
variable changing the container name effectively.

Change-Id: I397ab7f3b04d35070cfb492ca482521ee10159fa
Issue-ID: OOM-2623
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>
build/creating_data/docker-images-collector.sh

index 253246d..b8eb174 100755 (executable)
@@ -81,8 +81,11 @@ fi
 PROJECT_DIR="${1}"
 LIST="${2}"
 LISTS_DIR="$(readlink -f $(dirname ${0}))/../data_lists"
-HELM_REPO="127.0.0.1:8879"
+HELM_REPO_HOST="127.0.0.1"
+HELM_REPO_PORT="8879"
+HELM_REPO="${HELM_REPO_HOST}:${HELM_REPO_PORT}"
 HELM_REPO_PATH="dist/packages" # based on PACKAGE_DIR defined in oom/kubernetes/Makefile
+DOCKER_CONTAINER="generate-certs-${HELM_REPO_PORT}" # oom-cert-service container name override
 PROJECT="$(basename ${1})"
 
 if [ ! -f "${PROJECT_DIR}/../Makefile" ]; then
@@ -116,7 +119,8 @@ helm repo remove stable 2>/dev/null || true
 pushd "${PROJECT_DIR}/.."
 echo "Building project..."
 export SKIP_LINT=TRUE
-make all > /dev/null; make ${PROJECT} > /dev/null
+export DOCKER_CONTAINER
+make -e all > /dev/null; make -e ${PROJECT} > /dev/null
 popd
 
 # Create the list from all enabled subsystems