diff options
| author | Robert Newson <rnewson@apache.org> | 2014-07-19 18:26:52 +0100 |
|---|---|---|
| committer | Robert Newson <rnewson@apache.org> | 2014-07-19 18:26:52 +0100 |
| commit | afe46715133653300774a3d73bf331e2475e918c (patch) | |
| tree | 14ce8e64cd7353a57aa3613ee908cb2b39d2f5c3 | |
| parent | 355f271f7174e47a68d27eeb1658a2faa9dbaa49 (diff) | |
| download | couchdb-afe46715133653300774a3d73bf331e2475e918c.tar.gz | |
Build the dev cluster from master branch
| -rw-r--r-- | Dockerfile | 3 | ||||
| -rw-r--r-- | Makefile | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/Dockerfile b/Dockerfile index ddb45cfb6..6e87b807a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,10 +14,7 @@ USER couchdb # Get the source WORKDIR /home/couchdb RUN git clone https://git-wip-us.apache.org/repos/asf/couchdb.git - -# Switch branches WORKDIR /home/couchdb/couchdb -RUN git checkout 1843-feature-bigcouch # We don't to be so strict for simple testing. RUN sed -i'' '/require_otp_vsn/d' rebar.config.script @@ -52,7 +52,7 @@ install.mk: @exit 1 docker: - @docker build --no-cache --rm -t couchdb/1843-feature-bigcouch . + @docker build --no-cache --rm -t couchdb/dev-cluster . eunit: @rebar eunit skip_deps=meck,mochiweb,lager |