1.0.37

.gitlab-ci.yml

@@ -1,13 +1,24 @@
-# gitzone ci_docker
-image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
-
-cache:
-  paths:
-  - .npmci-cache/
-  key: "$CI_BUILD_STAGE"
+# gitzone custom
+image: docker:19.03.1
+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++ python linux-headers paxctl
+- apk add --no-cache libgcc libstdc++ gnupg nodejs nodejs-npm
+- apk add --no-cache krb5-libs
+- 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
+- npm install -g @shipzone/npmci
+- npmci npm prepare
 
 stages:
 - test
@@ -18,17 +29,16 @@ stages:
 testSTABLE:
   stage: test
   script:
-    - npmci node install stable
-    - npmci npm install
-    - npmci npm test
+  - npmci node install stable
+  - npmci npm install
+  - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - docker
+  - docker
+  - lossless
+  - priv
 
 release:
-  image: registry.gitlab.com/hosttoday/ht-docker-dbase:npmci
-  services:
-  - docker:dind
   stage: release
   script:
   - npmci node install stable
@@ -40,13 +50,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,6 +1,7 @@
-FROM docker:git
+FROM docker:19.03.1
 
 RUN apk update && apk add --no-cache \
+  git \
   openssl \
   ca-certificates \
   bash \
@@ -18,4 +19,16 @@ RUN apk update && apk add --no-cache \
   nodejs-npm \
   && update-ca-certificates
 
+# Add the patch fix
+COPY ./stack-fix.c /lib/
+
+# 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

package-lock.json

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ht-docker-dbase",
-  "version": "1.0.8",
+  "version": "1.0.37",
   "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, 10 * 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;
+}