4.3.41

.gitlab-ci.yml

@@ -7,6 +7,7 @@ variables:
 
 
 stages:
+  - buildAndTest
   - build
   - test
   - release
@@ -15,13 +16,27 @@ stages:
 
 before_script:
   - yarn global add npmci
-  - npmci docker prepare
+  - npmci docker login
+
+buildAndTest:
+  stage: buildAndTest
+  script:
+    - npmci docker build
+    - npmci docker test
+  except:
+    - tags
+  tags:
+    - lossless
+    - priv
 
 build:
   stage: build
   script:
     - npmci docker build
     - npmci docker push registry.gitlab.com test
+  only:
+    - tags
+    - triggers
   tags:
     - lossless
     - priv
@@ -32,6 +47,9 @@ test:
   script:
     - npmci docker pull registry.gitlab.com test
     - npmci docker test
+  only:
+    - tags
+    - triggers
   tags:
     - lossless
     - priv
@@ -41,6 +59,7 @@ release:
   script:
     - npmci docker pull registry.gitlab.com test
     - npmci docker push docker.io
+    - npmci docker push registry.gitlab.com
   only:
     - tags
     - triggers

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:latest
+FROM ubuntu:xenial
 MAINTAINER Lossless GmbH <office@lossless.com>
 
 # important environment variables 
@@ -14,11 +14,14 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio
         build-essential \
         ca-certificates \
         curl \
+        g++ \
+        gcc \
         git \
-        ssh \
+        make \
         openssl \
         python \
         rsync \
+        ssh \
         wget \
     && 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 \

Dockerfile_mongo

@@ -1,7 +1,7 @@
 FROM hosttoday/ht-docker-node:stable
 MAINTAINER Lossless GmbH <office@lossless.com>
 
-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 \
+RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6 \
+  && echo "deb [ arch=amd64,arm64 ] http://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-3.4.list \
   && apt-get update \
   && apt-get install -y mongodb-org

Dockerfile_npmpage

@@ -0,0 +1,19 @@
+FROM hosttoday/ht-docker-node:stable
+RUN apt-get update && apt-get install -y python-pip
+RUN npmci command 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"]

package.json

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

test/test_npmpage.sh

@@ -0,0 +1 @@
+mkdocs --version