You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by va...@apache.org on 2025/03/09 07:50:19 UTC
(couchdb) branch 3.4.x updated (b7d19488b -> 9295a0aa9)
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a change to branch 3.4.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git
from b7d19488b Release notes for 3.4.3
new 482639257 Make a note of the Nouveau docker image, and include a sample compose.
new 446c3f9bb lint
new a72b953b4 Showing sponsors (#5430)
new 8fd11e072 nouveau: base64 only takes binaries
new d6e79d94c Bump all Erlang patch versions
new 9295a0aa9 Update 3.4.3 whatsnew with the latest cherry-picks
The 6 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:
README.rst | 44 +++++++++++++++++++++++++++-------
build-aux/Jenkinsfile.full | 4 ++--
build-aux/Jenkinsfile.pr | 4 ++--
src/docs/src/install/nouveau.rst | 46 ++++++++++++++++++++++++++++++++++++
src/docs/src/whatsnew/3.4.rst | 2 ++
src/nouveau/src/nouveau_bookmark.erl | 4 ++--
6 files changed, 90 insertions(+), 14 deletions(-)
(couchdb) 05/06: Bump all Erlang patch versions
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch 3.4.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit d6e79d94c8aab7cef3cc218a527ee92543a78c27
Author: Nick Vatamaniuc <va...@apache.org>
AuthorDate: Sat Mar 8 19:44:52 2025 -0500
Bump all Erlang patch versions
---
build-aux/Jenkinsfile.full | 4 ++--
build-aux/Jenkinsfile.pr | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/build-aux/Jenkinsfile.full b/build-aux/Jenkinsfile.full
index bdbd0bf63..d0eb93c1b 100644
--- a/build-aux/Jenkinsfile.full
+++ b/build-aux/Jenkinsfile.full
@@ -14,11 +14,11 @@
// the License.
// Erlang version embedded in binary packages
-ERLANG_VERSION = '25.3.2.15'
+ERLANG_VERSION = '25.3.2.18'
// Erlang version used for rebar in release process. CouchDB will not build from
// the release tarball on Erlang versions older than this
-MINIMUM_ERLANG_VERSION = '25.3.2.15'
+MINIMUM_ERLANG_VERSION = '25.3.2.18'
// We create parallel build / test / package stages for each OS using the metadata
// in this map. Adding a new OS should ideally only involve adding a new entry here.
diff --git a/build-aux/Jenkinsfile.pr b/build-aux/Jenkinsfile.pr
index 0e25b9555..af0f35b65 100644
--- a/build-aux/Jenkinsfile.pr
+++ b/build-aux/Jenkinsfile.pr
@@ -50,7 +50,7 @@ pipeline {
// Search for ERLANG_VERSION
// see https://issues.jenkins.io/browse/JENKINS-61047 for why this cannot
// be done parametrically
- LOW_ERLANG_VER = '25.3.2.15'
+ LOW_ERLANG_VER = '25.3.2.18'
}
options {
@@ -247,7 +247,7 @@ pipeline {
axes {
axis {
name 'ERLANG_VERSION'
- values '25.3.2.15', '26.2.5.4', '27.1.1'
+ values '25.3.2.18', '26.2.5.9', '27.3'
}
axis {
name 'SM_VSN'
(couchdb) 03/06: Showing sponsors (#5430)
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch 3.4.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit a72b953b4b6d88c878af954a1264a6fa4d943673
Author: Ronny Berndt <ro...@apache.org>
AuthorDate: Sat Mar 8 00:18:29 2025 +0100
Showing sponsors (#5430)
Add links/logos to our CI sponsors.
---
README.rst | 44 ++++++++++++++++++++++++++++++++++++--------
1 file changed, 36 insertions(+), 8 deletions(-)
diff --git a/README.rst b/README.rst
index 261581e5f..ece0ca891 100644
--- a/README.rst
+++ b/README.rst
@@ -43,7 +43,7 @@ For troubleshooting or cryptic error messages, see:
For general help, see:
https://couchdb.apache.org/#mailing-list
-
+
We also have an IRC channel:
https://web.libera.chat/#couchdb
@@ -68,15 +68,15 @@ Getting started with developing
.. image:: https://img.shields.io/static/v1?label=Remote%20-%20Containers&message=Open&color=blue&logo=visualstudiocode
:target: https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/apache/couchdb
-If you already have VS Code and Docker installed, you can click the badge above or
-`here <https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/apache/couchdb>`_
-to get started. Clicking these links will cause VS Code to automatically install the
-Remote - Containers extension if needed, clone the source code into a container volume,
+If you already have VS Code and Docker installed, you can click the badge above or
+`here <https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/apache/couchdb>`_
+to get started. Clicking these links will cause VS Code to automatically install the
+Remote - Containers extension if needed, clone the source code into a container volume,
and spin up a dev container for use.
-This ``devcontainer`` will automatically run ``./configure && make`` the first time it is created.
-While this may take some extra time to spin up, this tradeoff means you will be able to
-run things like ``./dev/run``, ``./dev/run --admin=admin:admin``, ``./dev/run --with-admin-party-please``,
+This ``devcontainer`` will automatically run ``./configure && make`` the first time it is created.
+While this may take some extra time to spin up, this tradeoff means you will be able to
+run things like ``./dev/run``, ``./dev/run --admin=admin:admin``, ``./dev/run --with-admin-party-please``,
and ``make check`` straight away. Subsequent startups should be quick.
**Manual Dev Setup:**
@@ -104,6 +104,34 @@ You can learn more about our contributing process here:
https://github.com/apache/couchdb/blob/main/CONTRIBUTING.md
+Acknowledgments
+---------------
+
+This project is proudly supported by:
+
+|3|
+
+`IBM Cloudant <https://www.ibm.com/products/cloudant>`_
+
+|5|
+
+|6|
+
+|7|
+
+.. |3| image:: https://couchdb.apache.org/image/macstadium-logo.png
+ :width: 150
+ :target: https://www.macstadium.com
+.. |5| image:: https://couchdb.apache.org/image/neighbourhoodie-logo-with-n.svg
+ :width: 150
+ :target: https://neighbourhood.ie/couchdb-support
+.. |6| image:: https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/PoweredByDO/DO_Powered_by_Badge_blue.png
+ :width: 150
+ :target: https://www.digitalocean.com
+.. |7| image:: https://couchdb.apache.org/image/netcup_logo_RGB_color.svg
+ :width: 150
+ :target: https://www.netcup.com
+
Cryptographic Software Notice
-----------------------------
(couchdb) 04/06: nouveau: base64 only takes binaries
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch 3.4.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 8fd11e0727d2a157def223238c49d56c9eae3e5d
Author: Robert Newson <rn...@apache.org>
AuthorDate: Thu Mar 6 14:03:42 2025 +0000
nouveau: base64 only takes binaries
jiffy may return an iolist butbase64:encode() cannot take iolists as
input. since we also want urlsafe encoding we switch base64:encode to
b64url:encode/1 as it will accept iolists. this matches dreyfus behaviour too.
closes #5453
---
src/nouveau/src/nouveau_bookmark.erl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/nouveau/src/nouveau_bookmark.erl b/src/nouveau/src/nouveau_bookmark.erl
index b919534ea..08aeb0f73 100644
--- a/src/nouveau/src/nouveau_bookmark.erl
+++ b/src/nouveau/src/nouveau_bookmark.erl
@@ -50,7 +50,7 @@ unpack(_DbName, Empty) when Empty == undefined; Empty == nil; Empty == null ->
unpack(DbName, PackedBookmark) when is_list(PackedBookmark) ->
unpack(DbName, list_to_binary(PackedBookmark));
unpack(DbName, PackedBookmark) when is_binary(PackedBookmark) ->
- Bookmark = jiffy:decode(base64:decode(PackedBookmark), [return_maps]),
+ Bookmark = jiffy:decode(b64url:decode(PackedBookmark), [return_maps]),
maps:from_list([{range_of(DbName, V), V} || V <- Bookmark]).
pack(nil) ->
@@ -58,7 +58,7 @@ pack(nil) ->
pack({EJson}) when is_list(EJson) ->
pack(from_ejson(EJson));
pack(UnpackedBookmark) when is_map(UnpackedBookmark) ->
- base64:encode(jiffy:encode(maps:values(UnpackedBookmark))).
+ b64url:encode(jiffy:encode(maps:values(UnpackedBookmark))).
%% legacy use of ejson within mango
from_ejson({Props}) ->
(couchdb) 02/06: lint
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch 3.4.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 446c3f9bb6f0e1dca6bb3a3cfa6aac04cea6bedd
Author: Jamie Bliss <ja...@ivyleav.es>
AuthorDate: Mon Feb 17 17:31:49 2025 -0500
lint
---
src/docs/src/install/nouveau.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/docs/src/install/nouveau.rst b/src/docs/src/install/nouveau.rst
index 1cdb712f7..01b899026 100644
--- a/src/docs/src/install/nouveau.rst
+++ b/src/docs/src/install/nouveau.rst
@@ -115,4 +115,4 @@ A minimal CouchDB/Nouveau cluster can be create with this compose:
.. note::
- This is not production ready, but it is a quick way to get Nouveau running.
\ No newline at end of file
+ This is not production ready, but it is a quick way to get Nouveau running.
(couchdb) 01/06: Make a note of the Nouveau docker image, and include a sample compose.
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch 3.4.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 4826392572ba2e0885d3af608a175ac12cf984d1
Author: Jamie Bliss <ja...@ivyleav.es>
AuthorDate: Mon Feb 17 17:26:11 2025 -0500
Make a note of the Nouveau docker image, and include a sample compose.
---
src/docs/src/install/nouveau.rst | 46 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 46 insertions(+)
diff --git a/src/docs/src/install/nouveau.rst b/src/docs/src/install/nouveau.rst
index c839a6401..1cdb712f7 100644
--- a/src/docs/src/install/nouveau.rst
+++ b/src/docs/src/install/nouveau.rst
@@ -70,3 +70,49 @@ in-progress segment merges, and finally closes all indexes. This is
not essential and you may safely kill the JVM without letting it do
this, though any uncommitted changes are necessarily lost. Once the
JVM is started again this indexing work will be attempted again.
+
+Docker
+======
+
+There is a version of of the :ref:`semi-official CouchDB Docker image <install/docker>`
+available under the ``*-nouveau`` tags (eg, ``3.4-nouveau``).
+
+Compose
+-------
+
+A minimal CouchDB/Nouveau cluster can be create with this compose:
+
+.. code-block:: yaml
+
+ services:
+ couchdb:
+ image: couchdb:3
+ environment:
+ COUCHDB_USER: admin
+ COUCHDB_PASSWORD: admin
+ volumes:
+ - couchdb:/opt/couchdb/data
+ ports:
+ - 5984:5984
+ configs:
+ - source: nouveau.ini
+ target: /opt/couchdb/etc/local.d/nouveau.ini
+
+ nouveau:
+ image: couchdb:3-nouveau
+
+ volumes:
+ couchdb:
+
+ configs:
+ nouveau.ini:
+ content: |
+ [couchdb]
+ single_node=true
+ [nouveau]
+ enable = true
+ url = http://nouveau:5987
+
+.. note::
+
+ This is not production ready, but it is a quick way to get Nouveau running.
\ No newline at end of file
(couchdb) 06/06: Update 3.4.3 whatsnew with the latest cherry-picks
Posted by va...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch 3.4.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 9295a0aa9ca01ad2254b0c5e245008749c8fcf64
Author: Nick Vatamaniuc <va...@gmail.com>
AuthorDate: Sat Mar 8 23:05:13 2025 -0500
Update 3.4.3 whatsnew with the latest cherry-picks
---
src/docs/src/whatsnew/3.4.rst | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/docs/src/whatsnew/3.4.rst b/src/docs/src/whatsnew/3.4.rst
index 3d805938e..b0cd80de1 100644
--- a/src/docs/src/whatsnew/3.4.rst
+++ b/src/docs/src/whatsnew/3.4.rst
@@ -85,6 +85,7 @@ Bugfixes
* :ghissue:`5332`: Skip deleted documents in the scanner.
* :ghissue:`5331`: Skip validation for design docs in the scanner.
* :ghissue:`5330`: Prevent inserting illegal design docs via Mango.
+* :ghissue:`5463`, :ghissue:`5453`: Fix Nouveau bookmark badarith error.
Docs
----
@@ -102,6 +103,7 @@ Docs
QuickJS.
* :ghissue:`5320`, :ghissue:`5374`: Improve auto-lockout feature documentation.
* :ghissue:`5323`: Nouveau: improve install instructions.
+* :ghissue:`5434`: Document use of Nouveau docker image
Tests
_____