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 2018/07/10 21:52:16 UTC

[couchdb-docker] 01/01: Upgrade 1.7.1, 2.1.1 -> 1.7.2, 2.1.2

This is an automated email from the ASF dual-hosted git repository.

wohali pushed a commit to branch 172-212
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git

commit ecb1e6dce5ef077d3517ad24e1cbcb080cde33a9
Author: Joan Touzet <wo...@apache.org>
AuthorDate: Tue Jul 10 14:51:42 2018 -0700

    Upgrade 1.7.1, 2.1.1 -> 1.7.2, 2.1.2
---
 {1.7.1-couchperuser => 1.7.2-couchperuser}/Dockerfile           | 2 +-
 {1.7.1-couchperuser => 1.7.2-couchperuser}/docker-entrypoint.sh | 0
 {1.7.1 => 1.7.2}/Dockerfile                                     | 2 +-
 {1.7.1 => 1.7.2}/docker-entrypoint.sh                           | 0
 {2.1.1 => 2.1.2}/10-docker-default.ini                          | 0
 {2.1.1 => 2.1.2}/Dockerfile                                     | 2 +-
 {2.1.1 => 2.1.2}/docker-entrypoint.sh                           | 0
 {2.1.1 => 2.1.2}/vm.args                                        | 0
 8 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/1.7.1-couchperuser/Dockerfile b/1.7.2-couchperuser/Dockerfile
similarity index 98%
rename from 1.7.1-couchperuser/Dockerfile
rename to 1.7.2-couchperuser/Dockerfile
index 1ed7a4c..510a458 100644
--- a/1.7.1-couchperuser/Dockerfile
+++ b/1.7.2-couchperuser/Dockerfile
@@ -10,7 +10,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-FROM couchdb:1.7.1
+FROM couchdb:1.7.2
 
 MAINTAINER CouchDB Developers dev@couchdb.apache.org
 
diff --git a/1.7.1-couchperuser/docker-entrypoint.sh b/1.7.2-couchperuser/docker-entrypoint.sh
similarity index 100%
rename from 1.7.1-couchperuser/docker-entrypoint.sh
rename to 1.7.2-couchperuser/docker-entrypoint.sh
diff --git a/1.7.1/Dockerfile b/1.7.2/Dockerfile
similarity index 99%
rename from 1.7.1/Dockerfile
rename to 1.7.2/Dockerfile
index da36f22..95b49be 100644
--- a/1.7.1/Dockerfile
+++ b/1.7.2/Dockerfile
@@ -76,7 +76,7 @@ RUN set -xe \
     gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
   done
 
-ENV COUCHDB_VERSION 1.7.1
+ENV COUCHDB_VERSION 1.7.2
 
 # download dependencies, compile and install couchdb,
 # set correct permissions, expose couchdb to the outside and disable logging to disk
diff --git a/1.7.1/docker-entrypoint.sh b/1.7.2/docker-entrypoint.sh
similarity index 100%
rename from 1.7.1/docker-entrypoint.sh
rename to 1.7.2/docker-entrypoint.sh
diff --git a/2.1.1/10-docker-default.ini b/2.1.2/10-docker-default.ini
similarity index 100%
rename from 2.1.1/10-docker-default.ini
rename to 2.1.2/10-docker-default.ini
diff --git a/2.1.1/Dockerfile b/2.1.2/Dockerfile
similarity index 99%
rename from 2.1.1/Dockerfile
rename to 2.1.2/Dockerfile
index 1ffb317..9520b6c 100644
--- a/2.1.1/Dockerfile
+++ b/2.1.2/Dockerfile
@@ -79,7 +79,7 @@ RUN set -xe \
     gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
   done
 
-ENV COUCHDB_VERSION 2.1.1
+ENV COUCHDB_VERSION 2.1.2
 
 # Download dev dependencies
 RUN buildDeps=' \
diff --git a/2.1.1/docker-entrypoint.sh b/2.1.2/docker-entrypoint.sh
similarity index 100%
rename from 2.1.1/docker-entrypoint.sh
rename to 2.1.2/docker-entrypoint.sh
diff --git a/2.1.1/vm.args b/2.1.2/vm.args
similarity index 100%
rename from 2.1.1/vm.args
rename to 2.1.2/vm.args