1.0.85

.gitlab-ci.yml

@@ -1,34 +1,30 @@
-# gitzone ci_docker
-image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-
-cache:
-  paths:
-  - .npmci-cache/
-  key: "$CI_BUILD_STAGE"
+# gitzone custom
+image: docker:20.10.8
+services:
+  - docker:stable-dind
 
 before_script:
-  - npmci npm prepare
+- apk update
+- apk add --no-cache git openssl ca-certificates bash curl
+- apk add --no-cache make gcc g++ python3 py3-pip linux-headers paxctl
+- apk add --no-cache libgcc libstdc++ gnupg nodejs-current npm
+- update-ca-certificates
+- cp ./stack-fix.c /lib/
+- set -ex
+- apk add --no-cache  --virtual .build-deps build-base
+- gcc  -shared -fPIC /lib/stack-fix.c -o /lib/stack-fix.so
+- apk del .build-deps
+- export LD_PRELOAD="/lib/stack-fix.so"
+- npm config set unsafe-perm true
+- node -v && npm -v
+- 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:18-dind
   stage: release
   script:
   - npmci node install stable
@@ -40,13 +36,16 @@ release:
   - tags
   tags:
   - docker
+  - lossless
   - priv
 
 trigger:
   stage: trigger
   script:
-    - npmci trigger
+  - npmci trigger
   only:
-    - tags
+  - tags
   tags:
-    - docker
+  - docker
+  - lossless
+  - priv

Dockerfile

@@ -1,22 +1,58 @@
-FROM docker:19.03.1
+FROM docker:20.10.8
 
 RUN apk update && apk add --no-cache \
   git \
   openssl \
+  openssl-dev \
   ca-certificates \
   bash \
   curl \
   make \
   gcc \
   g++ \
-  python \
+  python3 \
+  python3-dev \
+  py3-pip \
   linux-headers \
   paxctl \
   libgcc \
   libstdc++ \
   gnupg \
-  nodejs \
-  nodejs-npm \
-  && update-ca-certificates
+  nodejs-current \
+  npm \
+  krb5-libs \
+  && update-ca-certificates \
+  rust \
+  docker-cli \
+  libffi-dev \
+  libc-dev \
+  docker-compose
+
+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
+
+# Add the patch fix
+COPY ./stack-fix.c /lib/
+
+RUN node -v && npm -v
+
+#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
+
+# Prepare the libraries packages
+RUN set -ex \
+    && apk add --no-cache  --virtual .build-deps build-base \
+    && gcc  -shared -fPIC /lib/stack-fix.c -o /lib/stack-fix.so \
+    && apk del .build-deps
+
+# export the environment variable of LD_PRELOAD
+ENV LD_PRELOAD /lib/stack-fix.so
 
 RUN npm config set unsafe-perm true

Dockerfile_dind

@@ -0,0 +1,58 @@
+FROM docker:20-dind
+
+RUN apk update && apk add --no-cache \
+  git \
+  openssl \
+  openssl-dev \
+  ca-certificates \
+  bash \
+  curl \
+  make \
+  gcc \
+  g++ \
+  python3 \
+  python3-dev \
+  py3-pip \
+  linux-headers \
+  paxctl \
+  libgcc \
+  libstdc++ \
+  gnupg \
+  nodejs-current \
+  npm \
+  krb5-libs \
+  && update-ca-certificates \
+  rust \
+  docker-cli \
+  libffi-dev \
+  libc-dev \
+  docker-compose
+
+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
+
+# Add the patch fix
+COPY ./stack-fix.c /lib/
+
+RUN node -v && npm -v
+
+#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
+
+# Prepare the libraries packages
+RUN set -ex \
+    && apk add --no-cache  --virtual .build-deps build-base \
+    && gcc  -shared -fPIC /lib/stack-fix.c -o /lib/stack-fix.so \
+    && apk del .build-deps
+
+# export the environment variable of LD_PRELOAD
+ENV LD_PRELOAD /lib/stack-fix.so
+
+RUN npm config set unsafe-perm true

Dockerfile_dindrootless

@@ -0,0 +1,58 @@
+FROM docker:20-dind-rootless
+
+RUN apk update && apk add --no-cache \
+  git \
+  openssl \
+  openssl-dev \
+  ca-certificates \
+  bash \
+  curl \
+  make \
+  gcc \
+  g++ \
+  python3 \
+  python3-dev \
+  py3-pip \
+  linux-headers \
+  paxctl \
+  libgcc \
+  libstdc++ \
+  gnupg \
+  nodejs-current \
+  npm \
+  krb5-libs \
+  && update-ca-certificates \
+  rust \
+  docker-cli \
+  libffi-dev \
+  libc-dev \
+  docker-compose
+
+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
+
+# Add the patch fix
+COPY ./stack-fix.c /lib/
+
+RUN node -v && npm -v
+
+#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
+
+# Prepare the libraries packages
+RUN set -ex \
+    && apk add --no-cache  --virtual .build-deps build-base \
+    && gcc  -shared -fPIC /lib/stack-fix.c -o /lib/stack-fix.so \
+    && apk del .build-deps
+
+# export the environment variable of LD_PRELOAD
+ENV LD_PRELOAD /lib/stack-fix.so
+
+RUN npm config set unsafe-perm true

Dockerfile_npmci

@@ -1,2 +1,2 @@
 FROM hosttoday/ht-docker-dbase:latest
-RUN npm install -g @shipzone/npmci
+RUN pnpm install -g @shipzone/npmci

package-lock.json

@@ -1,5 +1,5 @@
 {
   "name": "ht-docker-dbase",
-  "version": "1.0.9",
+  "version": "1.0.85",
   "lockfileVersion": 1
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ht-docker-dbase",
-  "version": "1.0.9",
+  "version": "1.0.85",
   "description": "easy CI for docker images",
   "main": "index.js",
   "directories": {

stack-fix.c

@@ -0,0 +1,32 @@
+#include <dlfcn.h>
+#include <pthread.h>
+#include <stdio.h>
+
+// THIS IS TO AVOID A SIGFAULT WHEN RUNNING python3.6 manage.py runserver
+// This should be fixed at some point by Alpine and/or Python
+// Check this issue for more info
+// https://github.com/docker-library/python/issues/211
+typedef int (*func_t)(pthread_t *thread, const pthread_attr_t *attr, void *(*start_routine)(void*), void *arg);
+
+int pthread_create(pthread_t *thread, const pthread_attr_t *attr, void *(*start_routine)(void*), void *arg) {
+
+    pthread_attr_t local;
+    int used = 0, ret;
+
+    if (!attr) {
+        used = 1;
+        pthread_attr_init(&local);
+        attr = &local;
+    }
+    pthread_attr_setstacksize((void*)attr, 2 * 1024 * 1024); // 2 MB
+
+    func_t orig = (func_t)dlsym(RTLD_NEXT, "pthread_create");
+
+    ret = orig(thread, attr, start_routine, arg);
+
+    if (used) {
+        pthread_attr_destroy(&local);
+    }
+
+    return ret;
+}

test/test_latest.sh

@@ -1,3 +1,2 @@
-yarn --version
 npm --version
 node --version

test/test_npmci.sh

@@ -1,5 +1,4 @@
 node -v
 npm -v
-yarn --version
+npm init --yes
 npmci -v
-git clone https://gitlab.com/sandboxzone/sandbox-npmts.git

tslint.json

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