4.3.10

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: hosttoday/ht-docker-dbase
+image: hosttoday/ht-docker-dbase:latest
 services:
   - docker:dind
 
@@ -27,8 +27,6 @@ test:
   stage: test
   script:
     - npmci test docker
-  only:
-    - master
   tags:
     - lossless
     - priv
@@ -38,7 +36,8 @@ release:
   script:
     - npmci publish docker
   only:
-    - master
+    - tags
+    - triggers
   tags:
     - lossless
     - priv
@@ -48,7 +47,8 @@ trigger:
   script:
     - npmci trigger
   only:
-    - master
+    - tags
+    - triggers
   tags:
     - lossless
     - priv

Dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:latest
 
 # important environment variables 
-ENV NODE_VERSION_LTS="4.4.7" NODE_VERSION_STABLE="6.3.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 \
@@ -18,16 +18,12 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
         openssl \
         python \
         rsync \
+    && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+    && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
+    && apt-get update \
+    && apt-get install yarn -y \
     && apt-get clean \
     && 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

Dockerfile_mongo

@@ -0,0 +1,5 @@
+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 \
+  && apt-get install -y mongodb-org

Dockerfile_npmci

@@ -1,2 +1,2 @@
-FROM hosttoday/ht-docker-node:latest
+FROM hosttoday/ht-docker-node:stable
 RUN npm install -g npmci

Dockerfile_npmdeploy

@@ -1,2 +0,0 @@
-FROM hosttoday/ht-docker-node:npmci
-RUN npm install -g npmdeploy

Dockerfile_npmpage

@@ -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

Dockerfile_npmts

@@ -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

Dockerfile_python3

@@ -1,13 +0,0 @@
-FROM hosttoday/ht-docker-node:latest
-RUN apt-get update \
-    && apt-get install -y -q --no-install-recommends \
-            python3 \
-    && apt-get clean \
-    && rm -r /var/lib/apt/lists/*
-
-# Install pip and symlink python to python3
-RUN curl -O https://bootstrap.pypa.io/get-pip.py \
-    && python3 get-pip.py \
-    && rm get-pip.py \
-    && rm -r /usr/bin/python \
-    && ln -s /usr/bin/python3 /usr/bin/python

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

README.md

@@ -27,4 +27,4 @@ RUN npmci install [node_version_number] // this installs node using node and set
 * **:npmci** - npmci preinstalled
 * **:npmts** - npmci + npmts preinstalled
 * **:npmpage** - npmci + npmts + npmpage preinstalled
-* **:python3** - like :latest, but with python3 as standard python version
+* **:mongo** - npmci + npmts + mongo

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ht-docker-node",
-  "version": "4.3.2",
+  "version": "4.3.10",
   "description": "docker image with nodejs with shipzone.io support",
   "main": "index.js",
   "scripts": {

test/test_latest.sh

@@ -1,3 +1,9 @@
 #!/bin/sh
+
+# test availability of node and npm
 npm -v
 node -v
+
+# test yarn
+yarn global add npmts
+npmts -v

test/test_npmci.sh

@@ -1 +1,9 @@
+# check if npmci is available
 npmci -v
+
+# check if we can use lts
+npmci install lts
+
+# check if yarn picks it up
+npmci command yarn global add npmts
+npmci command npmts -v

test/test_npmts.sh

@@ -1,6 +0,0 @@
-npmci install stable
-npmci command npmts -v
-npmci install lts
-npmci command npmts -v
-npmci install legacy
-npmci command npmts -v