build: Make it possible to add custom repo files at build

pkubatrh · Feb 6, 2018 · 7beee13 · 7beee13
1 parent 389a27f
commit 7beee13
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/build.sh b/build.sh
@@ -71,6 +71,9 @@ function docker_build_with_version {
   if [[ "${UPDATE_BASE}" == "1" ]]; then
     BUILD_OPTIONS+=" --pull=true"
   fi
+  if [ ! -z "$CUSTOM_REPO" ]; then
+    BUILD_OPTIONS+=" -v $CUSTOM_REPO:/etc/yum.repos.d/:Z --build-arg SKIP_REPOS_ENABLE=1"
+  fi
 
   parse_output 'docker build $BUILD_OPTIONS -f "$dockerfile" "${DOCKER_BUILD_CONTEXT}"' \
                "awk '/Successfully built/{print \$NF}'" \

diff --git a/common.mk b/common.mk
@@ -33,7 +33,8 @@ script_env = \
 	OS=$(OS)                                        \
 	CLEAN_AFTER=$(CLEAN_AFTER)                      \
 	DOCKER_BUILD_CONTEXT=$(DOCKER_BUILD_CONTEXT)    \
-	OPENSHIFT_NAMESPACES="$(OPENSHIFT_NAMESPACES)"
+	OPENSHIFT_NAMESPACES="$(OPENSHIFT_NAMESPACES)"  \
+	CUSTOM_REPO="$(CUSTOM_REPO)"
 
 # TODO: switch to 'build: build-all' once parallel builds are relatively safe
 .PHONY: build build-serial build-all