5.0.60

.gitignore

@@ -1 +1,22 @@
-.idea/
+.nogit/
+
+# artifacts
+coverage/
+public/
+pages/
+
+# installs
+node_modules/
+
+# caches
+.yarn/
+.cache/
+.rpt2_cache
+
+# builds
+dist/
+dist_web/
+dist_serve/
+dist_ts_web/
+
+# custom

.gitlab-ci.yml

@@ -1,71 +1,52 @@
-# gitzone docker
-image: hosttoday/ht-docker-dbase:latest
-services:
-  - docker:dind
+# gitzone ci_docker
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
-stages:
-  - build
-  - test
-  - release
-  - trigger
-  - pages
+cache:
+  paths:
+  - .npmci-cache/
+  key: "$CI_BUILD_STAGE"
 
 before_script:
-  - npm uninstall -g npmci
-  - npm install -g npmci
-  - npmci prepare docker
+  - npmci npm prepare
 
-
-build:
-  stage: build
-  script:
-    - npmci build docker
-  tags:
-    - lossless
-    - priv
-  
-
-test:
+stages:
+- test
+- release
+- trigger
+- pages
+    
+testStable:
   stage: test
   script:
-    - npmci test docker
+    - npmci node install stable
+    - npmci npm install
+    - npmci npm test
+  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
-    - priv
+    - docker
 
 release:
+  image: registry.gitlab.com/hosttoday/ht-docker-dbase:npmci
+  services:
+  - docker:stable-dind
   stage: release
   script:
-    - npmci publish docker
+  - npmci node install lts
+  - npmci docker login
+  - npmci docker build
+  - npmci docker test
+  - npmci docker push registry.gitlab.com
   only:
-    - tags
-    - triggers
+  - tags
   tags:
-    - lossless
-    - priv
+  - docker
+  - priv
 
 trigger:
   stage: trigger
   script:
     - npmci trigger
-  only:
-    - tags
-    - triggers
-  tags:
-    - lossless
-    - priv
-
-pages:
-  image: hosttoday/ht-docker-node:npmci
-  stage: pages
-  script:
-    - npmci command yarn global add npmpage
-    - npmci command npmpage
   only:
     - tags
   tags:
     - docker
-  artifacts:
-    expire_in: 1 week
-    paths:
-    - public

Dockerfile

@@ -1,7 +1,9 @@
-FROM ubuntu:latest
+FROM ubuntu:xenial
+LABEL author="Lossless GmbH <hello@lossless.com>"
 
+WORKDIR /workspace
 # important environment variables 
-ENV NODE_VERSION_LTS="6.10.0" NODE_VERSION_STABLE="7.7.2" NVM_DIR="/usr/local/nvm"
+ENV NODE_VERSION_LTS="14.16.1" NODE_VERSION_STABLE="16.1.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 \
@@ -13,17 +15,55 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
         build-essential \
         ca-certificates \
         curl \
+        g++ \
+        gcc \
         git \
-        ssh \
+        make \
         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 \
+        ssh \
+        wget \
+        gconf-service \
+        libasound2 \
+        libatk1.0-0 \
+        libatk-bridge2.0-0 \
+        libc6 \
+        libcairo2 \
+        libcups2 \
+        libdbus-1-3 \
+        libexpat1 \
+        libfontconfig1 \
+        libgcc1 \
+        libgconf-2-4 \
+        libgdk-pixbuf2.0-0 \
+        libglib2.0-0 \
+        libgtk-3-0 \
+        libnspr4 \
+        libpango-1.0-0 \
+        libpangocairo-1.0-0 \
+        libstdc++6 \
+        libx11-6 \
+        libx11-xcb1 \
+        libxcb1 \
+        libxcomposite1 \
+        libxcursor1 \
+        libxdamage1 \
+        libxext6 \
+        libxfixes3 \
+        libxi6 \
+        libxrandr2 \
+        libxrender1 \
+        libxss1 \
+        libxtst6 \
+        fonts-liberation \
+        libappindicator1 \
+        libnss3 \
+        lsb-release \
+        xdg-utils \
     && 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
+RUN curl https://raw.githubusercontent.com/creationix/nvm/v0.33.8/install.sh | bash

Dockerfile_alpine

@@ -0,0 +1,10 @@
+FROM node:14.15.4-alpine
+LABEL author="Lossless GmbH <hello@lossless.com>"
+RUN apk update && apk add bash libc6-compat alpine-sdk
+ENV PYTHONUNBUFFERED=1
+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
+
+
+ENV NODE_OPTIONS="--max_old_space_size=1000"

Dockerfile_iot

@@ -0,0 +1,12 @@
+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
+  # update-binfmts --enable qemu-arm \
+  # && update-binfmts --display qemu-arm \
+  # && mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc \
+  # && echo ':arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm-static:' > /proc/sys/fs/binfmt_misc/register
+
+FROM arm32v7/node:lts-jessie as stage2
+COPY --from=stage1 /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static
+

Dockerfile_lts

@@ -1,9 +1,11 @@
 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_LTS \
     && nvm alias default $NODE_VERSION_LTS \
     && nvm use default \
+    && npm config set unsafe-perm true \
     && npm install -g npm"
     
 ENV NODE_PATH $NVM_DIR/v$NODE_VERSION_LTS/lib/node_modules

Dockerfile_mongo

@@ -1,5 +0,0 @@
-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,4 @@
 FROM hosttoday/ht-docker-node:stable
-RUN npm install -g npmci
+LABEL author="Lossless GmbH <hello@lossless.com>"
+
+RUN npm install -g @shipzone/npmci

Dockerfile_snyk

@@ -0,0 +1,5 @@
+FROM hosttoday/ht-docker-node:npmci
+LABEL author="Lossless GmbH <hello@lossless.com>"
+
+RUN npm install -g snyk
+

Dockerfile_stable

@@ -1,9 +1,11 @@
 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 npm"
 
 ENV NODE_PATH $NVM_DIR/v$NODE_VERSION_STABLE/lib/node_modules

Dockerfile_tsdocker

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

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Host.Today
+Copyright (c) 2016 Lossless GmbH
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,30 +0,0 @@
-# ht-docker-node
-
-This image is available on DockerHub. Specify it as base image like so:
-
-```Dockerfile
-FROM hosttoday/ht-docker-node
-```
-
-## Status
-[![build status](https://gitlab.com/hosttoday/ht-docker-node/badges/master/build.svg)](https://gitlab.com/hosttoday/ht-docker-node/commits/master)
-
-## Usage
-The purpose of this Docker image is to provide a robust base for node apps and CI.
-It comes in different flavours and all of them have node, npm, git and ssh in PATH.
-
-The **:npmci flavour** has npmci in path and can install any required node version and update PATH accordingly:
-
-```Dockerfile
-FROM hosttoday/ht-docker-node:npmci
-RUN npmci install [node_version_number] // this installs node using node and sets the default to the new node and npm versions
-```
-
-## Flavour Overview:
-
-* **:lts** - node lts version, equals :latest
-* **:stable** - node stable version
-* **:npmci** - npmci preinstalled
-* **:npmts** - npmci + npmts preinstalled
-* **:npmpage** - npmci + npmts + npmpage preinstalled
-* **:mongo** - npmci + npmts + mongo

node_modules/.yarn-integrity

@@ -1 +0,0 @@
-549854b8a60607db81d4c58008d59f812d744acba026266f380acd942941356a

npmextra.json

@@ -0,0 +1,18 @@
+{
+  "gitzone": {
+    "module": {
+      "githost": "gitlab.com",
+      "gitscope": "hosttoday",
+      "gitrepo": "ht-docker-node",
+      "shortDescription": "docker image with nodejs and shipzone.io support",
+      "npmPackagename": "@hosttoday/ht-docker-node",
+      "license": "MIT"
+    }
+  },
+  "npmci": {
+    "dockerRegistries": [
+      "docker.io",
+      "registry.gitlab.com"
+    ]
+  }
+}

package-lock.json

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

package.json

@@ -1,10 +1,11 @@
 {
   "name": "ht-docker-node",
-  "version": "4.3.13",
-  "description": "docker image with nodejs with shipzone.io support",
+  "version": "5.0.60",
+  "description": "docker image with nodejs and shipzone.io support",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"no npm test specified\"",
+    "build": "echo \"Not needed for now\""
   },
   "repository": {
     "type": "git",
@@ -15,5 +16,20 @@
   "bugs": {
     "url": "https://github.com/HostToday/ht-docker-node/issues"
   },
-  "homepage": "https://github.com/HostToday/ht-docker-node#readme"
+  "homepage": "https://github.com/HostToday/ht-docker-node#readme",
+  "private": true,
+  "files": [
+    "ts/*",
+    "ts_web/*",
+    "dist/*",
+    "dist_web/*",
+    "dist_ts_web/*",
+    "assets/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ],
+  "directories": {
+    "test": "test"
+  }
 }

readme.md

@@ -0,0 +1,59 @@
+# @hosttoday/ht-docker-node
+docker image with nodejs and shipzone.io support
+
+## Availabililty and Links
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@hosttoday/ht-docker-node)
+* [gitlab.com (source)](https://gitlab.com/hosttoday/ht-docker-node)
+* [github.com (source mirror)](https://github.com/hosttoday/ht-docker-node)
+* [docs (typedoc)](https://hosttoday.gitlab.io/ht-docker-node/)
+
+## Status for master
+[![build status](https://gitlab.com/hosttoday/ht-docker-node/badges/master/build.svg)](https://gitlab.com/hosttoday/ht-docker-node/commits/master)
+[![coverage report](https://gitlab.com/hosttoday/ht-docker-node/badges/master/coverage.svg)](https://gitlab.com/hosttoday/ht-docker-node/commits/master)
+[![npm downloads per month](https://img.shields.io/npm/dm/@hosttoday/ht-docker-node.svg)](https://www.npmjs.com/package/@hosttoday/ht-docker-node)
+[![Known Vulnerabilities](https://snyk.io/test/npm/@hosttoday/ht-docker-node/badge.svg)](https://snyk.io/test/npm/@hosttoday/ht-docker-node)
+[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
+
+## Usage
+
+The purpose of this Docker image is to provide a robust base for node apps and CI.
+It comes in different flavours and all of them have node, npm, git and ssh in PATH.
+
+The **:npmci flavour** has npmci in path and can install any required node version and update PATH accordingly:
+
+```Dockerfile
+FROM hosttoday/ht-docker-node:npmci
+RUN npmci install [node_version_number] // this installs node using node and sets the default to the new node and npm versions
+```
+
+## Availability
+
+| Registry        | Image Path                                   |
+| --------------- | -------------------------------------------- |
+| GitLab Registry | registry.gitlab.com/hosttoday/ht-docker-node |
+| Docker Hub      | hosttoday/ht-docker-node                     |
+
+## Flavour Overview
+
+- **:lts** - node lts version, equals :latest
+- **:stable** - node stable version
+- **:npmci** - npmci preinstalled
+- **:npmts** - npmci + npmts preinstalled
+- **:npmpage** - npmci + npmts + npmpage preinstalled
+- **:mongo** - npmci + npmts + mongo
+
+For further information read the linked docs at the top of this README.
+
+> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+> | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
+
+[![repo-footer](https://hosttoday.gitlab.io/assets/repo-footer.svg)](https://host.today)
+
+For further information read the linked docs at the top of this readme.
+
+> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
+
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

test/test_latest.sh

@@ -1,2 +1 @@
-#!/bin/sh
-yarn -v
+echo "this runs within latest container!";

test/test_npmci.sh

@@ -1,9 +1,10 @@
 # check if npmci is available
+npm init -y
 npmci -v
 
-# check if we can use lts
-npmci install lts
+# TODO update npmci to not require package.json
+npmci node install stable
 
-# check if yarn picks it up
-npmci command yarn global add npmts
-npmci command npmts -v
+# check if npm picks it up
+npmci command npm install -g @gitzone/tsrun
+npmci command tsrun -v

test/test_stable.sh

@@ -1,3 +1,5 @@
-# test yarn
-yarn global add npmts
-npmts -v
+# npm
+npm -v
+node -v
+npm install -g @gitzone/tsrun
+# tsrun -v

tslint.json

@@ -0,0 +1,17 @@
+{
+  "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"
+}