rabbah closed pull request #142: Merge outdated docker_build makefile target.
URL: https://github.com/apache/incubator-openwhisk-devtools/pull/142
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/docker-compose/Makefile b/docker-compose/Makefile
index 7c32ddf..3ec770b 100644
--- a/docker-compose/Makefile
+++ b/docker-compose/Makefile
@@ -78,14 +78,9 @@ quick-start-info:
echo "$$(tput setaf 2)To stop openwhisk use: $$(tput setaf 4)make
destroy$$(tput sgr0)"
docker_build:
- echo "building the docker images short list ... "
+ echo "building the openwhisk core docker images ... "
cd $(OPENWHISK_PROJECT_HOME) && \
- ./gradlew distDocker -PdockerImagePrefix=$(DOCKER_IMAGE_PREFIX)
-x :actionRuntimes:pythonAction:distDocker -x
:actionRuntimes:python2Action:distDocker -x
actionRuntimes:swift3.1.1Action:distDocker -x
actionRuntimes:swift4.1Action:distDocker -x
:actionRuntimes:javaAction:distDocker
-
-docker_build_full:
- echo "building the docker images full list ... "
- cd $(OPENWHISK_PROJECT_HOME) && \
- ./gradlew distDocker -PdockerImagePrefix=$(DOCKER_IMAGE_PREFIX)
+ ./gradlew distDocker -PdockerImagePrefix=$(DOCKER_IMAGE_PREFIX)
docker_pull:
echo "pulling the docker images short list... "
diff --git a/docker-compose/README.md b/docker-compose/README.md
index 7b4481e..c6ac499 100644
--- a/docker-compose/README.md
+++ b/docker-compose/README.md
@@ -82,7 +82,7 @@ make restart-controller
* Check the [issue
tracker](https://github.com/apache/incubator-openwhisk-devtools/issues) for
more.
-# Build or Pull
+# Pull and build local OpenWhisk core images
You can pull pre-built image
```bash
@@ -95,7 +95,7 @@ This command pulls the docker images for local testing and
development.
make docker_build
```
-This command builds the docker images for local testing and development.
+This command builds the opewnhisk core docker images for local testing and
development.
# Start
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
