You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kl...@apache.org on 2015/11/02 13:02:57 UTC
couchdb-docker git commit: 1.6: use debian jessie and its erlang
Repository: couchdb-docker
Updated Branches:
refs/heads/master 6374bd653 -> 88f96a611
1.6: use debian jessie and its erlang
- I'm tired of tracking erlang-solutions' updates that break the build
:(
fixes klaemo/docker-couchdb#35
Project: http://git-wip-us.apache.org/repos/asf/couchdb-docker/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-docker/commit/88f96a61
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-docker/tree/88f96a61
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-docker/diff/88f96a61
Branch: refs/heads/master
Commit: 88f96a6111b7f137a17aac354c25868525a5c08a
Parents: 6374bd6
Author: klaemo <kl...@fastmail.fm>
Authored: Mon Nov 2 12:59:23 2015 +0100
Committer: klaemo <kl...@fastmail.fm>
Committed: Mon Nov 2 12:59:49 2015 +0100
----------------------------------------------------------------------
1.6.1/Dockerfile | 7 +++----
README.md | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-docker/blob/88f96a61/1.6.1/Dockerfile
----------------------------------------------------------------------
diff --git a/1.6.1/Dockerfile b/1.6.1/Dockerfile
index e556d76..6a4c6aa 100644
--- a/1.6.1/Dockerfile
+++ b/1.6.1/Dockerfile
@@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations under
# the License.
-FROM debian:wheezy
+FROM debian:8.2
MAINTAINER Clemens Stolle klaemo@fastmail.fm
@@ -25,8 +25,7 @@ RUN apt-get update -y \
&& apt-get install -y --no-install-recommends \
build-essential ca-certificates curl \
libmozjs185-dev libmozjs185-1.0 libnspr4 libnspr4-0d libnspr4-dev libcurl4-openssl-dev libicu-dev \
- && curl -sSL https://packages.erlang-solutions.com/erlang-solutions_1.0_all.deb -o esl.deb && dpkg -i esl.deb && apt-get update \
- && apt-get install -y --no-install-recommends erlang-nox=1:17.5.3 erlang-dev=1:17.5.3 \
+ erlang-nox erlang-dev \
&& curl -sSL http://apache.openmirror.de/couchdb/source/$COUCHDB_VERSION/apache-couchdb-$COUCHDB_VERSION.tar.gz -o couchdb.tar.gz \
&& curl -sSL https://www.apache.org/dist/couchdb/source/$COUCHDB_VERSION/apache-couchdb-$COUCHDB_VERSION.tar.gz.asc -o couchdb.tar.gz.asc \
&& curl -sSL https://www.apache.org/dist/couchdb/KEYS -o KEYS \
@@ -38,7 +37,7 @@ RUN apt-get update -y \
&& make && make install \
&& apt-get purge -y perl binutils cpp make build-essential libnspr4-dev libcurl4-openssl-dev libicu-dev \
&& apt-get autoremove -y \
- && apt-get update && apt-get install -y libicu48 --no-install-recommends \
+ && apt-get update && apt-get install -y libicu52 --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* /usr/src/couchdb /couchdb.tar.gz* /KEYS /esl.deb
# grab gosu for easy step-down from root
http://git-wip-us.apache.org/repos/asf/couchdb-docker/blob/88f96a61/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 959ae4a..252c172 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Put the couch in a docker container and ship it anywhere.
If you're looking for a CouchDB with SSL support you can check out [klaemo/couchdb-ssl](https://index.docker.io/u/klaemo/couchdb-ssl/)
-- Version (stable): `CouchDB 1.6.1`, `Erlang 17.5.3`
+- Version (stable): `CouchDB 1.6.1`, `Erlang 17.3`
- Version (dev): `CouchDB 2.0 developer preview`, `Erlang 18.0`
## Run (stable)