Compare commits

...

38 Commits

Author SHA1 Message Date
ad3e4ad739 1.0.35 2019-11-23 21:47:03 +00:00
711e71709a fix(core): update 2019-11-23 21:47:03 +00:00
cebd14e338 1.0.34 2019-11-23 21:36:49 +00:00
8968bb5450 fix(core): update 2019-11-23 21:36:48 +00:00
726c32f5ea 1.0.33 2019-11-23 21:35:33 +00:00
ab23734e25 fix(core): update 2019-11-23 21:35:32 +00:00
9137d51267 1.0.32 2019-11-23 21:34:08 +00:00
a6bc8055f1 fix(core): update 2019-11-23 21:34:07 +00:00
4ff525cf64 1.0.31 2019-11-23 21:32:41 +00:00
272a82e06a fix(core): update 2019-11-23 21:32:41 +00:00
8a70aa4c49 1.0.30 2019-11-23 21:29:08 +00:00
e95c68243f fix(core): update 2019-11-23 21:29:08 +00:00
102747d49d 1.0.29 2019-11-23 19:49:24 +00:00
909fb5bc1f 1.0.28 2019-10-04 15:24:41 +02:00
a771587de6 1.0.27 2019-10-02 23:56:55 +02:00
20eb639907 1.0.26 2019-10-02 23:40:35 +02:00
3caa5a6694 1.0.25 2019-10-02 12:02:58 +02:00
d92cfa0988 1.0.24 2019-10-02 11:41:49 +02:00
6b74db9326 1.0.23 2019-10-02 11:41:35 +02:00
874740924d 1.0.22 2019-09-01 15:16:12 +02:00
038867c450 1.0.21 2019-09-01 13:59:36 +02:00
690b683723 1.0.20 2019-08-31 14:25:24 +02:00
4f7fb662f1 1.0.19 2019-08-27 18:14:17 +02:00
563425d7c4 fix(core): update 2019-08-27 18:14:17 +02:00
29404533c6 1.0.18 2019-08-27 18:12:23 +02:00
26f0a6a26b fix(core): update 2019-08-27 18:12:23 +02:00
3c8c51c8a0 1.0.17 2019-08-27 18:10:04 +02:00
cf23013036 fix(core): update 2019-08-27 18:10:04 +02:00
98f7a8fd65 1.0.16 2019-08-27 18:09:16 +02:00
bdc3a7b093 fix(core): update 2019-08-27 18:09:16 +02:00
e5eca3c967 1.0.15 2019-08-27 18:07:27 +02:00
63de7e6388 fix(core): update 2019-08-27 18:07:26 +02:00
413bea2579 1.0.14 2019-08-27 18:06:53 +02:00
71490f8d8e fix(core): update 2019-08-27 18:06:53 +02:00
3ca85c4c31 1.0.13 2019-08-27 18:04:36 +02:00
44226c3c53 fix(core): update 2019-08-27 18:04:36 +02:00
09b0bfa4ce 1.0.12 2019-08-27 18:03:34 +02:00
cb23895d0c fix(core): update 2019-08-27 18:03:34 +02:00
4 changed files with 64 additions and 38 deletions

View File

@ -1,32 +1,24 @@
# gitzone ci_docker
# gitzone custom
image: docker:19.03.1
cache:
paths:
- .npmci-cache/
key: "$CI_BUILD_STAGE"
services:
- docker:stable-dind
before_script:
- apk update && apk add --no-cache \
git \
openssl \
ca-certificates \
bash \
curl \
make \
gcc \
g++ \
python \
linux-headers \
paxctl \
libgcc \
libstdc++ \
gnupg \
nodejs \
nodejs-npm \
&& update-ca-certificates
- npm install -g npmci
- 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
@ -37,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:18-dind
stage: release
script:
- npmci node install stable
@ -59,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

2
package-lock.json generated
View File

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

View File

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

32
stack-fix.c Normal file
View File

@ -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;
}