From f1d9053bb8a639ef6b572e00db84613a816dbe0b Mon Sep 17 00:00:00 2001
From: Technowix <Technowix@users.noreply.github.com>
Date: Mon, 18 Sep 2017 16:15:42 +0200
Subject: [PATCH] Use multithreaded compilation of Libiconv and Mastodon (#231)

* Multithreaded compilation for Libiconv & Mastodon (master)

* Multithreaded compilation for Libiconv & Mastodon (stable)

* Multithreaded compilation for Libiconv & Mastodon (targaryen)
---
 mastodon/Dockerfile.master    | 4 ++--
 mastodon/Dockerfile.stable    | 4 ++--
 mastodon/Dockerfile.targaryen | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mastodon/Dockerfile.master b/mastodon/Dockerfile.master
index 2b680a3..973d6cc 100644
--- a/mastodon/Dockerfile.master
+++ b/mastodon/Dockerfile.master
@@ -60,13 +60,13 @@ RUN apk -U upgrade \
  && mkdir /tmp/src && tar xzf /tmp/libiconv-${LIBICONV_VERSION}.tar.gz -C /tmp/src \
  && cd /tmp/src/libiconv-${LIBICONV_VERSION} \
  && ./configure --prefix=/usr/local \
- && make && make install && libtool --finish /usr/local/lib \
+ && make -j$(getconf _NPROCESSORS_ONLN) && make install && libtool --finish /usr/local/lib \
 
 # Install Mastodon
  && cd /mastodon \
  && wget -qO- https://github.com/${REPOSITORY}/archive/${VERSION}.tar.gz | tar xz --strip 1 \
  && gem install bundler \
- && bundle install --deployment --clean --no-cache --without test development \
+ && bundle install -j$(getconf _NPROCESSORS_ONLN) --deployment --clean --no-cache --without test development \
  && yarn --ignore-optional --pure-lockfile \
 
 # Precompile Mastodon assets
diff --git a/mastodon/Dockerfile.stable b/mastodon/Dockerfile.stable
index fbd3049..4971766 100644
--- a/mastodon/Dockerfile.stable
+++ b/mastodon/Dockerfile.stable
@@ -60,13 +60,13 @@ RUN apk -U upgrade \
  && mkdir /tmp/src && tar xzf /tmp/libiconv-${LIBICONV_VERSION}.tar.gz -C /tmp/src \
  && cd /tmp/src/libiconv-${LIBICONV_VERSION} \
  && ./configure --prefix=/usr/local \
- && make && make install && libtool --finish /usr/local/lib \
+ && make -j$(getconf _NPROCESSORS_ONLN) && make install && libtool --finish /usr/local/lib \
 
 # Install Mastodon
  && cd /mastodon \
  && wget -qO- https://github.com/${REPOSITORY}/archive/${VERSION}.tar.gz | tar xz --strip 1 \
  && gem install bundler \
- && bundle install --deployment --clean --no-cache --without test development \
+ && bundle install -j$(getconf _NPROCESSORS_ONLN) --deployment --clean --no-cache --without test development \
  && yarn --ignore-optional --pure-lockfile \
 
 # Precompile Mastodon assets
diff --git a/mastodon/Dockerfile.targaryen b/mastodon/Dockerfile.targaryen
index 747bdc5..433ecb9 100644
--- a/mastodon/Dockerfile.targaryen
+++ b/mastodon/Dockerfile.targaryen
@@ -62,14 +62,14 @@ RUN apk -U upgrade \
  && mkdir /tmp/src && tar xzf /tmp/libiconv-${LIBICONV_VERSION}.tar.gz -C /tmp/src \
  && cd /tmp/src/libiconv-${LIBICONV_VERSION} \
  && ./configure --prefix=/usr/local \
- && make && make install && libtool --finish /usr/local/lib \
+ && make -j$(getconf _NPROCESSORS_ONLN) && make install && libtool --finish /usr/local/lib \
 
 # Install Mastodon
  && cd /mastodon \
  && wget -qO- https://github.com/${REPOSITORY}/archive/${VERSION}.tar.gz | tar xz --strip 1 \
  && cp -R /tmp/targaryen/* . && chmod +x targaryen.sh && ./targaryen.sh \
  && gem install bundler \
- && bundle install --deployment --clean --no-cache --without test development \
+ && bundle install -j$(getconf _NPROCESSORS_ONLN) --deployment --clean --no-cache --without test development \
  && yarn --ignore-optional --pure-lockfile \
 
 # Precompile Mastodon assets