diff options
| -rw-r--r-- | Dockerfile | 3 | ||||
| -rw-r--r-- | docker_entrypoint.sh | 2 | ||||
| -rw-r--r-- | stack-fix.c | 32 |
3 files changed, 36 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile index 7cca02ecf..d455116da 100644 --- a/Dockerfile +++ b/Dockerfile @@ -61,6 +61,9 @@ RUN apk -U upgrade \ && rm -rf /tmp/* /var/cache/apk/* COPY Gemfile Gemfile.lock package.json yarn.lock .yarnclean /mastodon/ +COPY stack-fix.c /lib +RUN gcc -shared -fPIC /lib/stack-fix.c -o /lib/stack-fix.so +RUN rm /lib/stack-fix.c RUN bundle config build.nokogiri --with-iconv-lib=/usr/local/lib --with-iconv-include=/usr/local/include \ && bundle install -j$(getconf _NPROCESSORS_ONLN) --deployment --without test development \ diff --git a/docker_entrypoint.sh b/docker_entrypoint.sh index e92959c8e..1af5dde64 100644 --- a/docker_entrypoint.sh +++ b/docker_entrypoint.sh @@ -11,4 +11,4 @@ echo "Updating permissions..." find /mastodon -path /mastodon/public/system -prune -o -not -user mastodon -not -group mastodon -print0 | xargs -0 chown -f mastodon:mastodon echo "Executing process..." -exec su-exec mastodon:mastodon /sbin/tini -- "$@" +LD_PRELOAD=/lib/stack-fix.so exec su-exec mastodon:mastodon /sbin/tini -- "$@" diff --git a/stack-fix.c b/stack-fix.c new file mode 100644 index 000000000..09311a8f0 --- /dev/null +++ b/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; +} |