rabbah closed pull request #134: synch couchdb base image with upstream project URL: https://github.com/apache/incubator-openwhisk-deploy-kube/pull/134
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/docker/couchdb/Dockerfile b/docker/couchdb/Dockerfile index a26e17a..aaddc59 100644 --- a/docker/couchdb/Dockerfile +++ b/docker/couchdb/Dockerfile @@ -1,4 +1,4 @@ -FROM klaemo/couchdb:2.0 +FROM apache/couchdb:2.1 ADD http://ftp.us.debian.org/debian/pool/main/a/apt/apt-transport-https_1.0.9.8.4_amd64.deb /tmp/apt-transport-https_1.0.9.8.4_amd64.deb ADD http://ftp.us.debian.org/debian/pool/main/c/curl/libcurl3-gnutls_7.38.0-4+deb8u8_amd64.deb /tmp/libcurl3-gnutls_7.38.0-4+deb8u58_amd64.deb diff --git a/docker/couchdb/init.sh b/docker/couchdb/init.sh index c8a4a43..e042057 100755 --- a/docker/couchdb/init.sh +++ b/docker/couchdb/init.sh @@ -75,6 +75,6 @@ pushd /openwhisk popd popd -echo "successfully setup and configured CouchDB v2.0" +echo "successfully setup and configured CouchDB for OpenWhisk" sleep inf ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
