openwhisk-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rab...@apache.org
Subject [incubator-openwhisk-devtools] branch master updated: Merge outdated docker_build makefile target. (#142)
Date Tue, 24 Jul 2018 00:39:53 GMT
This is an automated email from the ASF dual-hosted git repository.

rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-devtools.git


The following commit(s) were added to refs/heads/master by this push:
     new 0e7579d  Merge outdated docker_build makefile target. (#142)
0e7579d is described below

commit 0e7579db42a9fc9711cb47dd2f6f2af2298b2b43
Author: Tzu-Chiao Yeh <su3g4284zo6y7@gmail.com>
AuthorDate: Tue Jul 24 08:39:51 2018 +0800

    Merge outdated docker_build makefile target. (#142)
    
    Since actionRuntimes had been removed from upstream codebase. Merge
    two docker_build* makefile targets for avoiding misunderstanding.
    
    Signed-off-by: Tzu-Chiao Yeh <su3g4284zo6y7@gmail.com>
---
 docker-compose/Makefile  | 9 ++-------
 docker-compose/README.md | 4 ++--
 2 files changed, 4 insertions(+), 9 deletions(-)

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


Mime
View raw message