You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by da...@apache.org on 2018/09/27 01:33:16 UTC
[incubator-openwhisk-devtools] branch master updated: Fixe some
documentation and typos (#161)
This is an automated email from the ASF dual-hosted git repository.
daisyguo 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 b61f8db Fixe some documentation and typos (#161)
b61f8db is described below
commit b61f8db68908eddc93d2a9fb1b5e00c6114b559a
Author: Alvaro Lopez Garcia <al...@ifca.unican.es>
AuthorDate: Thu Sep 27 03:33:11 2018 +0200
Fixe some documentation and typos (#161)
* Fix download-catalog typo in Makefile
* Do not list deprecated docker_* commands in documentation
---
docker-compose/Makefile | 2 +-
docker-compose/README.md | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docker-compose/Makefile b/docker-compose/Makefile
index b7d199b..7f15bdd 100644
--- a/docker-compose/Makefile
+++ b/docker-compose/Makefile
@@ -65,7 +65,7 @@ download-src:
.PHONY: download-catalog
download-catalog:
if [ "$(OPENWHISK_CATALOG_HOME)" = "./openwhisk-catalog" ]; then \
- rm -rf ./openwhisk-catalog* \
+ rm -rf ./openwhisk-catalog*; \
curl -O ./openwhisk-catalog.tar.gz -L https://api.github.com/repos/apache/incubator-openwhisk-catalog/tarball/master > ./openwhisk-catalog.tar.gz; \
mkdir openwhisk-catalog; \
tar -xf ./openwhisk-catalog.tar.gz --strip 1 -C openwhisk-catalog; \
diff --git a/docker-compose/README.md b/docker-compose/README.md
index d765ce2..22fafbe 100644
--- a/docker-compose/README.md
+++ b/docker-compose/README.md
@@ -87,13 +87,13 @@ make restart-controller
You can pull pre-built image
```bash
-make docker_pull
+make docker-pull
```
This command pulls the docker images for local testing and development.
```bash
-make docker_build
+make docker-build
```
This command builds the opewnhisk core docker images for local testing and development.