<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/19232">View Change</a></p><div style="white-space:pre-wrap">Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
fixeria: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">make: use $(nproc) instead of hard-coded number of cores<br><br>Change-Id: Ie93b81a8a9206c47c4e4d4834fc5c03d9bf4254c<br>---<br>M gr-gsm-master/Dockerfile<br>M osmo-bsc-master/Dockerfile<br>M osmo-bts-master/Dockerfile<br>M osmo-gerrit-libosmo/Dockerfile<br>M osmo-ggsn-master/Dockerfile<br>M osmo-hlr-master/Dockerfile<br>M osmo-hnbgw-master/Dockerfile<br>M osmo-mgw-master/Dockerfile<br>M osmo-msc-master/Dockerfile<br>M osmo-nitb-master/Dockerfile<br>M osmo-pcu-master/Dockerfile<br>M osmo-remsim-master/Dockerfile<br>M osmo-sgsn-master/Dockerfile<br>M osmo-sip-master/Dockerfile<br>M osmo-stp-master/Dockerfile<br>M osmo-uecups-master/Dockerfile<br>M osmocom-bb-host-master/Dockerfile<br>17 files changed, 29 insertions(+), 29 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/gr-gsm-master/Dockerfile b/gr-gsm-master/Dockerfile</span><br><span>index 03cf427..a756b88 100644</span><br><span>--- a/gr-gsm-master/Dockerfile</span><br><span>+++ b/gr-gsm-master/Dockerfile</span><br><span>@@ -57,7 +57,7 @@</span><br><span> --disable-doxygen \</span><br><span> --disable-pcsc \</span><br><span> --prefix=/usr \</span><br><span style="color: hsl(0, 100%, 40%);">- && make -j5 \</span><br><span style="color: hsl(120, 100%, 40%);">+ && make "-j$(nproc)" \</span><br><span> && make install \</span><br><span> && make distclean</span><br><span> </span><br><span>@@ -74,7 +74,7 @@</span><br><span> -Wno-dev \</span><br><span> -DENABLE_GRCC=OFF \</span><br><span> ../ \</span><br><span style="color: hsl(0, 100%, 40%);">- && make -j5 \</span><br><span style="color: hsl(120, 100%, 40%);">+ && make "-j$(nproc)" \</span><br><span> && make install \</span><br><span> && cd ../ \</span><br><span> && rm -rf build/</span><br><span>diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile</span><br><span>index 57b4b04..6cfaebd 100644</span><br><span>--- a/osmo-bsc-master/Dockerfile</span><br><span>+++ b/osmo-bsc-master/Dockerfile</span><br><span>@@ -61,7 +61,7 @@</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span style="color: hsl(0, 100%, 40%);">- make -j8 install</span><br><span style="color: hsl(120, 100%, 40%);">+ make "-j$(nproc)" install</span><br><span> </span><br><span> VOLUME /data</span><br><span> </span><br><span>diff --git a/osmo-bts-master/Dockerfile b/osmo-bts-master/Dockerfile</span><br><span>index 98b0bb0..6e208c6 100644</span><br><span>--- a/osmo-bts-master/Dockerfile</span><br><span>+++ b/osmo-bts-master/Dockerfile</span><br><span>@@ -62,7 +62,7 @@</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure --enable-trx && \</span><br><span style="color: hsl(0, 100%, 40%);">- make -j8 install</span><br><span style="color: hsl(120, 100%, 40%);">+ make "-j$(nproc)" install</span><br><span> </span><br><span> VOLUME /data</span><br><span> </span><br><span>diff --git a/osmo-gerrit-libosmo/Dockerfile b/osmo-gerrit-libosmo/Dockerfile</span><br><span>index 5442703..1b98c9f 100644</span><br><span>--- a/osmo-gerrit-libosmo/Dockerfile</span><br><span>+++ b/osmo-gerrit-libosmo/Dockerfile</span><br><span>@@ -48,7 +48,7 @@</span><br><span> git fetch && git checkout -f -B master origin/master && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span style="color: hsl(0, 100%, 40%);">- make -j8 && \</span><br><span style="color: hsl(120, 100%, 40%);">+ make "-j$(nproc)" && \</span><br><span> sudo make install && \</span><br><span> make clean && \</span><br><span> sudo ldconfig</span><br><span>@@ -59,7 +59,7 @@</span><br><span> git fetch && git checkout -f -B master origin/master && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span style="color: hsl(0, 100%, 40%);">- make -j1 && \</span><br><span style="color: hsl(120, 100%, 40%);">+ make "-j$(nproc)" && \</span><br><span> sudo make install && \</span><br><span> make clean && \</span><br><span> sudo ldconfig</span><br><span>@@ -70,7 +70,7 @@</span><br><span> git fetch && git checkout -f -B master origin/master && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span style="color: hsl(0, 100%, 40%);">- make -j8 && \</span><br><span style="color: hsl(120, 100%, 40%);">+ make "-j$(nproc)" && \</span><br><span> sudo make install && \</span><br><span> make clean && \</span><br><span> sudo ldconfig</span><br><span>@@ -82,7 +82,7 @@</span><br><span> git fetch && git checkout -f -B master origin/master && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span style="color: hsl(0, 100%, 40%);">- make -j8 && \</span><br><span style="color: hsl(120, 100%, 40%);">+ make "-j$(nproc)" && \</span><br><span> sudo make install && \</span><br><span> make clean && \</span><br><span> sudo ldconfig</span><br><span>@@ -92,7 +92,7 @@</span><br><span> git fetch && git checkout -f -B master origin/master && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span style="color: hsl(0, 100%, 40%);">- make -j8 && \</span><br><span style="color: hsl(120, 100%, 40%);">+ make "-j$(nproc)" && \</span><br><span> sudo make install && \</span><br><span> make clean && \</span><br><span> sudo ldconfig</span><br><span>@@ -102,7 +102,7 @@</span><br><span> git fetch && git checkout -f -B master origin/master && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span style="color: hsl(0, 100%, 40%);">- make -j8 && \</span><br><span style="color: hsl(120, 100%, 40%);">+ make "-j$(nproc)" && \</span><br><span> sudo make install && \</span><br><span> make clean && \</span><br><span> sudo ldconfig</span><br><span>@@ -112,7 +112,7 @@</span><br><span> git fetch && git checkout -f -B master origin/master && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span style="color: hsl(0, 100%, 40%);">- make -j8 && \</span><br><span style="color: hsl(120, 100%, 40%);">+ make "-j$(nproc)" && \</span><br><span> sudo make install && \</span><br><span> make clean && \</span><br><span> sudo ldconfig</span><br><span>@@ -122,7 +122,7 @@</span><br><span> git fetch && git checkout -f -B master origin/master && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span style="color: hsl(0, 100%, 40%);">- make -j8 && \</span><br><span style="color: hsl(120, 100%, 40%);">+ make "-j$(nproc)" && \</span><br><span> sudo make install && \</span><br><span> make clean && \</span><br><span> sudo ldconfig</span><br><span>@@ -132,11 +132,11 @@</span><br><span> git fetch && git checkout -f -B master origin/master && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span style="color: hsl(0, 100%, 40%);">- make -j8 && \</span><br><span style="color: hsl(120, 100%, 40%);">+ make "-j$(nproc)" && \</span><br><span> sudo make install && \</span><br><span> make clean && \</span><br><span> sudo ldconfig</span><br><span> </span><br><span> </span><br><span> # example command which builds a single osmo-* application at 'docker run' time in tmpfs</span><br><span style="color: hsl(0, 100%, 40%);">-CMD /bin/sh -c 'cd /tmpfs && git clone --reference /build/openbsc git://git.osmocom.org/openbsc.git && cd openbsc && git checkout -f -B master origin/master && cd openbsc && autoreconf -fi && ./configure --enable-nat --enable-osmo-bsc --enable-smpp --enable-vty-tests --enable-external-tests && make -j8 check'</span><br><span style="color: hsl(120, 100%, 40%);">+CMD /bin/sh -c 'cd /tmpfs && git clone --reference /build/openbsc git://git.osmocom.org/openbsc.git && cd openbsc && git checkout -f -B master origin/master && cd openbsc && autoreconf -fi && ./configure --enable-nat --enable-osmo-bsc --enable-smpp --enable-vty-tests --enable-external-tests && make "-j$(nproc)" check'</span><br><span>diff --git a/osmo-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile</span><br><span>index 81444d8..17ea3c9 100644</span><br><span>--- a/osmo-ggsn-master/Dockerfile</span><br><span>+++ b/osmo-ggsn-master/Dockerfile</span><br><span>@@ -50,7 +50,7 @@</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span style="color: hsl(0, 100%, 40%);">- make -j8 install && \</span><br><span style="color: hsl(120, 100%, 40%);">+ make "-j$(nproc)" install && \</span><br><span> ldconfig</span><br><span> </span><br><span> VOLUME /data</span><br><span>diff --git a/osmo-hlr-master/Dockerfile b/osmo-hlr-master/Dockerfile</span><br><span>index d4727cc..1595c11 100644</span><br><span>--- a/osmo-hlr-master/Dockerfile</span><br><span>+++ b/osmo-hlr-master/Dockerfile</span><br><span>@@ -56,7 +56,7 @@</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span style="color: hsl(0, 100%, 40%);">- make -j8 install && \</span><br><span style="color: hsl(120, 100%, 40%);">+ make "-j$(nproc)" install && \</span><br><span> ldconfig</span><br><span> </span><br><span> VOLUME /data</span><br><span>diff --git a/osmo-hnbgw-master/Dockerfile b/osmo-hnbgw-master/Dockerfile</span><br><span>index 951b95b..215b562 100644</span><br><span>--- a/osmo-hnbgw-master/Dockerfile</span><br><span>+++ b/osmo-hnbgw-master/Dockerfile</span><br><span>@@ -35,7 +35,7 @@</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span style="color: hsl(0, 100%, 40%);">- make -j8 install && \</span><br><span style="color: hsl(120, 100%, 40%);">+ make "-j$(nproc)" install && \</span><br><span> ldconfig</span><br><span> </span><br><span> VOLUME /data</span><br><span>diff --git a/osmo-mgw-master/Dockerfile b/osmo-mgw-master/Dockerfile</span><br><span>index 773c2a5..c07697e 100644</span><br><span>--- a/osmo-mgw-master/Dockerfile</span><br><span>+++ b/osmo-mgw-master/Dockerfile</span><br><span>@@ -56,7 +56,7 @@</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span style="color: hsl(0, 100%, 40%);">- make -j8 install && \</span><br><span style="color: hsl(120, 100%, 40%);">+ make "-j$(nproc)" install && \</span><br><span> ldconfig</span><br><span> </span><br><span> VOLUME /data</span><br><span>diff --git a/osmo-msc-master/Dockerfile b/osmo-msc-master/Dockerfile</span><br><span>index 366e77c..15b59f0 100644</span><br><span>--- a/osmo-msc-master/Dockerfile</span><br><span>+++ b/osmo-msc-master/Dockerfile</span><br><span>@@ -70,7 +70,7 @@</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure --enable-smpp --enable-iu && \</span><br><span style="color: hsl(0, 100%, 40%);">- make -j8 install</span><br><span style="color: hsl(120, 100%, 40%);">+ make "-j$(nproc)" install</span><br><span> </span><br><span> VOLUME /data</span><br><span> </span><br><span>diff --git a/osmo-nitb-master/Dockerfile b/osmo-nitb-master/Dockerfile</span><br><span>index 0dad7fa..cd463fe 100644</span><br><span>--- a/osmo-nitb-master/Dockerfile</span><br><span>+++ b/osmo-nitb-master/Dockerfile</span><br><span>@@ -36,7 +36,7 @@</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure --enable-nat --enable-osmo-bsc --enable-smpp && \</span><br><span style="color: hsl(0, 100%, 40%);">- make -j8 install && \</span><br><span style="color: hsl(120, 100%, 40%);">+ make "-j$(nproc)" install && \</span><br><span> ldconfig</span><br><span> </span><br><span> VOLUME /data</span><br><span>diff --git a/osmo-pcu-master/Dockerfile b/osmo-pcu-master/Dockerfile</span><br><span>index e8ce5d8..8306837 100644</span><br><span>--- a/osmo-pcu-master/Dockerfile</span><br><span>+++ b/osmo-pcu-master/Dockerfile</span><br><span>@@ -52,7 +52,7 @@</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span style="color: hsl(0, 100%, 40%);">- make -j8 install</span><br><span style="color: hsl(120, 100%, 40%);">+ make "-j$(nproc)" install</span><br><span> </span><br><span> VOLUME /data</span><br><span> </span><br><span>diff --git a/osmo-remsim-master/Dockerfile b/osmo-remsim-master/Dockerfile</span><br><span>index bed7f47..2653ac2 100644</span><br><span>--- a/osmo-remsim-master/Dockerfile</span><br><span>+++ b/osmo-remsim-master/Dockerfile</span><br><span>@@ -28,7 +28,7 @@</span><br><span> </span><br><span> # build virtualsmartcard</span><br><span> RUN git clone https://github.com/frankmorgner/vsmartcard.git</span><br><span style="color: hsl(0, 100%, 40%);">-RUN cd vsmartcard/virtualsmartcard && autoreconf -fi && ./configure && make -j8 install</span><br><span style="color: hsl(120, 100%, 40%);">+RUN cd vsmartcard/virtualsmartcard && autoreconf -fi && ./configure && make "-j$(nproc)" install</span><br><span> </span><br><span> </span><br><span> ARG OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/"</span><br><span>@@ -91,7 +91,7 @@</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span style="color: hsl(0, 100%, 40%);">- make -j8 install && \</span><br><span style="color: hsl(120, 100%, 40%);">+ make "-j$(nproc)" install && \</span><br><span> ldconfig</span><br><span> </span><br><span> VOLUME /data</span><br><span>diff --git a/osmo-sgsn-master/Dockerfile b/osmo-sgsn-master/Dockerfile</span><br><span>index 1121712..d3b2518 100644</span><br><span>--- a/osmo-sgsn-master/Dockerfile</span><br><span>+++ b/osmo-sgsn-master/Dockerfile</span><br><span>@@ -68,7 +68,7 @@</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure --enable-iu && \</span><br><span style="color: hsl(0, 100%, 40%);">- make -j8 install && \</span><br><span style="color: hsl(120, 100%, 40%);">+ make "-j$(nproc)" install && \</span><br><span> ldconfig</span><br><span> </span><br><span> VOLUME /data</span><br><span>diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile</span><br><span>index b15a2c9..1f40ff0 100644</span><br><span>--- a/osmo-sip-master/Dockerfile</span><br><span>+++ b/osmo-sip-master/Dockerfile</span><br><span>@@ -60,7 +60,7 @@</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure --enable-smpp --enable-iu && \</span><br><span style="color: hsl(0, 100%, 40%);">- make -j8 install</span><br><span style="color: hsl(120, 100%, 40%);">+ make "-j$(nproc)" install</span><br><span> </span><br><span> VOLUME /data</span><br><span> </span><br><span>diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile</span><br><span>index 6396b32..26ec494 100644</span><br><span>--- a/osmo-stp-master/Dockerfile</span><br><span>+++ b/osmo-stp-master/Dockerfile</span><br><span>@@ -50,7 +50,7 @@</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span style="color: hsl(0, 100%, 40%);">- make -j8 install && \</span><br><span style="color: hsl(120, 100%, 40%);">+ make "-j$(nproc)" install && \</span><br><span> install examples/.libs/sccp_demo_user /usr/local/bin/ && \</span><br><span> ldconfig</span><br><span> </span><br><span>diff --git a/osmo-uecups-master/Dockerfile b/osmo-uecups-master/Dockerfile</span><br><span>index 9684d08..777797f 100644</span><br><span>--- a/osmo-uecups-master/Dockerfile</span><br><span>+++ b/osmo-uecups-master/Dockerfile</span><br><span>@@ -35,7 +35,7 @@</span><br><span> git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span style="color: hsl(0, 100%, 40%);">- make -j8 install</span><br><span style="color: hsl(120, 100%, 40%);">+ make "-j$(nproc)" install</span><br><span> </span><br><span> VOLUME /data</span><br><span> </span><br><span>diff --git a/osmocom-bb-host-master/Dockerfile b/osmocom-bb-host-master/Dockerfile</span><br><span>index 1d79f06..4a41085 100644</span><br><span>--- a/osmocom-bb-host-master/Dockerfile</span><br><span>+++ b/osmocom-bb-host-master/Dockerfile</span><br><span>@@ -33,12 +33,12 @@</span><br><span> RUN cd osmocom-bb/src/host/trxcon && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span style="color: hsl(0, 100%, 40%);">- make -j8 install</span><br><span style="color: hsl(120, 100%, 40%);">+ make "-j$(nproc)" install</span><br><span> </span><br><span> RUN cd osmocom-bb/src/host/virt_phy && \</span><br><span> autoreconf -fi && \</span><br><span> ./configure && \</span><br><span style="color: hsl(0, 100%, 40%);">- make -j8 install</span><br><span style="color: hsl(120, 100%, 40%);">+ make "-j$(nproc)" install</span><br><span> </span><br><span> RUN mkdir -p /data/unix</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/19232">change 19232</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/docker-playground/+/19232"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ie93b81a8a9206c47c4e4d4834fc5c03d9bf4254c </div>
<div style="display:none"> Gerrit-Change-Number: 19232 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>