Skip to content

Commit 5545c51

Browse files
committed
build: move common parts out from this project
Per discussion in PR sclorg#138 and some private discussion with @omron93: We keep the "warning" Makefile-hack to inform users who have old clones of this repository and will do "git pull" (those users must explicitly init the git module).
1 parent 7d98f06 commit 5545c51

File tree

6 files changed

+12
-144
lines changed

6 files changed

+12
-144
lines changed

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "common"]
2+
path = common
3+
url = https://github.com/sclorg/container-common-scripts.git

Makefile

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
# Variables are documented in hack/build.sh.
1+
# Variables are documented in common/build.sh.
22
BASE_IMAGE_NAME = postgresql
33
VERSIONS = 9.4 9.5
44
OPENSHIFT_NAMESPACES = 9.2
55

6-
# Include common Makefile code.
7-
include hack/common.mk
6+
# HACK: Ensure that 'git pull' for old clones doesn't cause confusion.
7+
# New clones should use '--recursive'.
8+
.PHONY: $(shell test -f common/common.mk || echo >&2 'Please do "git submodule update --init" first.')
9+
10+
include common/common.mk

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Choose either the CentOS7 or RHEL7 based image:
3030
subscribed RHEL machine.
3131

3232
```
33-
$ git clone https://github.com/openshift/postgresql.git
33+
$ git clone --recursive https://github.com/sclorg/postgresql-container.git
3434
$ cd postgresql
3535
$ make build TARGET=rhel7 VERSION=9.5
3636
```
@@ -46,7 +46,7 @@ Choose either the CentOS7 or RHEL7 based image:
4646
To build a PostgreSQL image from scratch run:
4747
4848
```
49-
$ git clone https://github.com/openshift/postgresql.git
49+
$ git clone --recursive https://github.com/sclorg/postgresql-container.git
5050
$ cd postgresql
5151
$ make build TARGET=centos7 VERSION=9.5
5252
```

common

Submodule common added at a2ae0ad

hack/build.sh

-103
This file was deleted.

hack/common.mk

-36
This file was deleted.

0 commit comments

Comments
 (0)