You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by wo...@apache.org on 2021/09/30 23:33:21 UTC
[couchdb-docker] branch 3.1.2 created (now b8e6941)
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
Posted by wo...@apache.org.
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 <wo...@apache.org>
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 dev@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 dev@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-ubi-clouseau/resources/clouseau/clouseau.sh
rename to 3.1.2-ubi-clouseau/resources/clouseau/clouseau.sh
diff --git a/3.1.1-ubi-clouseau/resources/clouseau/log4j.properties b/3.1.2-ubi-clouseau/resources/clouseau/log4j.properties
similarity index 100%
rename from 3.1.1-ubi-clouseau/resources/clouseau/log4j.properties
rename to 3.1.2-ubi-clouseau/resources/clouseau/log4j.properties
diff --git a/3.1.1-ubi-clouseau/resources/docker-entrypoint.sh b/3.1.2-ubi-clouseau/resources/docker-entrypoint.sh
similarity index 100%
rename from 3.1.1-ubi-clouseau/resources/docker-entrypoint.sh
rename to 3.1.2-ubi-clouseau/resources/docker-entrypoint.sh
diff --git a/3.1.1-ubi-clouseau/resources/pre_stop b/3.1.2-ubi-clouseau/resources/pre_stop
similarity index 100%
rename from 3.1.1-ubi-clouseau/resources/pre_stop
rename to 3.1.2-ubi-clouseau/resources/pre_stop
diff --git a/3.1.1-ubi-clouseau/resources/run b/3.1.2-ubi-clouseau/resources/run
similarity index 100%
rename from 3.1.1-ubi-clouseau/resources/run
rename to 3.1.2-ubi-clouseau/resources/run
diff --git a/3.1.1-ubi-clouseau/resources/run_clouseau b/3.1.2-ubi-clouseau/resources/run_clouseau
similarity index 100%
rename from 3.1.1-ubi-clouseau/resources/run_clouseau
rename to 3.1.2-ubi-clouseau/resources/run_clouseau
diff --git a/3.1.1/vm.args b/3.1.2-ubi-clouseau/resources/vm.args
similarity index 100%
rename from 3.1.1/vm.args
rename to 3.1.2-ubi-clouseau/resources/vm.args
diff --git a/3.1.1-ubi/Dockerfile b/3.1.2-ubi/Dockerfile
similarity index 98%
rename from 3.1.1-ubi/Dockerfile
rename to 3.1.2-ubi/Dockerfile
index 055cd0c..592fe42 100644
--- a/3.1.1-ubi/Dockerfile
+++ b/3.1.2-ubi/Dockerfile
@@ -17,7 +17,7 @@ ARG BUILD_DATE
LABEL maintainer="CouchDB Developers dev@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} \
@@ -33,7 +33,7 @@ LABEL maintainer="CouchDB Developers dev@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
# Add CouchDB user account to make sure the IDs are assigned consistently
# CouchDB user added to root group for OpenShift support
diff --git a/3.1.1-ubi-clouseau/couchdb.repo b/3.1.2-ubi/couchdb.repo
similarity index 100%
rename from 3.1.1-ubi-clouseau/couchdb.repo
rename to 3.1.2-ubi/couchdb.repo
diff --git a/3.1.1-ubi-clouseau/imeyer_runit.repo b/3.1.2-ubi/imeyer_runit.repo
similarity index 100%
rename from 3.1.1-ubi-clouseau/imeyer_runit.repo
rename to 3.1.2-ubi/imeyer_runit.repo
diff --git a/3.1.1-ubi-clouseau/licenses/LICENSE b/3.1.2-ubi/licenses/LICENSE
similarity index 100%
rename from 3.1.1-ubi-clouseau/licenses/LICENSE
rename to 3.1.2-ubi/licenses/LICENSE
diff --git a/3.1.1-ubi/resources/10-docker-default.ini b/3.1.2-ubi/resources/10-docker-default.ini
similarity index 100%
rename from 3.1.1-ubi/resources/10-docker-default.ini
rename to 3.1.2-ubi/resources/10-docker-default.ini
diff --git a/3.1.1-ubi/resources/docker-entrypoint.sh b/3.1.2-ubi/resources/docker-entrypoint.sh
similarity index 100%
rename from 3.1.1-ubi/resources/docker-entrypoint.sh
rename to 3.1.2-ubi/resources/docker-entrypoint.sh
diff --git a/3.1.1-ubi/resources/run b/3.1.2-ubi/resources/run
similarity index 100%
rename from 3.1.1-ubi/resources/run
rename to 3.1.2-ubi/resources/run
diff --git a/3.1.1-ubi/resources/vm.args b/3.1.2-ubi/resources/vm.args
similarity index 100%
rename from 3.1.1-ubi/resources/vm.args
rename to 3.1.2-ubi/resources/vm.args
diff --git a/3.1.1-ubi-clouseau/resources/10-docker-default.ini b/3.1.2/10-docker-default.ini
similarity index 100%
rename from 3.1.1-ubi-clouseau/resources/10-docker-default.ini
rename to 3.1.2/10-docker-default.ini
diff --git a/3.1.1/Dockerfile b/3.1.2/Dockerfile
similarity index 99%
rename from 3.1.1/Dockerfile
rename to 3.1.2/Dockerfile
index 75b4b29..0260c6e 100644
--- a/3.1.1/Dockerfile
+++ b/3.1.2/Dockerfile
@@ -54,7 +54,7 @@ RUN set -eux; \
apt purge -y --autoremove curl; \
rm -rf /var/lib/apt/lists/*
-ENV COUCHDB_VERSION 3.1.1
+ENV COUCHDB_VERSION 3.1.2
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" | \
diff --git a/3.1.1/docker-entrypoint.sh b/3.1.2/docker-entrypoint.sh
similarity index 100%
rename from 3.1.1/docker-entrypoint.sh
rename to 3.1.2/docker-entrypoint.sh
diff --git a/3.1.1-ubi-clouseau/resources/vm.args b/3.1.2/vm.args
similarity index 100%
rename from 3.1.1-ubi-clouseau/resources/vm.args
rename to 3.1.2/vm.args