[couchdb-docker] branch master updated: update docs deps and dev-cluster node to 8.x

[wo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wohali pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-docker.git


The following commit(s) were added to refs/heads/master by this push:
     new a1f4d9d  update docs deps and dev-cluster node to 8.x
a1f4d9d is described below

commit a1f4d9d579a7986d27a791c7b7ede50b13157751
Author: Joan Touzet <jo...@atypical.net>
AuthorDate: Tue Jul 10 02:24:13 2018 -0400

    update docs deps and dev-cluster node to 8.x
---
 dev-cluster/Dockerfile | 8 ++++----
 dev/Dockerfile         | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dev-cluster/Dockerfile b/dev-cluster/Dockerfile
index c89c104..14df4b1 100644
--- a/dev-cluster/Dockerfile
+++ b/dev-cluster/Dockerfile
@@ -84,17 +84,17 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
     libmozjs185-dev \
     python-setuptools \ 
     python-pip \
+    python-sphinx \
     python-wheel
 
-RUN pip install \
-    sphinx \
+RUN pip install --upgrade \
     sphinx_rtd_theme
 
 # Node is special
 RUN set -ex; \
     curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -; \
-    echo 'deb https://deb.nodesource.com/node_6.x stretch main' > /etc/apt/sources.list.d/nodesource.list; \
-    echo 'deb-src https://deb.nodesource.com/node_6.x stretch main' >> /etc/apt/sources.list.d/nodesource.list; \
+    echo 'deb https://deb.nodesource.com/node_8.x stretch main' > /etc/apt/sources.list.d/nodesource.list; \
+    echo 'deb-src https://deb.nodesource.com/node_8.x stretch main' >> /etc/apt/sources.list.d/nodesource.list; \
     apt-get update -y && apt-get install -y nodejs; \
     npm install -g grunt-cli
 
diff --git a/dev/Dockerfile b/dev/Dockerfile
index 4b5b2af..24db534 100644
--- a/dev/Dockerfile
+++ b/dev/Dockerfile
@@ -86,10 +86,10 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
     libmozjs185-dev \
     python-setuptools \ 
     python-pip \
+    python-sphinx \
     python-wheel
 
-RUN pip install \
-    sphinx \
+RUN pip install --upgrade \
     sphinx_rtd_theme
 
 # Node is special