5.0.94

.gitlab-ci.yml

@@ -36,6 +36,7 @@ release:
   - npmci docker build
   - npmci docker test
   - npmci docker push registry.gitlab.com
+  - npmci docker push docker.io
   only:
   - tags
   tags:

Dockerfile

@@ -1,9 +1,9 @@
-FROM ubuntu:bionic
+FROM ubuntu:20.04
 LABEL author="Lossless GmbH <hello@lossless.com>"
 
 WORKDIR /workspace
 # important environment variables 
-ENV NODE_VERSION_LTS="14.18.1" NODE_VERSION_STABLE="16.11.1" NVM_DIR="/usr/local/nvm"
+ENV NODE_VERSION_LTS="16.16.0" NODE_VERSION_STABLE="18.7.0" NVM_DIR="/usr/local/nvm"
 
 # Set debconf to run non-interactively and install packages
 RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections \
@@ -73,6 +73,7 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
     # mongodb
     && curl -fsSL https://www.mongodb.org/static/pgp/server-4.4.asc | apt-key add - \
     && echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list \
+    && apt-get update \
     && apt-get install -y -q --no-install-recommends \
         mongodb-org \
     && apt-get clean \
@@ -80,3 +81,19 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
 
 # Install nvm with node and npm
 RUN curl https://raw.githubusercontent.com/creationix/nvm/v0.33.8/install.sh | bash
+
+RUN bash -c "source $NVM_DIR/nvm.sh \
+    && nvm install $NODE_VERSION_STABLE \
+    && nvm alias default $NODE_VERSION_STABLE \
+    && nvm use default \
+    && npm config set unsafe-perm true \
+    && npm install -g agentkeepalive \
+    && 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
+
+ENV PNPM_HOME="/root/.local/share/pnpm/pnpm"
+RUN mkdir -p ${PNPM_HOME}
+ENV PATH="$PNPM_HOME:$PATH"
+RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm && pnpm -v

Dockerfile_alpine

@@ -1,4 +1,4 @@
-FROM node:14.15.4-alpine
+FROM node:18.7.0-alpine
 LABEL author="Lossless GmbH <hello@lossless.com>"
 RUN apk update && apk add bash libc6-compat alpine-sdk
 ENV PYTHONUNBUFFERED=1
@@ -6,5 +6,11 @@ RUN apk add --update --no-cache python3 && ln -sf python3 /usr/bin/python
 RUN python3 -m ensurepip
 RUN pip3 install --no-cache --upgrade pip setuptools
 
+#pnpm
+ENV PNPM_HOME="/root/.local/share/pnpm/pnpm"
+RUN mkdir -p ${PNPM_HOME}
+ENV PATH="$PNPM_HOME:$PATH"
+RUN curl -fsSL "https://github.com/pnpm/pnpm/releases/latest/download/pnpm-linuxstatic-x64" -o /bin/pnpm; chmod +x /bin/pnpm;
+RUN pnpm -v
 
 ENV NODE_OPTIONS="--max_old_space_size=1000"

Dockerfile_alpinenpmci

@@ -0,0 +1,2 @@
+FROM hosttoday/ht-docker-node:alpine
+RUN pnpm install -g @shipzone/npmci

Dockerfile_iot

@@ -1,4 +1,4 @@
-FROM hosttoday/ht-docker-node:stable as stage1
+FROM hosttoday/ht-docker-node:latest as stage1
 LABEL author="Lossless GmbH <hello@lossless.com>"
 RUN apt-get update && apt-get install -y --no-install-recommends qemu-user-static binfmt-support
   # the following lines need to be run on a system that supports both architectures

Dockerfile_npmci

@@ -1,4 +1,4 @@
-FROM hosttoday/ht-docker-node:stable
+FROM hosttoday/ht-docker-node:latest
 LABEL author="Lossless GmbH <hello@lossless.com>"
 
-RUN npm install -g @shipzone/npmci
+RUN pnpm install -g @shipzone/npmci

Dockerfile_stable

@@ -1,13 +0,0 @@
-FROM hosttoday/ht-docker-node:latest
-LABEL author="Lossless GmbH <hello@lossless.com>"
-
-RUN bash -c "source $NVM_DIR/nvm.sh \
-    && nvm install $NODE_VERSION_STABLE \
-    && nvm alias default $NODE_VERSION_STABLE \
-    && nvm use default \
-    && npm config set unsafe-perm true \
-    && npm install -g agentkeepalive \
-    && 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

Dockerfile_stableinit

@@ -0,0 +1,6 @@
+FROM hosttoday/ht-docker-node:latest
+# Add Tini
+ENV TINI_VERSION v0.19.0
+ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
+RUN chmod +x /tini
+ENTRYPOINT ["/tini", "--"]

Dockerfile_tsdocker

@@ -1,4 +0,0 @@
-FROM hosttoday/ht-docker-node:lts
-LABEL author="Lossless GmbH <hello@lossless.com>"
-
-RUN npm install -g @shipzone/npmci @gitzone/tsdocker @gitzone/tsrun

package-lock.json

@@ -1,5 +1,5 @@
 {
   "name": "ht-docker-node",
-  "version": "5.0.74",
+  "version": "5.0.94",
   "lockfileVersion": 1
 }

package.json

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

readme.md

@@ -1,5 +1,5 @@
 # @hosttoday/ht-docker-node
-docker image with nodejs and shipzone.io support
+docker image with nodejs and [ship.zone](https://ship.zone) support
 
 ## Availabililty and Links
 * [npmjs.org (npm package)](https://www.npmjs.com/package/@hosttoday/ht-docker-node)

test/test_npmci.sh

@@ -6,5 +6,5 @@ npmci -v
 npmci node install stable
 
 # check if npm picks it up
-npmci command npm install -g @gitzone/tsrun
+npmci command pnpm install -g @gitzone/tsrun
 npmci command tsrun -v

test/test_stable.sh

@@ -1,5 +1,5 @@
 # npm
 npm -v
 node -v
-npm install -g @gitzone/tsrun
-# tsrun -v
+pnpm install -g @gitzone/tsrun
+tsrun -v

tslint.json

@@ -1,17 +0,0 @@
-{
-  "extends": ["tslint:latest", "tslint-config-prettier"],
-  "rules": {
-    "semicolon": [true, "always"],
-    "no-console": false,
-    "ordered-imports": false,
-    "object-literal-sort-keys": false,
-    "member-ordering": {
-      "options":{
-        "order": [
-          "static-method"
-        ]
-      }
-    }
-  },
-  "defaultSeverity": "warning"
-}