ddragosd closed pull request #74: Make ansible also setup couchdb during
compose quickstart
URL: https://github.com/apache/incubator-openwhisk-devtools/pull/74
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/.travis.yml b/.travis.yml
index cc06797..1d678b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ sudo: required
env:
global:
- - DOCKER_COMPOSE_VERSION: 1.13
+ - DOCKER_COMPOSE_VERSION: 1.13.0
matrix:
- TOOL: docker-compose
diff --git a/docker-compose/Makefile b/docker-compose/Makefile
index 9967078..190c1fb 100644
--- a/docker-compose/Makefile
+++ b/docker-compose/Makefile
@@ -147,7 +147,7 @@ init-couchdb:
docker run --rm -v ~/tmp/openwhisk/src:/openwhisk -w /openwhisk/ansible
\
--network="host" -t \
ddragosd/ansible:2.3.1.0-debian8 \
- ansible-playbook setup.yml initdb.yml wipe.yml \
+ ansible-playbook setup.yml couchdb.yml initdb.yml wipe.yml
--tags=ini \
-e db_host=$(DOCKER_HOST_IP) -e openwhisk_home=/openwhisk
-e db_prefix=$(OPEN_WHISK_DB_PREFIX)
.PHONY: init-whisk-cli
----------------------------------------------------------------
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
