openwhisk-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dra...@apache.org
Subject [incubator-openwhisk-devtools] branch master updated: Make ansible also setup couchdb during compose quickstart (#74)
Date Mon, 08 Jan 2018 15:32:02 GMT
This is an automated email from the ASF dual-hosted git repository.

dragos 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 c419ee1  Make ansible also setup couchdb during compose quickstart (#74)
c419ee1 is described below

commit c419ee1763093765c27eafe4857774006b8c0cd6
Author: dan mcweeney <me@danmcweeney.com>
AuthorDate: Mon Jan 8 10:32:00 2018 -0500

    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             | 2 +-
 docker-compose/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <commits@openwhisk.apache.org>'].

Mime
View raw message