You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by wo...@apache.org on 2021/01/11 17:14:39 UTC

[couchdb-docker] branch main updated: Update dev to use `main` branch rather than master (#195)

This is an automated email from the ASF dual-hosted git repository.

wohali pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git


The following commit(s) were added to refs/heads/main by this push:
     new 03af73d  Update dev to use `main` branch rather than master (#195)
03af73d is described below

commit 03af73d79440c44c386848b6ceac1434cf5af357
Author: Amit Phulera <am...@gmail.com>
AuthorDate: Mon Jan 11 22:44:30 2021 +0530

    Update dev to use `main` branch rather than master (#195)
---
 dev-cluster/Dockerfile | 2 +-
 dev/Dockerfile         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-cluster/Dockerfile b/dev-cluster/Dockerfile
index 70e3bfb..62883f2 100644
--- a/dev-cluster/Dockerfile
+++ b/dev-cluster/Dockerfile
@@ -108,7 +108,7 @@ RUN git clone $clone_url /usr/src/couchdb
 WORKDIR /usr/src/couchdb
 RUN ./configure -c --spidermonkey-version 60
 
-ARG checkout_branch=master
+ARG checkout_branch=main
 ARG configure_options="-c --spidermonkey-version 60"
 
 WORKDIR /usr/src/couchdb/
diff --git a/dev/Dockerfile b/dev/Dockerfile
index a32bb34..782d233 100644
--- a/dev/Dockerfile
+++ b/dev/Dockerfile
@@ -125,10 +125,10 @@ RUN ./configure
 # This layer performs the actual build of a relocatable, self-contained
 # release of CouchDB. It pulls down the latest changes from the remote
 # origin (because the layer above will be cached) and switches to the
-# branch specified in the build_arg (defaults to master)
+# branch specified in the build_arg (defaults to main)
 FROM build_dependencies AS build
 
-ARG checkout_branch=master
+ARG checkout_branch=main
 ARG configure_options
 ARG spidermonkey_version=60