CouchDB 3.1.1 release #8745
Merged
CouchDB 3.1.1 release #8745
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@tianon Not sure what we need to do for the "Naughty" check failure, this seems new since our last PR. Obviously 2.3.1 builds against |
|
We'll go ahead and remove |
Diff for 23d6169:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 54b541a..5b37186 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,15 +1,15 @@
Maintainers: Joan Touzet <wohali@apache.org> (@wohali)
GitRepo: https://github.com/apache/couchdb-docker
-GitCommit: 01e1c16bb405c1174393c76a7ebc3792b0c5e2c9
+GitCommit: 47d2a972604e1d33969a244e46b68f45c0382390
Tags: 2.3.1, 2.3, 2
-Architectures: amd64, arm64v8, ppc64le
+Architectures: amd64, arm64v8
Directory: 2.3.1
Tags: 3.0.1, 3.0
Architectures: amd64, arm64v8, ppc64le
Directory: 3.0.1
-Tags: latest, 3.1.0, 3.1, 3
+Tags: latest, 3.1.1, 3.1, 3
Architectures: amd64, arm64v8, ppc64le
-Directory: 3.1.0
+Directory: 3.1.1
diff --git a/_bashbrew-list b/_bashbrew-list
index 7771e1b..8fb5a85 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -5,5 +5,5 @@ couchdb:3
couchdb:3.0
couchdb:3.0.1
couchdb:3.1
-couchdb:3.1.0
+couchdb:3.1.1
couchdb:latest
diff --git a/couchdb_2/docker-entrypoint.sh b/couchdb_2/docker-entrypoint.sh
index be9e099..6e0e2c1 100755
--- a/couchdb_2/docker-entrypoint.sh
+++ b/couchdb_2/docker-entrypoint.sh
@@ -65,14 +65,14 @@ if [ "$1" = '/opt/couchdb/bin/couchdb' ]; then
if [ "$COUCHDB_USER" ] && [ "$COUCHDB_PASSWORD" ]; then
# Create admin only if not already present
- if ! grep -Pzoqr "\[admins\]\n$COUCHDB_USER =" /opt/couchdb/etc/local.d/*.ini; then
+ if ! grep -Pzoqr "\[admins\]\n$COUCHDB_USER =" /opt/couchdb/etc/local.d/*.ini /opt/couchdb/etc/local.ini; then
printf "\n[admins]\n%s = %s\n" "$COUCHDB_USER" "$COUCHDB_PASSWORD" >> /opt/couchdb/etc/local.d/docker.ini
fi
fi
if [ "$COUCHDB_SECRET" ]; then
# Set secret only if not already present
- if ! grep -Pzoqr "\[couch_httpd_auth\]\nsecret =" /opt/couchdb/etc/local.d/*.ini; then
+ if ! grep -Pzoqr "\[couch_httpd_auth\]\nsecret =" /opt/couchdb/etc/local.d/*.ini /opt/couchdb/etc/local.ini; then
printf "\n[couch_httpd_auth]\nsecret = %s\n" "$COUCHDB_SECRET" >> /opt/couchdb/etc/local.d/docker.ini
fi
fi
@@ -82,7 +82,7 @@ if [ "$1" = '/opt/couchdb/bin/couchdb' ]; then
fi
# if we don't find an [admins] section followed by a non-comment, display a warning
- if ! grep -Pzoqr '\[admins\]\n[^;]\w+' /opt/couchdb/etc/default.d/*.ini /opt/couchdb/etc/local.d/*.ini; then
+ if ! grep -Pzoqr '\[admins\]\n[^;]\w+' /opt/couchdb/etc/default.d/*.ini /opt/couchdb/etc/local.d/*.ini /opt/couchdb/etc/local.ini; then
# The - option suppresses leading tabs but *not* spaces. :)
cat >&2 <<-'EOWARN'
****************************************************
diff --git a/couchdb_3.0/docker-entrypoint.sh b/couchdb_3.0/docker-entrypoint.sh
index d7353f2..acf3675 100755
--- a/couchdb_3.0/docker-entrypoint.sh
+++ b/couchdb_3.0/docker-entrypoint.sh
@@ -65,14 +65,14 @@ if [ "$1" = '/opt/couchdb/bin/couchdb' ]; then
if [ "$COUCHDB_USER" ] && [ "$COUCHDB_PASSWORD" ]; then
# Create admin only if not already present
- if ! grep -Pzoqr "\[admins\]\n$COUCHDB_USER =" /opt/couchdb/etc/local.d/*.ini; then
+ if ! grep -Pzoqr "\[admins\]\n$COUCHDB_USER =" /opt/couchdb/etc/local.d/*.ini /opt/couchdb/etc/local.ini; then
printf "\n[admins]\n%s = %s\n" "$COUCHDB_USER" "$COUCHDB_PASSWORD" >> /opt/couchdb/etc/local.d/docker.ini
fi
fi
if [ "$COUCHDB_SECRET" ]; then
# Set secret only if not already present
- if ! grep -Pzoqr "\[couch_httpd_auth\]\nsecret =" /opt/couchdb/etc/local.d/*.ini; then
+ if ! grep -Pzoqr "\[couch_httpd_auth\]\nsecret =" /opt/couchdb/etc/local.d/*.ini /opt/couchdb/etc/local.ini; then
printf "\n[couch_httpd_auth]\nsecret = %s\n" "$COUCHDB_SECRET" >> /opt/couchdb/etc/local.d/docker.ini
fi
fi
@@ -82,7 +82,7 @@ if [ "$1" = '/opt/couchdb/bin/couchdb' ]; then
fi
# if we don't find an [admins] section followed by a non-comment, display a warning
- if ! grep -Pzoqr '\[admins\]\n[^;]\w+' /opt/couchdb/etc/default.d/*.ini /opt/couchdb/etc/local.d/*.ini; then
+ if ! grep -Pzoqr '\[admins\]\n[^;]\w+' /opt/couchdb/etc/default.d/*.ini /opt/couchdb/etc/local.d/*.ini /opt/couchdb/etc/local.ini; then
# The - option suppresses leading tabs but *not* spaces. :)
cat >&2 <<-'EOWARN'
*************************************************************
diff --git a/couchdb_3/Dockerfile b/couchdb_3/Dockerfile
index 6a3fac0..8e5ec26 100644
--- a/couchdb_3/Dockerfile
+++ b/couchdb_3/Dockerfile
@@ -91,7 +91,7 @@ RUN set -xe; \
rm -rf "$GNUPGHOME"; \
apt-key list
-ENV COUCHDB_VERSION 3.1.0
+ENV COUCHDB_VERSION 3.1.1
RUN echo "deb https://apache.bintray.com/couchdb-deb buster main" > /etc/apt/sources.list.d/couchdb.list
diff --git a/couchdb_3/docker-entrypoint.sh b/couchdb_3/docker-entrypoint.sh
index d7353f2..acf3675 100755
--- a/couchdb_3/docker-entrypoint.sh
+++ b/couchdb_3/docker-entrypoint.sh
@@ -65,14 +65,14 @@ if [ "$1" = '/opt/couchdb/bin/couchdb' ]; then
if [ "$COUCHDB_USER" ] && [ "$COUCHDB_PASSWORD" ]; then
# Create admin only if not already present
- if ! grep -Pzoqr "\[admins\]\n$COUCHDB_USER =" /opt/couchdb/etc/local.d/*.ini; then
+ if ! grep -Pzoqr "\[admins\]\n$COUCHDB_USER =" /opt/couchdb/etc/local.d/*.ini /opt/couchdb/etc/local.ini; then
printf "\n[admins]\n%s = %s\n" "$COUCHDB_USER" "$COUCHDB_PASSWORD" >> /opt/couchdb/etc/local.d/docker.ini
fi
fi
if [ "$COUCHDB_SECRET" ]; then
# Set secret only if not already present
- if ! grep -Pzoqr "\[couch_httpd_auth\]\nsecret =" /opt/couchdb/etc/local.d/*.ini; then
+ if ! grep -Pzoqr "\[couch_httpd_auth\]\nsecret =" /opt/couchdb/etc/local.d/*.ini /opt/couchdb/etc/local.ini; then
printf "\n[couch_httpd_auth]\nsecret = %s\n" "$COUCHDB_SECRET" >> /opt/couchdb/etc/local.d/docker.ini
fi
fi
@@ -82,7 +82,7 @@ if [ "$1" = '/opt/couchdb/bin/couchdb' ]; then
fi
# if we don't find an [admins] section followed by a non-comment, display a warning
- if ! grep -Pzoqr '\[admins\]\n[^;]\w+' /opt/couchdb/etc/default.d/*.ini /opt/couchdb/etc/local.d/*.ini; then
+ if ! grep -Pzoqr '\[admins\]\n[^;]\w+' /opt/couchdb/etc/default.d/*.ini /opt/couchdb/etc/local.d/*.ini /opt/couchdb/etc/local.ini; then
# The - option suppresses leading tabs but *not* spaces. :)
cat >&2 <<-'EOWARN'
************************************************************* |
|
Yep, that "naughty" is part of what I was trying to communicate with #8405 (comment) -- namely, Stretch has moved from being supported by the Security Team (who officially support all release architectures of Debian) to being supported by the LTS Team (who only support the subset of architectures that the LTS sponsors have explicitly requested). 👍 |
actionmanmbc
approved these changes
Sep 18, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Title says it all.