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 d5089cc9e818c02274f7406a96e586746b67d080 Author: Joan Touzet <[email protected]> AuthorDate: Tue Jul 10 14:51:42 2018 -0700 Upgrade 1.7.1, 2.1.1 -> 1.7.2, 2.1.2 --- .travis.yml | 6 +++--- {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 9 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7db5791..1e791c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,9 @@ services: - docker env: - - RELEASE=1.7.1 - - RELEASE=1.7.1-couchperuser - - RELEASE=2.1.1 + - RELEASE=1.7.2 + - RELEASE=1.7.2-couchperuser + - RELEASE=2.1.2 - RELEASE=dev - RELEASE=dev-cluster 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 [email protected] 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
