Move common parts out from this project

sclorg · May 12, 2017 · 2b80258 · 2b80258
1 parent 06e5686
commit 2b80258
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 134 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 = php
 VERSIONS = 5.6 7.0
 OPENSHIFT_NAMESPACES = 5.5
 
-# 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/README.md b/README.md
@@ -32,14 +32,14 @@ To build a PHP image, choose either the CentOS or RHEL based image:
     subscribed RHEL machine.
 
     ```
-    $ git clone https://github.com/sclorg/s2i-php-container.git
+    $ git clone --recursive https://github.com/sclorg/s2i-php-container.git
     $ cd s2i-php-container
     $ make build TARGET=rhel7 VERSION=7.0
     ```
 
 *  **CentOS based image**
     ```
-    $ git clone https://github.com/sclorg/s2i-php-container.git
+    $ git clone --recursive https://github.com/sclorg/s2i-php-container.git
     $ cd s2i-php-container
     $ make build TARGET=centos7 VERSION=7.0
     ```

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