couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject couchdb commit: updated refs/heads/master to afe4671
Date Sat, 19 Jul 2014 17:27:08 GMT
Repository: couchdb
Updated Branches:
  refs/heads/master 355f271f7 -> afe467151


Build the dev cluster from master branch


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/afe46715
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/afe46715
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/afe46715

Branch: refs/heads/master
Commit: afe46715133653300774a3d73bf331e2475e918c
Parents: 355f271
Author: Robert Newson <rnewson@apache.org>
Authored: Sat Jul 19 18:26:52 2014 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Sat Jul 19 18:26:52 2014 +0100

----------------------------------------------------------------------
 Dockerfile | 3 ---
 Makefile   | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/afe46715/Dockerfile
----------------------------------------------------------------------
diff --git a/Dockerfile b/Dockerfile
index ddb45cf..6e87b80 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

http://git-wip-us.apache.org/repos/asf/couchdb/blob/afe46715/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 1301b49..800b6dd 100644
--- a/Makefile
+++ b/Makefile
@@ -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


Mime
View raw message