couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kla...@apache.org
Subject couchdb-docker git commit: 2.0: further reduce image size by splitting off docs version
Date Fri, 18 Dec 2015 13:35:45 GMT
Repository: couchdb-docker
Updated Branches:
  refs/heads/master 9d4172a9f -> a61b1f358


2.0: further reduce image size by splitting off docs version


Project: http://git-wip-us.apache.org/repos/asf/couchdb-docker/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-docker/commit/a61b1f35
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-docker/tree/a61b1f35
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-docker/diff/a61b1f35

Branch: refs/heads/master
Commit: a61b1f3589dd92f09ff0facdb2bd19941d728a7e
Parents: 9d4172a
Author: klaemo <klaemo@fastmail.fm>
Authored: Fri Dec 18 14:35:18 2015 +0100
Committer: klaemo <klaemo@fastmail.fm>
Committed: Fri Dec 18 14:35:18 2015 +0100

----------------------------------------------------------------------
 2.0-dev-docs/Dockerfile | 96 ++++++++++++++++++++++++++++++++++++++++++++
 2.0-dev/Dockerfile      | 36 +++++------------
 README.md               |  6 +++
 3 files changed, 112 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-docker/blob/a61b1f35/2.0-dev-docs/Dockerfile
----------------------------------------------------------------------
diff --git a/2.0-dev-docs/Dockerfile b/2.0-dev-docs/Dockerfile
new file mode 100644
index 0000000..d0a3ffb
--- /dev/null
+++ b/2.0-dev-docs/Dockerfile
@@ -0,0 +1,96 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+FROM debian:jessie
+
+MAINTAINER Clemens Stolle klaemo@apache.org
+
+ENV COUCHDB_VERSION master
+
+RUN groupadd -r couchdb && useradd -d /usr/src/couchdb -g couchdb couchdb
+
+# download dependencies
+RUN apt-get update -y && apt-get install -y --no-install-recommends \
+    apt-transport-https \
+    build-essential \
+    ca-certificates \
+    curl \
+    default-jdk \
+    erlang-base-hipe \
+    erlang-dev \
+    erlang-eunit \
+    erlang-nox \
+    git \
+    haproxy \
+    libcurl4-openssl-dev \
+    libicu-dev \
+    libmozjs185-dev \
+    libnspr4 \
+    libnspr4-0d \
+    libnspr4-dev \
+    libwxgtk3.0 \
+    openssl \
+    pkg-config \
+    procps \
+    python \
+    python-sphinx \
+    texinfo \
+    texlive-base \
+    texlive-fonts-extra \
+    texlive-fonts-recommended \
+    texlive-latex-extra \
+    wget \
+ && curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
\
+ && echo 'deb https://deb.nodesource.com/node_4.x jessie main' > /etc/apt/sources.list.d/nodesource.list
\
+ && echo 'deb-src https://deb.nodesource.com/node_4.x jessie main' >> /etc/apt/sources.list.d/nodesource.list
\
+ && apt-get update -y && apt-get install -y nodejs \
+ && npm install -g grunt-cli \
+ && cd /usr/src && git clone https://git-wip-us.apache.org/repos/asf/couchdb.git
\
+ && cd couchdb && git checkout $COUCHDB_VERSION \
+ && cd /usr/src/couchdb && ./configure && make \
+ && apt-get purge -y \
+    binutils \
+    build-essential \
+    cpp \
+    default-jdk \
+    git \
+    libcurl4-openssl-dev \
+    libicu-dev \
+    libnspr4-dev \
+    libwxgtk3.0 \
+    make \
+    nodejs \
+    perl \
+    pkg-config \
+    texinfo \
+    texlive-base \
+    texlive-fonts-extra \
+    texlive-fonts-recommended \
+    texlive-latex-extra \
+    wget \
+ && apt-get autoremove -y \
+ && apt-get install -y libicu52 --no-install-recommends \
+ && rm -rf /var/lib/apt/lists/* /usr/lib/node_modules src/fauxton/node_modules src/**/.git
.git
+
+# permissions
+RUN chmod +x /usr/src/couchdb/dev/run && chown -R couchdb:couchdb /usr/src/couchdb
+
+USER couchdb
+
+# Expose to the outside
+RUN sed -i'' 's/bind_address = 127.0.0.1/bind_address = 0.0.0.0/' /usr/src/couchdb/rel/overlay/etc/default.ini
+
+EXPOSE 5984
+WORKDIR /usr/src/couchdb
+
+ENTRYPOINT ["/usr/src/couchdb/dev/run"]
+CMD ["--with-haproxy"]

http://git-wip-us.apache.org/repos/asf/couchdb-docker/blob/a61b1f35/2.0-dev/Dockerfile
----------------------------------------------------------------------
diff --git a/2.0-dev/Dockerfile b/2.0-dev/Dockerfile
index 14b6afc..0b4e26a 100644
--- a/2.0-dev/Dockerfile
+++ b/2.0-dev/Dockerfile
@@ -24,7 +24,6 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends
\
     build-essential \
     ca-certificates \
     curl \
-    default-jdk \
     erlang-base-hipe \
     erlang-dev \
     erlang-eunit \
@@ -37,49 +36,34 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends
\
     libnspr4 \
     libnspr4-0d \
     libnspr4-dev \
-    libwxgtk3.0 \
     openssl \
-    pkg-config \
     procps \
     python \
-    python-sphinx \
-    texinfo \
-    texlive-base \
-    texlive-fonts-extra \
-    texlive-fonts-recommended \
-    texlive-latex-extra \
     wget \
- && git clone https://github.com/rebar/rebar /usr/src/rebar \
- && (cd /usr/src/rebar ; make && mv rebar /usr/local/bin/) \
- && cd /usr/src && git clone https://git-wip-us.apache.org/repos/asf/couchdb.git
\
- && cd couchdb && git checkout $COUCHDB_VERSION \
  && curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
\
- && echo 'deb https://deb.nodesource.com/node jessie main' > /etc/apt/sources.list.d/nodesource.list
\
- && echo 'deb-src https://deb.nodesource.com/node jessie main' >> /etc/apt/sources.list.d/nodesource.list
\
+ && echo 'deb https://deb.nodesource.com/node_4.x jessie main' > /etc/apt/sources.list.d/nodesource.list
\
+ && echo 'deb-src https://deb.nodesource.com/node_4.x jessie main' >> /etc/apt/sources.list.d/nodesource.list
\
  && apt-get update -y && apt-get install -y nodejs \
- && npm -g install npm@latest && npm install -g grunt-cli \
- && cd /usr/src/couchdb && ./configure && make \
+ && npm install -g grunt-cli \
+ && cd /usr/src && git clone --depth 1 https://git-wip-us.apache.org/repos/asf/couchdb.git
\
+ && cd couchdb && git checkout $COUCHDB_VERSION \
+ && cd /usr/src/couchdb && ./configure --disable-docs && make \
  && apt-get purge -y \
     binutils \
     build-essential \
     cpp \
-    default-jdk \
+    erlang-dev \
     git \
     libcurl4-openssl-dev \
+    libicu-dev \
     libnspr4-dev \
-    libwxgtk3.0 \
     make \
     nodejs \
     perl \
-    pkg-config \
-    texinfo \
-    texlive-base \
-    texlive-fonts-extra \
-    texlive-fonts-recommended \
-    texlive-latex-extra \
     wget \
  && apt-get autoremove -y && apt-get clean \
- && rm -rf /var/lib/apt/lists/* /usr/lib/node_modules /usr/src/couchdb/src/fauxton/node_modules
+ && apt-get install -y libicu52 --no-install-recommends \
+ && rm -rf /var/lib/apt/lists/* /usr/lib/node_modules src/fauxton/node_modules src/**/.git
.git
 
 # permissions
 RUN chmod +x /usr/src/couchdb/dev/run && chown -R couchdb:couchdb /usr/src/couchdb

http://git-wip-us.apache.org/repos/asf/couchdb-docker/blob/a61b1f35/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 6b60254..55f51b3 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,12 @@ If you're looking for a CouchDB with SSL support you can check out [klaemo/couch
 - Version (stable): `CouchDB 1.6.1`, `Erlang 17.3`
 - Version (dev): `CouchDB 2.0 master`, `Erlang 17.3`
 
+## Available tags
+
+- `1`, `1.6`, `1.6.1`, `latest`: CouchDB 1.6.1
+- `2.0-dev`: CouchDB 2.0 master (development version)
+- `2.0-dev-docs`: CouchDB 2.0 master (development version) with documentation
+
 ## Features
 
 * built on top of the solid and small `debian:jessie` base image


Mime
View raw message