5.0.90

.gitlab-ci.yml

@@ -7,7 +7,6 @@ cache:
   key: "$CI_BUILD_STAGE"
 
 before_script:
-  - npm install -g @shipzone/npmci
   - npmci npm prepare
 
 stages:
@@ -16,7 +15,7 @@ stages:
 - trigger
 - pages
     
-testSTABLE:
+testStable:
   stage: test
   script:
     - npmci node install stable
@@ -27,16 +26,17 @@ testSTABLE:
     - docker
 
 release:
-  image: hosttoday/ht-docker-dbase:npmci
+  image: registry.gitlab.com/hosttoday/ht-docker-dbase:npmci
   services:
-  - docker:dind
+  - docker:stable-dind
   stage: release
   script:
-  - npmci node install stable
+  - npmci node install lts
   - npmci docker login
   - npmci docker build
   - npmci docker test
-  - npmci docker push
+  - npmci docker push registry.gitlab.com
+  - npmci docker push docker.io
   only:
   - tags
   tags:

Dockerfile

@@ -1,19 +1,21 @@
-FROM ubuntu:xenial
+FROM ubuntu:20.04
 LABEL author="Lossless GmbH <hello@lossless.com>"
 
 WORKDIR /workspace
 # important environment variables 
-ENV NODE_VERSION_LTS="10.16.0" NODE_VERSION_STABLE="12.4.0" 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 \
     && apt-get update \
     && apt-get upgrade --no-install-recommends -y \
     && apt-get install -y -q --no-install-recommends \
+        # base libs
         software-properties-common \
         apt-transport-https \
         build-essential \
         ca-certificates \
+        gpg-agent \
         curl \
         g++ \
         gcc \
@@ -21,13 +23,14 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
         make \
         openssl \
         python \
+        python3 \
         rsync \
         ssh \
         wget \
+        # puppeteer
         gconf-service \
         libasound2 \
         libatk1.0-0 \
-        libatk-bridge2.0-0 \
         libc6 \
         libcairo2 \
         libcups2 \
@@ -56,14 +59,41 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
         libxrender1 \
         libxss1 \
         libxtst6 \
+        ca-certificates \
         fonts-liberation \
         libappindicator1 \
         libnss3 \
         lsb-release \
         xdg-utils \
+    
+    # chrome
+    && wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
+    && apt install -y -q --no-install-recommends ./google-chrome-stable_current_amd64.deb \
+    
+    # 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 \
     && rm -r /var/lib/apt/lists/*
 
 # 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,3 +1,16 @@
-FROM node:11.3.0-alpine
+FROM node:18.7.0-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
+
+#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_iot

@@ -1,4 +1,5 @@
 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 \

Dockerfile_lts

@@ -6,6 +6,7 @@ RUN bash -c "source $NVM_DIR/nvm.sh \
     && nvm alias default $NODE_VERSION_LTS \
     && 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_LTS/lib/node_modules

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_npmdocker

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

Dockerfile_stable

@@ -1,12 +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 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", "--"]

package-lock.json

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ht-docker-node",
-  "version": "5.0.26",
+  "version": "5.0.90",
   "description": "docker image with nodejs and shipzone.io support",
   "main": "index.js",
   "scripts": {
@@ -23,6 +23,7 @@
     "ts_web/*",
     "dist/*",
     "dist_web/*",
+    "dist_ts_web/*",
     "assets/*",
     "cli.js",
     "npmextra.json",

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)
@@ -54,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,11 @@
 # check if npmci is available
+npm init -y
 npmci -v
+npm set registry https://verdaccio.lossless.one
 
-# check if we can use lts
+# TODO update npmci to not require package.json
-npmci install lts
+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,6 @@
 # npm
 npm -v
 node -v
+npm set registry https://verdaccio.lossless.one
 npm install -g @gitzone/tsrun
 # tsrun -v