Skip to content

Commit ce9285d

Browse files
author
Marek Skalický
committed
Move common parts out from this project
1 parent 83c4239 commit ce9285d

File tree

6 files changed

+12
-135
lines changed

6 files changed

+12
-135
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 = perl
33
VERSIONS = 5.20 5.24
44
OPENSHIFT_NAMESPACES = 5.16
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
@@ -32,7 +32,7 @@ To build a Perl image, choose either the CentOS or RHEL based image:
3232
subscribed RHEL machine.
3333

3434
```
35-
$ git clone https://github.com/openshift/s2i-perl.git
35+
$ git clone --recursive https://github.com/openshift/s2i-perl.git
3636
$ cd s2i-perl
3737
$ make build TARGET=rhel7 VERSION=5.24
3838
```
@@ -48,7 +48,7 @@ To build a Perl image, choose either the CentOS or RHEL based image:
4848
To build the perl-5.24 image from scratch run:
4949
5050
```
51-
$ git clone https://github.com/openshift/s2i-perl.git
51+
$ git clone --recursive https://github.com/openshift/s2i-perl.git
5252
$ cd s2i-perl
5353
$ make build TARGET=centos7 VERSION=5.24
5454
```

common

Submodule common added at 6be4375

hack/build.sh

-104
This file was deleted.

hack/common.mk

-26
This file was deleted.

0 commit comments

Comments
 (0)