about summary refs log tree commit diff
path: root/Dockerfile
diff options
context:
space:
mode:
authorThomas Leister <thomas.leister@mailbox.org>2017-08-07 18:55:07 +0200
committerEugen Rochko <eugen@zeonfederated.com>2017-08-07 18:55:07 +0200
commit5d408fd9aa76f9ef3d559a377bccbcece998fbfa (patch)
tree017974b209f9947c65efc01d76b656ceb31de14c /Dockerfile
parent47579ec58ce984acc9f194f8cb145abd88d0ea19 (diff)
[Docker] Add multicore support to "make" and "bundler" (#4544)
* Let make and bundler use multiple cores

* Adds -j option to bundle install instead of bundle config
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile
index 93a8ffd0b..398628a48 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -48,7 +48,7 @@ RUN echo "@edge https://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/reposit
  && rm libiconv.tar.gz \
  && cd /tmp/src/libiconv-$LIBICONV_VERSION \
  && ./configure --prefix=/usr/local \
- && make \
+ && make -j$(getconf _NPROCESSORS_ONLN)\
  && make install \
  && libtool --finish /usr/local/lib \
  && cd /mastodon \
@@ -57,7 +57,7 @@ RUN echo "@edge https://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/reposit
 COPY Gemfile Gemfile.lock package.json yarn.lock /mastodon/
 
 RUN bundle config build.nokogiri --with-iconv-lib=/usr/local/lib --with-iconv-include=/usr/local/include \
- && bundle install --deployment --without test development \
+ && bundle install -j$(getconf _NPROCESSORS_ONLN) --deployment --without test development \
  && yarn --ignore-optional --pure-lockfile
 
 COPY . /mastodon