[couchdb-docker] branch main updated: Updated UBI + Clouseau for CouchDB 3.2.0 (#209)

[wohali]

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 a0e807f  Updated UBI + Clouseau for CouchDB 3.2.0 (#209)
a0e807f is described below

commit a0e807f609cde6628c2cffb85416b0de747b65cc
Author: Dr Doug Cowie 
AuthorDate: Tue Oct 19 18:56:07 2021 +0100

Updated UBI + Clouseau for CouchDB 3.2.0 (#209)

Adds a new entry for CouchDB 3.2.0 built on UBI, with Clouseau. This is a 
direct copy of 3.1.2-ubi-clouseau with CouchDB version bumped to 3.2.0
---
 3.2.0-ubi-clouseau/Dockerfile  | 131 +
 3.2.0-ubi-clouseau/couchdb.repo|   7 +
 3.2.0-ubi-clouseau/imeyer_runit.repo   |  10 +
 3.2.0-ubi-clouseau/licenses/LICENSE| 202 +
 3.2.0-ubi-clouseau/resources/10-docker-default.ini |   8 +
 3.2.0-ubi-clouseau/resources/clouseau/clouseau.ini |   6 +
 3.2.0-ubi-clouseau/resources/clouseau/clouseau.sh  |  13 ++
 .../resources/clouseau/log4j.properties|   5 +
 3.2.0-ubi-clouseau/resources/docker-entrypoint.sh  | 185 +++
 3.2.0-ubi-clouseau/resources/pre_stop  |  30 +++
 3.2.0-ubi-clouseau/resources/run   |   1 +
 3.2.0-ubi-clouseau/resources/run_clouseau  |   1 +
 3.2.0-ubi-clouseau/resources/vm.args   |  28 +++
 13 files changed, 627 insertions(+)

diff --git a/3.2.0-ubi-clouseau/Dockerfile b/3.2.0-ubi-clouseau/Dockerfile
new file mode 100644
index 000..16abfe6
--- /dev/null
+++ b/3.2.0-ubi-clouseau/Dockerfile
@@ -0,0 +1,131 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+ARG CLOUSEAU_VERSION=2.17.0
+
+FROM registry.access.redhat.com/ubi8/ubi-minimal as builder
+
+ARG CLOUSEAU_VERSION
+
+WORKDIR /usr/src
+
+# Fetch and extract clouseau
+RUN set -xe; \
+microdnf update -y && rm -rf /var/cache/yum && \
+microdnf install -y unzip wget && \
+wget 
https://github.com/cloudant-labs/clouseau/releases/download/${CLOUSEAU_VERSION}/clouseau-${CLOUSEAU_VERSION}-dist.zip
 && \
+unzip clouseau-2.17.0-dist.zip && \ 
+microdnf clean all; \
+rm -rf /var/cache/yum
+
+FROM registry.access.redhat.com/ubi8/ubi-minimal
+
+ARG RELEASE
+ARG BUILD_DATE
+ARG CLOUSEAU_VERSION
+
+LABEL maintainer="CouchDB Developers d...@couchdb.apache.org" \
+  name="Apache CouchDB" \
+  version="3.2.0" \
+  summary="Apache CouchDB based on Red Hat UBI" \
+  description="Red Hat OpenShift-compatible container that runs Apache 
CouchDB" \
+  release=${RELEASE}  \
+  usage="https://github.com/apache/couchdb-docker; \
+  build-date=${BUILD_DATE} \
+  io.k8s.display-name="Apache CouchDB" \
+  io.k8s.description="Red Hat OpenShift-compatible container that runs 
Apache CouchDB" \
+  io.openshift.tags="database couchdb apache rhel8" \
+  io.openshift.expose-services="5984/http,4369/epmd,9100/erlang" \
+  io.openshift.min-memory="1Gi" \
+  io.openshift.min-cpu="1"
+
+COPY imeyer_runit.repo /etc/yum.repos.d/imeyer_runit.repo
+COPY couchdb.repo /etc/yum.repos.d/couchdb.repo
+
+ENV COUCHDB_VERSION=3.2.0 \
+CLOUSEAU_VERSION=${CLOUSEAU_VERSION} \
+JAVA_MAJOR_VERSION=8 \
+JAVA_HOME=/usr/lib/jvm/jre-1.8.0 \
+CLASSPATH=${APP_ROOT}/lib/*
+
+# Add CouchDB user account to make sure the IDs are assigned consistently
+# CouchDB user added to root group for OpenShift support
+RUN set -ex; \
+# be sure GPG and apt-transport-https are available and functional
+microdnf update -y && rm -rf /var/cache/yum; \
+microdnf install -y \
+java-1.8.0-openjdk-headless \
+ca-certificates \
+gnupg \
+findutils \
+shadow-utils; \
+# Add CouchDB User and Group (group required by rpm)
+useradd -u 5984 -d /opt/couchdb -g root couchdb; \
+groupadd -g 5984 couchdb; \
+# Install runit
+microdnf update --disableplugin=subscription-manager -y && rm -rf 
/var/cache/yum; \
+microdnf install --enablerepo=imeyer_runit -y runit; \
+# Clean up
+microdnf clean all; \
+rm -rf /var/cache/yum
+
+# Install CouchDB
+RUN set -xe; \
+microdnf update --disab

[couchdb-docker] branch main updated: Version 3.2.0 (#208)

[wohali]

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 c2dc5a8  Version 3.2.0 (#208)
c2dc5a8 is described below

commit c2dc5a84add2d673bce151e0aa8174d09d227d22
Author: Joan Touzet 
AuthorDate: Fri Oct 8 23:07:37 2021 +

Version 3.2.0 (#208)
---
 .travis.yml |   1 +
 3.2.0/10-docker-default.ini |   8 
 3.2.0/Dockerfile| 105 +++
 3.2.0/docker-entrypoint.sh  | 106 
 3.2.0/vm.args   |  28 
 README.md   |   3 +-
 6 files changed, 250 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5b7db66..3199eca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,7 @@ env:
   - RELEASES=2.3.1-ubi
   - RELEASES=3.1.2
   - RELEASES=3.1.2-ubi
+  - RELEASES=3.2.0
 # Needs updating for fdb
 #  - RELEASES=dev
 #  - RELEASES=dev-cluster
diff --git a/3.2.0/10-docker-default.ini b/3.2.0/10-docker-default.ini
new file mode 100644
index 000..1aa633c
--- /dev/null
+++ b/3.2.0/10-docker-default.ini
@@ -0,0 +1,8 @@
+; CouchDB Configuration Settings
+
+; Custom settings should be made in this file. They will override settings
+; in default.ini, but unlike changes made to default.ini, this file won't be
+; overwritten on server upgrade.
+
+[chttpd]
+bind_address = any
diff --git a/3.2.0/Dockerfile b/3.2.0/Dockerfile
new file mode 100644
index 000..159be0f
--- /dev/null
+++ b/3.2.0/Dockerfile
@@ -0,0 +1,105 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+FROM debian:buster-slim
+
+LABEL maintainer="CouchDB Developers d...@couchdb.apache.org"
+
+# Add CouchDB user account to make sure the IDs are assigned consistently
+RUN groupadd -g 5984 -r couchdb && useradd -u 5984 -d /opt/couchdb -g couchdb 
couchdb
+
+# be sure GPG and apt-transport-https are available and functional
+RUN set -ex; \
+apt-get update; \
+apt-get install -y --no-install-recommends \
+apt-transport-https \
+ca-certificates \
+dirmngr \
+gnupg \
+ ; \
+rm -rf /var/lib/apt/lists/*
+
+# grab gosu for easy step-down from root and tini for signal handling and 
zombie reaping
+# see https://github.com/apache/couchdb-docker/pull/28#discussion_r141112407
+RUN set -eux; \
+apt-get update; \
+apt-get install -y --no-install-recommends gosu tini; \
+rm -rf /var/lib/apt/lists/*; \
+gosu nobody true; \
+tini --version
+
+# 
http://docs.couchdb.org/en/latest/install/unix.html#installing-the-apache-couchdb-packages
+ENV GPG_COUCH_KEY \
+# gpg: rsa8192 205-01-19 The Apache Software Foundation (Package repository 
signing key) 
+390EF70BB1EA12B2773962950EE62FB37A00258D
+RUN set -eux; \
+apt-get update; \
+apt-get install -y curl; \
+export GNUPGHOME="$(mktemp -d)"; \
+curl -fL -o keys.asc https://couchdb.apache.org/repo/keys.asc; \
+gpg --batch --import keys.asc; \
+gpg --batch --export "${GPG_COUCH_KEY}" > 
/usr/share/keyrings/couchdb-archive-keyring.gpg; \
+command -v gpgconf && gpgconf --kill all || :; \
+rm -rf "$GNUPGHOME"; \
+apt-key list; \
+apt purge -y --autoremove curl; \
+rm -rf /var/lib/apt/lists/*
+
+ENV COUCHDB_VERSION 3.2.0
+
+RUN . /etc/os-release; \
+echo "deb [signed-by=/usr/share/keyrings/couchdb-archive-keyring.gpg] 
https://apache.jfrog.io/artifactory/couchdb-deb/ ${VERSION_CODENAME} main" | \
+tee /etc/apt/sources.list.d/couchdb.list >/dev/null
+
+# https://github.com/apache/couchdb-pkg/blob/master/debian/README.Debian
+RUN set -eux; \
+apt-get update; \
+\
+echo "couchdb couchdb/mode select none" | debconf-set-selections; \
+# we DO want recommends this time
+DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-downgrades 
--allow-remove-essential --allow-change-held-packages \
+couchdb="$COUCHDB_VERSION"~buster \
+; \
+# Undo symlinks to /var/log and /var/lib
+rmdir /var/lib/couchdb /var/log/couchdb; \
+rm /opt/couchdb/data /opt/couchdb/var/log; \
+mkdir -p /opt/couchdb/data /opt/couchdb/var/log; \
+chown couchdb:couchdb /opt/couchdb/data /opt/couchdb/var/log; \
+chmod 7

[couchdb-docker] branch 3.2.0 created (now 306d785)

[wohali]

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

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


  at 306d785  Version 3.2.0

This branch includes the following new commits:

 new 306d785  Version 3.2.0

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[couchdb-docker] 01/01: Version 3.2.0

[wohali]

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

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

commit 306d78505ce532e76ac3126cd0c25355dde8fd01
Author: Joan Touzet 
AuthorDate: Fri Oct 8 16:04:46 2021 -0700

Version 3.2.0
---
 .travis.yml |   1 +
 3.2.0/10-docker-default.ini |   8 
 3.2.0/Dockerfile| 105 +++
 3.2.0/docker-entrypoint.sh  | 106 
 3.2.0/vm.args   |  28 
 README.md   |   3 +-
 6 files changed, 250 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5b7db66..3199eca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,7 @@ env:
   - RELEASES=2.3.1-ubi
   - RELEASES=3.1.2
   - RELEASES=3.1.2-ubi
+  - RELEASES=3.2.0
 # Needs updating for fdb
 #  - RELEASES=dev
 #  - RELEASES=dev-cluster
diff --git a/3.2.0/10-docker-default.ini b/3.2.0/10-docker-default.ini
new file mode 100644
index 000..1aa633c
--- /dev/null
+++ b/3.2.0/10-docker-default.ini
@@ -0,0 +1,8 @@
+; CouchDB Configuration Settings
+
+; Custom settings should be made in this file. They will override settings
+; in default.ini, but unlike changes made to default.ini, this file won't be
+; overwritten on server upgrade.
+
+[chttpd]
+bind_address = any
diff --git a/3.2.0/Dockerfile b/3.2.0/Dockerfile
new file mode 100644
index 000..159be0f
--- /dev/null
+++ b/3.2.0/Dockerfile
@@ -0,0 +1,105 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+FROM debian:buster-slim
+
+LABEL maintainer="CouchDB Developers d...@couchdb.apache.org"
+
+# Add CouchDB user account to make sure the IDs are assigned consistently
+RUN groupadd -g 5984 -r couchdb && useradd -u 5984 -d /opt/couchdb -g couchdb 
couchdb
+
+# be sure GPG and apt-transport-https are available and functional
+RUN set -ex; \
+apt-get update; \
+apt-get install -y --no-install-recommends \
+apt-transport-https \
+ca-certificates \
+dirmngr \
+gnupg \
+ ; \
+rm -rf /var/lib/apt/lists/*
+
+# grab gosu for easy step-down from root and tini for signal handling and 
zombie reaping
+# see https://github.com/apache/couchdb-docker/pull/28#discussion_r141112407
+RUN set -eux; \
+apt-get update; \
+apt-get install -y --no-install-recommends gosu tini; \
+rm -rf /var/lib/apt/lists/*; \
+gosu nobody true; \
+tini --version
+
+# 
http://docs.couchdb.org/en/latest/install/unix.html#installing-the-apache-couchdb-packages
+ENV GPG_COUCH_KEY \
+# gpg: rsa8192 205-01-19 The Apache Software Foundation (Package repository 
signing key) 
+390EF70BB1EA12B2773962950EE62FB37A00258D
+RUN set -eux; \
+apt-get update; \
+apt-get install -y curl; \
+export GNUPGHOME="$(mktemp -d)"; \
+curl -fL -o keys.asc https://couchdb.apache.org/repo/keys.asc; \
+gpg --batch --import keys.asc; \
+gpg --batch --export "${GPG_COUCH_KEY}" > 
/usr/share/keyrings/couchdb-archive-keyring.gpg; \
+command -v gpgconf && gpgconf --kill all || :; \
+rm -rf "$GNUPGHOME"; \
+apt-key list; \
+apt purge -y --autoremove curl; \
+rm -rf /var/lib/apt/lists/*
+
+ENV COUCHDB_VERSION 3.2.0
+
+RUN . /etc/os-release; \
+echo "deb [signed-by=/usr/share/keyrings/couchdb-archive-keyring.gpg] 
https://apache.jfrog.io/artifactory/couchdb-deb/ ${VERSION_CODENAME} main" | \
+tee /etc/apt/sources.list.d/couchdb.list >/dev/null
+
+# https://github.com/apache/couchdb-pkg/blob/master/debian/README.Debian
+RUN set -eux; \
+apt-get update; \
+\
+echo "couchdb couchdb/mode select none" | debconf-set-selections; \
+# we DO want recommends this time
+DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-downgrades 
--allow-remove-essential --allow-change-held-packages \
+couchdb="$COUCHDB_VERSION"~buster \
+; \
+# Undo symlinks to /var/log and /var/lib
+rmdir /var/lib/couchdb /var/log/couchdb; \
+rm /opt/couchdb/data /opt/couchdb/var/log; \
+mkdir -p /opt/couchdb/data /opt/couchdb/var/log; \
+chown couchdb:couchdb /opt/couchdb/data /opt/couchdb/var/log; \
+chmod 777 /opt/couchdb/data /opt/couchdb/var/log; \
+# Remove file that sets logging to a file
+rm /opt/couchdb/etc/default.d/10-filelog.ini; \
+# 

[couchdb-pkg] branch main updated: Minor bugfixes encountered in the 3.2.0 release (#85)

[wohali]

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-pkg.git


The following commit(s) were added to refs/heads/main by this push:
 new a241d57  Minor bugfixes encountered in the 3.2.0 release (#85)
a241d57 is described below

commit a241d573edd495026931a058d5dc238076c1c824
Author: Joan Touzet 
AuthorDate: Fri Oct 8 22:55:28 2021 +

Minor bugfixes encountered in the 3.2.0 release (#85)
---
 README.md | 2 +-
 build.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 7d66248..0e31880 100644
--- a/README.md
+++ b/README.md
@@ -102,7 +102,7 @@ A similar `js-all` target exists, should the SpiderMonkey 
packages need to be re
 
 ## Uploading the packages
 
-If you have Apache Bintray credentials (set your `BINTRAY_USER` and 
`BINTRAY_API_KEY` environment variables appropriately), after building all 
CouchDB packages above, simply run:
+If you have Apache credentials (set your `BINARY_CREDS` environment variable 
appropriately), after building all CouchDB packages above, **and signing the 
rpms with the appropriate GPG key using the `rpmsign --addsign ` 
command**, simply run:
 
 ./build.sh couch-upload-all
 
diff --git a/build.sh b/build.sh
index b729ec1..27aa61b 100755
--- a/build.sh
+++ b/build.sh
@@ -106,7 +106,7 @@ build-all-couch() {
 build-couch $plat $*
   done
   for arch in $XPLAT_ARCHES; do
-CONTAINERARCH="${arch}-" build-couch $XPLAT_BASE
+CONTAINERARCH="${arch}" build-couch $XPLAT_BASE
   done
 }
 

[couchdb-pkg] branch 3.2.0-cleanup updated: Minor bugfixes encountered in the 3.2.0 release

[wohali]

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

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


The following commit(s) were added to refs/heads/3.2.0-cleanup by this push:
 new 23be704  Minor bugfixes encountered in the 3.2.0 release
23be704 is described below

commit 23be704ae2c1939a1e6fefc9ad4390cff37f5975
Author: Joan Touzet 
AuthorDate: Fri Oct 8 15:54:28 2021 -0700

Minor bugfixes encountered in the 3.2.0 release
---
 README.md | 2 +-
 build.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 7d66248..0e31880 100644
--- a/README.md
+++ b/README.md
@@ -102,7 +102,7 @@ A similar `js-all` target exists, should the SpiderMonkey 
packages need to be re
 
 ## Uploading the packages
 
-If you have Apache Bintray credentials (set your `BINTRAY_USER` and 
`BINTRAY_API_KEY` environment variables appropriately), after building all 
CouchDB packages above, simply run:
+If you have Apache credentials (set your `BINARY_CREDS` environment variable 
appropriately), after building all CouchDB packages above, **and signing the 
rpms with the appropriate GPG key using the `rpmsign --addsign ` 
command**, simply run:
 
 ./build.sh couch-upload-all
 
diff --git a/build.sh b/build.sh
index b729ec1..27aa61b 100755
--- a/build.sh
+++ b/build.sh
@@ -106,7 +106,7 @@ build-all-couch() {
 build-couch $plat $*
   done
   for arch in $XPLAT_ARCHES; do
-CONTAINERARCH="${arch}-" build-couch $XPLAT_BASE
+CONTAINERARCH="${arch}" build-couch $XPLAT_BASE
   done
 }
 

[couchdb-pkg] branch 3.2.0-cleanup created (now d9e3c29)

[wohali]

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

wohali pushed a change to branch 3.2.0-cleanup
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git.


  at d9e3c29  Switch from bintray to artifactory; remove build.sh support 
for SM (#84)

No new revisions were added by this update.

[couchdb-glazier] branch main updated: Drop curl dependency

[wohali]

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-glazier.git


The following commit(s) were added to refs/heads/main by this push:
 new 206e6ef  Drop curl dependency
206e6ef is described below

commit 206e6ef6c4919f994a8b19fc9aee2f2f1145d7c5
Author: Joan Touzet 
AuthorDate: Fri Oct 8 18:28:27 2021 -0400

Drop curl dependency
---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 3cac5b8..3d07073 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,6 @@ At this point, you should have the following installed:
 * VCPkg (https://github.com/Microsoft/vcpkg), which built and installed:
   * OpenSSL (at time of writing, 1.1.1)
   * ICU (at time of writing, 61)
-  * libcurl (at time of writing, 7.68.0)
 * Cygwin (used for building Erlang), plus some packages required for Erlang 
builds
 
 # Building Erlang
@@ -188,7 +187,7 @@ cd c:\relax
 git clone https://github.com/apache/couchdb
 cd couchdb
 git checkout 
-&.\configure.ps1 -WithCurl -SpiderMonkeyVersion 60
+&.\configure.ps1 -SpiderMonkeyVersion 60
 make -f Makefile.win
 ```
 

[couchdb] branch 3.x updated: Fix Windows makefile for Fauxton (#3777)

[wohali]

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

wohali pushed a commit to branch 3.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/3.x by this push:
 new b32aa9a  Fix Windows makefile for Fauxton (#3777)
b32aa9a is described below

commit b32aa9a53986e50c58c9eea98ee6412b043bde72
Author: Joan Touzet 
AuthorDate: Tue Oct 5 17:23:52 2021 +

Fix Windows makefile for Fauxton (#3777)

Missed file in f85cff669f20cee0a54da7bb8c645dfc4d2de5c9
---
 Makefile.win | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.win b/Makefile.win
index a9f8a80..25c4d9f 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -425,7 +425,7 @@ endif
 share\www:
 ifeq ($(with_fauxton), 1)
@echo 'Building Fauxton'
-   @cd src\fauxton && npm install --production && 
.\node_modules\.bin\grunt couchdb
+   @cd src\fauxton && npm install && .\node_modules\.bin\grunt couchdb
 endif
 
 derived:

[couchdb] branch 3.x-fauxton-windows created (now f105644)

[wohali]

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

wohali pushed a change to branch 3.x-fauxton-windows
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


  at f105644  Fix Windows makefile for Fauxton

This branch includes the following new commits:

 new f105644  Fix Windows makefile for Fauxton

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[couchdb] 01/01: Fix Windows makefile for Fauxton

[wohali]

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

wohali pushed a commit to branch 3.x-fauxton-windows
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit f105644b519b114a78be5d63311e063db344b429
Author: Joan Touzet 
AuthorDate: Tue Oct 5 12:32:31 2021 -0400

Fix Windows makefile for Fauxton

Missed file in f85cff669f20cee0a54da7bb8c645dfc4d2de5c9
---
 Makefile.win | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.win b/Makefile.win
index a9f8a80..25c4d9f 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -425,7 +425,7 @@ endif
 share\www:
 ifeq ($(with_fauxton), 1)
@echo 'Building Fauxton'
-   @cd src\fauxton && npm install --production && 
.\node_modules\.bin\grunt couchdb
+   @cd src\fauxton && npm install && .\node_modules\.bin\grunt couchdb
 endif
 
 derived:

[couchdb-docker] branch main updated: v3.1.2 release (#207)

[wohali]

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 ee358e6  v3.1.2 release (#207)
ee358e6 is described below

commit ee358e62d72bdd72fd69d67ba7fbc80580502270
Author: Joan Touzet 
AuthorDate: Fri Oct 1 05:45:33 2021 +

v3.1.2 release (#207)
---
 .travis.yml   | 4 ++--
 {3.1.1-ubi-clouseau => 3.1.2-ubi-clouseau}/Dockerfile | 4 ++--
 {3.1.1-ubi => 3.1.2-ubi-clouseau}/couchdb.repo| 0
 {3.1.1-ubi => 3.1.2-ubi-clouseau}/imeyer_runit.repo   | 0
 {3.1.1-ubi => 3.1.2-ubi-clouseau}/licenses/LICENSE| 0
 {3.1.1 => 3.1.2-ubi-clouseau/resources}/10-docker-default.ini | 0
 .../resources/clouseau/clouseau.ini   | 0
 .../resources/clouseau/clouseau.sh| 0
 .../resources/clouseau/log4j.properties   | 0
 .../resources/docker-entrypoint.sh| 0
 {3.1.1-ubi-clouseau => 3.1.2-ubi-clouseau}/resources/pre_stop | 0
 {3.1.1-ubi-clouseau => 3.1.2-ubi-clouseau}/resources/run  | 0
 {3.1.1-ubi-clouseau => 3.1.2-ubi-clouseau}/resources/run_clouseau | 0
 {3.1.1 => 3.1.2-ubi-clouseau/resources}/vm.args   | 0
 {3.1.1-ubi => 3.1.2-ubi}/Dockerfile   | 4 ++--
 {3.1.1-ubi-clouseau => 3.1.2-ubi}/couchdb.repo| 0
 {3.1.1-ubi-clouseau => 3.1.2-ubi}/imeyer_runit.repo   | 0
 {3.1.1-ubi-clouseau => 3.1.2-ubi}/licenses/LICENSE| 0
 {3.1.1-ubi => 3.1.2-ubi}/resources/10-docker-default.ini  | 0
 {3.1.1-ubi => 3.1.2-ubi}/resources/docker-entrypoint.sh   | 0
 {3.1.1-ubi => 3.1.2-ubi}/resources/run| 0
 {3.1.1-ubi => 3.1.2-ubi}/resources/vm.args| 0
 {3.1.1-ubi-clouseau/resources => 3.1.2}/10-docker-default.ini | 0
 {3.1.1 => 3.1.2}/Dockerfile   | 2 +-
 {3.1.1 => 3.1.2}/docker-entrypoint.sh | 0
 {3.1.1-ubi-clouseau/resources => 3.1.2}/vm.args   | 0
 26 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4bf6261..5b7db66 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,8 @@ services:
 env:
   - RELEASES=2.3.1
   - RELEASES=2.3.1-ubi
-  - RELEASES=3.1.1
-  - RELEASES=3.1.1-ubi
+  - RELEASES=3.1.2
+  - RELEASES=3.1.2-ubi
 # Needs updating for fdb
 #  - RELEASES=dev
 #  - RELEASES=dev-cluster
diff --git a/3.1.1-ubi-clouseau/Dockerfile b/3.1.2-ubi-clouseau/Dockerfile
similarity index 99%
rename from 3.1.1-ubi-clouseau/Dockerfile
rename to 3.1.2-ubi-clouseau/Dockerfile
index fe304af..7853bad 100644
--- a/3.1.1-ubi-clouseau/Dockerfile
+++ b/3.1.2-ubi-clouseau/Dockerfile
@@ -35,7 +35,7 @@ ARG CLOUSEAU_VERSION
 
 LABEL maintainer="CouchDB Developers d...@couchdb.apache.org" \
   name="Apache CouchDB" \
-  version="3.1.1" \
+  version="3.1.2" \
   summary="Apache CouchDB based on Red Hat UBI" \
   description="Red Hat OpenShift-compatible container that runs Apache 
CouchDB" \
   release=${RELEASE}  \
@@ -51,7 +51,7 @@ LABEL maintainer="CouchDB Developers d...@couchdb.apache.org" 
\
 COPY imeyer_runit.repo /etc/yum.repos.d/imeyer_runit.repo
 COPY couchdb.repo /etc/yum.repos.d/couchdb.repo
 
-ENV COUCHDB_VERSION=3.1.1 \
+ENV COUCHDB_VERSION=3.1.2 \
 CLOUSEAU_VERSION=${CLOUSEAU_VERSION} \
 JAVA_MAJOR_VERSION=8 \
 JAVA_HOME=/usr/lib/jvm/jre-1.8.0 \
diff --git a/3.1.1-ubi/couchdb.repo b/3.1.2-ubi-clouseau/couchdb.repo
similarity index 100%
rename from 3.1.1-ubi/couchdb.repo
rename to 3.1.2-ubi-clouseau/couchdb.repo
diff --git a/3.1.1-ubi/imeyer_runit.repo b/3.1.2-ubi-clouseau/imeyer_runit.repo
similarity index 100%
rename from 3.1.1-ubi/imeyer_runit.repo
rename to 3.1.2-ubi-clouseau/imeyer_runit.repo
diff --git a/3.1.1-ubi/licenses/LICENSE b/3.1.2-ubi-clouseau/licenses/LICENSE
similarity index 100%
rename from 3.1.1-ubi/licenses/LICENSE
rename to 3.1.2-ubi-clouseau/licenses/LICENSE
diff --git a/3.1.1/10-docker-default.ini 
b/3.1.2-ubi-clouseau/resources/10-docker-default.ini
similarity index 100%
rename from 3.1.1/10-docker-default.ini
rename to 3.1.2-ubi-clouseau/resources/10-docker-default.ini
diff --git a/3.1.1-ubi-clouseau/resources/clouseau/clouseau.ini 
b/3.1.2-ubi-clouseau/resources/clouseau/clouseau.ini
similarity index 100%
rename from 3.1.1-ubi-clouseau/resources/clouseau/clouseau.ini
rename to 3.1.2-ubi-clouseau/resources/clouseau/clouseau.ini
diff --git a/3.1

[couchdb-docker] branch 3.1.2 created (now b8e6941)

[wohali]

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

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


  at b8e6941  v3.1.2 release

This branch includes the following new commits:

 new b8e6941  v3.1.2 release

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[couchdb-docker] 01/01: v3.1.2 release

[wohali]

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

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

commit b8e6941923c9e83681547acaca88846d88f82ddf
Author: Joan Touzet 
AuthorDate: Thu Sep 30 16:33:11 2021 -0700

v3.1.2 release
---
 .travis.yml   | 4 ++--
 {3.1.1-ubi-clouseau => 3.1.2-ubi-clouseau}/Dockerfile | 4 ++--
 {3.1.1-ubi => 3.1.2-ubi-clouseau}/couchdb.repo| 0
 {3.1.1-ubi => 3.1.2-ubi-clouseau}/imeyer_runit.repo   | 0
 {3.1.1-ubi => 3.1.2-ubi-clouseau}/licenses/LICENSE| 0
 {3.1.1 => 3.1.2-ubi-clouseau/resources}/10-docker-default.ini | 0
 .../resources/clouseau/clouseau.ini   | 0
 .../resources/clouseau/clouseau.sh| 0
 .../resources/clouseau/log4j.properties   | 0
 .../resources/docker-entrypoint.sh| 0
 {3.1.1-ubi-clouseau => 3.1.2-ubi-clouseau}/resources/pre_stop | 0
 {3.1.1-ubi-clouseau => 3.1.2-ubi-clouseau}/resources/run  | 0
 {3.1.1-ubi-clouseau => 3.1.2-ubi-clouseau}/resources/run_clouseau | 0
 {3.1.1 => 3.1.2-ubi-clouseau/resources}/vm.args   | 0
 {3.1.1-ubi => 3.1.2-ubi}/Dockerfile   | 4 ++--
 {3.1.1-ubi-clouseau => 3.1.2-ubi}/couchdb.repo| 0
 {3.1.1-ubi-clouseau => 3.1.2-ubi}/imeyer_runit.repo   | 0
 {3.1.1-ubi-clouseau => 3.1.2-ubi}/licenses/LICENSE| 0
 {3.1.1-ubi => 3.1.2-ubi}/resources/10-docker-default.ini  | 0
 {3.1.1-ubi => 3.1.2-ubi}/resources/docker-entrypoint.sh   | 0
 {3.1.1-ubi => 3.1.2-ubi}/resources/run| 0
 {3.1.1-ubi => 3.1.2-ubi}/resources/vm.args| 0
 {3.1.1-ubi-clouseau/resources => 3.1.2}/10-docker-default.ini | 0
 {3.1.1 => 3.1.2}/Dockerfile   | 2 +-
 {3.1.1 => 3.1.2}/docker-entrypoint.sh | 0
 {3.1.1-ubi-clouseau/resources => 3.1.2}/vm.args   | 0
 26 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4bf6261..5b7db66 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,8 @@ services:
 env:
   - RELEASES=2.3.1
   - RELEASES=2.3.1-ubi
-  - RELEASES=3.1.1
-  - RELEASES=3.1.1-ubi
+  - RELEASES=3.1.2
+  - RELEASES=3.1.2-ubi
 # Needs updating for fdb
 #  - RELEASES=dev
 #  - RELEASES=dev-cluster
diff --git a/3.1.1-ubi-clouseau/Dockerfile b/3.1.2-ubi-clouseau/Dockerfile
similarity index 99%
rename from 3.1.1-ubi-clouseau/Dockerfile
rename to 3.1.2-ubi-clouseau/Dockerfile
index fe304af..7853bad 100644
--- a/3.1.1-ubi-clouseau/Dockerfile
+++ b/3.1.2-ubi-clouseau/Dockerfile
@@ -35,7 +35,7 @@ ARG CLOUSEAU_VERSION
 
 LABEL maintainer="CouchDB Developers d...@couchdb.apache.org" \
   name="Apache CouchDB" \
-  version="3.1.1" \
+  version="3.1.2" \
   summary="Apache CouchDB based on Red Hat UBI" \
   description="Red Hat OpenShift-compatible container that runs Apache 
CouchDB" \
   release=${RELEASE}  \
@@ -51,7 +51,7 @@ LABEL maintainer="CouchDB Developers d...@couchdb.apache.org" 
\
 COPY imeyer_runit.repo /etc/yum.repos.d/imeyer_runit.repo
 COPY couchdb.repo /etc/yum.repos.d/couchdb.repo
 
-ENV COUCHDB_VERSION=3.1.1 \
+ENV COUCHDB_VERSION=3.1.2 \
 CLOUSEAU_VERSION=${CLOUSEAU_VERSION} \
 JAVA_MAJOR_VERSION=8 \
 JAVA_HOME=/usr/lib/jvm/jre-1.8.0 \
diff --git a/3.1.1-ubi/couchdb.repo b/3.1.2-ubi-clouseau/couchdb.repo
similarity index 100%
rename from 3.1.1-ubi/couchdb.repo
rename to 3.1.2-ubi-clouseau/couchdb.repo
diff --git a/3.1.1-ubi/imeyer_runit.repo b/3.1.2-ubi-clouseau/imeyer_runit.repo
similarity index 100%
rename from 3.1.1-ubi/imeyer_runit.repo
rename to 3.1.2-ubi-clouseau/imeyer_runit.repo
diff --git a/3.1.1-ubi/licenses/LICENSE b/3.1.2-ubi-clouseau/licenses/LICENSE
similarity index 100%
rename from 3.1.1-ubi/licenses/LICENSE
rename to 3.1.2-ubi-clouseau/licenses/LICENSE
diff --git a/3.1.1/10-docker-default.ini 
b/3.1.2-ubi-clouseau/resources/10-docker-default.ini
similarity index 100%
rename from 3.1.1/10-docker-default.ini
rename to 3.1.2-ubi-clouseau/resources/10-docker-default.ini
diff --git a/3.1.1-ubi-clouseau/resources/clouseau/clouseau.ini 
b/3.1.2-ubi-clouseau/resources/clouseau/clouseau.ini
similarity index 100%
rename from 3.1.1-ubi-clouseau/resources/clouseau/clouseau.ini
rename to 3.1.2-ubi-clouseau/resources/clouseau/clouseau.ini
diff --git a/3.1.1-ubi-clouseau/resources/clouseau/clouseau.sh 
b/3.1.2-ubi-clouseau/resources/clouseau/clouseau.sh
similarity index 100%
rename from 3.1.1-ub

[couchdb-pkg] branch main updated: Switch from bintray to artifactory; remove build.sh support for SM (#84)

[wohali]

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-pkg.git


The following commit(s) were added to refs/heads/main by this push:
 new d9e3c29  Switch from bintray to artifactory; remove build.sh support 
for SM (#84)
d9e3c29 is described below

commit d9e3c294e3e859203b8248d48f121a9e2a4c6931
Author: Joan Touzet 
AuthorDate: Thu Sep 30 18:57:24 2021 -0400

Switch from bintray to artifactory; remove build.sh support for SM (#84)
---
 build.sh | 188 ++-
 1 file changed, 52 insertions(+), 136 deletions(-)

diff --git a/build.sh b/build.sh
index b2b3513..b729ec1 100755
--- a/build.sh
+++ b/build.sh
@@ -27,13 +27,13 @@ set -e
 # otherwise, see https://stackoverflow.com/questions/59895/
 SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-# TODO derive these by interrogating the couchdb-ci repo rather than hard 
coding the list...
+# TODO derive these by interrogating the couchdb-ci repo rather than hard 
coding the list
 DEBIANS="debian-stretch debian-buster debian-bullseye"
 UBUNTUS="ubuntu-xenial ubuntu-bionic ubuntu-focal"
 CENTOSES="centos-7 centos-8"
 XPLAT_BASE="debian-buster"
 XPLAT_ARCHES="arm64v8 ppc64le"
-BINTRAY_API="https://api.bintray.com;
+BINARY_API="https://apache.jfrog.io/artifactory;
 ERLANGVERSION=${ERLANGVERSION:-20.3.8.26-1}
 
 split-os-ver() {
@@ -44,95 +44,6 @@ split-os-ver() {
   version=${tokens[1]}
 }
 
-build-js() {
-  # TODO: check if image is built first, if not, complain
-  # invoke as build-js 
-  split-os-ver $1
-  if [[ ${TRAVIS} == "true" ]]; then
-docker run \
---mount type=bind,src=${SCRIPTPATH},dst=/home/jenkins/couchdb-pkg \
--u 0 apache/couchdbci-${os}:${CONTAINERARCH}${version}-base \
-/home/jenkins/couchdb-pkg/bin/build-js.sh
-  else
-docker run \
---mount type=bind,src=${SCRIPTPATH},dst=/home/jenkins/couchdb-pkg \
-apache/couchdbci-${os}:${CONTAINERARCH}${version}-base \
-sudo /home/jenkins/couchdb-pkg/bin/build-js.sh
-  fi
-}
-
-build-all-js() {
-  rm -rf ${SCRIPTPATH}/pkgs/js/*
-  for plat in $DEBIANS $UBUNTUS $CENTOSES; do
-build-js $plat
-  done
-  for arch in $XPLAT_ARCHES; do
-CONTAINERARCH="${arch}-" build-js $XPLAT_BASE
-  done
-}
-
-bintray-check-credentials() {
-  if [[ ! ${BINTRAY_USER} || ! ${BINTRAY_API_KEY} ]]; then
-echo "Please set your Bintray credentials before using this command:"
-echo "  export BINTRAY_USER="
-echo "  export BINTRAY_API_KEY="
-exit 1
-  fi
-}
-
-bintray-upload() {
-  echo "Uploading ${PKG}..."
-  local ret="$(curl \
-  --request PUT \
-  --upload-file $PKG \
-  --user ${BINTRAY_USER}:${BINTRAY_API_KEY} \
-  --header "X-Bintray-Package: ${PKGNAME}" \
-  --header "X-Bintray-Version: ${PKGVERSION}" \
-  --header "X-Bintray-Publish: 1" \
-  --header "X-Bintray-Override: 1" \
-  --header "X-Bintray-Explode: 0" \
-  "${HEADERS[@]}" \
-  "${BINTRAY_API}/content/apache/${REPO}/${RELPATH}")"
-  if [[ ${ret} == '{"message":"success"}' ]]; then
-echo "Uploaded successfully."
-  else
-echo "Failed to upload $PKG, ${ret}"
-exit 1
-  fi
-}
-
-upload-js() {
-  # invoke with $1 as plat, expect to find the binaries under pkgs/js/$plat/*
-  bintray-check-credentials
-  # Debian packages first
-  PKGNAME="spidermonkey"
-  PKGVERSION="1.8.5"
-  for PKG in $(ls pkgs/js/$1/*.deb 2>/dev/null); do
-# Example filename: 
couch-libmozjs185-1.0_1.8.5-1.0.0+couch-2~bionic_amd64.deb
-# TODO: pull this stuff from buildinfo / changes files, perhaps? Not sure 
it matters.
-REPO="couchdb-deb"
-fname=${PKG##*/}
-DIST=$(echo $fname | cut -d~ -f 2 | cut -d_ -f 1)
-PKGARCH=$(echo $fname | cut -d_ -f 3 | cut -d. -f 1)
-RELPATH="pool/s/spidermonkey/${fname}"
-HEADERS=("--header" "X-Bintray-Debian-Distribution: ${DIST}")
-HEADERS+=("--header" "X-Bintray-Debian-Component: main")
-HEADERS+=("--header" "X-Bintray-Debian-Architecture: ${PKGARCH}")
-bintray-upload
-  done
-  for PKG in $(ls pkgs/js/$1/*.rpm 2>/dev/null); do
-# Example filename: couch-js-1.8.5-21.el7.x86_64.rpm
-REPO="couchdb-rpm"
-fname=${PKG##*/}
-# better not put any extra . in the filename...
-DIST=$(echo $fname | cut -d. -f 4)
-PKGARCH=$(echo $fname | cut -d. -f 5)
-RELPATH="${DIST}/${PKGARCH}/${fname}"
-HEADERS=()
-bintray-upload
-  done
-}
-
 cannot-find-tarball() {
 echo Must supply path to tarbal

[couchdb-pkg] branch artifactory created (now d8f997c)

[wohali]

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

wohali pushed a change to branch artifactory
in repository https://gitbox.apache.org/repos/asf/couchdb-pkg.git.


  at d8f997c  Switch from bintray to artifactory; remove build.sh support 
for SM

This branch includes the following new commits:

 new d8f997c  Switch from bintray to artifactory; remove build.sh support 
for SM

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[couchdb-pkg] 01/01: Switch from bintray to artifactory; remove build.sh support for SM

[wohali]

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

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

commit d8f997c9f30ab6ff74cfe96e2f458772271efa83
Author: Joan Touzet 
AuthorDate: Thu Sep 30 15:56:24 2021 -0700

Switch from bintray to artifactory; remove build.sh support for SM
---
 build.sh | 188 ++-
 1 file changed, 52 insertions(+), 136 deletions(-)

diff --git a/build.sh b/build.sh
index b2b3513..b729ec1 100755
--- a/build.sh
+++ b/build.sh
@@ -27,13 +27,13 @@ set -e
 # otherwise, see https://stackoverflow.com/questions/59895/
 SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-# TODO derive these by interrogating the couchdb-ci repo rather than hard 
coding the list...
+# TODO derive these by interrogating the couchdb-ci repo rather than hard 
coding the list
 DEBIANS="debian-stretch debian-buster debian-bullseye"
 UBUNTUS="ubuntu-xenial ubuntu-bionic ubuntu-focal"
 CENTOSES="centos-7 centos-8"
 XPLAT_BASE="debian-buster"
 XPLAT_ARCHES="arm64v8 ppc64le"
-BINTRAY_API="https://api.bintray.com;
+BINARY_API="https://apache.jfrog.io/artifactory;
 ERLANGVERSION=${ERLANGVERSION:-20.3.8.26-1}
 
 split-os-ver() {
@@ -44,95 +44,6 @@ split-os-ver() {
   version=${tokens[1]}
 }
 
-build-js() {
-  # TODO: check if image is built first, if not, complain
-  # invoke as build-js 
-  split-os-ver $1
-  if [[ ${TRAVIS} == "true" ]]; then
-docker run \
---mount type=bind,src=${SCRIPTPATH},dst=/home/jenkins/couchdb-pkg \
--u 0 apache/couchdbci-${os}:${CONTAINERARCH}${version}-base \
-/home/jenkins/couchdb-pkg/bin/build-js.sh
-  else
-docker run \
---mount type=bind,src=${SCRIPTPATH},dst=/home/jenkins/couchdb-pkg \
-apache/couchdbci-${os}:${CONTAINERARCH}${version}-base \
-sudo /home/jenkins/couchdb-pkg/bin/build-js.sh
-  fi
-}
-
-build-all-js() {
-  rm -rf ${SCRIPTPATH}/pkgs/js/*
-  for plat in $DEBIANS $UBUNTUS $CENTOSES; do
-build-js $plat
-  done
-  for arch in $XPLAT_ARCHES; do
-CONTAINERARCH="${arch}-" build-js $XPLAT_BASE
-  done
-}
-
-bintray-check-credentials() {
-  if [[ ! ${BINTRAY_USER} || ! ${BINTRAY_API_KEY} ]]; then
-echo "Please set your Bintray credentials before using this command:"
-echo "  export BINTRAY_USER="
-echo "  export BINTRAY_API_KEY="
-exit 1
-  fi
-}
-
-bintray-upload() {
-  echo "Uploading ${PKG}..."
-  local ret="$(curl \
-  --request PUT \
-  --upload-file $PKG \
-  --user ${BINTRAY_USER}:${BINTRAY_API_KEY} \
-  --header "X-Bintray-Package: ${PKGNAME}" \
-  --header "X-Bintray-Version: ${PKGVERSION}" \
-  --header "X-Bintray-Publish: 1" \
-  --header "X-Bintray-Override: 1" \
-  --header "X-Bintray-Explode: 0" \
-  "${HEADERS[@]}" \
-  "${BINTRAY_API}/content/apache/${REPO}/${RELPATH}")"
-  if [[ ${ret} == '{"message":"success"}' ]]; then
-echo "Uploaded successfully."
-  else
-echo "Failed to upload $PKG, ${ret}"
-exit 1
-  fi
-}
-
-upload-js() {
-  # invoke with $1 as plat, expect to find the binaries under pkgs/js/$plat/*
-  bintray-check-credentials
-  # Debian packages first
-  PKGNAME="spidermonkey"
-  PKGVERSION="1.8.5"
-  for PKG in $(ls pkgs/js/$1/*.deb 2>/dev/null); do
-# Example filename: 
couch-libmozjs185-1.0_1.8.5-1.0.0+couch-2~bionic_amd64.deb
-# TODO: pull this stuff from buildinfo / changes files, perhaps? Not sure 
it matters.
-REPO="couchdb-deb"
-fname=${PKG##*/}
-DIST=$(echo $fname | cut -d~ -f 2 | cut -d_ -f 1)
-PKGARCH=$(echo $fname | cut -d_ -f 3 | cut -d. -f 1)
-RELPATH="pool/s/spidermonkey/${fname}"
-HEADERS=("--header" "X-Bintray-Debian-Distribution: ${DIST}")
-HEADERS+=("--header" "X-Bintray-Debian-Component: main")
-HEADERS+=("--header" "X-Bintray-Debian-Architecture: ${PKGARCH}")
-bintray-upload
-  done
-  for PKG in $(ls pkgs/js/$1/*.rpm 2>/dev/null); do
-# Example filename: couch-js-1.8.5-21.el7.x86_64.rpm
-REPO="couchdb-rpm"
-fname=${PKG##*/}
-# better not put any extra . in the filename...
-DIST=$(echo $fname | cut -d. -f 4)
-PKGARCH=$(echo $fname | cut -d. -f 5)
-RELPATH="${DIST}/${PKGARCH}/${fname}"
-HEADERS=()
-bintray-upload
-  done
-}
-
 cannot-find-tarball() {
 echo Must supply path to tarball, either:
 echo '  - path/to/couchdb-VERSION.tar.gz or'
@@ -173,11 +84,19 @@ build-couch() {
   # We will be changing user to 'jenkins' - ensure it has write permissions
   chmod a+rwx pkgs 

[couchdb-documentation] branch 3.2-relnotes updated (f971a81 -> aa10a0d)

[wohali]

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

wohali pushed a change to branch 3.2-relnotes
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git.


omit f971a81  CouchDB 3.2 release notes
 add aa10a0d  CouchDB 3.2 release notes

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (f971a81)
\
 N -- N -- N   refs/heads/3.2-relnotes (aa10a0d)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 src/whatsnew/3.2.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[couchdb-documentation] branch 3.2-relnotes updated (186c089 -> f971a81)

[wohali]

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

wohali pushed a change to branch 3.2-relnotes
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git.


 discard 186c089  CouchDB 3.2 release notes
 add f971a81  CouchDB 3.2 release notes

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (186c089)
\
 N -- N -- N   refs/heads/3.2-relnotes (f971a81)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 src/whatsnew/3.2.rst | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

[couchdb-documentation] branch 3.2-relnotes updated (cdd187c -> 186c089)

[wohali]

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

wohali pushed a change to branch 3.2-relnotes
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git.


 discard cdd187c  CouchDB 3.2 release notes
 add 186c089  CouchDB 3.2 release notes

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (cdd187c)
\
 N -- N -- N   refs/heads/3.2-relnotes (186c089)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 src/whatsnew/3.2.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[couchdb-documentation] branch 3.2-relnotes updated (a9eda3b -> cdd187c)

[wohali]

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

wohali pushed a change to branch 3.2-relnotes
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git.


 discard a9eda3b  CouchDB 3.2 release notes
 add cdd187c  CouchDB 3.2 release notes

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (a9eda3b)
\
 N -- N -- N   refs/heads/3.2-relnotes (cdd187c)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 src/whatsnew/3.2.rst | 40 
 1 file changed, 20 insertions(+), 20 deletions(-)

[couchdb-documentation] branch 3.2-relnotes updated (920c03d -> a9eda3b)

[wohali]

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

wohali pushed a change to branch 3.2-relnotes
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git.


 discard 920c03d  Update src/whatsnew/3.2.rst
 discard 78e7a90  Update src/whatsnew/3.2.rst
 discard fff8a07  CouchDB 3.2 release notes - first pass
 add a9eda3b  CouchDB 3.2 release notes

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (920c03d)
\
 N -- N -- N   refs/heads/3.2-relnotes (a9eda3b)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 src/whatsnew/3.2.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

[couchdb-documentation] branch 3.2-relnotes updated (78e7a90 -> 920c03d)

[wohali]

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

wohali pushed a change to branch 3.2-relnotes
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git.


from 78e7a90  Update src/whatsnew/3.2.rst
 add 920c03d  Update src/whatsnew/3.2.rst

No new revisions were added by this update.

Summary of changes:
 src/whatsnew/3.2.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[couchdb-documentation] branch 3.2-relnotes updated (fff8a07 -> 78e7a90)

[wohali]

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

wohali pushed a change to branch 3.2-relnotes
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git.


from fff8a07  CouchDB 3.2 release notes - first pass
 add 78e7a90  Update src/whatsnew/3.2.rst

No new revisions were added by this update.

Summary of changes:
 src/whatsnew/3.2.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[couchdb-documentation] branch 3.2-relnotes updated (65b03fd -> fff8a07)

[wohali]

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

wohali pushed a change to branch 3.2-relnotes
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git.


 discard 65b03fd  CouchDB 3.2 release notes - first pass
 add fff8a07  CouchDB 3.2 release notes - first pass

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (65b03fd)
\
 N -- N -- N   refs/heads/3.2-relnotes (fff8a07)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 src/whatsnew/3.2.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[couchdb-documentation] branch 3.2-relnotes created (now 65b03fd)

[wohali]

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

wohali pushed a change to branch 3.2-relnotes
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git.


  at 65b03fd  CouchDB 3.2 release notes - first pass

This branch includes the following new commits:

 new 65b03fd  CouchDB 3.2 release notes - first pass

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[couchdb-documentation] 01/01: CouchDB 3.2 release notes - first pass

[wohali]

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

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

commit 65b03fd577fc9d9e7b4fe2b1d330775bd5c7c566
Author: Joan Touzet 
AuthorDate: Mon Sep 13 23:54:29 2021 -0400

CouchDB 3.2 release notes - first pass
---
 images/fair-enough.png | Bin 0 -> 49634 bytes
 src/conf.py|   4 +-
 src/whatsnew/3.2.rst   | 196 -
 3 files changed, 196 insertions(+), 4 deletions(-)

diff --git a/images/fair-enough.png b/images/fair-enough.png
new file mode 100755
index 000..0894022
Binary files /dev/null and b/images/fair-enough.png differ
diff --git a/src/conf.py b/src/conf.py
index 3f7996a..73aa6f6 100644
--- a/src/conf.py
+++ b/src/conf.py
@@ -33,8 +33,8 @@ source_suffix = ".rst"
 nitpicky = True
 
 # should be over-written using rebar-inherited settings
-version = "3.1"
-release = "3.1.1"
+version = "3.2"
+release = "3.2.0"
 
 project = u"Apache CouchDB\u00ae"
 
diff --git a/src/whatsnew/3.2.rst b/src/whatsnew/3.2.rst
index 9d0b421..b44fd6d 100644
--- a/src/whatsnew/3.2.rst
+++ b/src/whatsnew/3.2.rst
@@ -28,6 +28,62 @@ Version 3.2.0
 Features and Enhancements
 -
 
+* :ghissue:`3364`: CouchDB's replicator now implements a Fair Share replication
+  scheduler. Rather than using a round-robin scheduling mechanism, this update 
allows to
+  specify the relative priority of jobs from different ``_replicator`` 
databases.
+  More information is available in the :ref:`_replicator DB docs `.
+
+.. figure:: ../../images/fair-enough.png
+  :align: center
+  :alt: Robert Downey, Jr., thinks that's fair enough for him.
+
+* :ghissue:`3166`: Allow custom JWT claims for roles, via the ``[jwt_auth]
+  roles_claim_name`` config setting.
+
+* :ghissue:`3296`, :ghissue:`3312`: CouchDB now includes ``weatherreport`` and 
its
+  dependency ``custodian``, a diagnostic app forked from Basho's 
``riaknostic`` tool.
+  More documentation is available in the :ref:`Cluster Troubleshooting
+  ` section.
+
+* :ghissue:`2911`, :ghissue:`3298`, :ghissue:`3425`: CouchDB now returns the 
version of
+  SpiderMonkey to administrators in the ``GET /_node/{node-name}/_versions`` 
response.
+
+* :ghissue:`3303`: CouchDB now treates a ``408`` response received by the 
replicator
+  similar to any ``5xx`` error (by retrying, as opposed to a permanent error). 
CouchDB
+  will never return a ``408``, but some reverse proxies in front of CouchDB 
may return
+  this code.
+
+* :ghissue:`3322`: ``_session`` now accepts gzip encoding.
+
+* :ghissue:`3254`: The new ``$keyMapMatch`` operator allows Mango to query on 
the keys
+  of a map. It is similar to the ``$elemMatch`` operator, but instead of 
operating on
+  the elements of array, it operates on the keys of a map.
+
+* :ghissue:`3336`: Developers now have acess to a ``.devcontainer`` 
configuration for
+  the 3.x version of CouchDB, right in the source code repository..
+
+* :ghissue:`3347`: The default maximum attachment size has been reduced from
+  ``infinity`` to 1 GiB.
+
+* :ghissue:`3361`: Compaction process suspension now appears in the 
``active_tasks``
+  output, allowing administrators to verify that the ``strict_window`` value 
is being
+  respected.
+
+* :ghissue:`3378`: The ``[admins]`` section and the ``[replicator] password`` 
are now
+  censored from all logs. In addition, :ghissue:`3380` removes user 
credentials,
+  user documents and design documents from logfiles as much as possible. 
Further,
+  :ghissue:`3489` no longer logs all of the messages received by a terminated 
internal
+  Erlang process.
+
+* :ghissue:`3421`, :ghissue:`3500`: CouchDB now supports SpiderMonkey 78 and 
86.
+
+* :ghissue:`3422`: CouchDB now supports Erlang/OTP 23 and ``error_logger`` 
reports
+  for Erlang/OTP >= 21.
+
+* :ghissue:`3566`: CouchDB now also supports Erlang/OTP 24.
+
+* :ghissue:`3571`: CouchDB *no longer supports Erlang/OTP 19*.
+
 * :ghissue:`3643`: Contribute a custom Erlang network protocol to CouchDB,
   users can specify nodes to use TCP or TLS.
 
@@ -36,8 +92,8 @@ Features and Enhancements
   :alt: The SSL/TLS handshake enables the TLS client and server to establish
 the secret keys with which they communicate.
 
-* :ghissue:`3472`, :ghissue:`3473`: Migrate some config options from [httpd]
-  to [chttpd], migrate some from [couch_httpd_auth] to [chttpd_auth], and
+* :ghissue:`3472`, :ghissue:`3473`, :ghissue:`3609`: Migrate some config 
options from
+  [httpd] to [chttpd], migrate some from [couch_httpd_auth] to [chttpd_auth], 
and
   commented out in the default.ini.
 
   **Moved config options from [httpd] to [chttpd]:**
@@ -57,4 +113,140 @@ Features and Enhancements
   which can include various characters previously not allowed to be included
   in the url info part of endpoint urls.
 
+* :ghis

[couchdb-pkg] branch main updated: protect main branch with .asf.yaml config (#75)

[wohali]

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-pkg.git


The following commit(s) were added to refs/heads/main by this push:
 new 44957a1  protect main branch with .asf.yaml config (#75)
44957a1 is described below

commit 44957a1a2e55416a1a99c1d10ade33b8de8a82ad
Author: Glynn Bird 
AuthorDate: Thu Aug 26 14:23:11 2021 +0100

protect main branch with .asf.yaml config (#75)
---
 .asf.yaml | 17 +
 1 file changed, 17 insertions(+)

diff --git a/.asf.yaml b/.asf.yaml
new file mode 100644
index 000..35c56c4
--- /dev/null
+++ b/.asf.yaml
@@ -0,0 +1,17 @@
+github:
+  description: "Apache CouchDB Packaging support files"
+  homepage: https://github.com/apache/couchdb-pkg
+  labels:
+- apache
+- couchdb
+- erlang
+- network-client
+- http
+- cplusplus
+- big-data
+- cloud
+- database
+- network-server
+- javascript
+  protected_branches:
+main

[couchdb-documentation] branch main updated: Update auth.rst (#672)

[wohali]

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-documentation.git


The following commit(s) were added to refs/heads/main by this push:
 new d4f16d7  Update auth.rst (#672)
d4f16d7 is described below

commit d4f16d7f53056922336145be4255d063a4674282
Author: Joan Touzet 
AuthorDate: Thu Jul 22 16:25:35 2021 +

Update auth.rst (#672)
---
 src/config/auth.rst | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/config/auth.rst b/src/config/auth.rst
index 39cfb73..70ec276 100644
--- a/src/config/auth.rst
+++ b/src/config/auth.rst
@@ -34,9 +34,10 @@ Server Administrators
 ``_users`` database, but in the last ``[admins]`` section that CouchDB
 finds when loading its ini files. See :config:intro for details on config
 file order and behaviour. This file (which could be something like
-``etc/local.ini`` or ``etc/local.d/10-admins.ini`` on a Debian/Ubuntu
-system installed from packages) should be appropriately secured and
-readable only by system administrators::
+``/opt/couchdb/etc/local.ini`` or
+``/opt/couchdb/etc/local.d/10-admins.ini`` when CouchDB is installed from
+packages) should be appropriately secured and readable only by system
+administrators::
 
 [admins]
 ;admin = mysecretpassword

[couchdb-documentation] branch wohali-patch-1 created (now 0dbc77a)

[wohali]

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

wohali pushed a change to branch wohali-patch-1
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git.


  at 0dbc77a  Update auth.rst

No new revisions were added by this update.

[couchdb-documentation] branch main updated: Update documentation with couch_prometheus endpoint API (#660)

[wohali]

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-documentation.git


The following commit(s) were added to refs/heads/main by this push:
 new ca7e561  Update documentation with couch_prometheus endpoint API (#660)
ca7e561 is described below

commit ca7e561acfcf399ca8d1cb0ec96d156c4a2bd98a
Author: Tony Sun 
AuthorDate: Thu Jul 22 09:17:52 2021 -0700

Update documentation with couch_prometheus endpoint API (#660)

* Update documentation with couch_prometheus endpoint API

Updates api/server and config/misc files to incorporate new
couch_prometheus functionality.

Co-authored-by: Jonathan Hall 
Co-authored-by: Joan Touzet 
---
 src/api/server/common.rst | 196 ++
 src/config/misc.rst   |  34 
 2 files changed, 230 insertions(+)

diff --git a/src/api/server/common.rst b/src/api/server/common.rst
index 6583b5a..100452d 100644
--- a/src/api/server/common.rst
+++ b/src/api/server/common.rst
@@ -1586,6 +1586,202 @@ node, you can use:
 This returns an entire statistics object, as with the full request, but
 containing only the requested individual statistic.
 
+.. _api/server/prometheus:
+
+==
+``/_node/{node-name}/_prometheus``
+==
+
+.. http:get:: /_node/{node-name}/_prometheus
+:synopsis: Returns server statistics in prometheus format
+
+The ``_prometheus`` resource returns a text/plain response that 
consolidates our
+:ref:`api/server/stats`, and :ref:`api/server/system` endpoints. The 
format is
+determined by `Prometheus 
<https://prometheus.io/docs/introduction/overview/>`_.
+The format version is 2.0.
+
+**Request**:
+
+.. code-block:: http
+
+GET /_node/_local/_prometheus HTTP/1.1
+Accept: text/plain
+Host: localhost:5984
+
+**Response**:
+
+.. code-block:: http
+
+HTTP/1.1 200 OK
+Cache-Control: must-revalidate
+Content-Length: 187
+Content-Type: text/plain; version=2.0
+Date: Sat, 10 May 2020 11:41:11 GMT
+Server: CouchDB (Erlang/OTP)
+
+# TYPE couchdb_couch_log_requests_total counter
+couchdb_couch_log_requests_total{level="alert"} 0
+couchdb_couch_log_requests_total{level="critical"} 0
+couchdb_couch_log_requests_total{level="debug"} 0
+couchdb_couch_log_requests_total{level="emergency"} 0
+couchdb_couch_log_requests_total{level="error"} 0
+couchdb_couch_log_requests_total{level="info"} 8
+couchdb_couch_log_requests_total{level="notice"} 51
+couchdb_couch_log_requests_total{level="warning"} 0
+# TYPE couchdb_couch_replicator_changes_manager_deaths_total counter
+couchdb_couch_replicator_changes_manager_deaths_total 0
+# TYPE couchdb_couch_replicator_changes_queue_deaths_total counter
+couchdb_couch_replicator_changes_queue_deaths_total 0
+# TYPE couchdb_couch_replicator_changes_read_failures_total counter
+couchdb_couch_replicator_changes_read_failures_total 0
+# TYPE couchdb_couch_replicator_changes_reader_deaths_total counter
+couchdb_couch_replicator_changes_reader_deaths_total 0
+# TYPE couchdb_couch_replicator_checkpoints_failure_total counter
+couchdb_couch_replicator_checkpoints_failure_total 0
+# TYPE couchdb_couch_replicator_checkpoints_total counter
+couchdb_couch_replicator_checkpoints_total 0
+# TYPE couchdb_couch_replicator_cluster_is_stable gauge
+couchdb_couch_replicator_cluster_is_stable 1
+# TYPE couchdb_couch_replicator_connection_acquires_total counter
+couchdb_couch_replicator_connection_acquires_total 0
+# TYPE couchdb_couch_replicator_connection_closes_total counter
+couchdb_couch_replicator_connection_closes_total 0
+# TYPE couchdb_couch_replicator_connection_creates_total counter
+couchdb_couch_replicator_connection_creates_total 0
+# TYPE couchdb_couch_replicator_connection_owner_crashes_total counter
+couchdb_couch_replicator_connection_owner_crashes_total 0
+# TYPE couchdb_couch_replicator_connection_releases_total counter
+couchdb_couch_replicator_connection_releases_total 0
+# TYPE couchdb_couch_replicator_connection_worker_crashes_total counter
+couchdb_couch_replicator_connection_worker_crashes_total 0
+# TYPE couchdb_couch_replicator_db_scans_total counter
+couchdb_couch_replicator_db_scans_total 1
+# TYPE couchdb_couch_replicator_docs_completed_state_updates_total 
counter
+couchdb_couch_replicator_docs_completed_state_updates_total 0
+# TYPE couchdb_couch_replicator_docs_db_changes_t

[couchdb-documentation] branch add_couch_prometheus updated (c7e6529 -> a3d261c)

[wohali]

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

wohali pushed a change to branch add_couch_prometheus
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git.


from c7e6529  truncate with ellipsis
 add a3d261c  Update src/config/misc.rst

No new revisions were added by this update.

Summary of changes:
 src/config/misc.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[couchdb-documentation] branch main updated: Add documentation for password_regexp (#652)

[wohali]

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-documentation.git


The following commit(s) were added to refs/heads/main by this push:
 new 7d1704d  Add documentation for password_regexp (#652)
7d1704d is described below

commit 7d1704d169bbd7fdbc3717555bdb2fa8bcb397bc
Author: Christopher 
AuthorDate: Thu Jul 22 18:15:00 2021 +0200

Add documentation for password_regexp (#652)

* Add documentation for password_regexp

Co-authored-by: Joan Touzet 
---
 src/config/auth.rst | 19 +++
 1 file changed, 19 insertions(+)

diff --git a/src/config/auth.rst b/src/config/auth.rst
index cd8e4e9..39cfb73 100644
--- a/src/config/auth.rst
+++ b/src/config/auth.rst
@@ -227,6 +227,25 @@ Authentication Configuration
 [chttpd_auth]
 max_iterations = 10
 
+.. config:option:: password_regexp :: Password regular expressions
+
+.. versionadded:: 3.2
+
+A list of
+`Regular Expressions 
<https://erlang.org/doc/man/re.html#regexp_syntax>`_
+to check new/changed passwords.
+When set, new user passwords must **match** all RegExp in this list.
+
+A RegExp can be paired with a *reason text*:
+``[{"RegExp", "reason text"}, ...]``.
+If a RegExp doesn't match, its *reason text* will be appended to the
+default reason of ``Password does not conform to requirements.`` ::
+
+[couch_httpd_auth]
+; Password must be 10 chars long and have one or more uppercase and
+; lowercase char and one or more numbers.
+password_regexp = [{".{10,}", "Min length is 10 chars."}, 
"[A-Z]+", "[a-z]+", "\\d+"]
+
 .. config:option:: proxy_use_secret :: Force proxy auth to use secret token
 
 .. versionchanged:: 3.2 moved from [couch_httpd_auth] to [chttpd_auth] 
section

[couchdb-documentation] branch main updated (eb451b3 -> db2496b)

[wohali]

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

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


from eb451b3  Update advice re: old JS version, closes #624 (#648)
 add db2496b  Clarified default behavior of authorization to databases 
(#657)

No new revisions were added by this update.

Summary of changes:
 src/api/database/security.rst | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

[couchdb-documentation] branch main updated (0603a30 -> eb451b3)

[wohali]

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

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


from 0603a30  Use double back-ticks in src/api/server/authn.rst (#669)
 add eb451b3  Update advice re: old JS version, closes #624 (#648)

No new revisions were added by this update.

Summary of changes:
 src/best-practices/jsdevel.rst | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

[couchdb-documentation] branch js-dev-tips updated (009a9b3 -> aa788d8)

[wohali]

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

wohali pushed a change to branch js-dev-tips
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git.


from 009a9b3  Update advice re: old JS version, closes #624
 add aa788d8  Update jsdevel.rst

No new revisions were added by this update.

Summary of changes:
 src/best-practices/jsdevel.rst | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

[couchdb-docker] branch main updated: Incorporate downstream Dockerfile feedback (#203)

[wohali]

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 4993111  Incorporate downstream Dockerfile feedback (#203)
4993111 is described below

commit 4993111e388d203d2200a3dd88449517db548c05
Author: Joan Touzet 
AuthorDate: Wed Jul 7 22:18:55 2021 +

Incorporate downstream Dockerfile feedback (#203)
---
 2.3.1/Dockerfile | 8 +++-
 3.1.1/Dockerfile | 8 +++-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/2.3.1/Dockerfile b/2.3.1/Dockerfile
index 75d0c24..f083992 100644
--- a/2.3.1/Dockerfile
+++ b/2.3.1/Dockerfile
@@ -45,11 +45,9 @@ RUN set -eux; \
 apt-get update; \
 apt-get install -y curl; \
 export GNUPGHOME="$(mktemp -d)"; \
-echo "disable-ipv6" >> ${GNUPGHOME}/dirmngr.conf; \
-curl https://couchdb.apache.org/repo/keys.asc | \
-gpg --dearmor | \
-tee /usr/share/keyrings/couchdb-archive-keyring.gpg >/dev/null 2>&1; \
-gpg --show-keys /usr/share/keyrings/couchdb-archive-keyring.gpg | grep -q 
${GPG_COUCH_KEY}; \
+curl -fL -o keys.asc https://couchdb.apache.org/repo/keys.asc; \
+gpg --batch --import keys.asc; \
+gpg --batch --export "${GPG_COUCH_KEY}" > 
/usr/share/keyrings/couchdb-archive-keyring.gpg; \
 command -v gpgconf && gpgconf --kill all || :; \
 rm -rf "$GNUPGHOME"; \
 apt-key list; \
diff --git a/3.1.1/Dockerfile b/3.1.1/Dockerfile
index 4677c45..75b4b29 100644
--- a/3.1.1/Dockerfile
+++ b/3.1.1/Dockerfile
@@ -45,11 +45,9 @@ RUN set -eux; \
 apt-get update; \
 apt-get install -y curl; \
 export GNUPGHOME="$(mktemp -d)"; \
-echo "disable-ipv6" >> ${GNUPGHOME}/dirmngr.conf; \
-curl https://couchdb.apache.org/repo/keys.asc | \
-gpg --dearmor | \
-tee /usr/share/keyrings/couchdb-archive-keyring.gpg >/dev/null 2>&1; \
-gpg --show-keys /usr/share/keyrings/couchdb-archive-keyring.gpg | grep -q 
${GPG_COUCH_KEY}; \
+curl -fL -o keys.asc https://couchdb.apache.org/repo/keys.asc; \
+gpg --batch --import keys.asc; \
+gpg --batch --export "${GPG_COUCH_KEY}" > 
/usr/share/keyrings/couchdb-archive-keyring.gpg; \
 command -v gpgconf && gpgconf --kill all || :; \
 rm -rf "$GNUPGHOME"; \
 apt-key list; \

[couchdb-docker] 01/01: Incorporate downstream Dockerfile feedback

[wohali]

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

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

commit fac64d37cbd48a546ba404b3a02828121540582d
Author: Joan Touzet 
AuthorDate: Tue Jul 6 13:22:29 2021 -0700

Incorporate downstream Dockerfile feedback
---
 2.3.1/Dockerfile | 8 +++-
 3.1.1/Dockerfile | 8 +++-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/2.3.1/Dockerfile b/2.3.1/Dockerfile
index 75d0c24..f083992 100644
--- a/2.3.1/Dockerfile
+++ b/2.3.1/Dockerfile
@@ -45,11 +45,9 @@ RUN set -eux; \
 apt-get update; \
 apt-get install -y curl; \
 export GNUPGHOME="$(mktemp -d)"; \
-echo "disable-ipv6" >> ${GNUPGHOME}/dirmngr.conf; \
-curl https://couchdb.apache.org/repo/keys.asc | \
-gpg --dearmor | \
-tee /usr/share/keyrings/couchdb-archive-keyring.gpg >/dev/null 2>&1; \
-gpg --show-keys /usr/share/keyrings/couchdb-archive-keyring.gpg | grep -q 
${GPG_COUCH_KEY}; \
+curl -fL -o keys.asc https://couchdb.apache.org/repo/keys.asc; \
+gpg --batch --import keys.asc; \
+gpg --batch --export "${GPG_COUCH_KEY}" > 
/usr/share/keyrings/couchdb-archive-keyring.gpg; \
 command -v gpgconf && gpgconf --kill all || :; \
 rm -rf "$GNUPGHOME"; \
 apt-key list; \
diff --git a/3.1.1/Dockerfile b/3.1.1/Dockerfile
index 4677c45..75b4b29 100644
--- a/3.1.1/Dockerfile
+++ b/3.1.1/Dockerfile
@@ -45,11 +45,9 @@ RUN set -eux; \
 apt-get update; \
 apt-get install -y curl; \
 export GNUPGHOME="$(mktemp -d)"; \
-echo "disable-ipv6" >> ${GNUPGHOME}/dirmngr.conf; \
-curl https://couchdb.apache.org/repo/keys.asc | \
-gpg --dearmor | \
-tee /usr/share/keyrings/couchdb-archive-keyring.gpg >/dev/null 2>&1; \
-gpg --show-keys /usr/share/keyrings/couchdb-archive-keyring.gpg | grep -q 
${GPG_COUCH_KEY}; \
+curl -fL -o keys.asc https://couchdb.apache.org/repo/keys.asc; \
+gpg --batch --import keys.asc; \
+gpg --batch --export "${GPG_COUCH_KEY}" > 
/usr/share/keyrings/couchdb-archive-keyring.gpg; \
 command -v gpgconf && gpgconf --kill all || :; \
 rm -rf "$GNUPGHOME"; \
 apt-key list; \

[couchdb-docker] branch downstream-patch created (now fac64d3)

[wohali]

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

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


  at fac64d3  Incorporate downstream Dockerfile feedback

This branch includes the following new commits:

 new fac64d3  Incorporate downstream Dockerfile feedback

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[couchdb-docker] branch main updated: Update with jfrog artifactory repo (#202)

[wohali]

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 a727920  Update with jfrog artifactory repo (#202)
a727920 is described below

commit a727920c8db0050c48a06809f3cd4a9ec18c81ed
Author: Joan Touzet 
AuthorDate: Mon Jul 5 23:03:51 2021 +

Update with jfrog artifactory repo (#202)
---
 .travis.yml|  7 +++--
 2.3.1-ubi/Dockerfile   | 22 ++-
 2.3.1-ubi/bintray-apache-couchdb-rpm.repo  |  6 
 2.3.1-ubi/couchdb.repo |  7 +
 2.3.1/Dockerfile   | 30 ++--
 3.1.1-ubi-clouseau/Dockerfile  | 24 ++--
 3.1.1-ubi-clouseau/bintray-apache-couchdb-rpm.repo |  6 
 3.1.1-ubi-clouseau/couchdb.repo|  7 +
 3.1.1-ubi/Dockerfile   | 26 +++---
 3.1.1-ubi/bintray-apache-couchdb-rpm.repo  |  6 
 3.1.1-ubi/couchdb.repo |  7 +
 3.1.1/Dockerfile   | 31 +++--
 build.sh   | 16 +--
 dev/Dockerfile | 32 +++---
 14 files changed, 95 insertions(+), 132 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9c0a4d4..4bf6261 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ language: minimal
 # Avoid double build on PRs (See 
https://github.com/travis-ci/travis-ci/issues/1147)
 branches:
   only:
-- master
+- main
 
 services:
   - docker
@@ -15,8 +15,9 @@ env:
   - RELEASES=2.3.1-ubi
   - RELEASES=3.1.1
   - RELEASES=3.1.1-ubi
-  - RELEASES=dev
-  - RELEASES=dev-cluster
+# Needs updating for fdb
+#  - RELEASES=dev
+#  - RELEASES=dev-cluster
 
 script:
   - for rel in $RELEASES; do docker build -t couchdb:$rel $rel; docker run -d 
--name $rel -e COUCHDB_USER=admin -e COUCHDB_PASSWORD=password -p 5984:5984 
couchdb:$rel && sleep 10 && curl http://admin:password@localhost:5984/ && 
docker kill $rel; done
diff --git a/2.3.1-ubi/Dockerfile b/2.3.1-ubi/Dockerfile
index 442bd45..7daba2a 100644
--- a/2.3.1-ubi/Dockerfile
+++ b/2.3.1-ubi/Dockerfile
@@ -31,7 +31,7 @@ LABEL maintainer="CouchDB Developers d...@couchdb.apache.org" 
\
   io.openshift.min-cpu="1"
 
 COPY imeyer_runit.repo /etc/yum.repos.d/imeyer_runit.repo
-COPY bintray-apache-couchdb-rpm.repo 
/etc/yum.repos.d/bintray-apache-couchdb-rpm.repo
+COPY couchdb.repo /etc/yum.repos.d/couchdb.repo
 
 ENV COUCHDB_VERSION 2.3.1
 
@@ -55,28 +55,10 @@ RUN set -ex; \
 microdnf clean all; \
 rm -rf /var/cache/yum
 
-# https://docs.couchdb.org/en/stable/install/unix.html
-# ENV GPG_COUCH_KEY \
-# # gpg: key D401AB61: public key "Bintray (by JFrog)  
imported
-#8756C4F765C9AC3CB6B85D62379CE192D401AB61
-# RUN set -xe; \
-# export GNUPGHOME="$(mktemp -d)"; \
-# echo "disable-ipv6" >> ${GNUPGHOME}/dirmngr.conf; \
-# for server in $(shuf -e pgpkeys.mit.edu \
-# ha.pool.sks-keyservers.net \
-# hkp://p80.pool.sks-keyservers.net:80 \
-# pgp.mit.edu) ; do \
-# gpg --batch --keyserver $server --recv-keys $GPG_COUCH_KEY 
&& break || : ; \
-# done; \
-# gpg --batch --export $GPG_COUCH_KEY > 
/etc/apt/trusted.gpg.d/couchdb.gpg; \
-# command -v gpgconf && gpgconf --kill all || :; \
-# rm -rf "$GNUPGHOME"; \
-# apt-key list
-
 # Install CouchDB
 RUN set -xe; \
 microdnf update --disableplugin=subscription-manager -y && rm -rf 
/var/cache/yum; \
-microdnf install --enablerepo=bintray-apache-couchdb-rpm -y couchdb-2.3.1; 
\
+microdnf install --enablerepo=couchdb -y couchdb-${COUCHDB_VERSION}; \
 microdnf clean all; \
 rm -rf /var/cache/yum; \
 # remove defaults that force writing logs to file
diff --git a/2.3.1-ubi/bintray-apache-couchdb-rpm.repo 
b/2.3.1-ubi/bintray-apache-couchdb-rpm.repo
deleted file mode 100644
index e131b6a..000
--- a/2.3.1-ubi/bintray-apache-couchdb-rpm.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[bintray-apache-couchdb-rpm]
-name=bintray--apache-couchdb-rpm
-baseurl=http://apache.bintray.com/couchdb-rpm/el8/x86_64
-gpgcheck=0
-repo_gpgcheck=0
-enabled=1
diff --git a/2.3.1-ubi/couchdb.repo b/2.3.1-ubi/couchdb.repo
new file mode 100644
index 000..b4f33d7
--- /dev/null
+++ b/2.3.1-ubi/couchdb.repo
@@ -0,0 +1,7 @@
+[couchdb]
+name=couchdb
+baseurl=https://apache.jfrog.io/artifactory/couchdb-rpm/el$releasever/$basearch/
+gpgkey=https://couchdb.apache.org/repo/keys.asc 
https://couchdb.apache.org/repo/rpm-package-key.asc
+gpgcheck=1
+repo_gpgcheck=1
+enabl

[couchdb-docker] branch jfrog updated (c0d3fb5 -> 724f025)

[wohali]

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

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


 discard c0d3fb5  Update with jfrog artifactory repo
 add 724f025  Update with jfrog artifactory repo

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (c0d3fb5)
\
 N -- N -- N   refs/heads/jfrog (724f025)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[couchdb-docker] branch jfrog updated (ddecea6 -> c0d3fb5)

[wohali]

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

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


 discard ddecea6  Update with jfrog artifactory repo
 add c0d3fb5  Update with jfrog artifactory repo

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (ddecea6)
\
 N -- N -- N   refs/heads/jfrog (c0d3fb5)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

[couchdb-docker] 01/01: Update with jfrog artifactory repo

[wohali]

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

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

commit ddecea6b9c67f45aa58c524ee16faefe5318ca7a
Author: Joan Touzet 
AuthorDate: Mon Jul 5 15:52:50 2021 -0700

Update with jfrog artifactory repo
---
 .travis.yml|  2 +-
 2.3.1-ubi/Dockerfile   | 22 ++-
 2.3.1-ubi/bintray-apache-couchdb-rpm.repo  |  6 
 2.3.1-ubi/couchdb.repo |  7 +
 2.3.1/Dockerfile   | 30 ++--
 3.1.1-ubi-clouseau/Dockerfile  | 24 ++--
 3.1.1-ubi-clouseau/bintray-apache-couchdb-rpm.repo |  6 
 3.1.1-ubi-clouseau/couchdb.repo|  7 +
 3.1.1-ubi/Dockerfile   | 26 +++---
 3.1.1-ubi/bintray-apache-couchdb-rpm.repo  |  6 
 3.1.1-ubi/couchdb.repo |  7 +
 3.1.1/Dockerfile   | 31 +++--
 build.sh   | 16 +--
 dev/Dockerfile | 32 +++---
 14 files changed, 92 insertions(+), 130 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9c0a4d4..ec5b926 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ language: minimal
 # Avoid double build on PRs (See 
https://github.com/travis-ci/travis-ci/issues/1147)
 branches:
   only:
-- master
+- main
 
 services:
   - docker
diff --git a/2.3.1-ubi/Dockerfile b/2.3.1-ubi/Dockerfile
index 442bd45..7daba2a 100644
--- a/2.3.1-ubi/Dockerfile
+++ b/2.3.1-ubi/Dockerfile
@@ -31,7 +31,7 @@ LABEL maintainer="CouchDB Developers d...@couchdb.apache.org" 
\
   io.openshift.min-cpu="1"
 
 COPY imeyer_runit.repo /etc/yum.repos.d/imeyer_runit.repo
-COPY bintray-apache-couchdb-rpm.repo 
/etc/yum.repos.d/bintray-apache-couchdb-rpm.repo
+COPY couchdb.repo /etc/yum.repos.d/couchdb.repo
 
 ENV COUCHDB_VERSION 2.3.1
 
@@ -55,28 +55,10 @@ RUN set -ex; \
 microdnf clean all; \
 rm -rf /var/cache/yum
 
-# https://docs.couchdb.org/en/stable/install/unix.html
-# ENV GPG_COUCH_KEY \
-# # gpg: key D401AB61: public key "Bintray (by JFrog)  
imported
-#8756C4F765C9AC3CB6B85D62379CE192D401AB61
-# RUN set -xe; \
-# export GNUPGHOME="$(mktemp -d)"; \
-# echo "disable-ipv6" >> ${GNUPGHOME}/dirmngr.conf; \
-# for server in $(shuf -e pgpkeys.mit.edu \
-# ha.pool.sks-keyservers.net \
-# hkp://p80.pool.sks-keyservers.net:80 \
-# pgp.mit.edu) ; do \
-# gpg --batch --keyserver $server --recv-keys $GPG_COUCH_KEY 
&& break || : ; \
-# done; \
-# gpg --batch --export $GPG_COUCH_KEY > 
/etc/apt/trusted.gpg.d/couchdb.gpg; \
-# command -v gpgconf && gpgconf --kill all || :; \
-# rm -rf "$GNUPGHOME"; \
-# apt-key list
-
 # Install CouchDB
 RUN set -xe; \
 microdnf update --disableplugin=subscription-manager -y && rm -rf 
/var/cache/yum; \
-microdnf install --enablerepo=bintray-apache-couchdb-rpm -y couchdb-2.3.1; 
\
+microdnf install --enablerepo=couchdb -y couchdb-${COUCHDB_VERSION}; \
 microdnf clean all; \
 rm -rf /var/cache/yum; \
 # remove defaults that force writing logs to file
diff --git a/2.3.1-ubi/bintray-apache-couchdb-rpm.repo 
b/2.3.1-ubi/bintray-apache-couchdb-rpm.repo
deleted file mode 100644
index e131b6a..000
--- a/2.3.1-ubi/bintray-apache-couchdb-rpm.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[bintray-apache-couchdb-rpm]
-name=bintray--apache-couchdb-rpm
-baseurl=http://apache.bintray.com/couchdb-rpm/el8/x86_64
-gpgcheck=0
-repo_gpgcheck=0
-enabled=1
diff --git a/2.3.1-ubi/couchdb.repo b/2.3.1-ubi/couchdb.repo
new file mode 100644
index 000..b4f33d7
--- /dev/null
+++ b/2.3.1-ubi/couchdb.repo
@@ -0,0 +1,7 @@
+[couchdb]
+name=couchdb
+baseurl=https://apache.jfrog.io/artifactory/couchdb-rpm/el$releasever/$basearch/
+gpgkey=https://couchdb.apache.org/repo/keys.asc 
https://couchdb.apache.org/repo/rpm-package-key.asc
+gpgcheck=1
+repo_gpgcheck=1
+enabled=1
diff --git a/2.3.1/Dockerfile b/2.3.1/Dockerfile
index 9d5706c..75d0c24 100644
--- a/2.3.1/Dockerfile
+++ b/2.3.1/Dockerfile
@@ -39,29 +39,31 @@ RUN set -eux; \
 
 # 
http://docs.couchdb.org/en/latest/install/unix.html#installing-the-apache-couchdb-packages
 ENV GPG_COUCH_KEY \
-# gpg: key D401AB61: public key "Bintray (by JFrog)  
imported
-8756C4F765C9AC3CB6B85D62379CE192D401AB61
-RUN set -xe; \
+# gpg: rsa8192 205-01-19 The Apache Software Foundation (Package repository 
signing key) 
+390EF70BB1EA12B2773962950EE62FB37A00258D
+RUN set -eux; \
+apt-get update; \
+apt-get install -y curl; \
 export GNUPGHOME="$(mk

[couchdb-docker] branch jfrog created (now ddecea6)

[wohali]

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

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


  at ddecea6  Update with jfrog artifactory repo

This branch includes the following new commits:

 new ddecea6  Update with jfrog artifactory repo

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[couchdb-www] branch asf-site updated: Fixed Addon URL (#38)

[wohali]

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

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


The following commit(s) were added to refs/heads/asf-site by this push:
 new eb215bb  Fixed Addon URL (#38)
eb215bb is described below

commit eb215bb6c4ba98cb9ba5a8292163a424ab4da22f
Author: Devesh Sarda <32046390+sarda-dev...@users.noreply.github.com>
AuthorDate: Sun Jun 13 09:34:07 2021 -0700

Fixed Addon URL (#38)
---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 77bf207..4ef74c7 100644
--- a/index.html
+++ b/index.html
@@ -320,7 +320,7 @@ Thanks to Yohei Shimomae and the Apache Cordova team for 
the original design.
 
Fauxton, a 
Visual Guide
https://github.com/apache/couchdb-fauxton;>Fauxton on GitHub
-   http://docs.couchdb.org/en/latest/fauxton/addons.html;>Writing an 
Addon
+   https://docs.couchdb.org/en/latest/fauxton/install.html?highlight=Addon#understanding-fauxton-code-layout>Writing
 an Addon
 
   
 

[couchdb] branch port-prometheus-3.x updated (40e0333 -> 3cec304)

[wohali]

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

wohali pushed a change to branch port-prometheus-3.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


from 40e0333  fix default values for prometheus templates
 add a5656ba  Improve smoosh defaults for slack channel (#3600)
 add e580d71  Bump ibrowse to 4.4.2-3
 add 3cec304  Merge branch '3.x' into port-prometheus-3.x

No new revisions were added by this update.

Summary of changes:
 rebar.config.script  |  2 +-
 rel/overlay/etc/default.ini  |  4 ++--
 src/smoosh/src/smoosh_server.erl | 10 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

[couchdb-documentation] branch main updated: Document 3.2 new smoosh defaults (#663)

[wohali]

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-documentation.git


The following commit(s) were added to refs/heads/main by this push:
 new 7111b4b  Document 3.2 new smoosh defaults (#663)
7111b4b is described below

commit 7111b4b0aadc6f2ccdb00420dd7740a7247b29a5
Author: Joan Touzet 
AuthorDate: Thu Jun 3 19:31:14 2021 -0400

Document 3.2 new smoosh defaults (#663)
---
 src/maintenance/compaction.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/maintenance/compaction.rst b/src/maintenance/compaction.rst
index 973afb3..9c5ced1 100644
--- a/src/maintenance/compaction.rst
+++ b/src/maintenance/compaction.rst
@@ -104,11 +104,11 @@ configuration setting in the `[smoosh]` block. The 
default configuration is
 
 [smoosh.slack_dbs]
 priority = slack
-min_priority = 16777216
+min_priority = 536870912
 
 [smoosh.slack_views]
 priority = slack
-min_priority = 16777216
+min_priority = 536870912
 
 The "upgrade" channels are a special pair of channels that only check whether
 the `disk_format_version` for the file matches the current version, and enqueue

[couchdb] branch 3.x updated: Improve smoosh defaults for slack channel (#3600)

[wohali]

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

wohali pushed a commit to branch 3.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/3.x by this push:
 new a5656ba  Improve smoosh defaults for slack channel (#3600)
a5656ba is described below

commit a5656bae255141beb6e81ab4af64db5fec63b6c3
Author: Joan Touzet 
AuthorDate: Thu Jun 3 19:31:10 2021 -0400

Improve smoosh defaults for slack channel (#3600)
---
 rel/overlay/etc/default.ini  |  4 ++--
 src/smoosh/src/smoosh_server.erl | 10 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index 5f69076..5ac8da6 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -626,11 +626,11 @@ writer = stderr
 ;
 ;[smoosh.slack_dbs]
 ;priority = slack
-;min_priority = 16777216
+;min_priority = 536870912
 ;
 ;[smoosh.slack_views]
 ;priority = slack
-;min_priority = 16777216
+;min_priority = 536870912
 
 [ioq]
 ; The maximum number of concurrent in-flight IO requests that
diff --git a/src/smoosh/src/smoosh_server.erl b/src/smoosh/src/smoosh_server.erl
index 6269608..f088c54 100644
--- a/src/smoosh/src/smoosh_server.erl
+++ b/src/smoosh/src/smoosh_server.erl
@@ -364,7 +364,7 @@ get_priority(Channel, DiskSize, DataSize, NeedsUpgrade) ->
 Priority = get_priority(Channel),
 MinSize = to_number(Channel, "min_size", "1048576"),
 MaxSize = to_number(Channel, "max_size", "infinity"),
-DefaultMinPriority = case Priority of "slack" -> "16777216"; _ -> "2.0" 
end,
+DefaultMinPriority = case Priority of "slack" -> "536870912"; _ -> "2.0" 
end,
 MinPriority = to_number(Channel, "min_priority", DefaultMinPriority),
 MaxPriority = to_number(Channel, "max_priority", "infinity"),
 if Priority =:= "upgrade", NeedsUpgrade ->
@@ -529,10 +529,10 @@ t_ratio_view({ok, Shard, GroupId}) ->
 t_slack_view({ok, Shard, GroupId}) ->
 ?_test(begin
 meck:expect(couch_index, get_info, fun(_) ->
-{ok, [{sizes, {[{file, 33554432}, {active, 16777215}]}}]}
+{ok, [{sizes, {[{file, 1073741824}, {active, 536870911}]}}]}
 end),
-?assertEqual(2.001192092967, get_priority("ratio_views", {Shard, 
GroupId})),
-?assertEqual(16777217, get_priority("slack_views", {Shard, GroupId})),
+?assertEqual(2.37252903, get_priority("ratio_views", {Shard, 
GroupId})),
+?assertEqual(536870913, get_priority("slack_views", {Shard, GroupId})),
 ?assertEqual(0, get_priority("upgrade_views", {Shard, GroupId}))
 end).
 
@@ -542,7 +542,7 @@ t_no_data_view({ok, Shard, GroupId}) ->
 {ok, [{sizes, {[{file, 5242880}, {active, 0}]}}]}
 end),
 ?assertEqual(2.0, get_priority("ratio_views", {Shard, GroupId})),
-?assertEqual(16777216, get_priority("slack_views", {Shard, GroupId})),
+?assertEqual(536870912, get_priority("slack_views", {Shard, GroupId})),
 ?assertEqual(2.0, get_priority("upgrade_views", {Shard, GroupId}))
 end).
 

[couchdb] 01/01: Improve smoosh defaults for slack channel

[wohali]

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

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

commit f4e74f67b67e85307fffc0c815323ddc8e1b39fb
Author: Joan Touzet 
AuthorDate: Thu Jun 3 19:04:41 2021 -0400

Improve smoosh defaults for slack channel
---
 rel/overlay/etc/default.ini  |  4 ++--
 src/smoosh/src/smoosh_server.erl | 10 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index 5f69076..5ac8da6 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -626,11 +626,11 @@ writer = stderr
 ;
 ;[smoosh.slack_dbs]
 ;priority = slack
-;min_priority = 16777216
+;min_priority = 536870912
 ;
 ;[smoosh.slack_views]
 ;priority = slack
-;min_priority = 16777216
+;min_priority = 536870912
 
 [ioq]
 ; The maximum number of concurrent in-flight IO requests that
diff --git a/src/smoosh/src/smoosh_server.erl b/src/smoosh/src/smoosh_server.erl
index 6269608..f088c54 100644
--- a/src/smoosh/src/smoosh_server.erl
+++ b/src/smoosh/src/smoosh_server.erl
@@ -364,7 +364,7 @@ get_priority(Channel, DiskSize, DataSize, NeedsUpgrade) ->
 Priority = get_priority(Channel),
 MinSize = to_number(Channel, "min_size", "1048576"),
 MaxSize = to_number(Channel, "max_size", "infinity"),
-DefaultMinPriority = case Priority of "slack" -> "16777216"; _ -> "2.0" 
end,
+DefaultMinPriority = case Priority of "slack" -> "536870912"; _ -> "2.0" 
end,
 MinPriority = to_number(Channel, "min_priority", DefaultMinPriority),
 MaxPriority = to_number(Channel, "max_priority", "infinity"),
 if Priority =:= "upgrade", NeedsUpgrade ->
@@ -529,10 +529,10 @@ t_ratio_view({ok, Shard, GroupId}) ->
 t_slack_view({ok, Shard, GroupId}) ->
 ?_test(begin
 meck:expect(couch_index, get_info, fun(_) ->
-{ok, [{sizes, {[{file, 33554432}, {active, 16777215}]}}]}
+{ok, [{sizes, {[{file, 1073741824}, {active, 536870911}]}}]}
 end),
-?assertEqual(2.001192092967, get_priority("ratio_views", {Shard, 
GroupId})),
-?assertEqual(16777217, get_priority("slack_views", {Shard, GroupId})),
+?assertEqual(2.37252903, get_priority("ratio_views", {Shard, 
GroupId})),
+?assertEqual(536870913, get_priority("slack_views", {Shard, GroupId})),
 ?assertEqual(0, get_priority("upgrade_views", {Shard, GroupId}))
 end).
 
@@ -542,7 +542,7 @@ t_no_data_view({ok, Shard, GroupId}) ->
 {ok, [{sizes, {[{file, 5242880}, {active, 0}]}}]}
 end),
 ?assertEqual(2.0, get_priority("ratio_views", {Shard, GroupId})),
-?assertEqual(16777216, get_priority("slack_views", {Shard, GroupId})),
+?assertEqual(536870912, get_priority("slack_views", {Shard, GroupId})),
 ?assertEqual(2.0, get_priority("upgrade_views", {Shard, GroupId}))
 end).
 

[couchdb] branch bump-smoosh-slack created (now f4e74f6)

[wohali]

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

wohali pushed a change to branch bump-smoosh-slack
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


  at f4e74f6  Improve smoosh defaults for slack channel

This branch includes the following new commits:

 new f4e74f6  Improve smoosh defaults for slack channel

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[couchdb-documentation] branch smoosh-new-defaults created (now 6fafbd3)

[wohali]

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

wohali pushed a change to branch smoosh-new-defaults
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git.


  at 6fafbd3  Document 3.2 new smoosh defaults

This branch includes the following new commits:

 new 6fafbd3  Document 3.2 new smoosh defaults

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[couchdb-documentation] 01/01: Document 3.2 new smoosh defaults

[wohali]

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

wohali pushed a commit to branch smoosh-new-defaults
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git

commit 6fafbd388e7e2367575a5d85cee8bc30eee87bf9
Author: Joan Touzet 
AuthorDate: Thu Jun 3 18:44:48 2021 -0400

Document 3.2 new smoosh defaults
---
 src/maintenance/compaction.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/maintenance/compaction.rst b/src/maintenance/compaction.rst
index 973afb3..9c5ced1 100644
--- a/src/maintenance/compaction.rst
+++ b/src/maintenance/compaction.rst
@@ -104,11 +104,11 @@ configuration setting in the `[smoosh]` block. The 
default configuration is
 
 [smoosh.slack_dbs]
 priority = slack
-min_priority = 16777216
+min_priority = 536870912
 
 [smoosh.slack_views]
 priority = slack
-min_priority = 16777216
+min_priority = 536870912
 
 The "upgrade" channels are a special pair of channels that only check whether
 the `disk_format_version` for the file matches the current version, and enqueue

[couchdb-www] branch asf-site updated: Drop interfering smooth.js --> CSS

[wohali]

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

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


The following commit(s) were added to refs/heads/asf-site by this push:
 new c55dcc2  Drop interfering smooth.js --> CSS
c55dcc2 is described below

commit c55dcc2b65d7776368c82ea725ce933362f7c6f6
Author: Joan Touzet 
AuthorDate: Thu May 27 17:33:08 2021 -0400

Drop interfering smooth.js --> CSS
---
 index.html| 1 -
 style/master.css  | 3 +++
 style/master.less | 4 
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 4cfd3d8..77bf207 100644
--- a/index.html
+++ b/index.html
@@ -28,7 +28,6 @@ Thanks to Yohei Shimomae and the Apache Cordova team for the 
original design.
 
 
 
-
 
 
 
diff --git a/style/master.css b/style/master.css
index e7bc772..1a839ec 100644
--- a/style/master.css
+++ b/style/master.css
@@ -3,6 +3,9 @@
   padding: 0;
   -webkit-text-size-adjust: none;
 }
+html {
+  scroll-behavior: smooth;
+}
 body,
 a {
   color: #291d1e;
diff --git a/style/master.less b/style/master.less
index bfec4fa..2173aba 100644
--- a/style/master.less
+++ b/style/master.less
@@ -4,6 +4,10 @@
 -webkit-text-size-adjust:none;
 }
 
+html {
+  scroll-behavior: smooth;
+}
+
 body {
 }
 

[couchdb-ci] branch main updated: Temp workaround for boost download in FDB

[wohali]

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-ci.git


The following commit(s) were added to refs/heads/main by this push:
 new 28ded90  Temp workaround for boost download in FDB
28ded90 is described below

commit 28ded905fc8ce911f4165ed6a9d5f9e4d5410465
Author: Joan Touzet 
AuthorDate: Wed May 5 17:32:25 2021 -0700

Temp workaround for boost download in FDB
---
 bin/apt-dependencies.sh |  1 +
 files/no-bintray.patch  | 13 +
 2 files changed, 14 insertions(+)

diff --git a/bin/apt-dependencies.sh b/bin/apt-dependencies.sh
index 9e53ae0..345d1c8 100755
--- a/bin/apt-dependencies.sh
+++ b/bin/apt-dependencies.sh
@@ -210,6 +210,7 @@ else
   apt install --no-install-recommends -y cmake mono-devel ninja-build 
libboost-all-dev liblz4-dev dos2unix fakeroot liblz4-1
   git clone https://github.com/apple/foundationdb/
   cd foundationdb && git checkout 6.3.9
+  git apply /root/couchdb-ci/files/no-bintray.patch || true
   mkdir .build && cd .build
   if [ "${ARCH}" == "ppc64le" ]; then
 cmake -DCMAKE_CXX_FLAGS="-DNO_WARN_X86_INTRINSICS" -G Ninja ..
diff --git a/files/no-bintray.patch b/files/no-bintray.patch
new file mode 100644
index 000..9804fd2
--- /dev/null
+++ b/files/no-bintray.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/CompileBoost.cmake b/cmake/CompileBoost.cmake
+index d67fe50de..d5642d642 100644
+--- a/cmake/CompileBoost.cmake
 b/cmake/CompileBoost.cmake
+@@ -6,7 +6,7 @@ if(Boost_FOUND)
+ else()
+   include(ExternalProject)
+   ExternalProject_add(boostProject
+-URL 
"https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2;
++URL 
"https://boostorg.jfrog.io/artifactory/main/release/1.72.0/source/boost_1_72_0.tar.bz2;
+ URL_HASH 
SHA256=59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722
+ CONFIGURE_COMMAND ""
+ BUILD_COMMAND ""

[couchdb-ci] branch main updated: bintray --> jfrog.io

[wohali]

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-ci.git


The following commit(s) were added to refs/heads/main by this push:
 new f8c4c53  bintray --> jfrog.io
f8c4c53 is described below

commit f8c4c53dae4fd3c92cdb807c51b6a44ce60c5359
Author: Joan Touzet 
AuthorDate: Wed May 5 14:59:18 2021 -0700

bintray --> jfrog.io
---
 bin/apt-dependencies.sh |  8 
 bin/yum-dependencies.sh | 10 ++
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/bin/apt-dependencies.sh b/bin/apt-dependencies.sh
index 88fbf8a..9e53ae0 100755
--- a/bin/apt-dependencies.sh
+++ b/bin/apt-dependencies.sh
@@ -172,10 +172,10 @@ fi
 if [ "$1" != "nojs" ]; then
   # older releases don't have libmozjs60+, and we provide 1.8.5
   if [ "${VERSION_CODENAME}" != "focal" -a "${VERSION_CODENAME}" != "bullseye" 
-a "${ARCH}" != "s390x" ]; then
-echo "deb https://apache.bintray.com/couchdb-deb ${VERSION_CODENAME} main" 
| \
-sudo tee /etc/apt/sources.list.d/couchdb.list
-apt-key adv --keyserver keyserver.ubuntu.com --recv-keys \
-8756C4F765C9AC3CB6B85D62379CE192D401AB61
+curl https://couchdb.apache.org/repo/keys.asc | gpg --dearmor | tee 
/usr/share/keyrings/couchdb-archive-keyring.gpg >/dev/null 2>&1
+source /etc/os-release
+echo "deb [signed-by=/usr/share/keyrings/couchdb-archive-keyring.gpg] 
https://apache.jfrog.io/artifactory/couchdb-deb/ ${VERSION_CODENAME} main" \
+| tee /etc/apt/sources.list.d/couchdb.list >/dev/null
 apt-get update
 apt-get install --no-install-recommends -y couch-libmozjs185-dev
   fi
diff --git a/bin/yum-dependencies.sh b/bin/yum-dependencies.sh
index 64d08ee..d651f85 100755
--- a/bin/yum-dependencies.sh
+++ b/bin/yum-dependencies.sh
@@ -179,14 +179,8 @@ ${PIP} --default-timeout=1000 install docutils==0.13.1 
sphinx==1.5.3 sphinx_rtd_
 if [[ $1 != "nojs" ]]; then
   if [[ ${VERSION_ID} -lt 8 ]]; then
   # config the CouchDB repo & install the JS packages
-cat << EOF > /etc/yum.repos.d/binary-apache-couchdb.repo
-[bintray--apache-couchdb-rpm]
-name=bintray--apache-couchdb-rpm
-baseurl=http://apache.bintray.com/couchdb-rpm/el${VERSION_ID}/${ARCH}/
-gpgcheck=0
-repo_gpgcheck=0
-enabled=1
-EOF
+yum install -y yum-utils
+yum-config-manager --add-repo https://couchdb.apache.org/repo/couchdb.repo
 # install the JS packages
 yum install -y couch-js-devel
   else

[couchdb] branch bump-ibrowse updated (2fd6208 -> d5038ac)

[wohali]

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

wohali pushed a change to branch bump-ibrowse
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


from 2fd6208  Bump ibrowse to 4.4.1
 add 4246e9f  Properly combine base and extra headers when making 
replicator requests
 add 52575df  Removed unused variable in merge headers unit test
 add fa0aff9  Fix boolean POST to view-like endpoints
 add dde1e13  Direct people to Discussions/docs from new issue (#3216)
 add 8fbf628  add missing applications to reltool.config
 add 2afc67c  Fix boolean POST to view-like endpoints
 add 79f71ec  Fix apache/couchdb#1988 -  Validate attachment names
 add bfda163  Allow for disabling custom reduce functions
 add ab70b75  convert erlfdb_error 2101 to transaction_too_large (#3222)
 add 2428f0f  update to latest fauxton 1.2.6 (#3134)
 add ea80fe3  Fix empty reduce output to match 3.x behavior
 add 49399ff  Remove debug logging
 add c0efba3  Fix semantics of total_rows
 add cc9e261  Merge pull request #3227 from 
cloudant/fix-total_rows-semantics
 add 4c1980e  Fix dialyzer warnings
 add dfb27b4  Use snapshot for cache insertion
 add 4d8b69a  Jenkins: do not alwaysPull true (#3234)
 add f85cff6  Remove '--production' flag when building Fauxton
 add 32dba58  Merge pull request #3240 from 
Antonio-Maranhao/update-fauxton-make-target
 add 4b10750  Allow administrators to optionally encrypt views
 add a499d6f  Retry filter_docs sequentially if the patch exceeds couchjs 
stack
 add 9e3637e  Add test for splitting filter batches
 add 753fc9a  Merge pull request #3248 from 
apache/changes_filter_all_docs_oom_main
 add 475ff60  Add an "encryption" object to db info
 add 647fd16  Merge pull request #3244 from apache/aegis_db_info
 add 8267950  Remove ebtree caching
 add 7d3caa9  Remove use of caching
 add 1a13880  Fix flaky test
 add e11ab46  Avoid deleting UUID keys that start with zeros
 add 263efd2  Assure that all node ids are the same length
 add 679fc83  Merge pull request #3263 from apache/fix-ebtree-range-clears
 add 1be2312  Use `req_body` field if present
 add 5cfa4a8  Merge pull request #3268 from cloudant/reuse-json-body
 add 8c21567  Bump erlfdb to v1.2.3
 add 0eb1043  `q` and `n` are not needed for FDB based CouchDB
 add edd320e  Disable TextIndex test since it is not implemeneted yet
 add 0b98b3b  Merge pull request #3274 from cloudant/fix-mango-tests
 add 1b30d08  Allow snapshots through fabric2_fdb:transactional
 add 0e91f2f  Allow specifying an end_key for fold_changes
 add 27e8e33  Minimize conflicts while building views
 add 3168a4d  Remove unnecessary line wraps
 add c362b1c  Add missing default headers to responses (#3279)
 add 109f74f  Add ability to control which Elixir integration tests to run
 add 5b8bf5a  Use elixir-suite
 add be87c40  Merge pull request #3286 from cloudant/specify-elixir-tests
 add df2fb67  treat 408 as a retryable error condition (#3303)
 add af436c1  Goodbye 2020. Hello 2021. YES. (#3318)
 add 7f2feb0  Upgrade Credo to 1.5.4
 add 0eff137  Add to credo ignores and gitignore new file_system dependency
 add a89242d  Switch from assert length === 0 to Enum.empty? as Credo 
suggests
 add bc9773a  Allow gzipped requests to _session (#3323)
 add b2a34dc  Update README.md
 add 94c5fe0  remove {restart_tx, true} from mango _all_docs
 add 053595c  add http error for fdb 1031
 add b033ef5  Simplify and speedup dev node startup (main branch) (#3338)
 add 1780573  fixing links after master->main branch rename
 add 127c441  fix additional links after branch renaming (master -> main)
 add 46b346e  Add a development container for VS Code (#3343)
 add 94df4bb  Fix PUT of multipart/related attachments support for 
Transfer-Encoding: chunked (#3360)
 add 0b488de  Handle all erlfdb error codes (#3355)
 add a9f2a5e  Show process status in active_tasks
 add 5f43148  Merge pull request #3365 from 
apache/active-tasks-process-status-main
 add 79b64ea  Fix typo
 add 73875b5  Add failing cases for ebtree:lookup_multi/3 bug
 add ec4b213  Fix ebtree:lookup_multi/3
 add 6f6db1e  use collate in lookup
 add 3d4a827  Merge pull request #3384 from apache/ebtree-lookup-collate-eq
 add 45d4039  Optimize lookup/3
 add a9e0ebe  Merge pull request #3386 from apache/ebtree-lookup-opt
 add 6822fe4  Set default nodes in dev/run to 1
 add 04086e6  Make session elixir test more robust
 add fac13a3  Fix badmatch in couch_views_indexer
 add 650ba28  Relax isolation level when indexer reads from DB (#3393)
 add 9b0ea10  Update Makefile stripping remaining direct make refs
 add 59669ed  Bump erlfdb to 1.2.6 (#3400)
 add 2ef72d6  Allow applying per-transaction options with 
fabric2_fdb

[couchdb-documentation] annotated tag stable updated (cae63fb -> 94e53ed)

[wohali]

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

wohali pushed a change to annotated tag stable
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git.


*** WARNING: tag stable was modified! ***

from cae63fb  (tag)
  to 94e53ed  (tag)
 tagging 3357fd7297f05a40cac8b4d774e0d8a3eca15fdd (commit)
 replaces 3.1.1
  by Joan Touzet
  on Sun Apr 25 23:15:04 2021 -0400

- Log -
Stable revision
---

from 46e22cd  Update docs for new binary location (#654)
 add 3357fd7  Add CentOS 8 to supported list

No new revisions were added by this update.

Summary of changes:
 src/install/unix.rst | 1 +
 1 file changed, 1 insertion(+)

[couchdb-documentation] branch 3.1.1-maint updated (46e22cd -> 3357fd7)

[wohali]

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

wohali pushed a change to branch 3.1.1-maint
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git.


from 46e22cd  Update docs for new binary location (#654)
 add 3357fd7  Add CentOS 8 to supported list

No new revisions were added by this update.

Summary of changes:
 src/install/unix.rst | 1 +
 1 file changed, 1 insertion(+)

[couchdb-documentation] annotated tag stable updated (d996bb9 -> cae63fb)

[wohali]

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

wohali pushed a change to annotated tag stable
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git.


*** WARNING: tag stable was modified! ***

from d996bb9  (tag)
  to cae63fb  (tag)
 tagging 46e22cd5fbde3a7006c33b0ae2746b91a2ab8476 (commit)
 replaces 3.1.1
  by Joan Touzet
  on Sun Apr 25 23:07:22 2021 -0400

- Log -
Stable revision
---

from 3f39035  Bump version number to 3.1.1
 add 46e22cd  Update docs for new binary location (#654)

No new revisions were added by this update.

Summary of changes:
 src/install/unix.rst | 112 ---
 1 file changed, 34 insertions(+), 78 deletions(-)

[couchdb-documentation] 01/01: Update docs for new binary location (#654)

[wohali]

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

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

commit 46e22cd5fbde3a7006c33b0ae2746b91a2ab8476
Author: Joan Touzet 
AuthorDate: Sun Apr 25 23:05:07 2021 -0400

Update docs for new binary location (#654)
---
 src/install/unix.rst | 112 ---
 1 file changed, 34 insertions(+), 78 deletions(-)

diff --git a/src/install/unix.rst b/src/install/unix.rst
index 64a0333..24ea880 100644
--- a/src/install/unix.rst
+++ b/src/install/unix.rst
@@ -29,7 +29,6 @@ Installation using the Apache CouchDB convenience binary 
packages
 If you are running one of the following operating systems, the easiest way
 to install CouchDB is to use the convenience binary packages:
 
-* CentOS/RHEL 6
 * CentOS/RHEL 7
 * Debian 9 (stretch)
 * Debian 10 (buster)
@@ -48,97 +47,36 @@ details are in the `README.Debian`_ file.
 
 .. _README.Debian: 
https://github.com/apache/couchdb-pkg/blob/master/debian/README.Debian
 
-Apache CouchDB also provides packages for the SpiderMonkey 1.8.5 JavaScript
-dependency, as the upstream packages for this shared library are starting to
-disappear or become unreliable.
+For distributions lacking a compatible SpiderMonkey library, Apache CouchDB
+also provides packages for the 1.8.5 version.
 
 Enabling the Apache CouchDB package repository
 --
 
 .. highlight:: sh
 
-**Debian 9 (stretch)**: Run the following commands::
+**Debian or Ubuntu**: Run the following commands::
 
-$ sudo apt-get install -y apt-transport-https gnupg ca-certificates
-$ echo "deb https://apache.bintray.com/couchdb-deb stretch main" \
-| sudo tee /etc/apt/sources.list.d/couchdb.list
+sudo apt update && sudo apt install -y curl apt-transport-https gnupg
+curl https://couchdb.apache.org/repo/keys.asc | gpg --dearmor | sudo tee 
/usr/share/keyrings/couchdb-archive-keyring.gpg >/dev/null 2>&1
+source /etc/os-release
+echo "deb [signed-by=/usr/share/keyrings/couchdb-archive-keyring.gpg] 
https://apache.jfrog.io/artifactory/couchdb-deb/ ${VERSION_CODENAME} main" \
+| sudo tee /etc/apt/sources.list.d/couchdb.list >/dev/null
 
-**Debian 10 (buster)**: Run the following commands::
+**RedHat or CentOS**: Run the following commands::
 
-$ sudo apt-get install -y gnupg ca-certificates
-$ echo "deb https://apache.bintray.com/couchdb-deb buster main" \
-| sudo tee /etc/apt/sources.list.d/couchdb.list
-
-**Ubuntu 16.04 (Xenial)**: Run the following commands::
-
-$ sudo apt-get install -y apt-transport-https gnupg ca-certificates
-$ echo "deb https://apache.bintray.com/couchdb-deb xenial main" \
-| sudo tee /etc/apt/sources.list.d/couchdb.list
-
-**Ubuntu 18.04 (Bionic)**: Run the following commands::
-
-$ sudo apt-get install -y gnupg ca-certificates
-$ echo "deb https://apache.bintray.com/couchdb-deb bionic main" \
-| sudo tee /etc/apt/sources.list.d/couchdb.list
-
-**Ubuntu 20.04 (Focal)**: Run the following commands::
-
-$ sudo apt-get install -y gnupg ca-certificates
-$ echo "deb https://apache.bintray.com/couchdb-deb focal main" \
-| sudo tee /etc/apt/sources.list.d/couchdb.list
-
-.. highlight:: ini
-
-**CentOS**: Place the following text into 
``/etc/yum.repos.d/bintray-apache-couchdb-rpm.repo``::
-
-[bintray--apache-couchdb-rpm]
-name=bintray--apache-couchdb-rpm
-baseurl=http://apache.bintray.com/couchdb-rpm/el$releasever/$basearch/
-gpgcheck=0
-repo_gpgcheck=0
-enabled=1
-
-**RedHat 6**: Place the following text into 
``/etc/yum.repos.d/bintray-apache-couchdb-rpm.repo``::
-
-[bintray--apache-couchdb-rpm]
-name=bintray--apache-couchdb-rpm
-baseurl=http://apache.bintray.com/couchdb-rpm/el6/$basearch/
-gpgcheck=0
-repo_gpgcheck=0
-enabled=1
-
-**RedHat 7**: Place the following text into 
``/etc/yum.repos.d/bintray-apache-couchdb-rpm.repo``::
-
-[bintray--apache-couchdb-rpm]
-name=bintray--apache-couchdb-rpm
-baseurl=http://apache.bintray.com/couchdb-rpm/el7/$basearch/
-gpgcheck=0
-repo_gpgcheck=0
-enabled=1
-
-**RedHat 8**: Place the following text into 
``/etc/yum.repos.d/bintray-apache-couchdb-rpm.repo``::
-
-[bintray--apache-couchdb-rpm]
-name=bintray--apache-couchdb-rpm
-baseurl=http://apache.bintray.com/couchdb-rpm/el8/$basearch/
-gpgcheck=0
-repo_gpgcheck=0
-enabled=1
+sudo yum install -y yum-utils
+sudo yum-config-manager --add-repo 
https://couchdb.apache.org/repo/couchdb.repo
 
 Installing the Apache CouchDB packages
 --
 
 .. highlight:: sh
 
-**Debian/Ubuntu**: First, install the CouchDB repository key::
+**Debian or Ubuntu**: Run the following 

[couchdb-documentation] branch 3.1.1-maint created (now 46e22cd)

[wohali]

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

wohali pushed a change to branch 3.1.1-maint
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git.


  at 46e22cd  Update docs for new binary location (#654)

This branch includes the following new commits:

 new 46e22cd  Update docs for new binary location (#654)

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[couchdb-documentation] branch main updated: Update docs for new binary location (#654)

[wohali]

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-documentation.git


The following commit(s) were added to refs/heads/main by this push:
 new 3e7273d  Update docs for new binary location (#654)
3e7273d is described below

commit 3e7273dca604a225d8c74ee21514327f56425405
Author: Joan Touzet 
AuthorDate: Sun Apr 25 23:05:07 2021 -0400

Update docs for new binary location (#654)
---
 src/install/unix.rst | 112 ---
 1 file changed, 34 insertions(+), 78 deletions(-)

diff --git a/src/install/unix.rst b/src/install/unix.rst
index 3e22a2b..ff7d3f4 100644
--- a/src/install/unix.rst
+++ b/src/install/unix.rst
@@ -29,7 +29,6 @@ Installation using the Apache CouchDB convenience binary 
packages
 If you are running one of the following operating systems, the easiest way
 to install CouchDB is to use the convenience binary packages:
 
-* CentOS/RHEL 6
 * CentOS/RHEL 7
 * CentOS/RHEL 8
 * Debian 9 (stretch)
@@ -49,97 +48,36 @@ details are in the `README.Debian`_ file.
 
 .. _README.Debian: 
https://github.com/apache/couchdb-pkg/blob/master/debian/README.Debian
 
-Apache CouchDB also provides packages for the SpiderMonkey 1.8.5 JavaScript
-dependency, as the upstream packages for this shared library are starting to
-disappear or become unreliable.
+For distributions lacking a compatible SpiderMonkey library, Apache CouchDB
+also provides packages for the 1.8.5 version.
 
 Enabling the Apache CouchDB package repository
 --
 
 .. highlight:: sh
 
-**Debian 9 (stretch)**: Run the following commands::
+**Debian or Ubuntu**: Run the following commands::
 
-$ sudo apt-get install -y apt-transport-https gnupg ca-certificates
-$ echo "deb https://apache.bintray.com/couchdb-deb stretch main" \
-| sudo tee /etc/apt/sources.list.d/couchdb.list
+sudo apt update && sudo apt install -y curl apt-transport-https gnupg
+curl https://couchdb.apache.org/repo/keys.asc | gpg --dearmor | sudo tee 
/usr/share/keyrings/couchdb-archive-keyring.gpg >/dev/null 2>&1
+source /etc/os-release
+echo "deb [signed-by=/usr/share/keyrings/couchdb-archive-keyring.gpg] 
https://apache.jfrog.io/artifactory/couchdb-deb/ ${VERSION_CODENAME} main" \
+| sudo tee /etc/apt/sources.list.d/couchdb.list >/dev/null
 
-**Debian 10 (buster)**: Run the following commands::
+**RedHat or CentOS**: Run the following commands::
 
-$ sudo apt-get install -y gnupg ca-certificates
-$ echo "deb https://apache.bintray.com/couchdb-deb buster main" \
-| sudo tee /etc/apt/sources.list.d/couchdb.list
-
-**Ubuntu 16.04 (Xenial)**: Run the following commands::
-
-$ sudo apt-get install -y apt-transport-https gnupg ca-certificates
-$ echo "deb https://apache.bintray.com/couchdb-deb xenial main" \
-| sudo tee /etc/apt/sources.list.d/couchdb.list
-
-**Ubuntu 18.04 (Bionic)**: Run the following commands::
-
-$ sudo apt-get install -y gnupg ca-certificates
-$ echo "deb https://apache.bintray.com/couchdb-deb bionic main" \
-| sudo tee /etc/apt/sources.list.d/couchdb.list
-
-**Ubuntu 20.04 (Focal)**: Run the following commands::
-
-$ sudo apt-get install -y gnupg ca-certificates
-$ echo "deb https://apache.bintray.com/couchdb-deb focal main" \
-| sudo tee /etc/apt/sources.list.d/couchdb.list
-
-.. highlight:: ini
-
-**CentOS**: Place the following text into 
``/etc/yum.repos.d/bintray-apache-couchdb-rpm.repo``::
-
-[bintray--apache-couchdb-rpm]
-name=bintray--apache-couchdb-rpm
-baseurl=http://apache.bintray.com/couchdb-rpm/el$releasever/$basearch/
-gpgcheck=0
-repo_gpgcheck=0
-enabled=1
-
-**RedHat 6**: Place the following text into 
``/etc/yum.repos.d/bintray-apache-couchdb-rpm.repo``::
-
-[bintray--apache-couchdb-rpm]
-name=bintray--apache-couchdb-rpm
-baseurl=http://apache.bintray.com/couchdb-rpm/el6/$basearch/
-gpgcheck=0
-repo_gpgcheck=0
-enabled=1
-
-**RedHat 7**: Place the following text into 
``/etc/yum.repos.d/bintray-apache-couchdb-rpm.repo``::
-
-[bintray--apache-couchdb-rpm]
-name=bintray--apache-couchdb-rpm
-baseurl=http://apache.bintray.com/couchdb-rpm/el7/$basearch/
-gpgcheck=0
-repo_gpgcheck=0
-enabled=1
-
-**RedHat 8**: Place the following text into 
``/etc/yum.repos.d/bintray-apache-couchdb-rpm.repo``::
-
-[bintray--apache-couchdb-rpm]
-name=bintray--apache-couchdb-rpm
-baseurl=http://apache.bintray.com/couchdb-rpm/el8/$basearch/
-gpgcheck=0
-repo_gpgcheck=0
-enabled=1
+sudo yum install -y yum-utils
+sudo yum-config-manager --add-repo 
https://couchdb.apache.org/repo/couchdb.repo
 
 Installing the Apache CouchDB packages
 --
 
 .. highlight

[couchdb-documentation] 01/01: Update docs for new binary location

[wohali]

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

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

commit 5da6a06d6831c2b40aa12274489f150edf6696dc
Author: Joan Touzet 
AuthorDate: Sun Apr 25 21:53:12 2021 -0400

Update docs for new binary location
---
 src/install/unix.rst | 112 ---
 1 file changed, 34 insertions(+), 78 deletions(-)

diff --git a/src/install/unix.rst b/src/install/unix.rst
index 3e22a2b..ff7d3f4 100644
--- a/src/install/unix.rst
+++ b/src/install/unix.rst
@@ -29,7 +29,6 @@ Installation using the Apache CouchDB convenience binary 
packages
 If you are running one of the following operating systems, the easiest way
 to install CouchDB is to use the convenience binary packages:
 
-* CentOS/RHEL 6
 * CentOS/RHEL 7
 * CentOS/RHEL 8
 * Debian 9 (stretch)
@@ -49,97 +48,36 @@ details are in the `README.Debian`_ file.
 
 .. _README.Debian: 
https://github.com/apache/couchdb-pkg/blob/master/debian/README.Debian
 
-Apache CouchDB also provides packages for the SpiderMonkey 1.8.5 JavaScript
-dependency, as the upstream packages for this shared library are starting to
-disappear or become unreliable.
+For distributions lacking a compatible SpiderMonkey library, Apache CouchDB
+also provides packages for the 1.8.5 version.
 
 Enabling the Apache CouchDB package repository
 --
 
 .. highlight:: sh
 
-**Debian 9 (stretch)**: Run the following commands::
+**Debian or Ubuntu**: Run the following commands::
 
-$ sudo apt-get install -y apt-transport-https gnupg ca-certificates
-$ echo "deb https://apache.bintray.com/couchdb-deb stretch main" \
-| sudo tee /etc/apt/sources.list.d/couchdb.list
+sudo apt update && sudo apt install -y curl apt-transport-https gnupg
+curl https://couchdb.apache.org/repo/keys.asc | gpg --dearmor | sudo tee 
/usr/share/keyrings/couchdb-archive-keyring.gpg >/dev/null 2>&1
+source /etc/os-release
+echo "deb [signed-by=/usr/share/keyrings/couchdb-archive-keyring.gpg] 
https://apache.jfrog.io/artifactory/couchdb-deb/ ${VERSION_CODENAME} main" \
+| sudo tee /etc/apt/sources.list.d/couchdb.list >/dev/null
 
-**Debian 10 (buster)**: Run the following commands::
+**RedHat or CentOS**: Run the following commands::
 
-$ sudo apt-get install -y gnupg ca-certificates
-$ echo "deb https://apache.bintray.com/couchdb-deb buster main" \
-| sudo tee /etc/apt/sources.list.d/couchdb.list
-
-**Ubuntu 16.04 (Xenial)**: Run the following commands::
-
-$ sudo apt-get install -y apt-transport-https gnupg ca-certificates
-$ echo "deb https://apache.bintray.com/couchdb-deb xenial main" \
-| sudo tee /etc/apt/sources.list.d/couchdb.list
-
-**Ubuntu 18.04 (Bionic)**: Run the following commands::
-
-$ sudo apt-get install -y gnupg ca-certificates
-$ echo "deb https://apache.bintray.com/couchdb-deb bionic main" \
-| sudo tee /etc/apt/sources.list.d/couchdb.list
-
-**Ubuntu 20.04 (Focal)**: Run the following commands::
-
-$ sudo apt-get install -y gnupg ca-certificates
-$ echo "deb https://apache.bintray.com/couchdb-deb focal main" \
-| sudo tee /etc/apt/sources.list.d/couchdb.list
-
-.. highlight:: ini
-
-**CentOS**: Place the following text into 
``/etc/yum.repos.d/bintray-apache-couchdb-rpm.repo``::
-
-[bintray--apache-couchdb-rpm]
-name=bintray--apache-couchdb-rpm
-baseurl=http://apache.bintray.com/couchdb-rpm/el$releasever/$basearch/
-gpgcheck=0
-repo_gpgcheck=0
-enabled=1
-
-**RedHat 6**: Place the following text into 
``/etc/yum.repos.d/bintray-apache-couchdb-rpm.repo``::
-
-[bintray--apache-couchdb-rpm]
-name=bintray--apache-couchdb-rpm
-baseurl=http://apache.bintray.com/couchdb-rpm/el6/$basearch/
-gpgcheck=0
-repo_gpgcheck=0
-enabled=1
-
-**RedHat 7**: Place the following text into 
``/etc/yum.repos.d/bintray-apache-couchdb-rpm.repo``::
-
-[bintray--apache-couchdb-rpm]
-name=bintray--apache-couchdb-rpm
-baseurl=http://apache.bintray.com/couchdb-rpm/el7/$basearch/
-gpgcheck=0
-repo_gpgcheck=0
-enabled=1
-
-**RedHat 8**: Place the following text into 
``/etc/yum.repos.d/bintray-apache-couchdb-rpm.repo``::
-
-[bintray--apache-couchdb-rpm]
-name=bintray--apache-couchdb-rpm
-baseurl=http://apache.bintray.com/couchdb-rpm/el8/$basearch/
-gpgcheck=0
-repo_gpgcheck=0
-enabled=1
+sudo yum install -y yum-utils
+sudo yum-config-manager --add-repo 
https://couchdb.apache.org/repo/couchdb.repo
 
 Installing the Apache CouchDB packages
 --
 
 .. highlight:: sh
 
-**Debian/Ubuntu**: First, install the CouchDB repository key::
+**Debian or Ubuntu**: Run the following 

[couchdb-documentation] branch new-binaries created (now 5da6a06)

[wohali]

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

wohali pushed a change to branch new-binaries
in repository https://gitbox.apache.org/repos/asf/couchdb-documentation.git.


  at 5da6a06  Update docs for new binary location

This branch includes the following new commits:

 new 5da6a06  Update docs for new binary location

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[couchdb-www] branch asf-site updated (b5514eb -> db12030)

[wohali]

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

wohali pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/couchdb-www.git.


 discard b5514eb  Add RPM repo template + signing key
 new db12030  Add RPM repo template + signing key

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (b5514eb)
\
 N -- N -- N   refs/heads/asf-site (db12030)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 repo/couchdb.repo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[couchdb-www] 01/01: Add RPM repo template + signing key

[wohali]

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

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

commit db1203004ffbf9d75960876ce77bfef6b79d5a58
Author: Joan Touzet 
AuthorDate: Sun Apr 25 21:33:55 2021 -0400

Add RPM repo template + signing key
---
 repo/couchdb.repo|  7 
 repo/rpm-package-key.asc | 87 
 2 files changed, 94 insertions(+)

diff --git a/repo/couchdb.repo b/repo/couchdb.repo
new file mode 100644
index 000..b4f33d7
--- /dev/null
+++ b/repo/couchdb.repo
@@ -0,0 +1,7 @@
+[couchdb]
+name=couchdb
+baseurl=https://apache.jfrog.io/artifactory/couchdb-rpm/el$releasever/$basearch/
+gpgkey=https://couchdb.apache.org/repo/keys.asc 
https://couchdb.apache.org/repo/rpm-package-key.asc
+gpgcheck=1
+repo_gpgcheck=1
+enabled=1
diff --git a/repo/rpm-package-key.asc b/repo/rpm-package-key.asc
new file mode 100644
index 000..944f21f
--- /dev/null
+++ b/repo/rpm-package-key.asc
@@ -0,0 +1,87 @@
+-BEGIN PGP PUBLIC KEY BLOCK-
+
+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

[couchdb-www] branch asf-site updated: Add RPM repo template + signing key

[wohali]

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

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


The following commit(s) were added to refs/heads/asf-site by this push:
 new b5514eb  Add RPM repo template + signing key
b5514eb is described below

commit b5514eb6dd1c4d426d2805363d0992a46b25a06b
Author: Joan Touzet 
AuthorDate: Sun Apr 25 21:33:55 2021 -0400

Add RPM repo template + signing key
---
 repo/couchdb.repo|  7 
 repo/rpm-package-key.asc | 87 
 2 files changed, 94 insertions(+)

diff --git a/repo/couchdb.repo b/repo/couchdb.repo
new file mode 100644
index 000..adbb684
--- /dev/null
+++ b/repo/couchdb.repo
@@ -0,0 +1,7 @@
+[couchdb]
+name=couchdb
+baseurl=https://apache.jfrog.io/artifactory/couchdb-rpm/el$releasever/$basearch/
+gpgkey=https://couchdb.apache.org/repo/keys.asc 
https://atypical.net/rpm-package-key.asc
+gpgcheck=1
+repo_gpgcheck=1
+enabled=1
diff --git a/repo/rpm-package-key.asc b/repo/rpm-package-key.asc
new file mode 100644
index 000..944f21f
--- /dev/null
+++ b/repo/rpm-package-key.asc
@@ -0,0 +1,87 @@
+-BEGIN PGP PUBLIC KEY BLOCK-
+
+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

[couchdb-www] branch asf-site updated: add new repo signing key

[wohali]

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

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


The following commit(s) were added to refs/heads/asf-site by this push:
 new b4454fc  add new repo signing key
b4454fc is described below

commit b4454fc10b42220a4e1611eb5e506d59bf10e2ab
Author: Joan Touzet 
AuthorDate: Sun Apr 25 01:28:01 2021 -0400

add new repo signing key
---
 repo/keys.asc | 64 +++
 1 file changed, 64 insertions(+)

diff --git a/repo/keys.asc b/repo/keys.asc
new file mode 100644
index 000..b70b985
--- /dev/null
+++ b/repo/keys.asc
@@ -0,0 +1,64 @@
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
+Comment: GPGTools - https://gpgtools.org
+
+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
+a7iaf/ZM3apksz3p
+=Kn6W
+-END PGP PUBLIC KEY BLOCK-

[couchdb-pkg] branch main updated: Fixes for bullseye

[wohali]

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-pkg.git


The following commit(s) were added to refs/heads/main by this push:
 new cff02c2  Fixes for bullseye
cff02c2 is described below

commit cff02c2226249267ec85fad2c5b72b159b9002e4
Author: Joan Touzet 
AuthorDate: Wed Apr 21 11:02:13 2021 -0700

Fixes for bullseye
---
 Makefile  | 25 +
 bin/detect-os.sh  |  6 +-
 build.sh  |  2 +-
 debian/control.in |  1 -
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 768d43b..4404621 100644
--- a/Makefile
+++ b/Makefile
@@ -83,6 +83,31 @@ ppc64le-debian-buster: buster
 
 buster: debian
 
+# Debian 11 - bullseye
+debian-bullseye: PLATFORM=bullseye
+debian-bullseye: DIST=debian-bullseye
+debian-bullseye: SPIDERMONKEY=libmozjs-78-0
+debian-bullseye: SPIDERMONKEY_DEV=libmozjs-78-dev
+debian-bullseye: SM_VER=78
+debian-bullseye: bullseye
+
+arm64v8-debian-bullseye: aarch64-debian-bullseye
+aarch64-debian-bullseye: PLATFORM=bullseye
+aarch64-debian-bullseye: DIST=debian-bullseye
+aarch64-debian-bullseye: SPIDERMONKEY=libmozjs-78-0
+aarch64-debian-bullseye: SPIDERMONKEY_DEV=libmozjs-78-dev
+aarch64-debian-bullseye: SM_VER=78
+aarch64-debian-bullseye: bullseye
+
+ppc64le-debian-bullseye: PLATFORM=bullseye
+ppc64le-debian-bullseye: DIST=debian-bullseye
+ppc64le-debian-bullseye: SPIDERMONKEY=libmozjs-78-0
+ppc64le-debian-bullseye: SPIDERMONKEY_DEV=libmozjs-78-dev
+ppc64le-debian-bullseye: SM_VER=78
+ppc64le-debian-bullseye: bullseye
+
+bullseye: debian
+
 
 # Ubuntu 16.04 (Xenial)
 ubuntu-xenial: PLATFORM=xenial
diff --git a/bin/detect-os.sh b/bin/detect-os.sh
index 83ffb51..8359d24 100755
--- a/bin/detect-os.sh
+++ b/bin/detect-os.sh
@@ -82,10 +82,13 @@ case "${OSTYPE}" in
   if [[ ${PRETTY_NAME} =~ "Ubuntu" ]]; then
 # Ubuntu keeps changing the format of /etc/os-release's VERSION, and
 # the codename is buried. Boo. Let's use a fancy regex.
+VERSION_ID=${VERSION_ID:-$(dpkg --status tzdata|grep Provides|cut -f2 
-d'-')}
 VERSION_CODENAME=${VERSION_CODENAME:-$(echo ${VERSION} | sed -E 
's/([0-9.]+)\W+([A-Za-z\,]+)\W+\(?(\w+)(.*)/\L\3/')}
 DISTRIB_CODENAME=${DISTRIB_CODENAME:-${VERSION_CODENAME}}
   elif [[ ${PRETTY_NAME} =~ "Debian" ]]; then
-VERSION_CODENAME=${VERSION_CODENAME:-$(echo ${VERSION} | sed -E 
's/(.*)\(([^\]+)\)/\2/')}
+VERSION_ID=${VERSION_ID:-$(dpkg --status tzdata|grep Provides|cut -f2 
-d'-')}
+VERSION=${VERSION:-${VERSION_ID}}
+VERSION_CODENAME=${VERSION_CODENAME:-$(echo ${VERSION} | sed -E 
's/(.*)\(([^\]+)\)/\2/' | sed -E 's/(.*)\/.*/\1/')}
 DISTRIB_CODENAME=${DISTRIB_CODENAME:-${VERSION_CODENAME}}
   else
 echo "Unknown Debian-like OS ${PRETTY_NAME}, aborting..."
@@ -96,6 +99,7 @@ case "${OSTYPE}" in
   echo "Detected distribution: ${ID}, version ${VERSION_ID} 
(${VERSION_CODENAME})"
 else
   echo "Unable to determine Linux distribution! Aborting."
+  echo "Detected: ID=${ID}, VERSION_ID=${VERSION_ID}, 
VERSION_CODENAME=(${VERSION_CODENAME})"
   exit 1
 fi
 ;;
diff --git a/build.sh b/build.sh
index 1842361..b2b3513 100755
--- a/build.sh
+++ b/build.sh
@@ -28,7 +28,7 @@ set -e
 SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # TODO derive these by interrogating the couchdb-ci repo rather than hard 
coding the list...
-DEBIANS="debian-stretch debian-buster"
+DEBIANS="debian-stretch debian-buster debian-bullseye"
 UBUNTUS="ubuntu-xenial ubuntu-bionic ubuntu-focal"
 CENTOSES="centos-7 centos-8"
 XPLAT_BASE="debian-buster"
diff --git a/debian/control.in b/debian/control.in
index a5e6e71..03437f9 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,7 +5,6 @@ Maintainer: CouchDB Developers 
 Standards-Version: 3.9.6
 Build-Depends: debhelper (>= 9),
dh-exec,
-   dh-systemd (>= 1.5),
erlang-dev (>= 1:19.2.1) | esl-erlang (>= 1:19.2.1),
erlang-crypto | esl-erlang,
erlang-dialyzer | esl-erlang,

[couchdb-ci] branch main updated: bugfixes; bullseye working

[wohali]

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-ci.git


The following commit(s) were added to refs/heads/main by this push:
 new f844f56  bugfixes; bullseye working
f844f56 is described below

commit f844f568a3446f50d9a580e712dfd7461ee95621
Author: Joan Touzet 
AuthorDate: Wed Apr 21 11:01:18 2021 -0700

bugfixes; bullseye working
---
 README.md   |  4 +--
 bin/apt-dependencies.sh | 16 +---
 bin/apt-erlang.sh   |  4 +--
 bin/detect-os.sh|  6 -
 bin/source-erlang.sh| 31 +++
 bin/yum-dependencies.sh |  8 +++---
 build.sh| 14 ---
 dockerfiles/debian-bullseye | 61 +
 8 files changed, 118 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index b3deda6..469e6ba 100644
--- a/README.md
+++ b/README.md
@@ -69,10 +69,10 @@ This only works from an `x86_64` build host.
 First, configure your machine with the correct dependencies to build 
multi-arch binaries:
 
 ```
-docker run --rm --privileged multiarch/qemu-user-static --reset -p yes 
--credential yes
+docker run --privileged --rm tonistiigi/binfmt --install all
 ```
 
-This is a one-time setup step. The `multiarch/qemu-user-static` docker 
container run will install the correct qemu static binaries necessary for 
running foreign architecture binaries on your host machine. It includes special 
magic to ensure `sudo` works correctly inside a container, too.
+This is a one-time setup step. This docker container run will install the 
correct qemu static binaries necessary for running foreign architecture 
binaries on your host machine. It includes special magic to ensure `sudo` works 
correctly inside a container, too.
 
 Then, override the `CONTAINERARCH` environment variable when starting 
`build.sh`:
 
diff --git a/bin/apt-dependencies.sh b/bin/apt-dependencies.sh
index f0a7ebc..d1c058b 100755
--- a/bin/apt-dependencies.sh
+++ b/bin/apt-dependencies.sh
@@ -68,14 +68,19 @@ apt-get install --no-install-recommends -y 
apt-transport-https curl git pkg-conf
 build-essential ca-certificates libcurl4-openssl-dev \
 libicu-dev libnspr4-dev \
 help2man python3-sphinx \
-curl debhelper devscripts dh-exec dh-python dh-systemd equivs \
+curl debhelper devscripts dh-exec dh-python equivs \
 dialog equivs lintian libwww-perl quilt \
 reprepro rsync \
 vim-tiny screen procps dirmngr ssh-client
 
-# python 2 based; gone from focal / bullseye. look for createrepo_c eventually
-# hopefully via: 
https://github.com/rpm-software-management/createrepo_c/issues/145
-apt-get install --no-install-recommends -y createrepo || true
+# createrepo_c or createrepo, depending on packaging support
+if [ ${VERSION_CODENAME} == "bullseye" ]; then
+  apt-get install --no-install-recommends -y createrepo-c || true
+else
+  # python 2 based; gone from focal / bullseye. look for createrepo_c 
eventually
+  # hopefully via: 
https://github.com/rpm-software-management/createrepo_c/issues/145
+  apt-get install --no-install-recommends -y createrepo || true
+fi
 
 if [ ${VERSION_CODENAME} == "xenial" ]; then
   apt remove -y python3-venv
@@ -176,6 +181,9 @@ if [ "$1" != "nojs" ]; then
   if [ "${VERSION_CODENAME}" == "focal" ]; then
 apt-get install --no-install-recommends -y libmozjs-68-dev
   fi
+  if [ "${VERSION_CODENAME}" == "bullseye" ]; then
+apt-get install --no-install-recommends -y libmozjs-78-dev
+  fi
 else
   # install js build-time dependencies only
   # we can't add the CouchDB repo here because the plat may not exist yet
diff --git a/bin/apt-erlang.sh b/bin/apt-erlang.sh
index 81a7c9e..ee1adb0 100755
--- a/bin/apt-erlang.sh
+++ b/bin/apt-erlang.sh
@@ -68,10 +68,10 @@ then
 elif [ "${ARCH}" = x86_64 ] && [ "${ERLANGVERSION}" != "all" ]
 then
   wget https://packages.erlang-solutions.com/erlang-solutions_2.0_all.deb
-  dpkg -i erlang-solutions_*_all.deb
+  dpkg -i erlang-solutions_*_all.deb || true
   rm erlang-solutions_*_all.deb
   # bionic is broken...
-  sed -i 's/debian  contrib/debian ${VERSION} contrib/' 
/etc/apt/sources.list.d/erlang-solutions.list
+  sed -i 's/debian  contrib/debian ${VERSION} contrib/' 
/etc/apt/sources.list.d/erlang-solutions.list || true
   if [[ ${ERLANGVERSION} == "19.3.6" && ${VERSION} == "bionic" ]]; then
 ERLANGVERSION=19.3.6.8
   fi
diff --git a/bin/detect-os.sh b/bin/detect-os.sh
index 83ffb51..8359d24 100755
--- a/bin/detect-os.sh
+++ b/bin/detect-os.sh
@@ -82,10 +82,13 @@ case "${OSTYPE}" in
   if [[ ${PRETTY_NAME} =~ "Ubuntu" ]]; then
 # Ubuntu keeps changing the format of /etc/os-release's VERSION, and
 # the codename is buri

[couchdb] branch main updated: Add docker creds to CI run (#3508) (#3509)

[wohali]

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.git


The following commit(s) were added to refs/heads/main by this push:
 new 403d27b  Add docker creds to CI run (#3508) (#3509)
403d27b is described below

commit 403d27b16f5209f918766dc62a8b0d039080fd32
Author: Joan Touzet 
AuthorDate: Wed Apr 14 18:00:49 2021 +

Add docker creds to CI run (#3508) (#3509)
---
 build-aux/Jenkinsfile.full | 22 ++
 build-aux/Jenkinsfile.pr   |  2 ++
 2 files changed, 24 insertions(+)

diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index fbd76d9..ecdf476 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -83,6 +83,8 @@ pipeline {
   label 'docker'
   image 'couchdbdev/debian-stretch-erlang-20.3.8.25-1:latest'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   options {
@@ -200,6 +202,8 @@ pipeline {
   image 'couchdbdev/centos-7-erlang-20.3.8.25-1:latest'
   label 'docker'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   environment {
@@ -244,6 +248,8 @@ pipeline {
   image 'couchdbdev/centos-8-erlang-20.3.8.25-1:latest'
   label 'docker'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   environment {
@@ -288,6 +294,8 @@ pipeline {
   image 'couchdbdev/ubuntu-xenial-erlang-20.3.8.25-1:latest'
   label 'docker'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   environment {
@@ -331,6 +339,8 @@ pipeline {
   image 'couchdbdev/ubuntu-bionic-erlang-20.3.8.25-1:latest'
   label 'docker'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   environment {
@@ -374,6 +384,8 @@ pipeline {
   image 'couchdbdev/ubuntu-focal-erlang-20.3.8.25-1:latest'
   label 'docker'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   environment {
@@ -417,6 +429,8 @@ pipeline {
   image 'couchdbdev/debian-stretch-erlang-20.3.8.25-1:latest'
   label 'docker'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   environment {
@@ -460,6 +474,8 @@ pipeline {
   image 'couchdbdev/debian-buster-erlang-20.3.8.25-1:latest'
   label 'docker'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   environment {
@@ -504,6 +520,8 @@ pipeline {
   image 
'couchdbdev/arm64v8-debian-buster-erlang-20.3.8.25-1:latest'
   label 'arm64v8'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   environment {
@@ -551,6 +569,8 @@ pipeline {
 //  image 
'couchdbdev/ppc64le-debian-buster-erlang-20.3.8.25-1:latest'
 //  label 'ppc64le'
 //  args "${DOCKER_ARGS}"
+//  registryUrl 'https://docker.io/'
+//  registryCredentialsId 'dockerhub_creds'
 //}
 //  }
 //  environment {
@@ -664,6 +684,8 @@ pipeline {
   image 'couchdbdev/debian-buster-erlang-20.3.8.25-1:latest'
   label 'docker'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   options {
diff --git a/build-aux/Jenkinsfile.pr b/build-aux/Jenkinsfile.pr
index 718dba1..16b8c47 100644
--- a/build-aux/Jenkinsfile.pr
+++ b/build-aux/Jenkinsfile.pr
@@ -69,6 +69,8 @@ pipeline {
   image "${DOCKER_IMAGE}"
   label 'docker'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   options {

[couchdb] 01/01: Add docker creds to CI run (#3508)

[wohali]

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

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

commit 0a817ab90c87d520488393f28263850cccaab132
Author: Joan Touzet 
AuthorDate: Wed Apr 14 17:08:04 2021 +

Add docker creds to CI run (#3508)
---
 build-aux/Jenkinsfile.full | 22 ++
 build-aux/Jenkinsfile.pr   |  2 ++
 2 files changed, 24 insertions(+)

diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index fbd76d9..ecdf476 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -83,6 +83,8 @@ pipeline {
   label 'docker'
   image 'couchdbdev/debian-stretch-erlang-20.3.8.25-1:latest'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   options {
@@ -200,6 +202,8 @@ pipeline {
   image 'couchdbdev/centos-7-erlang-20.3.8.25-1:latest'
   label 'docker'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   environment {
@@ -244,6 +248,8 @@ pipeline {
   image 'couchdbdev/centos-8-erlang-20.3.8.25-1:latest'
   label 'docker'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   environment {
@@ -288,6 +294,8 @@ pipeline {
   image 'couchdbdev/ubuntu-xenial-erlang-20.3.8.25-1:latest'
   label 'docker'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   environment {
@@ -331,6 +339,8 @@ pipeline {
   image 'couchdbdev/ubuntu-bionic-erlang-20.3.8.25-1:latest'
   label 'docker'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   environment {
@@ -374,6 +384,8 @@ pipeline {
   image 'couchdbdev/ubuntu-focal-erlang-20.3.8.25-1:latest'
   label 'docker'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   environment {
@@ -417,6 +429,8 @@ pipeline {
   image 'couchdbdev/debian-stretch-erlang-20.3.8.25-1:latest'
   label 'docker'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   environment {
@@ -460,6 +474,8 @@ pipeline {
   image 'couchdbdev/debian-buster-erlang-20.3.8.25-1:latest'
   label 'docker'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   environment {
@@ -504,6 +520,8 @@ pipeline {
   image 
'couchdbdev/arm64v8-debian-buster-erlang-20.3.8.25-1:latest'
   label 'arm64v8'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   environment {
@@ -551,6 +569,8 @@ pipeline {
 //  image 
'couchdbdev/ppc64le-debian-buster-erlang-20.3.8.25-1:latest'
 //  label 'ppc64le'
 //  args "${DOCKER_ARGS}"
+//  registryUrl 'https://docker.io/'
+//  registryCredentialsId 'dockerhub_creds'
 //}
 //  }
 //  environment {
@@ -664,6 +684,8 @@ pipeline {
   image 'couchdbdev/debian-buster-erlang-20.3.8.25-1:latest'
   label 'docker'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   options {
diff --git a/build-aux/Jenkinsfile.pr b/build-aux/Jenkinsfile.pr
index 718dba1..16b8c47 100644
--- a/build-aux/Jenkinsfile.pr
+++ b/build-aux/Jenkinsfile.pr
@@ -69,6 +69,8 @@ pipeline {
   image "${DOCKER_IMAGE}"
   label 'docker'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   options {

[couchdb] branch main-jenkins-creds created (now 0a817ab)

[wohali]

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

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


  at 0a817ab  Add docker creds to CI run (#3508)

This branch includes the following new commits:

 new 0a817ab  Add docker creds to CI run (#3508)

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[couchdb] branch 3.x updated: Add docker creds to CI run (#3508)

[wohali]

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

wohali pushed a commit to branch 3.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/3.x by this push:
 new 098c5a2  Add docker creds to CI run (#3508)
098c5a2 is described below

commit 098c5a2a60781634a3fc68f4529ce80d7923e908
Author: Joan Touzet 
AuthorDate: Wed Apr 14 17:08:04 2021 +

Add docker creds to CI run (#3508)
---
 build-aux/Jenkinsfile.full | 22 ++
 build-aux/Jenkinsfile.pr   |  2 ++
 2 files changed, 24 insertions(+)

diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index 208723e..1c93472 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -83,6 +83,8 @@ pipeline {
   label 'docker'
   image 'apache/couchdbci-debian:buster-erlang-20.3.8.26-1'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   options {
@@ -200,6 +202,8 @@ pipeline {
   image 'apache/couchdbci-centos:7-erlang-20.3.8.26-1'
   label 'docker'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   environment {
@@ -244,6 +248,8 @@ pipeline {
   image 'apache/couchdbci-centos:8-erlang-20.3.8.26-1'
   label 'docker'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   environment {
@@ -288,6 +294,8 @@ pipeline {
   image 'apache/couchdbci-ubuntu:xenial-erlang-20.3.8.26-1'
   label 'docker'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   environment {
@@ -331,6 +339,8 @@ pipeline {
   image 'apache/couchdbci-ubuntu:bionic-erlang-20.3.8.26-1'
   label 'docker'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   environment {
@@ -374,6 +384,8 @@ pipeline {
   image 'apache/couchdbci-ubuntu:focal-erlang-20.3.8.26-1'
   label 'docker'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   environment {
@@ -417,6 +429,8 @@ pipeline {
   image 'apache/couchdbci-debian:stretch-erlang-20.3.8.26-1'
   label 'docker'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   environment {
@@ -460,6 +474,8 @@ pipeline {
   image 'apache/couchdbci-debian:buster-erlang-20.3.8.26-1'
   label 'docker'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   environment {
@@ -503,6 +519,8 @@ pipeline {
   image 'apache/couchdbci-debian:arm64v8-buster-erlang-20.3.8.26-1'
   label 'arm64v8'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   environment {
@@ -550,6 +568,8 @@ pipeline {
 //  image 
'apache/couchdbci-debian:ppc64le-buster-erlang-20.3.8.26-1'
 //  label 'ppc64le'
 //  args "${DOCKER_ARGS}"
+//  registryUrl 'https://docker.io/'
+//  registryCredentialsId 'dockerhub_creds'
 //}
 //  }
 //  environment {
@@ -663,6 +683,8 @@ pipeline {
   image 'apache/couchdbci-debian:buster-erlang-20.3.8.26-1'
   label 'docker'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   options {
diff --git a/build-aux/Jenkinsfile.pr b/build-aux/Jenkinsfile.pr
index 46cda1d..8f9d6f1 100644
--- a/build-aux/Jenkinsfile.pr
+++ b/build-aux/Jenkinsfile.pr
@@ -69,6 +69,8 @@ pipeline {
   image "${DOCKER_IMAGE}"
   label 'docker'
   args "${DOCKER_ARGS}"
+  registryUrl 'https://docker.io/'
+  registryCredentialsId 'dockerhub_creds'
 }
   }
   options {

[couchdb] branch jenkins-creds updated (ad07cd6 -> 956ec4e)

[wohali]

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

wohali pushed a change to branch jenkins-creds
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


 discard ad07cd6  Add docker creds to CI run
 add 956ec4e  Add docker creds to CI run

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (ad07cd6)
\
 N -- N -- N   refs/heads/jenkins-creds (956ec4e)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 build-aux/Jenkinsfile.full | 22 ++
 1 file changed, 22 insertions(+)

[couchdb] branch jenkins-creds updated (33870c0 -> ad07cd6)

[wohali]

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

wohali pushed a change to branch jenkins-creds
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


 discard 33870c0  Add docker creds to CI run
 add ad07cd6  Add docker creds to CI run

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (33870c0)
\
 N -- N -- N   refs/heads/jenkins-creds (ad07cd6)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 build-aux/Jenkinsfile.pr | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

[couchdb] branch jenkins-creds updated (30835f9 -> 33870c0)

[wohali]

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

wohali pushed a change to branch jenkins-creds
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


 discard 30835f9  Add docker creds to CI run
 add 33870c0  Add docker creds to CI run

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (30835f9)
\
 N -- N -- N   refs/heads/jenkins-creds (33870c0)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 build-aux/Jenkinsfile.pr | 1 +
 1 file changed, 1 insertion(+)

[couchdb] 01/01: Add docker creds to CI run

[wohali]

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

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

commit 30835f9ef6e5a3271270b87f1220952b79ff5967
Author: Joan Touzet 
AuthorDate: Wed Apr 14 12:08:36 2021 -0400

Add docker creds to CI run
---
 build-aux/Jenkinsfile.pr | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build-aux/Jenkinsfile.pr b/build-aux/Jenkinsfile.pr
index 46cda1d..f86a829 100644
--- a/build-aux/Jenkinsfile.pr
+++ b/build-aux/Jenkinsfile.pr
@@ -39,6 +39,7 @@ pipeline {
 GIT_COMMITTER_NAME = 'Jenkins User'
 GIT_COMMITTER_EMAIL = 'couc...@apache.org'
 // Parameters for the matrix build
+DOCKERHUB_CREDS = credentials('dockerhub_creds')
 DOCKER_IMAGE = 'apache/couchdbci-debian:buster-erlang-all'
 // https://github.com/jenkins-infra/jenkins.io/blob/master/Jenkinsfile#64
 // We need the jenkins user mapped inside of the image
@@ -69,6 +70,7 @@ pipeline {
   image "${DOCKER_IMAGE}"
   label 'docker'
   args "${DOCKER_ARGS}"
+  registryCredentialsId '${DOCKERHUB_CREDS}'
 }
   }
   options {

[couchdb] branch jenkins-creds created (now 30835f9)

[wohali]

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

wohali pushed a change to branch jenkins-creds
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


  at 30835f9  Add docker creds to CI run

This branch includes the following new commits:

 new 30835f9  Add docker creds to CI run

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[couchdb] branch 3.x updated: [CI] Move to new containers for full build (#3505)

[wohali]

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

wohali pushed a commit to branch 3.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/3.x by this push:
 new 1d987ae  [CI] Move to new containers for full build (#3505)
1d987ae is described below

commit 1d987aed7d964e6346df3f128d5dc2724da1
Author: Joan Touzet 
AuthorDate: Wed Apr 14 05:16:12 2021 +

[CI] Move to new containers for full build (#3505)
---
 build-aux/Jenkinsfile.full | 74 +-
 1 file changed, 14 insertions(+), 60 deletions(-)

diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index 2a4692c..208723e 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -81,7 +81,7 @@ pipeline {
   agent {
 docker {
   label 'docker'
-  image 'couchdbdev/debian-stretch-erlang-20.3.8.25-1:latest'
+  image 'apache/couchdbci-debian:buster-erlang-20.3.8.26-1'
   args "${DOCKER_ARGS}"
 }
   }
@@ -194,53 +194,10 @@ pipeline {
   } // post
 } // stage macOS
 
-stage('CentOS 6') {
-  agent {
-docker {
-  image 'couchdbdev/centos-6-erlang-20.3.8.25-1:latest'
-  label 'docker'
-  args "${DOCKER_ARGS}"
-}
-  }
-  environment {
-platform = 'centos6'
-sm_ver = '1.8.5'
-  }
-  stages {
-stage('Build from tarball & test') {
-  steps {
-unstash 'tarball'
-sh( script: build_and_test )
-  }
-  post {
-always {
-  junit '**/.eunit/*.xml, **/_build/*/lib/couchdbtest/*.xml, 
**/src/mango/nosetests.xml, **/test/javascript/junit.xml'
-}
-  }
-}
-stage('Build CouchDB packages') {
-  steps {
-sh( script: make_packages )
-sh( script: cleanup_and_save )
-  }
-  post {
-success {
-  archiveArtifacts artifacts: 'pkgs/**', fingerprint: true
-}
-  }
-}
-  } // stages
-  post {
-cleanup {
-  sh 'rm -rf ${WORKSPACE}/*'
-}
-  } // post
-} // stage
-
 stage('CentOS 7') {
   agent {
 docker {
-  image 'couchdbdev/centos-7-erlang-20.3.8.25-1:latest'
+  image 'apache/couchdbci-centos:7-erlang-20.3.8.26-1'
   label 'docker'
   args "${DOCKER_ARGS}"
 }
@@ -284,7 +241,7 @@ pipeline {
 stage('CentOS 8') {
   agent {
 docker {
-  image 'couchdbdev/centos-8-erlang-20.3.8.25-1:latest'
+  image 'apache/couchdbci-centos:8-erlang-20.3.8.26-1'
   label 'docker'
   args "${DOCKER_ARGS}"
 }
@@ -328,7 +285,7 @@ pipeline {
 stage('Ubuntu Xenial') {
   agent {
 docker {
-  image 'couchdbdev/ubuntu-xenial-erlang-20.3.8.25-1:latest'
+  image 'apache/couchdbci-ubuntu:xenial-erlang-20.3.8.26-1'
   label 'docker'
   args "${DOCKER_ARGS}"
 }
@@ -371,7 +328,7 @@ pipeline {
 stage('Ubuntu Bionic') {
   agent {
 docker {
-  image 'couchdbdev/ubuntu-bionic-erlang-20.3.8.25-1:latest'
+  image 'apache/couchdbci-ubuntu:bionic-erlang-20.3.8.26-1'
   label 'docker'
   args "${DOCKER_ARGS}"
 }
@@ -414,7 +371,7 @@ pipeline {
 stage('Ubuntu Focal') {
   agent {
 docker {
-  image 'couchdbdev/ubuntu-focal-erlang-20.3.8.25-1:latest'
+  image 'apache/couchdbci-ubuntu:focal-erlang-20.3.8.26-1'
   label 'docker'
   args "${DOCKER_ARGS}"
 }
@@ -457,7 +414,7 @@ pipeline {
 stage('Debian Stretch') {
   agent {
 docker {
-  image 'couchdbdev/debian-stretch-erlang-20.3.8.25-1:latest'
+  image 'apache/couchdbci-debian:stretch-erlang-20.3.8.26-1'
   label 'docker'
   args "${DOCKER_ARGS}"
 }
@@ -500,7 +457,7 @@ pipeline {
 stage('Debian Buster amd64') {
   agent {
 docker {
-  image 'couchdbdev/debian-buster-erlang-20.3.8.25-1:latest'
+  image 'apache/couchdbci-debian:buster-erlang-20.3.8.26-1'
   label 'docker'
   args "${DOCKER_ARGS}"
 }
@@ -543,7 +500,7 @@ pipeline {
 stage('Debian Buster arm64v8') {
   agent {
 docker {
-  image 
'couchdbdev/arm64v8-debian-

[couchdb] branch jenkins-3.x-new-containers updated (644dba6 -> eb567a1)

[wohali]

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

wohali pushed a change to branch jenkins-3.x-new-containers
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


 discard 644dba6  [CI] Move to new containers for full build
 add eb567a1  [CI] Move to new containers for full build

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (644dba6)
\
 N -- N -- N   refs/heads/jenkins-3.x-new-containers (eb567a1)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 build-aux/Jenkinsfile.full | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

[couchdb-ci] branch main updated: bump pull script for new hub location

[wohali]

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-ci.git


The following commit(s) were added to refs/heads/main by this push:
 new 4cff856  bump pull script for new hub location
4cff856 is described below

commit 4cff8560fd7a1233709836d82ff46c682094f675
Author: Joan Touzet 
AuthorDate: Tue Apr 13 21:28:12 2021 -0700

bump pull script for new hub location
---
 pull-all-couchdbdev-docker | 92 +++---
 1 file changed, 21 insertions(+), 71 deletions(-)

diff --git a/pull-all-couchdbdev-docker b/pull-all-couchdbdev-docker
index 435ccec..050db39 100644
--- a/pull-all-couchdbdev-docker
+++ b/pull-all-couchdbdev-docker
@@ -1,82 +1,32 @@
 #!/bin/bash
 
-DOCKER_ORG="couchdbdev"
+DOCKER_ORG="apache"
 
 # These are the images that are currently being used, so don't `docker rmi` 
them on cleanup.
 KEEP_IMAGES=(
-debian-buster-erlang-all
-centos-8-erlang-20.3.8.25-1
-centos-7-erlang-20.3.8.25-1
-centos-6-erlang-20.3.8.25-1
-ubuntu-focal-erlang-20.3.8.25-1
-ubuntu-bionic-erlang-20.3.8.25-1
-ubuntu-xenial-erlang-20.3.8.25-1
-debian-buster-erlang-20.3.8.25-1
-debian-stretch-erlang-20.3.8.25-1
-# ppc64le-debian-buster-erlang-20.3.8.25-1
-arm64v8-debian-buster-erlang-20.3.8.25-1
-debian-stretch-erlang-19.3.6
-centos-7-erlang-19.3.6
-centos-6-erlang-19.3.6
+couchdbci-debian:stretch-erlang-20.3.8.26-1
+couchdbci-debian:buster-erlang-20.3.8.26-1
+couchdbci-debian:arm64v8-buster-erlang-20.3.8.26-1
+couchdbci-debian:buster-erlang-all
+couchdbci-centos:8-erlang-20.3.8.26-1
+couchdbci-centos:7-erlang-20.3.8.26-1
+couchdbci-ubuntu:focal-erlang-20.3.8.26-1
+couchdbci-ubuntu:bionic-erlang-20.3.8.26-1
+couchdbci-ubuntu:xenial-erlang-20.3.8.26-1
 )
 
 # Base images are used for building old libmozjs, primarily.
 BASE_IMAGES=(
-aarch64-debian-stretch-base
-arm64v8-debian-buster-base
-centos-6-base
-centos-7-base
-centos-8-base
-debian-buster-base
-debian-jessie-base
-debian-stretch-base
-ppc64le-debian-buster-base
-ubuntu-bionic-base
-ubuntu-trusty-base
-ubuntu-xenial-base
+couchdbci-debian:ppc64le-stretch-base
 )
 # These images layer in the rest of the CouchDB build chain, and 1 or more 
Erlang versions.
 IMAGES=(
-aarch64-debian-stretch-erlang-20.3.8.20
-#arm64v8-debian-buster-erlang-20.3.8.22-1
-#arm64v8-debian-buster-erlang-20.3.8.24-1
-arm64v8-debian-buster-erlang-20.3.8.25-1
-arm64v8-debian-stretch-erlang-20.3.8.22-1
-centos-6-erlang-19.3.6
-#centos-6-erlang-20.3.8.22-1
-#centos-6-erlang-20.3.8.24-1
-centos-6-erlang-20.3.8.25-1
-centos-7-erlang-19.3.6
-#centos-7-erlang-20.3.8.22-1
-#centos-7-erlang-20.3.8.24-1
-centos-7-erlang-20.3.8.25-1
-#centos-8-erlang-20.3.8.22-1
-#centos-8-erlang-20.3.8.24-1
-centos-8-erlang-20.3.8.25-1
-#debian-buster-erlang-20.3.8.22-1
-#debian-buster-erlang-20.3.8.24-1
-debian-buster-erlang-20.3.8.25-1
-debian-buster-erlang-all
-debian-jessie-erlang-17.5.3
-debian-jessie-erlang-19.3.6
-debian-stretch-erlang-19.3.6
-#debian-stretch-erlang-20.3.8.22-1
-#debian-stretch-erlang-20.3.8.24-1
-debian-stretch-erlang-20.3.8.25-1
-ppc64le-debian-buster-erlang-20.3.8.25-1
-s390x-debian-buster-erlang-20.3.8.25-1
-ubuntu-12.04-erlang-18.3
-ubuntu-bionic-erlang-19.3.6
-#ubuntu-bionic-erlang-20.3.8.22-1
-#ubuntu-bionic-erlang-20.3.8.24-1
-ubuntu-bionic-erlang-20.3.8.25-1
-ubuntu-focal-erlang-20.3.8.25-1
-ubuntu-trusty-erlang-19.3.6
-ubuntu-trusty-erlang-default
-ubuntu-xenial-erlang-19.3.6
-#ubuntu-xenial-erlang-20.3.8.22-1
-#ubuntu-xenial-erlang-20.3.8.24-1
-ubuntu-xenial-erlang-20.3.8.25-1
+couchdbci-debian:arm64v8-buster-erlang-20.3.8.25-1
+couchdbci-debian:ppc64le-buster-erlang-20.3.8.25-1
+couchdbci-centos:6-erlang-20.3.8.25-1
+couchdbci-centos:6-erlang-19.3.6
+couchdbci-centos:7-erlang-19.3.6
+couchdbci-debian:stretch-erlang-19.3.6
 )
 
 if [ "$(date +%u)" -ne "1" ]; then
@@ -87,12 +37,12 @@ fi
 
 for image in ${LIST[*]}
 do
-echo docker pull couchdbdev/${image}
-docker pull couchdbdev/${image}
+echo docker pull ${DOCKER_ORG}/${image}
+docker pull ${DOCKER_ORG}/${image}
 # We don't want to delete the current working set of images.
 if ! printf '%s\n' "${KEEP_IMAGES[@]}" | grep -q -P "^${image}$"; then
-echo docker rmi couchdbdev/$image
-docker rmi couchdbdev/$image
+echo docker rmi ${DOCKER_ORG}/$image
+docker rmi ${DOCKER_ORG}/$image
 fi
 done
 

[couchdb-ci] branch main updated: add ssh-client to debian image for repo creation

[wohali]

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-ci.git


The following commit(s) were added to refs/heads/main by this push:
 new 35e61ce  add ssh-client to debian image for repo creation
35e61ce is described below

commit 35e61ce368f2d773e5a5d79a0c0568f7210d820c
Author: Joan Touzet 
AuthorDate: Tue Apr 13 20:20:32 2021 -0700

add ssh-client to debian image for repo creation
---
 bin/apt-dependencies.sh | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/bin/apt-dependencies.sh b/bin/apt-dependencies.sh
index 25814d3..f0a7ebc 100755
--- a/bin/apt-dependencies.sh
+++ b/bin/apt-dependencies.sh
@@ -71,7 +71,7 @@ apt-get install --no-install-recommends -y 
apt-transport-https curl git pkg-conf
 curl debhelper devscripts dh-exec dh-python dh-systemd equivs \
 dialog equivs lintian libwww-perl quilt \
 reprepro rsync \
-vim-tiny screen procps dirmngr
+vim-tiny screen procps dirmngr ssh-client
 
 # python 2 based; gone from focal / bullseye. look for createrepo_c eventually
 # hopefully via: 
https://github.com/rpm-software-management/createrepo_c/issues/145
@@ -198,7 +198,11 @@ else
   git clone https://github.com/apple/foundationdb/
   cd foundationdb && git checkout 6.3.9
   mkdir .build && cd .build
-  cmake -G Ninja ..
+  if [ "${ARCH}" == "ppc64le" ]; then
+cmake -DCMAKE_CXX_FLAGS="-DNO_WARN_X86_INTRINSICS" -G Ninja ..
+  else
+cmake -G Ninja ..
+  fi
   ninja -j2
   fakeroot cpack -G DEB
   # see 
https://forums.foundationdb.org/t/possible-missing-dependency-in-6-3-x-deb-package/2579
@@ -206,6 +210,7 @@ else
   mkdir -p /var/lib/foundationdb/data
   dpkg -i packages/foundationdb-clients*deb packages/foundationdb-server*deb 
|| true
   apt purge -y cmake mono-devel ninja-build libboost-all-dev liblz4-dev 
dos2unix
+  apt autoremove -y
   cd ../../ && rm -rf foundationdb
 fi
 

[couchdb-pkg] branch main updated: bump detect-os for centos 8 (from couchdb-ci)

[wohali]

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-pkg.git


The following commit(s) were added to refs/heads/main by this push:
 new 65cb69d  bump detect-os for centos 8 (from couchdb-ci)
65cb69d is described below

commit 65cb69d54c2d31d8021278b6a84b84fe8693dea3
Author: Joan Touzet 
AuthorDate: Tue Apr 13 19:01:43 2021 -0700

bump detect-os for centos 8 (from couchdb-ci)
---
 bin/detect-os.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/detect-os.sh b/bin/detect-os.sh
index f664f33..83ffb51 100755
--- a/bin/detect-os.sh
+++ b/bin/detect-os.sh
@@ -68,7 +68,7 @@ case "${OSTYPE}" in
 # and finally some rough heuristics
 if [[ -f /etc/redhat-release ]]; then
   # /etc/redhat-release is so inconsistent, we use rpm instead
-  rhelish=$(rpm -qa 
'(redhat|sl|slf|centos|oraclelinux)-release(|-server|-workstation|-client|-computenode)'
 2>/dev/null | head -1)
+  rhelish=$(rpm -qa 
'(redhat|sl|slf|centos|centos-linux|oraclelinux)-release(|-server|-workstation|-client|-computenode)'
 2>/dev/null | head -1)
   if [[ $rhelish ]]; then
 ID=${ID:-$(echo ${rhelish} | awk -F'-' '{print tolower($1)}')}
 VERSION_ID=${VERSION_ID:-$(echo ${rhelish} | sed -E 
's/([^[:digit:]]+)([[:digit:]]+)(.*)/\2/' )}

[couchdb] branch jenkins-3.x-new-containers updated (f14f6c2 -> 644dba6)

[wohali]

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

wohali pushed a change to branch jenkins-3.x-new-containers
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


 discard f14f6c2  [CI] Move to new containers for full build
 add 644dba6  [CI] Move to new containers for full build

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (f14f6c2)
\
 N -- N -- N   refs/heads/jenkins-3.x-new-containers (644dba6)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 build-aux/Jenkinsfile.full | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

[couchdb-pkg] branch main updated: Update for new apache hosted containers, drop CentOS 6

[wohali]

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-pkg.git


The following commit(s) were added to refs/heads/main by this push:
 new 1c97f37  Update for new apache hosted containers, drop CentOS 6
1c97f37 is described below

commit 1c97f373e46f5534b15b38b35fb4acf7a867aeb2
Author: Joan Touzet 
AuthorDate: Tue Apr 13 15:39:25 2021 -0700

Update for new apache hosted containers, drop CentOS 6
---
 .gitignore |  2 ++
 build.sh   | 31 ---
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0d70b4a..d630ae8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,5 @@ prime/
 snap/.snapcraft/
 stage/
 *.tar.gz
+*.bak
+*~
diff --git a/build.sh b/build.sh
index 6f1041d..1842361 100755
--- a/build.sh
+++ b/build.sh
@@ -27,26 +27,36 @@ set -e
 # otherwise, see https://stackoverflow.com/questions/59895/
 SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-# TODO derive these by interrogating the repo rather than hard coding the list
-DEBIANS="debian-stretch debian-buster arm64v8-debian-buster 
ppc64le-debian-buster"
+# TODO derive these by interrogating the couchdb-ci repo rather than hard 
coding the list...
+DEBIANS="debian-stretch debian-buster"
 UBUNTUS="ubuntu-xenial ubuntu-bionic ubuntu-focal"
-CENTOSES="centos-6 centos-7 centos-8"
+CENTOSES="centos-7 centos-8"
+XPLAT_BASE="debian-buster"
+XPLAT_ARCHES="arm64v8 ppc64le"
 BINTRAY_API="https://api.bintray.com;
-ERLANGVERSION=${ERLANGVERSION:-20.3.8.25-1}
+ERLANGVERSION=${ERLANGVERSION:-20.3.8.26-1}
 
+split-os-ver() {
+  OLDIFS=$IFS
+  IFS='-' tokens=( $1 )
+  IFS=$OLDIFS
+  os=${tokens[0]}
+  version=${tokens[1]}
+}
 
 build-js() {
   # TODO: check if image is built first, if not, complain
   # invoke as build-js 
+  split-os-ver $1
   if [[ ${TRAVIS} == "true" ]]; then
 docker run \
 --mount type=bind,src=${SCRIPTPATH},dst=/home/jenkins/couchdb-pkg \
--u 0 couchdbdev/$1-base \
+-u 0 apache/couchdbci-${os}:${CONTAINERARCH}${version}-base \
 /home/jenkins/couchdb-pkg/bin/build-js.sh
   else
 docker run \
 --mount type=bind,src=${SCRIPTPATH},dst=/home/jenkins/couchdb-pkg \
-couchdbdev/$1-base \
+apache/couchdbci-${os}:${CONTAINERARCH}${version}-base \
 sudo /home/jenkins/couchdb-pkg/bin/build-js.sh
   fi
 }
@@ -56,6 +66,9 @@ build-all-js() {
   for plat in $DEBIANS $UBUNTUS $CENTOSES; do
 build-js $plat
   done
+  for arch in $XPLAT_ARCHES; do
+CONTAINERARCH="${arch}-" build-js $XPLAT_BASE
+  done
 }
 
 bintray-check-credentials() {
@@ -156,13 +169,14 @@ get-couch-tarball() {
 }
 
 build-couch() {
+  split-os-ver $1
   # We will be changing user to 'jenkins' - ensure it has write permissions
   chmod a+rwx pkgs pkgs/couch pkgs/js
   # $1 is plat, $2 is the optional path to a dist tarball
   docker run \
   --mount type=bind,src=${SCRIPTPATH},dst=/home/jenkins/couchdb-pkg \
   -u 0 -w /home/jenkins/couchdb-pkg \
-  couchdbdev/$1-erlang-${ERLANGVERSION} \
+  
apache/couchdbci-${os}:${CONTAINERARCH}${version}-erlang-${ERLANGVERSION} \
   make copy-couch $1 COUCHTARBALL=${COUCHTARBALL}
   make clean
 }
@@ -172,6 +186,9 @@ build-all-couch() {
   for plat in $DEBIANS $UBUNTUS $CENTOSES; do
 build-couch $plat $*
   done
+  for arch in $XPLAT_ARCHES; do
+CONTAINERARCH="${arch}-" build-couch $XPLAT_BASE
+  done
 }
 
 upload-couch() {

[couchdb] 01/01: [CI] Move to new containers for full build

[wohali]

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

wohali pushed a commit to branch jenkins-3.x-new-containers
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit f14f6c2291b9a8f4c4007b08a704adae1bfa4fa0
Author: Joan Touzet 
AuthorDate: Tue Apr 13 18:12:25 2021 -0400

[CI] Move to new containers for full build
---
 build-aux/Jenkinsfile.full | 69 +-
 1 file changed, 13 insertions(+), 56 deletions(-)

diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index 2a4692c..3869d3d 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -81,7 +81,7 @@ pipeline {
   agent {
 docker {
   label 'docker'
-  image 'couchdbdev/debian-stretch-erlang-20.3.8.25-1:latest'
+  image 'apache/couchdbci-debian:buster-erlang-20.3.8.26-1:latest'
   args "${DOCKER_ARGS}"
 }
   }
@@ -194,53 +194,10 @@ pipeline {
   } // post
 } // stage macOS
 
-stage('CentOS 6') {
-  agent {
-docker {
-  image 'couchdbdev/centos-6-erlang-20.3.8.25-1:latest'
-  label 'docker'
-  args "${DOCKER_ARGS}"
-}
-  }
-  environment {
-platform = 'centos6'
-sm_ver = '1.8.5'
-  }
-  stages {
-stage('Build from tarball & test') {
-  steps {
-unstash 'tarball'
-sh( script: build_and_test )
-  }
-  post {
-always {
-  junit '**/.eunit/*.xml, **/_build/*/lib/couchdbtest/*.xml, 
**/src/mango/nosetests.xml, **/test/javascript/junit.xml'
-}
-  }
-}
-stage('Build CouchDB packages') {
-  steps {
-sh( script: make_packages )
-sh( script: cleanup_and_save )
-  }
-  post {
-success {
-  archiveArtifacts artifacts: 'pkgs/**', fingerprint: true
-}
-  }
-}
-  } // stages
-  post {
-cleanup {
-  sh 'rm -rf ${WORKSPACE}/*'
-}
-  } // post
-} // stage
-
 stage('CentOS 7') {
   agent {
 docker {
-  image 'couchdbdev/centos-7-erlang-20.3.8.25-1:latest'
+  image 'apache/couchdbci-centos:7-erlang-20.3.8.26-1:latest'
   label 'docker'
   args "${DOCKER_ARGS}"
 }
@@ -284,7 +241,7 @@ pipeline {
 stage('CentOS 8') {
   agent {
 docker {
-  image 'couchdbdev/centos-8-erlang-20.3.8.25-1:latest'
+  image 'apache/couchdbci-centos:8-erlang-20.3.8.26-1:latest'
   label 'docker'
   args "${DOCKER_ARGS}"
 }
@@ -328,7 +285,7 @@ pipeline {
 stage('Ubuntu Xenial') {
   agent {
 docker {
-  image 'couchdbdev/ubuntu-xenial-erlang-20.3.8.25-1:latest'
+  image 'apache/couchdbci-ubuntu:xenial-erlang-20.3.8.26-1:latest'
   label 'docker'
   args "${DOCKER_ARGS}"
 }
@@ -371,7 +328,7 @@ pipeline {
 stage('Ubuntu Bionic') {
   agent {
 docker {
-  image 'couchdbdev/ubuntu-bionic-erlang-20.3.8.25-1:latest'
+  image 'apache/couchdbci-ubuntu:bionic-erlang-20.3.8.26-1:latest'
   label 'docker'
   args "${DOCKER_ARGS}"
 }
@@ -414,7 +371,7 @@ pipeline {
 stage('Ubuntu Focal') {
   agent {
 docker {
-  image 'couchdbdev/ubuntu-focal-erlang-20.3.8.25-1:latest'
+  image 'apache/couchdbci-ubuntu:focal-erlang-20.3.8.26-1:latest'
   label 'docker'
   args "${DOCKER_ARGS}"
 }
@@ -457,7 +414,7 @@ pipeline {
 stage('Debian Stretch') {
   agent {
 docker {
-  image 'couchdbdev/debian-stretch-erlang-20.3.8.25-1:latest'
+  image 'apache/couchdbci-debian:stretch-erlang-20.3.8.26-1:latest'
   label 'docker'
   args "${DOCKER_ARGS}"
 }
@@ -500,7 +457,7 @@ pipeline {
 stage('Debian Buster amd64') {
   agent {
 docker {
-  image 'couchdbdev/debian-buster-erlang-20.3.8.25-1:latest'
+  image 'apache/couchdbci-debian:buster-erlang-20.3.8.26-1:latest'
   label 'docker'
   args "${DOCKER_ARGS}"
 }
@@ -543,7 +500,7 @@ pipeline {
 stage('Debian Buster arm64v8') {
   agent {
 docker {
-  image 
'couchdbdev/arm64v8-debian-buster-erlang-20.3.8.25-1:latest'
+  image 
'apache/couchdbci-debian:arm64v8-buste

[couchdb] branch jenkins-3.x-new-containers created (now f14f6c2)

[wohali]

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

wohali pushed a change to branch jenkins-3.x-new-containers
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


  at f14f6c2  [CI] Move to new containers for full build

This branch includes the following new commits:

 new f14f6c2  [CI] Move to new containers for full build

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[couchdb] branch 3.x updated: [CI] Move to new containers, expand Erlang matrix (#3504)

[wohali]

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

wohali pushed a commit to branch 3.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/3.x by this push:
 new a27f241  [CI] Move to new containers, expand Erlang matrix (#3504)
a27f241 is described below

commit a27f2416765c9ba238cd18db82686a4e066aa876
Author: Joan Touzet 
AuthorDate: Tue Apr 13 21:59:27 2021 +

[CI] Move to new containers, expand Erlang matrix (#3504)

We now host our CI containers directly under the Apache Docker Hub
org.

In addition, the newly rebuilt buster-erlang-all image has 4 Erlang
releases in it, corresponding to the latest version available in each
supported major release today:

* 20.3.8.26 (against which our 3.2 binaries will be built)
* 21.3.8.22
* 22.3.4.17
* 23.3.1

This PR changes our PR builds to run against all 4 of these versions.
---
 build-aux/Jenkinsfile.pr | 19 ---
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/build-aux/Jenkinsfile.pr b/build-aux/Jenkinsfile.pr
index 718dba1..46cda1d 100644
--- a/build-aux/Jenkinsfile.pr
+++ b/build-aux/Jenkinsfile.pr
@@ -20,7 +20,7 @@ mkdir build
 cd build
 tar -xf ${WORKSPACE}/apache-couchdb-*.tar.gz
 cd apache-couchdb-*
-. /usr/local/kerl/${KERL_VER}/activate
+. /usr/local/kerl/${ERLANG_VERSION}/activate
 ./configure --spidermonkey-version 60
 make check || (make build-report && false)
 '''
@@ -39,18 +39,18 @@ pipeline {
 GIT_COMMITTER_NAME = 'Jenkins User'
 GIT_COMMITTER_EMAIL = 'couc...@apache.org'
 // Parameters for the matrix build
-DOCKER_IMAGE = 'couchdbdev/debian-buster-erlang-all:latest'
+DOCKER_IMAGE = 'apache/couchdbci-debian:buster-erlang-all'
 // https://github.com/jenkins-infra/jenkins.io/blob/master/Jenkinsfile#64
 // We need the jenkins user mapped inside of the image
 // npm config cache below deals with /home/jenkins not mapping correctly
 // inside the image
 DOCKER_ARGS = '-e npm_config_cache=npm-cache -e HOME=. 
-v=/etc/passwd:/etc/passwd -v /etc/group:/etc/group'
-// *** BE SURE TO CHANGE THE ERLANG VERSION FARTHER DOWN S WELL ***
+
+// *** BE SURE TO ALSO CHANGE THE ERLANG VERSIONS FARTHER DOWN ***
 // Search for ERLANG_VERSION
-// see https://issues.jenkins-ci.org/browse/JENKINS-40986
-LOW_ERLANG_VER = '20.3.8.11'
-MID_ERLANG_VER = '20.3.8.25'
-HIGH_ERLANG_VER = '22.2.3'
+// see https://issues.jenkins.io/browse/JENKINS-61047 for why this cannot
+// be done parametrically
+LOW_ERLANG_VER = '20.3.8.26'
   }
 
   options {
@@ -105,7 +105,7 @@ pipeline {
 axes {
   axis {
 name 'ERLANG_VERSION'
-values "20.3.8.11", "20.3.8.25", "22.2.3"
+values '20.3.8.26', '21.3.8.22', '22.3.4.17', '23.3.1'
   }
 }
 
@@ -118,9 +118,6 @@ pipeline {
 args "${DOCKER_ARGS}"
   }
 }
-environment {
-  KERL_VER = "${ERLANG_VERSION}"
-}
 options {
   skipDefaultCheckout()
   timeout(time: 90, unit: "MINUTES")

[couchdb] branch new-pr-jenkinsfile updated (e4aae12 -> 25c3b7d)

[wohali]

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

wohali pushed a change to branch new-pr-jenkinsfile
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


 discard e4aae12  [CI] Move to new containers, expand Erlang matrix
omit 54f3e7c  Merge pull request #3416 from apache/prometheus-endpoint
omit b1f1d1c  add license to missing files
omit f754fad  add prometheus versioning to header
omit b4d3554  add eunit tests
omit 4e5df74  add configurable http server
omit 2ae4775  Add new app couch_prometheus
omit 46b333c  Fix publish stage
omit 2679fda  Disable arm64v8
omit 90cbb8e  Increase timeouts for flaky tests
omit 37b5eed  Add support for Spidermonkey 78 (#3501)
omit d24e295  Bump erlfdb to v1.3.3
omit 7a6ea65  Retryable error fixes in couch_jobs_type_monitor
omit 8843083  remove couch_index_server:validate
omit 8736b98  Validate ddoc uses couch_eval
omit f6f81be  Fix collation issue for older versions of libicu library
omit a085399  Merge pull request #3485 from 
cloudant/configurable_filter_fields
omit 776f920  Improve search for FDB cluster files (#3468)
omit 96bdc21  Make silly list configurable
omit 5cac2c5  Document strip_last_msg in default.ini
omit 9195b05  Display name of tests
omit 371a763  Bump erlfdb to v1.3.2
omit cfe2fd3  Refactor config_test.exs (#3465)
omit acb43e1  Improve retryable FDB error handling
omit 4e6117e  Remove compact elixir test (#3459)
omit 0059b8f  Decrease the view indexer transaction time
omit 2f23dcb  Clean up indexes after each test case in 
couch_views_active_tasks_test
omit a1a3ca0  Require subscribers to wait until indexer finishes
omit c777fc3  Consistent view emits using indexer's GRVs and committed 
versionstamps
omit a7078ee  Increase timeout for continuous filtered changes elixir test 
(#3453)
omit 739db6a  Make "make leaves" replication test less flaky
omit eb94a0e  Increase timeout for process_response in ChangesAsyncTest 
(#3450)
omit f0471ba  Remove CentOS 6 from CI (#3439)
omit 4f0574d  Fix error_logger reports for OTP >= 21
omit 69ed2da  Add more concurrent write tests
omit 36eae8f  Merge pull request #3441 from 
apache/concurrent-write-test-with-updates
omit eeec561  Merge pull request #3440 from cloudant/fix-typo
omit b125036  Add Secondary data tests with updates test
omit 9043204  Fix typo causing not saving of configuration changes from 
chttpd_node
omit a411fe2  feat(couchjs): add support for SpiderMonkey 86
omit 1062435  Fix _changes?filter=_design (#3430)
omit 67061db  Set wait_for_built_index=True for 17-multi-type-value-test.py
omit 7341334  Ignore unchecked JWT claims
omit 6fa2a6f  Include necessary dependency in jwtf keystore test setup & 
teardown
omit 00811b4  Remove error message on mix test
omit 38678d0  Remove _membership call from set_config_raw in integration 
tests
omit c508efe  Fix more couch_jobs flakiness
omit 304a063  Fix couch_jobs to be less flaky
omit 63700c3  Fix and re-enable ChangesAsyncTest
omit 82bd4d4  Merge pull request #3413 from apache/concurrent_write_tests
omit c1c8295  Verify correctness with concurrent updates
omit c00bdd7  Bump erlfdb to v1.3.0
omit 6e29ede  Bump erlfdb to v1.2.9
omit db6a782  Bump erlfdb to v1.2.8
omit fdd5377  Lower the view indexer transaction retry limit
omit ad30fea  Re-add transaction size exceeded test (#3395)
omit 2ef72d6  Allow applying per-transaction options with 
fabric2_fdb:transactional/3
omit 59669ed  Bump erlfdb to 1.2.6 (#3400)
omit 9b0ea10  Update Makefile stripping remaining direct make refs
omit 650ba28  Relax isolation level when indexer reads from DB (#3393)
omit fac13a3  Fix badmatch in couch_views_indexer
omit 04086e6  Make session elixir test more robust
omit 6822fe4  Set default nodes in dev/run to 1
omit a9e0ebe  Merge pull request #3386 from apache/ebtree-lookup-opt
omit 45d4039  Optimize lookup/3
omit 3d4a827  Merge pull request #3384 from apache/ebtree-lookup-collate-eq
omit ec4b213  Fix ebtree:lookup_multi/3
omit 73875b5  Add failing cases for ebtree:lookup_multi/3 bug
omit 79b64ea  Fix typo
omit 6f6db1e  use collate in lookup
omit 5f43148  Merge pull request #3365 from 
apache/active-tasks-process-status-main
omit a9f2a5e  Show process status in active_tasks
omit 0b488de  Handle all erlfdb error codes (#3355)
omit 94df4bb  Fix PUT of multipart/related attachments support for 
Transfer-Encoding: chunked (#3360)
omit 46b346e  Add a development container for VS Code (#3343)
omit 127c441  fix additional links after branch renaming (master -> main)
omit 1780573  fixing links after master->main branch rename
omit b033ef5  Simplify and speedup dev node startup (main branch) (#3338)
omit 053595c  add http error for fd

[couchdb-ci] branch main updated: Rework for April 2021

[wohali]

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-ci.git


The following commit(s) were added to refs/heads/main by this push:
 new 8dfc3a8  Rework for April 2021
8dfc3a8 is described below

commit 8dfc3a809a9192c19bb53dd97f35a4d6a0f94434
Author: Joan Touzet 
AuthorDate: Tue Apr 13 14:05:41 2021 -0700

Rework for April 2021
---
 README.md  | 28 --
 bin/apt-dependencies.sh| 38 ++---
 bin/apt-erlang.sh  | 12 +-
 bin/detect-os.sh   |  2 +-
 bin/yum-dependencies.sh| 10 
 build.sh   | 60 ++
 dockerfiles/centos-6   |  6 ++---
 dockerfiles/centos-7   |  6 ++---
 dockerfiles/centos-8   |  6 ++---
 dockerfiles/debian-buster  |  8 +++
 dockerfiles/debian-jessie  | 56 ---
 dockerfiles/debian-stretch |  6 ++---
 dockerfiles/ubuntu-bionic  |  6 ++---
 dockerfiles/ubuntu-focal   |  6 ++---
 dockerfiles/ubuntu-trusty  |  6 ++---
 dockerfiles/ubuntu-xenial  |  6 ++---
 16 files changed, 103 insertions(+), 159 deletions(-)

diff --git a/README.md b/README.md
index 63f7464..b3deda6 100644
--- a/README.md
+++ b/README.md
@@ -34,16 +34,6 @@ CouchDB's CI build philosophy is to use Travis (with `kerl`) 
to validate CouchDB
 
 For those OSes that support Docker, we run builds inside of Docker containers. 
These containers are built using the `build.sh` command at the root level.
 
-## Building a "base image"
-
-The base images include all of the build dependencies necessary to build 
CouchDB **except** for Erlang and SpiderMonkey 1.8.5. These images are 
typically used to build the CouchDB SpiderMonkey 1.8.5 binaries for a given 
OS/version/architecture combination.
-
-Build a base image with:
-
-```
-./build.sh base -
-```
-
 ## Building a "platform image"
 
 The platform images include all of the build dependencies necessary to build 
and full test CouchDB on a given OS/version/architecture combination.
@@ -109,13 +99,7 @@ CONTAINERARCH=aarch64 ./build.sh platform debian-stretch
 
 Recognized commands:
   clean   Removes all images for .
-  clean-all Removes all images for all platforms & base images.
-
-  baseBuilds the base (no JS/Erlang) image for .
-  base-all  Builds all base (no JS/Erlang) images.
-  *base-upload  Uploads the specified couchdbdev/*-base image
-to Docker Hub.
-  *base-upload-all  Uploads all the couchdbdev/*-base images.
+  clean-all Removes all images for all platforms.
 
   platformBuilds the image for  with Erlang & JS support.
   platform-all  Builds all images with Erlang and JS support.
@@ -146,13 +130,21 @@ where `` is of the format 
`--`, such as `debian-stre
 
 ## Building SpiderMonkey 1.8.5 convenience packages
 
+This is only needed if a platform does not have a supported SpiderMonkey 
library. As of April 2021, this is no currently supported platform.
+
+First, build the 'base' image with:
+
+```
+./build.sh base -
+```
+
 After building the base image as above, head over to the 
[apache/couchdb-pkg](https://github.com/apache/couchdb-pkg) repository and 
follow the instructions there.
 
 ## Adding support for a new release/platform/architecture
 
 1. Update the build scripts in the `bin/` directory to install the 
dependencies correctly on your new OS/version/platform. Push a PR with these 
changes.
 1. Copy and customize an appropriate Dockerfile in the `dockerfiles` directory 
for your new OS.
-1. Build a base image using `./build.sh base -`. Solve any 
problems with the build process here. Add your new platform combination to the 
`.travis.yml` file, then push a PR with these changes.
+1. If a supported SpiderMonkey library is not available on the target 
platform, build a base image using `./build.sh base -`. Solve 
any problems with the build process here. Add your new platform combination to 
the `.travis.yml` file, then push a PR with these changes.
 1. Using the [apache/couchdb-pkg](https://github.com/apache/couchdb-pkg) 
repository, validate you can build the JS package. Fix any problems in that 
repo that arise and raise a new PR. Open a new issue on that PR requesting that 
the JS packages be made available through the CouchDB repository/download 
infrastructure.
 1. Build a full platform image with `./build.sh platform -`. 
Solve any problems with the build process here. Add your new platform 
combination to the `.travis.yml` file, then push a PR with these changes.
 1. Submit a PR against the [apache/couchdb](https://github.com/apache/couchdb) 
repository, adding the new platform to the top level `Jenkinsfile`. Ask if you 
need help.
diff --git a/bin/apt-dependencies.sh b/bin/apt-dependencies.sh
index f8f0be3..

[couchdb] 01/01: [CI] Move to new containers, expand Erlang matrix

[wohali]

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

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

commit e4aae128ef8fcfc5b1d53b8aa05d9bbee471c634
Author: Joan Touzet 
AuthorDate: Tue Apr 13 16:51:01 2021 -0400

[CI] Move to new containers, expand Erlang matrix

We now host our CI containers directly under the Apache Docker Hub
org.

In addition, the newly rebuilt buster-erlang-all image has 4 Erlang
releases in it, corresponding to the latest version available in each
supported major release today:

* 20.3.8.26 (against which our 3.2 binaries will be built)
* 21.3.8.22
* 22.3.4.17
* 23.3.1

This PR changes our PR builds to run against all 4 of these versions.
---
 build-aux/Jenkinsfile.pr | 19 ---
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/build-aux/Jenkinsfile.pr b/build-aux/Jenkinsfile.pr
index 718dba1..46cda1d 100644
--- a/build-aux/Jenkinsfile.pr
+++ b/build-aux/Jenkinsfile.pr
@@ -20,7 +20,7 @@ mkdir build
 cd build
 tar -xf ${WORKSPACE}/apache-couchdb-*.tar.gz
 cd apache-couchdb-*
-. /usr/local/kerl/${KERL_VER}/activate
+. /usr/local/kerl/${ERLANG_VERSION}/activate
 ./configure --spidermonkey-version 60
 make check || (make build-report && false)
 '''
@@ -39,18 +39,18 @@ pipeline {
 GIT_COMMITTER_NAME = 'Jenkins User'
 GIT_COMMITTER_EMAIL = 'couc...@apache.org'
 // Parameters for the matrix build
-DOCKER_IMAGE = 'couchdbdev/debian-buster-erlang-all:latest'
+DOCKER_IMAGE = 'apache/couchdbci-debian:buster-erlang-all'
 // https://github.com/jenkins-infra/jenkins.io/blob/master/Jenkinsfile#64
 // We need the jenkins user mapped inside of the image
 // npm config cache below deals with /home/jenkins not mapping correctly
 // inside the image
 DOCKER_ARGS = '-e npm_config_cache=npm-cache -e HOME=. 
-v=/etc/passwd:/etc/passwd -v /etc/group:/etc/group'
-// *** BE SURE TO CHANGE THE ERLANG VERSION FARTHER DOWN S WELL ***
+
+// *** BE SURE TO ALSO CHANGE THE ERLANG VERSIONS FARTHER DOWN ***
 // Search for ERLANG_VERSION
-// see https://issues.jenkins-ci.org/browse/JENKINS-40986
-LOW_ERLANG_VER = '20.3.8.11'
-MID_ERLANG_VER = '20.3.8.25'
-HIGH_ERLANG_VER = '22.2.3'
+// see https://issues.jenkins.io/browse/JENKINS-61047 for why this cannot
+// be done parametrically
+LOW_ERLANG_VER = '20.3.8.26'
   }
 
   options {
@@ -105,7 +105,7 @@ pipeline {
 axes {
   axis {
 name 'ERLANG_VERSION'
-values "20.3.8.11", "20.3.8.25", "22.2.3"
+values '20.3.8.26', '21.3.8.22', '22.3.4.17', '23.3.1'
   }
 }
 
@@ -118,9 +118,6 @@ pipeline {
 args "${DOCKER_ARGS}"
   }
 }
-environment {
-  KERL_VER = "${ERLANG_VERSION}"
-}
 options {
   skipDefaultCheckout()
   timeout(time: 90, unit: "MINUTES")

[couchdb] branch new-pr-jenkinsfile updated (519ad01 -> e4aae12)

[wohali]

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

wohali pushed a change to branch new-pr-jenkinsfile
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


 discard 519ad01  [CI] Move to new containers, expand Erlang matrix
 new e4aae12  [CI] Move to new containers, expand Erlang matrix

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (519ad01)
\
 N -- N -- N   refs/heads/new-pr-jenkinsfile (e4aae12)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build-aux/Jenkinsfile.pr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[couchdb] branch new-pr-jenkinsfile created (now 519ad01)

[wohali]

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

wohali pushed a change to branch new-pr-jenkinsfile
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


  at 519ad01  [CI] Move to new containers, expand Erlang matrix

This branch includes the following new commits:

 new 519ad01  [CI] Move to new containers, expand Erlang matrix

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[couchdb] 01/01: [CI] Move to new containers, expand Erlang matrix

[wohali]

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

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

commit 519ad0149c2f55b79ee51efbed7885ea042e29bf
Author: Joan Touzet 
AuthorDate: Tue Apr 13 16:51:01 2021 -0400

[CI] Move to new containers, expand Erlang matrix

We now host our CI containers directly under the Apache Docker Hub
org.

In addition, the newly rebuilt buster-erlang-all image has 4 Erlang
releases in it, corresponding to the latest version available in each
supported major release today:

* 20.3.8.26 (against which our 3.2 binaries will be built)
* 21.3.8.22
* 22.3.4.17
* 23.3.1

This PR changes our PR builds to run against all 4 of these versions.
---
 build-aux/Jenkinsfile.pr | 19 ---
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/build-aux/Jenkinsfile.pr b/build-aux/Jenkinsfile.pr
index 718dba1..48ec72a 100644
--- a/build-aux/Jenkinsfile.pr
+++ b/build-aux/Jenkinsfile.pr
@@ -20,7 +20,7 @@ mkdir build
 cd build
 tar -xf ${WORKSPACE}/apache-couchdb-*.tar.gz
 cd apache-couchdb-*
-. /usr/local/kerl/${KERL_VER}/activate
+. /usr/local/kerl/${ERLANG_VERSION}/activate
 ./configure --spidermonkey-version 60
 make check || (make build-report && false)
 '''
@@ -39,18 +39,18 @@ pipeline {
 GIT_COMMITTER_NAME = 'Jenkins User'
 GIT_COMMITTER_EMAIL = 'couc...@apache.org'
 // Parameters for the matrix build
-DOCKER_IMAGE = 'couchdbdev/debian-buster-erlang-all:latest'
+DOCKER_IMAGE = 'apache/couchdbci-debian:buster-erlang-all"
 // https://github.com/jenkins-infra/jenkins.io/blob/master/Jenkinsfile#64
 // We need the jenkins user mapped inside of the image
 // npm config cache below deals with /home/jenkins not mapping correctly
 // inside the image
 DOCKER_ARGS = '-e npm_config_cache=npm-cache -e HOME=. 
-v=/etc/passwd:/etc/passwd -v /etc/group:/etc/group'
-// *** BE SURE TO CHANGE THE ERLANG VERSION FARTHER DOWN S WELL ***
+
+// *** BE SURE TO ALSO CHANGE THE ERLANG VERSIONS FARTHER DOWN ***
 // Search for ERLANG_VERSION
-// see https://issues.jenkins-ci.org/browse/JENKINS-40986
-LOW_ERLANG_VER = '20.3.8.11'
-MID_ERLANG_VER = '20.3.8.25'
-HIGH_ERLANG_VER = '22.2.3'
+// see https://issues.jenkins.io/browse/JENKINS-61047 for why this cannot
+// be done parametrically
+LOW_ERLANG_VER = '20.3.8.26'
   }
 
   options {
@@ -105,7 +105,7 @@ pipeline {
 axes {
   axis {
 name 'ERLANG_VERSION'
-values "20.3.8.11", "20.3.8.25", "22.2.3"
+values '20.3.8.26', '21.3.8.22', '22.3.4.17', '23.3.1'
   }
 }
 
@@ -118,9 +118,6 @@ pipeline {
 args "${DOCKER_ARGS}"
   }
 }
-environment {
-  KERL_VER = "${ERLANG_VERSION}"
-}
 options {
   skipDefaultCheckout()
   timeout(time: 90, unit: "MINUTES")

[couchdb] branch main updated (d24e295 -> 37b5eed)

[wohali]

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

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


from d24e295  Bump erlfdb to v1.3.3
 add 37b5eed  Add support for Spidermonkey 78 (#3501)

No new revisions were added by this update.

Summary of changes:
 src/couch/rebar.config.script   | 15 ++-
 src/couch/test/eunit/couch_js_tests.erl |  3 ++-
 support/build_js.escript| 14 +-
 3 files changed, 17 insertions(+), 15 deletions(-)

[couchdb] branch sm78-main created (now 4a7a2ee)

[wohali]

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

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


  at 4a7a2ee  Add support for Spidermonkey 78

No new revisions were added by this update.

[couchdb] branch SM78 updated (4c7692a -> 15777e8)

[wohali]

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

wohali pushed a change to branch SM78
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


 discard 4c7692a  Add support for Spidermonkey 78
 add 15777e8  Add support for Spidermonkey 78

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (4c7692a)
\
 N -- N -- N   refs/heads/SM78 (15777e8)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 src/couch/test/eunit/couch_js_tests.erl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

[couchdb] branch SM78 created (now 4c7692a)

[wohali]

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

wohali pushed a change to branch SM78
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


  at 4c7692a  Add support for Spidermonkey 78

This branch includes the following new commits:

 new 4c7692a  Add support for Spidermonkey 78

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[couchdb] 01/01: Add support for Spidermonkey 78

[wohali]

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

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

commit 4c7692aad6ff9f318cf4dbde6fd115d2a237b97d
Author: Joan Touzet 
AuthorDate: Wed Apr 7 18:36:26 2021 -0400

Add support for Spidermonkey 78
---
 src/couch/rebar.config.script | 15 ++-
 support/build_js.escript  | 14 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/couch/rebar.config.script b/src/couch/rebar.config.script
index 5c9e633..a6d7005 100644
--- a/src/couch/rebar.config.script
+++ b/src/couch/rebar.config.script
@@ -61,6 +61,8 @@ SMVsn = case lists:keyfind(spidermonkey_version, 1, 
CouchConfig) of
 "60";
 {_, "68"} ->
 "68";
+{_, "78"} ->
+"78";
 {_, "86"} ->
 "86";
 undefined ->
@@ -84,7 +86,12 @@ ConfigH = [
 {"PACKAGE_VERSION", "\"" ++ Version ++ "\""}
 ].
 
-CouchJSConfig = "priv/couch_js/" ++ SMVsn ++ "/config.h".
+CouchJSConfig = case SMVsn of
+"78" ->
+"priv/couch_js/86/config.h";
+_ ->
+"priv/couch_js/" ++ SMVsn ++ "/config.h"
+end.
 ConfigSrc = [["#define ", K, " ", V, $\n] || {K, V} <- ConfigH].
 ConfigBin = iolist_to_binary(ConfigSrc).
 ok = CopyIfDifferent(CouchJSConfig, ConfigBin).
@@ -132,6 +139,11 @@ end.
 "-DXP_UNIX -I/usr/include/mozjs-68 -I/usr/local/include/mozjs-68 
-std=c++14 -Wno-invalid-offsetof",
 "-L/usr/local/lib -std=c++14 -lmozjs-68 -lm"
 };
+{unix, _} when SMVsn == "78" ->
+{
+"-DXP_UNIX -I/usr/include/mozjs-78 -I/usr/local/include/mozjs-78 
-std=c++20 -Wno-invalid-offsetof",
+"-L/usr/local/lib -std=c++20 -lmozjs-78 -lm"
+};
 {unix, _} when SMVsn == "86" ->
 {
 "-DXP_UNIX -I/usr/include/mozjs-86 -I/usr/local/include/mozjs-86 
-I/opt/homebrew/include/mozjs-86/ -std=c++17 -Wno-invalid-offsetof",
@@ -143,6 +155,7 @@ CouchJSSrc = case SMVsn of
 "1.8.5" -> ["priv/couch_js/1.8.5/*.c"];
 "60" -> ["priv/couch_js/60/*.cpp"];
 "68" -> ["priv/couch_js/68/*.cpp"];
+"78" -> ["priv/couch_js/86/*.cpp"];
 "86" -> ["priv/couch_js/86/*.cpp"]
 end.
 
diff --git a/support/build_js.escript b/support/build_js.escript
index 03d45a7..5f1e920 100644
--- a/support/build_js.escript
+++ b/support/build_js.escript
@@ -65,19 +65,7 @@ main([]) ->
 [
 "share/server/rewrite_fun.js"
 ];
-"60" ->
-[
-"share/server/60/esprima.js",
-"share/server/60/escodegen.js",
-"share/server/60/rewrite_fun.js"
-];
-"68" ->
-[
-"share/server/60/esprima.js",
-"share/server/60/escodegen.js",
-"share/server/60/rewrite_fun.js"
-];
-"86" ->
+_ ->
 [
 "share/server/60/esprima.js",
 "share/server/60/escodegen.js",