commit c419ee1763093765c27eafe4857774006b8c0cd6
author dan mcweeney <me@danmcweeney.com> Mon Jan 08 10:32:00 2018 -0500
committer ddragosd <ddragosd@gmail.com> Mon Jan 08 07:32:00 2018 -0800
tree 74df1cb9420c4127714b60e15c53357309f899b5
parent 324d3df902b4b9b1bae1dd7f2dc580d9e6274ae0

Make ansible also setup couchdb during compose quickstart (#74)

* Fix #78 - update docker compose version
* Make ansible also setup couchdb during compose quickstart

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index cc06797..1d678b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@
 
 env:
   global:
-    - DOCKER_COMPOSE_VERSION: 1.13
+    - DOCKER_COMPOSE_VERSION: 1.13.0
   matrix:
     - TOOL: docker-compose
 

docker-compose/Makefile

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 @@
 	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