From 4a21a0c0ca021a077eb793bffe0005144f471be1 Mon Sep 17 00:00:00 2001 From: Trevor McKay Date: Thu, 15 Sep 2016 14:59:29 -0400 Subject: [PATCH] Add comment to Make and tweak README.md --- openshift-spark-py27-sti/Makefile | 6 +++++- openshift-spark-py27-sti/README.md | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/openshift-spark-py27-sti/Makefile b/openshift-spark-py27-sti/Makefile index 334f1ad..70a362f 100644 --- a/openshift-spark-py27-sti/Makefile +++ b/openshift-spark-py27-sti/Makefile @@ -1,6 +1,10 @@ BASE_IMAGE=centos/python-27-centos7:latest LOCAL_IMAGE=openshift-spark-py27-sti -SPARK_IMAGE=myproject/openshift-spark-py27-sti + +# If you are going to push the built image to a registry +# using the "push" make target then you should replace +# "project" with an appropriate path for your registry and/or project +SPARK_IMAGE=project/openshift-spark-py27-sti .PHONY: build clean push create destroy artifacts clean-artifacts clean-dockerfile clean-scripts clean-template diff --git a/openshift-spark-py27-sti/README.md b/openshift-spark-py27-sti/README.md index cf9726d..223c243 100644 --- a/openshift-spark-py27-sti/README.md +++ b/openshift-spark-py27-sti/README.md @@ -12,9 +12,12 @@ the parent directory contain the same version of spark. ## How to use this Makefile -The `clean`, `build`, `create`, and `destroy` targets are analagous +The `clean`, `build`, `push`, `create`, and `destroy` targets are analagous to the targets in the parent directory's Makefile. +By default the `push` target will tag the image as `project/openshift-spark-py27-sti`, +edit the Makefile and change `SPARK_IAMGE` to control this. + However, files must be copied from the parent directory before the image may be built. To do this use `make artifacts`: