Upgrade 1.7.1, 2.1.1 -> 1.7.2, 2.1.2

apache · Jul 10, 2018 · ca9b039 · ca9b039
1 parent 9057152
commit ca9b039
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,12 +4,10 @@ services:
   - docker
 
 env:
-  - RELEASE=1.7.1
-  - RELEASE=1.7.1-couchperuser
-  - RELEASE=2.1.1
-  - RELEASE=dev
-  - RELEASE=dev-cluster
+  - RELEASES="1.7.2 1.7.2-couchperuser"
+  - RELEASES=2.1.2
+  - RELEASES=dev
+  - RELEASES=dev-cluster
 
 script:
-  - docker build -t couchdb:$RELEASE $RELEASE
-  - docker run -d -p 5984:5984 couchdb:$RELEASE && sleep 10 && curl http://localhost:5984
+  - for rel in $RELEASES; do docker build -t couchdb:$rel $rel; docker run -d --name $rel -p 5984:5984 couchdb:$rel && sleep 10 && curl http://localhost:5984 && docker kill $rel; done
diff --git a/1.7.1-couchperuser/Dockerfile → 1.7.2-couchperuser/Dockerfile b/1.7.1-couchperuser/Dockerfile → 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 → 1.7.2-couchperuser/docker-entrypoint.sh b/1.7.1-couchperuser/docker-entrypoint.sh → 1.7.2-couchperuser/docker-entrypoint.sh
diff --git a/1.7.1/Dockerfile → 1.7.2/Dockerfile b/1.7.1/Dockerfile → 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 → 1.7.2/docker-entrypoint.sh b/1.7.1/docker-entrypoint.sh → 1.7.2/docker-entrypoint.sh
diff --git a/2.1.1/10-docker-default.ini → 2.1.2/10-docker-default.ini b/2.1.1/10-docker-default.ini → 2.1.2/10-docker-default.ini
diff --git a/2.1.1/Dockerfile → 2.1.2/Dockerfile b/2.1.1/Dockerfile → 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 → 2.1.2/docker-entrypoint.sh b/2.1.1/docker-entrypoint.sh → 2.1.2/docker-entrypoint.sh
diff --git a/2.1.1/vm.args → 2.1.2/vm.args b/2.1.1/vm.args → 2.1.2/vm.args