diff options
| author | drebs <drebs@leap.se> | 2016-07-26 13:44:50 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2016-08-01 21:09:04 -0300 |
| commit | 682aab0b30e479ea4e826f0636340bb100b36c0a (patch) | |
| tree | 3e539ec54ba5ff57b8df50354d764e5a4d204b40 /scripts/docker/Makefile | |
| parent | de5cd462cc3f04275e22d9267ecb8e6c2b23dfda (diff) | |
[test] add custom couchdb docker image
Diffstat (limited to 'scripts/docker/Makefile')
| -rw-r--r-- | scripts/docker/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/docker/Makefile b/scripts/docker/Makefile index 4b4d4496..1bb57757 100644 --- a/scripts/docker/Makefile +++ b/scripts/docker/Makefile @@ -33,7 +33,7 @@ soledad-image: docker build -t $(IMAGE_NAME) . couchdb-image: - docker pull couchdb + (cd couchdb/ && make) ################################################## # Run a Soledad Server inside a docker container # @@ -77,7 +77,7 @@ run-client-bootstrap: run-tox: name=$$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 5 | head -n 1); \ - docker run -d --name $${name} couchdb; \ + docker run -d --name $${name} leap/couchdb; \ docker run -t -i \ --memory="$(MEMORY)" \ --env="SOLEDAD_REMOTE=$(SOLEDAD_REMOTE)" \ @@ -93,7 +93,7 @@ run-tox: run-perf: name=$$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 5 | head -n 1); \ - docker run -d --name $${name} couchdb; \ + docker run -d --name $${name} leap/couchdb; \ docker run -t -i \ --memory="$(MEMORY)" \ --env="SOLEDAD_REMOTE=$(SOLEDAD_REMOTE)" \ |