about summary refs log tree commit diff
path: root/Dockerfile
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2017-12-22 00:07:02 +0000
committerDavid Yip <yipdw@member.fsf.org>2018-01-11 04:09:16 -0600
commitf13ebd02c91776ddb88b5178bf9015c6e0f1ca80 (patch)
tree87803f8fc3344a4baa276de6d0db47fffa5e386e /Dockerfile
parent095a00ef3d6ed5845e331dc1e2b78fd42d861dd6 (diff)
dockerfile: Give more stack space to /sbin/tini.
/sbin/tini ends up running the Sass compiler, which seems to need a
larger thread stack size than the musl default.  This patch incorporates
a fix from
https://raw.githubusercontent.com/jubel-han/dockerfiles/master/common/stack-fix.c,
as described in https://github.com/sass/node-sass/issues/2031.
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile3
1 files changed, 3 insertions, 0 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 \