4.3.60

.gitlab-ci.yml

@@ -2,23 +2,16 @@
 image: hosttoday/ht-docker-dbase:npmci
 services:
   - docker:dind
-variables:
-  DOCKER_DRIVER: overlay
-
 
 stages:
   - buildAndTest
-  - build
+  - triggerPagesVerify
-  - test
-  - release
-  - trigger
-  - pages
 
 before_script:
   - yarn global add npmci
   - npmci docker login
 
-buildAndTest:
+buildTest:
   stage: buildAndTest
   script:
     - npmci docker build
@@ -30,37 +23,14 @@ buildAndTest:
     - lossless
     - priv
 
-build:
+buildTestRelase:
-  stage: build
+  stage: buildAndTest
   script:
     - npmci docker build
-    - npmci docker push registry.gitlab.com test
-  only:
-    - tags
-    - triggers
-  tags:
-    - lossless
-    - priv
-  
-
-test:
-  stage: test
-  script:
-    - npmci docker pull registry.gitlab.com test
     - npmci docker test
-  only:
+    - npmci docker push registry.gitlab.com test
-    - tags
-    - triggers
-  tags:
-    - lossless
-    - priv
-
-release:
-  stage: release
-  script:
-    - npmci docker pull registry.gitlab.com test
-    - npmci docker push docker.io
     - npmci docker push registry.gitlab.com
+    - npmci docker push docker.io
   only:
     - tags
     - triggers
@@ -69,7 +39,7 @@ release:
     - priv
 
 trigger:
-  stage: trigger
+  stage: triggerPagesVerify
   script:
     - npmci trigger
   only:
@@ -80,10 +50,10 @@ trigger:
     - priv
 
 pages:
+  stage: triggerPagesVerify
   before_script:
     - 'npmci -v'
   image: hosttoday/ht-docker-node:npmci
-  stage: pages
   script:
     - npmci command yarn global add npmpage
     - npmci command npmpage
@@ -95,3 +65,12 @@ pages:
     expire_in: 1 week
     paths:
     - public
+
+verify:
+  stage: triggerPagesVerify
+  script:
+    - npmci docker pull registry.gitlab.com test
+  only:
+    - tags
+  tags:
+    - docker

Dockerfile_chrome

@@ -15,4 +15,13 @@ RUN apt-get update && apt-get install -y wget --no-install-recommends \
     && apt-get install -y google-chrome-unstable \
       --no-install-recommends \
     && rm -rf /var/lib/apt/lists/* \
-    && rm -rf /src/*.deb
+    && rm -rf /src/*.deb
+
+# Add user so we don't need --no-sandbox.
+RUN groupadd -r pptruser && useradd -r -g pptruser -G audio,video pptruser \
+    && mkdir -p /home/pptruser/Downloads \
+    && chown -R pptruser:pptruser /home/pptruser \
+    && chown -R pptruser:pptruser /node_modules
+
+# Run everything after as non-privileged user.
+USER pptruser

Dockerfile_npmci

@@ -1,4 +1,4 @@
 FROM hosttoday/ht-docker-node:stable
 LABEL author="Lossless GmbH <office@lossless.com>"
 
-RUN yarn global add npmci
+RUN yarn global add @shipzone/npmci

Dockerfile_npmdocker

@@ -1,4 +1,4 @@
 FROM hosttoday/ht-docker-node:stable
 LABEL author="Lossless GmbH <office@lossless.com>"
 
-RUN yarn global add npmci npmdocker npmts ts-node
+RUN yarn global add npmci npmdocker @gitzone/npmts ts-node

Dockerfile_npmpage

@@ -1,21 +0,0 @@
-FROM hosttoday/ht-docker-node:stable
-LABEL author="Lossless GmbH <office@lossless.com>"
-
-RUN apt-get update && apt-get install -y python-pip
-RUN yarn global add npmpage
-RUN pip install --upgrade pip \
-    && pip install mkdocs \
-    && mkdocs --version \
-    && pip install mkdocs-material \
-    && pip install pygments \
-    && pip install pymdown-extensions
-
-# Set working directory
-WORKDIR /docs
-
-# Expose MkDocs development server port
-EXPOSE 8000
-
-# Start development server by default
-ENTRYPOINT ["mkdocs"]
-CMD ["serve", "--dev-addr=0.0.0.0:8000"]

docs/index.md

@@ -31,7 +31,6 @@ RUN npmci install [node_version_number] // this installs node using node and set
 * **:stable** - node stable version
 * **:npmci** - npmci preinstalled
 * **:npmcijava - npmci + java
-* **:npmts** - npmci + npmts preinstalled
 * **:npmpage** - npmci + npmts + npmpage preinstalled
 * **:mongo** - npmci + npmts + mongo
 

package.json

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