From 4ec250367146c970d3bc4441895ece038eeade81 Mon Sep 17 00:00:00 2001
From: Phil Kunz <gitlab@philkunz.com>
Date: Sat, 11 Mar 2017 14:29:10 +0100
Subject: [PATCH] update

---
 Dockerfile           | 12 ++----------
 Dockerfile_mongo     |  2 +-
 Dockerfile_npmci     |  2 +-
 Dockerfile_npmdeploy |  2 --
 Dockerfile_npmpage   |  5 -----
 Dockerfile_npmts     |  5 -----
 Dockerfile_stable    |  9 +++++++++
 7 files changed, 13 insertions(+), 24 deletions(-)
 delete mode 100644 Dockerfile_npmdeploy
 delete mode 100644 Dockerfile_npmpage
 delete mode 100644 Dockerfile_npmts

diff --git a/Dockerfile b/Dockerfile
index effa5fe..364bf77 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:latest
 
 # important environment variables 
-ENV NODE_VERSION_LTS="6.9.1" NODE_VERSION_STABLE="7.1.0" NVM_DIR="/usr/local/nvm"
+ENV NODE_VERSION_LTS="6.10.0" NODE_VERSION_STABLE="7.7.2" NVM_DIR="/usr/local/nvm"
 
 # Set debconf to run non-interactively and install packages
 RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections \
@@ -26,12 +26,4 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
     && rm -r /var/lib/apt/lists/*
 
 # Install nvm with node and npm
-RUN curl https://raw.githubusercontent.com/creationix/nvm/v0.31.0/install.sh | bash \
-    && bash -c "source $NVM_DIR/nvm.sh \
-    && nvm install $NODE_VERSION_STABLE \
-    && nvm alias default $NODE_VERSION_STABLE \
-    && nvm use default \
-    && npm install -g npm"
-
-ENV NODE_PATH $NVM_DIR/v$NODE_VERSION_STABLE/lib/node_modules
-ENV PATH      $NVM_DIR/versions/node/v$NODE_VERSION_STABLE/bin:$PATH
+RUN curl https://raw.githubusercontent.com/creationix/nvm/v0.31.0/install.sh | bash
diff --git a/Dockerfile_mongo b/Dockerfile_mongo
index 85f464e..a8a4ebf 100644
--- a/Dockerfile_mongo
+++ b/Dockerfile_mongo
@@ -1,4 +1,4 @@
-FROM hosttoday/ht-docker-node:npmts
+FROM hosttoday/ht-docker-node:stable
 RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv EA312927 \
   && echo "deb http://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.2 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-3.2.list \
   && apt-get update \
diff --git a/Dockerfile_npmci b/Dockerfile_npmci
index 8fad2fc..c00f527 100644
--- a/Dockerfile_npmci
+++ b/Dockerfile_npmci
@@ -1,2 +1,2 @@
-FROM hosttoday/ht-docker-node:latest
+FROM hosttoday/ht-docker-node:stable
 RUN npm install -g npmci
\ No newline at end of file
diff --git a/Dockerfile_npmdeploy b/Dockerfile_npmdeploy
deleted file mode 100644
index 761ac24..0000000
--- a/Dockerfile_npmdeploy
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM hosttoday/ht-docker-node:npmci
-RUN npm install -g npmdeploy
diff --git a/Dockerfile_npmpage b/Dockerfile_npmpage
deleted file mode 100644
index a3887c4..0000000
--- a/Dockerfile_npmpage
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM hosttoday/ht-docker-node:npmts
-RUN npmci install stable && npmci command npm install -g npmpage && npmci command npmpage -v \
-    && npmci install legacy && npmci command npm install -g npmpage && npmci command npmpage -v \
-    && npmci install lts && npmci command npm install -g npmpage && npmci command npmpage -v \
-    && npmci clean
\ No newline at end of file
diff --git a/Dockerfile_npmts b/Dockerfile_npmts
deleted file mode 100644
index 38aea39..0000000
--- a/Dockerfile_npmts
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM hosttoday/ht-docker-node:npmci
-RUN npmci install stable && npmci command npm install -g npm npmts && npmci command npmts -v \
-    && npmci install legacy && npmci command npm install -g npm npmts && npmci command npmts -v \
-    && npmci install lts && npmci command npm install -g npm npmts && npmci command npmts -v \
-    && npmci clean
diff --git a/Dockerfile_stable b/Dockerfile_stable
index d2e3a8d..fab15fa 100644
--- a/Dockerfile_stable
+++ b/Dockerfile_stable
@@ -1 +1,10 @@
 FROM hosttoday/ht-docker-node:latest
+
+RUN bash -c "source $NVM_DIR/nvm.sh \
+    && nvm install $NODE_VERSION_STABLE \
+    && nvm alias default $NODE_VERSION_STABLE \
+    && nvm use default \
+    && npm install -g npm"
+
+ENV NODE_PATH $NVM_DIR/v$NODE_VERSION_STABLE/lib/node_modules
+ENV PATH      $NVM_DIR/versions/node/v$NODE_VERSION_STABLE/bin:$PATH