5.0.60

.gitignore

@@ -8,9 +8,12 @@ pages/
 # installs
 node_modules/
 
-# caches and builds
+# caches
 .yarn/
 .cache/
+.rpt2_cache
+
+# builds
 dist/
 dist_web/
 dist_serve/

.gitlab-ci.yml

@@ -1,77 +1,52 @@
-# gitzone docker
-image: hosttoday/ht-docker-dbase:npmci
-services:
-  - docker:dind
+# gitzone ci_docker
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
-stages:
-  - buildAndTest
-  - triggerPagesVerify
+cache:
+  paths:
+  - .npmci-cache/
+  key: "$CI_BUILD_STAGE"
 
 before_script:
-  - npm install -g @shipzone/npmci
+  - npmci npm prepare
+
+stages:
+- test
+- release
+- trigger
+- pages
+    
+testStable:
+  stage: test
+  script:
+    - npmci node install stable
+    - npmci npm install
+    - npmci npm test
+  coverage: /\d+.?\d+?\%\s*coverage/
+  tags:
+    - docker
+
+release:
+  image: registry.gitlab.com/hosttoday/ht-docker-dbase:npmci
+  services:
+  - docker:stable-dind
+  stage: release
+  script:
+  - npmci node install lts
   - npmci docker login
-
-buildTest:
-  stage: buildAndTest
-  script:
-    - npmci docker build
-    - npmci docker test
-  except:
-    - tags
-    - triggers
-  tags:
-    - lossless
-    - priv
-
-buildTestRelease:
-  stage: buildAndTest
-  script:
-    - npmci docker build
-    - npmci docker test
-    - npmci docker push registry.gitlab.com test
-    - npmci docker push registry.gitlab.com
-    - npmci docker push docker.io
+  - npmci docker build
+  - npmci docker test
+  - npmci docker push registry.gitlab.com
   only:
-    - tags
-    - triggers
+  - tags
   tags:
-    - lossless
-    - priv
+  - docker
+  - priv
 
 trigger:
-  stage: triggerPagesVerify
+  stage: trigger
   script:
     - npmci trigger
-  only:
-    - tags
-    - triggers
-  tags:
-    - lossless
-    - priv
-
-pages:
-  stage: triggerPagesVerify
-  before_script:
-    - 'npmci -v'
-  image: hosttoday/ht-docker-node:npmci
-  script:
-    # - npmci command npm install -g npmpage
-    # - npmci command npmpage
-    - echo "nothing here yet until @gitzone/npmpage is ready!"
   only:
     - tags
   tags:
     - docker
-  artifacts:
-    expire_in: 1 week
-    paths:
-    - public
-
-verify:
-  stage: triggerPagesVerify
-  script:
-    - npmci docker pull registry.gitlab.com test
-  only:
-    - tags
-  tags:
-    - docker

Dockerfile

@@ -3,7 +3,7 @@ LABEL author="Lossless GmbH <hello@lossless.com>"
 
 WORKDIR /workspace
 # important environment variables 
-ENV NODE_VERSION_LTS="10.13.0" NODE_VERSION_STABLE="11.2.0" 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 \

Dockerfile_alpine

@@ -1,3 +1,10 @@
-FROM node:11.3.0-alpine
+FROM node:14.15.4-alpine
 LABEL author="Lossless GmbH <hello@lossless.com>"
-RUN apk update && apk add bash libc6-compat
+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_snyk

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

Dockerfile_tsdocker

@@ -1,4 +1,4 @@
-FROM hosttoday/ht-docker-node:stable
+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

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"
+    ]
+  }
+}

obsolete/Dockerfile_chrome

@@ -1,19 +0,0 @@
-FROM hosttoday/ht-docker-node:stable
-LABEL author="Lossless GmbH <hello@lossless.com>"
-
-# See https://crbug.com/795759
-RUN apt-get update && apt-get install -yq libgconf-2-4 \
-  && apt-get clean \
-  && rm -r /var/lib/apt/lists/*
-
-# Install latest chrome dev package.
-# Note: this installs the necessary libs to make the bundled version of Chromium that Puppeteer
-# installs, work.
-RUN apt-get update && apt-get install -y wget --no-install-recommends \
-    && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
-    && sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
-    && apt-get update \
-    && apt-get install -y google-chrome-unstable \
-      --no-install-recommends \
-    && rm -rf /var/lib/apt/lists/* \
-    && rm -rf /src/*.deb

package-lock.json

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

package.json

@@ -1,10 +1,10 @@
 {
   "name": "ht-docker-node",
-  "version": "5.0.13",
+  "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": {
@@ -17,5 +17,19 @@
     "url": "https://github.com/HostToday/ht-docker-node/issues"
   },
   "homepage": "https://github.com/HostToday/ht-docker-node#readme",
-  "private": true
+  "private": true,
+  "files": [
+    "ts/*",
+    "ts_web/*",
+    "dist/*",
+    "dist_web/*",
+    "dist_ts_web/*",
+    "assets/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ],
+  "directories": {
+    "test": "test"
+  }
 }

readme.md

@@ -1,5 +1,5 @@
 # @hosttoday/ht-docker-node
-docker image with nodejs and ship.zone support
+docker image with nodejs and shipzone.io support
 
 ## Availabililty and Links
 * [npmjs.org (npm package)](https://www.npmjs.com/package/@hosttoday/ht-docker-node)
@@ -29,10 +29,11 @@ RUN npmci install [node_version_number] // this installs node using node and set
 ```
 
 ## Availability
-Registry | Image Path
---- | ---
-GitLab Registry | registry.gitlab.com/hosttoday/ht-docker-node
-Docker Hub | hosttoday/ht-docker-node
+
+| Registry        | Image Path                                   |
+| --------------- | -------------------------------------------- |
+| GitLab Registry | registry.gitlab.com/hosttoday/ht-docker-node |
+| Docker Hub      | hosttoday/ht-docker-node                     |
 
 ## Flavour Overview
 
@@ -53,6 +54,6 @@ For further information read the linked docs at the top of this README.
 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)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
 
-[![repo-footer](https://hosttoday.gitlab.io/assets/repo-footer.svg)](https://maintainedby.lossless.com)
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

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 npm picks it up
-npmci command npm install -g @gitzone/gitzone
-npmci command gitzone -v
+npmci command npm 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/gitzone
-gitzone -v
+npm install -g @gitzone/tsrun
+# tsrun -v