3.1.0 -> 3.1.1 (#190)
diff --git a/.travis.yml b/.travis.yml
index da26661..ba445ff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,8 @@
- RELEASES=2.3.1
- RELEASES=2.3.1-ubi
- RELEASES=3.0.1
- - RELEASES=3.1.0
- - RELEASES=3.1.0-ubi
+ - RELEASES=3.1.1
+ - RELEASES=3.1.1-ubi
- RELEASES=dev
- RELEASES=dev-cluster
diff --git a/3.1.0-ubi-clouseau/Dockerfile b/3.1.1-ubi-clouseau/Dockerfile
similarity index 98%
rename from 3.1.0-ubi-clouseau/Dockerfile
rename to 3.1.1-ubi-clouseau/Dockerfile
index 01617cd..7d918a9 100644
--- a/3.1.0-ubi-clouseau/Dockerfile
+++ b/3.1.1-ubi-clouseau/Dockerfile
@@ -35,7 +35,7 @@
LABEL maintainer="CouchDB Developers dev@couchdb.apache.org" \
name="Apache CouchDB" \
- version="3.1.0" \
+ version="3.1.1" \
summary="Apache CouchDB based on Red Hat UBI" \
description="Red Hat OpenShift-compatible container that runs Apache CouchDB" \
release=${RELEASE} \
@@ -51,7 +51,7 @@
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
-ENV COUCHDB_VERSION 3.1.0 \
+ENV COUCHDB_VERSION 3.1.1 \
CLOUSEAU_VERSION=${CLOUSEAU_VERSION} \
JAVA_MAJOR_VERSION=8 \
JAVA_HOME=/usr/lib/jvm/jre-1.8.0 \
@@ -99,7 +99,7 @@
# 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-3.1.0; \
+ microdnf install --enablerepo=bintray-apache-couchdb-rpm -y couchdb-3.1.1; \
microdnf clean all; \
rm -rf /var/cache/yum; \
# remove defaults that force writing logs to file
diff --git a/3.1.0-ubi-clouseau/bintray-apache-couchdb-rpm.repo b/3.1.1-ubi-clouseau/bintray-apache-couchdb-rpm.repo
similarity index 100%
rename from 3.1.0-ubi-clouseau/bintray-apache-couchdb-rpm.repo
rename to 3.1.1-ubi-clouseau/bintray-apache-couchdb-rpm.repo
diff --git a/3.1.0-ubi-clouseau/imeyer_runit.repo b/3.1.1-ubi-clouseau/imeyer_runit.repo
similarity index 100%
rename from 3.1.0-ubi-clouseau/imeyer_runit.repo
rename to 3.1.1-ubi-clouseau/imeyer_runit.repo
diff --git a/3.1.0-ubi-clouseau/licenses/LICENSE b/3.1.1-ubi-clouseau/licenses/LICENSE
similarity index 100%
rename from 3.1.0-ubi-clouseau/licenses/LICENSE
rename to 3.1.1-ubi-clouseau/licenses/LICENSE
diff --git a/3.1.0-ubi-clouseau/resources/10-docker-default.ini b/3.1.1-ubi-clouseau/resources/10-docker-default.ini
similarity index 100%
rename from 3.1.0-ubi-clouseau/resources/10-docker-default.ini
rename to 3.1.1-ubi-clouseau/resources/10-docker-default.ini
diff --git a/3.1.0-ubi-clouseau/resources/clouseau/clouseau.ini b/3.1.1-ubi-clouseau/resources/clouseau/clouseau.ini
similarity index 100%
rename from 3.1.0-ubi-clouseau/resources/clouseau/clouseau.ini
rename to 3.1.1-ubi-clouseau/resources/clouseau/clouseau.ini
diff --git a/3.1.0-ubi-clouseau/resources/clouseau/clouseau.sh b/3.1.1-ubi-clouseau/resources/clouseau/clouseau.sh
similarity index 100%
rename from 3.1.0-ubi-clouseau/resources/clouseau/clouseau.sh
rename to 3.1.1-ubi-clouseau/resources/clouseau/clouseau.sh
diff --git a/3.1.0-ubi-clouseau/resources/clouseau/log4j.properties b/3.1.1-ubi-clouseau/resources/clouseau/log4j.properties
similarity index 100%
rename from 3.1.0-ubi-clouseau/resources/clouseau/log4j.properties
rename to 3.1.1-ubi-clouseau/resources/clouseau/log4j.properties
diff --git a/3.1.0-ubi-clouseau/resources/docker-entrypoint.sh b/3.1.1-ubi-clouseau/resources/docker-entrypoint.sh
similarity index 100%
rename from 3.1.0-ubi-clouseau/resources/docker-entrypoint.sh
rename to 3.1.1-ubi-clouseau/resources/docker-entrypoint.sh
diff --git a/3.1.0-ubi-clouseau/resources/pre_stop b/3.1.1-ubi-clouseau/resources/pre_stop
similarity index 100%
rename from 3.1.0-ubi-clouseau/resources/pre_stop
rename to 3.1.1-ubi-clouseau/resources/pre_stop
diff --git a/3.1.0-ubi-clouseau/resources/run b/3.1.1-ubi-clouseau/resources/run
similarity index 100%
rename from 3.1.0-ubi-clouseau/resources/run
rename to 3.1.1-ubi-clouseau/resources/run
diff --git a/3.1.0-ubi-clouseau/resources/run_clouseau b/3.1.1-ubi-clouseau/resources/run_clouseau
similarity index 100%
rename from 3.1.0-ubi-clouseau/resources/run_clouseau
rename to 3.1.1-ubi-clouseau/resources/run_clouseau
diff --git a/3.1.0-ubi-clouseau/resources/vm.args b/3.1.1-ubi-clouseau/resources/vm.args
similarity index 100%
rename from 3.1.0-ubi-clouseau/resources/vm.args
rename to 3.1.1-ubi-clouseau/resources/vm.args
diff --git a/3.1.0-ubi/Dockerfile b/3.1.1-ubi/Dockerfile
similarity index 98%
rename from 3.1.0-ubi/Dockerfile
rename to 3.1.1-ubi/Dockerfile
index 9738c08..6e6146c 100644
--- a/3.1.0-ubi/Dockerfile
+++ b/3.1.1-ubi/Dockerfile
@@ -17,7 +17,7 @@
LABEL maintainer="CouchDB Developers dev@couchdb.apache.org" \
name="Apache CouchDB" \
- version="3.1.0" \
+ version="3.1.1" \
summary="Apache CouchDB based on Red Hat UBI" \
description="Red Hat OpenShift-compatible container that runs Apache CouchDB" \
release=${RELEASE} \
@@ -33,7 +33,7 @@
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
-ENV COUCHDB_VERSION 3.1.0
+ENV COUCHDB_VERSION 3.1.1
# Add CouchDB user account to make sure the IDs are assigned consistently
# CouchDB user added to root group for OpenShift support
@@ -76,7 +76,7 @@
# 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-3.1.0; \
+ microdnf install --enablerepo=bintray-apache-couchdb-rpm -y couchdb-3.1.1; \
microdnf clean all; \
rm -rf /var/cache/yum; \
# remove defaults that force writing logs to file
diff --git a/3.1.0-ubi/bintray-apache-couchdb-rpm.repo b/3.1.1-ubi/bintray-apache-couchdb-rpm.repo
similarity index 100%
rename from 3.1.0-ubi/bintray-apache-couchdb-rpm.repo
rename to 3.1.1-ubi/bintray-apache-couchdb-rpm.repo
diff --git a/3.1.0-ubi/imeyer_runit.repo b/3.1.1-ubi/imeyer_runit.repo
similarity index 100%
rename from 3.1.0-ubi/imeyer_runit.repo
rename to 3.1.1-ubi/imeyer_runit.repo
diff --git a/3.1.0-ubi/licenses/LICENSE b/3.1.1-ubi/licenses/LICENSE
similarity index 100%
rename from 3.1.0-ubi/licenses/LICENSE
rename to 3.1.1-ubi/licenses/LICENSE
diff --git a/3.1.0-ubi/resources/10-docker-default.ini b/3.1.1-ubi/resources/10-docker-default.ini
similarity index 100%
rename from 3.1.0-ubi/resources/10-docker-default.ini
rename to 3.1.1-ubi/resources/10-docker-default.ini
diff --git a/3.1.0-ubi/resources/docker-entrypoint.sh b/3.1.1-ubi/resources/docker-entrypoint.sh
similarity index 100%
rename from 3.1.0-ubi/resources/docker-entrypoint.sh
rename to 3.1.1-ubi/resources/docker-entrypoint.sh
diff --git a/3.1.0-ubi/resources/run b/3.1.1-ubi/resources/run
similarity index 100%
rename from 3.1.0-ubi/resources/run
rename to 3.1.1-ubi/resources/run
diff --git a/3.1.0-ubi/resources/vm.args b/3.1.1-ubi/resources/vm.args
similarity index 100%
rename from 3.1.0-ubi/resources/vm.args
rename to 3.1.1-ubi/resources/vm.args
diff --git a/3.1.0/10-docker-default.ini b/3.1.1/10-docker-default.ini
similarity index 100%
rename from 3.1.0/10-docker-default.ini
rename to 3.1.1/10-docker-default.ini
diff --git a/3.1.0/Dockerfile b/3.1.1/Dockerfile
similarity index 99%
rename from 3.1.0/Dockerfile
rename to 3.1.1/Dockerfile
index 6a3fac0..8e5ec26 100644
--- a/3.1.0/Dockerfile
+++ b/3.1.1/Dockerfile
@@ -91,7 +91,7 @@
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/3.1.0/docker-entrypoint.sh b/3.1.1/docker-entrypoint.sh
similarity index 100%
rename from 3.1.0/docker-entrypoint.sh
rename to 3.1.1/docker-entrypoint.sh
diff --git a/3.1.0/vm.args b/3.1.1/vm.args
similarity index 100%
rename from 3.1.0/vm.args
rename to 3.1.1/vm.args
diff --git a/README.md b/README.md
index 5a6aecb..048d141 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
- `2`: The very latest CouchDB 2.x single node release (capable of running in a cluster)
As of this writing, the latest numbered tags available are:
-- `3.1.0`
+- `3.1.1`
- `2.3.1`
# How to use this image
