Common parts moved into 'container-common-scripts' project.

pmccarthy · Aug 2, 2017 · 1dd2c25 · 1dd2c25
1 parent 590170a
commit 1dd2c25
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 133 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "common"]
+	path = common
+	url = https://github.com/sclorg/container-common-scripts.git
diff --git a/Makefile b/Makefile
@@ -3,5 +3,8 @@ BASE_IMAGE_NAME = mongodb
 VERSIONS = 2.6 3.0-upg 3.2
 OPENSHIFT_NAMESPACES = 2.4
 
-# Include common Makefile code.
-include hack/common.mk
+# HACK:  Ensure that 'git pull' for old clones doesn't cause confusion.
+# New clones should use '--recursive'.
+.PHONY: $(shell test -f common/common.mk || echo >&2 'Please do "git submodule update --init" first.')
+
+include common/common.mk
diff --git a/common b/common
diff --git a/hack/build.sh b/hack/build.sh
diff --git a/hack/common.mk b/hack/common.mk