Skip to content

Commit

Permalink
build: move common parts out from this project
Browse files Browse the repository at this point in the history
Per discussion in PR #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).
  • Loading branch information
praiskup committed Feb 14, 2017
1 parent 7d98f06 commit 5545c51
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 144 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "common"]
path = common
url = https://github.com/sclorg/container-common-scripts.git
9 changes: 6 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
# Variables are documented in hack/build.sh.
# Variables are documented in common/build.sh.
BASE_IMAGE_NAME = postgresql
VERSIONS = 9.4 9.5
OPENSHIFT_NAMESPACES = 9.2

# 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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Choose either the CentOS7 or RHEL7 based image:
subscribed RHEL machine.

```
$ git clone https://github.com/openshift/postgresql.git
$ git clone --recursive https://github.com/sclorg/postgresql-container.git
$ cd postgresql
$ make build TARGET=rhel7 VERSION=9.5
```
Expand All @@ -46,7 +46,7 @@ Choose either the CentOS7 or RHEL7 based image:
To build a PostgreSQL image from scratch run:
```
$ git clone https://github.com/openshift/postgresql.git
$ git clone --recursive https://github.com/sclorg/postgresql-container.git
$ cd postgresql
$ make build TARGET=centos7 VERSION=9.5
```
Expand Down
1 change: 1 addition & 0 deletions common
Submodule common added at a2ae0a
103 changes: 0 additions & 103 deletions hack/build.sh

This file was deleted.

36 changes: 0 additions & 36 deletions hack/common.mk

This file was deleted.

0 comments on commit 5545c51

Please sign in to comment.