You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ko...@apache.org on 2022/02/26 21:22:10 UTC
[couchdb-docker] branch main updated (efa6e93 -> 4dc3a6b)
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git.
from efa6e93 Listen for COUCHDB_ERLANG_COOKIE and write it down
new beb5062 Revert "Drop ppc64le until suitable CI replacement identified (#199)"
new 4dc3a6b Update Debian / Erlang / SpiderMonkey versions
The 2 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:
3.2.1/Dockerfile | 6 +++---
build.sh | 10 +++++++---
2 files changed, 10 insertions(+), 6 deletions(-)
[couchdb-docker] 01/02: Revert "Drop ppc64le until suitable CI replacement identified (#199)"
Posted by ko...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit beb5062a64fc293d6cb7f9df39b4f04336d6a695
Author: Adam Kocoloski <ad...@airbnb.com>
AuthorDate: Fri Feb 25 15:53:16 2022 -0500
Revert "Drop ppc64le until suitable CI replacement identified (#199)"
This reverts commit e3ca492, since ppc64le machines are back in the CI
matrix.
---
build.sh | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/build.sh b/build.sh
index 44a4f58..e3f7cf2 100755
--- a/build.sh
+++ b/build.sh
@@ -33,8 +33,8 @@ set -e
PROMPT="Are you sure (y/n)? "
QEMU="YES"
-PLATFORMS="amd64 arm64v8"
-BUILDX_PLATFORMS="linux/amd64,linux/arm64/v8"
+PLATFORMS="amd64 arm64v8 ppc64le"
+BUILDX_PLATFORMS="linux/amd64,linux/arm64/v8,linux/ppc64le"
prompt() {
if [ -z "${PROMPT}" ]
@@ -153,11 +153,15 @@ push() {
fi
docker manifest create apache/couchdb:$tag_as \
apache/couchdb:amd64-$1 \
- apache/couchdb:arm64v8-$1
+ apache/couchdb:arm64v8-$1 \
+ apache/couchdb:ppc64le-$1
docker manifest annotate apache/couchdb:$tag_as \
apache/couchdb:arm64v8-$1 --os linux --arch arm64 --variant v8
+ docker manifest annotate apache/couchdb:$tag_as \
+ apache/couchdb:ppc64le-$1 --os linux --arch ppc64le
+
docker manifest push --purge apache/couchdb:$tag_as
docker manifest inspect apache/couchdb:$tag_as
[couchdb-docker] 02/02: Update Debian / Erlang / SpiderMonkey versions
Posted by ko...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kocolosk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git
commit 4dc3a6b1f2bd8d46489cad5828912f0a64bf0b36
Author: Adam Kocoloski <ad...@airbnb.com>
AuthorDate: Fri Feb 25 16:47:28 2022 -0500
Update Debian / Erlang / SpiderMonkey versions
Debian: 10 -> 11
Erlang: 20 -> 23
SpiderMonkey: 60 -> 78 (implicit in Debian upgrade)
---
3.2.1/Dockerfile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/3.2.1/Dockerfile b/3.2.1/Dockerfile
index 61b43b7..27e9d9c 100644
--- a/3.2.1/Dockerfile
+++ b/3.2.1/Dockerfile
@@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations under
# the License.
-FROM debian:buster-slim
+FROM debian:bullseye-slim
LABEL maintainer="CouchDB Developers dev@couchdb.apache.org"
@@ -54,7 +54,7 @@ RUN set -eux; \
apt purge -y --autoremove curl; \
rm -rf /var/lib/apt/lists/*
-ENV COUCHDB_VERSION 3.2.1
+ENV COUCHDB_VERSION 3.2.1-1
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" | \
@@ -67,7 +67,7 @@ RUN set -eux; \
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 \
+ couchdb="$COUCHDB_VERSION"~bullseye \
; \
# Undo symlinks to /var/log and /var/lib
rmdir /var/lib/couchdb /var/log/couchdb; \