Move common parts out from this project

sclorg · May 12, 2017 · c9dc22a · c9dc22a
1 parent b46d24b
commit c9dc22a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 128 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
@@ -1,7 +1,10 @@
-# Variables are documented in hack/build.sh.
+# Variables are documented in common/build.sh.
 BASE_IMAGE_NAME = nginx
 VERSIONS = 1.6 1.8
 OPENSHIFT_NAMESPACES = 
 
-# 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