Change in docker-playground[master]: make: use $(nproc) instead of hard-coded number of cores

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

fixeria gerrit-no-reply at lists.osmocom.org
Tue Jul 14 10:44:00 UTC 2020


fixeria has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/19232 )

Change subject: make: use $(nproc) instead of hard-coded number of cores
......................................................................

make: use $(nproc) instead of hard-coded number of cores

Change-Id: Ie93b81a8a9206c47c4e4d4834fc5c03d9bf4254c
---
M gr-gsm-master/Dockerfile
M osmo-bsc-master/Dockerfile
M osmo-bts-master/Dockerfile
M osmo-gerrit-libosmo/Dockerfile
M osmo-ggsn-master/Dockerfile
M osmo-hlr-master/Dockerfile
M osmo-hnbgw-master/Dockerfile
M osmo-mgw-master/Dockerfile
M osmo-msc-master/Dockerfile
M osmo-nitb-master/Dockerfile
M osmo-pcu-master/Dockerfile
M osmo-remsim-master/Dockerfile
M osmo-sgsn-master/Dockerfile
M osmo-sip-master/Dockerfile
M osmo-stp-master/Dockerfile
M osmo-uecups-master/Dockerfile
M osmocom-bb-host-master/Dockerfile
17 files changed, 29 insertions(+), 29 deletions(-)

Approvals:
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved
  fixeria: Verified



diff --git a/gr-gsm-master/Dockerfile b/gr-gsm-master/Dockerfile
index 03cf427..a756b88 100644
--- a/gr-gsm-master/Dockerfile
+++ b/gr-gsm-master/Dockerfile
@@ -57,7 +57,7 @@
 		--disable-doxygen \
 		--disable-pcsc \
 		--prefix=/usr \
-	&& make -j5 \
+	&& make "-j$(nproc)" \
 	&& make install \
 	&& make distclean
 
@@ -74,7 +74,7 @@
 		-Wno-dev \
 		-DENABLE_GRCC=OFF \
 		../ \
-	&& make -j5 \
+	&& make "-j$(nproc)" \
 	&& make install \
 	&& cd ../ \
 	&& rm -rf build/
diff --git a/osmo-bsc-master/Dockerfile b/osmo-bsc-master/Dockerfile
index 57b4b04..6cfaebd 100644
--- a/osmo-bsc-master/Dockerfile
+++ b/osmo-bsc-master/Dockerfile
@@ -61,7 +61,7 @@
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	autoreconf -fi && \
 	./configure && \
-	make -j8 install
+	make "-j$(nproc)" install
 
 VOLUME	/data
 
diff --git a/osmo-bts-master/Dockerfile b/osmo-bts-master/Dockerfile
index 98b0bb0..6e208c6 100644
--- a/osmo-bts-master/Dockerfile
+++ b/osmo-bts-master/Dockerfile
@@ -62,7 +62,7 @@
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	autoreconf -fi && \
 	./configure --enable-trx && \
-	make -j8 install
+	make "-j$(nproc)" install
 
 VOLUME	/data
 
diff --git a/osmo-gerrit-libosmo/Dockerfile b/osmo-gerrit-libosmo/Dockerfile
index 5442703..1b98c9f 100644
--- a/osmo-gerrit-libosmo/Dockerfile
+++ b/osmo-gerrit-libosmo/Dockerfile
@@ -48,7 +48,7 @@
 	git fetch && git checkout -f -B master origin/master && \
 	autoreconf -fi && \
 	./configure && \
-	make -j8 && \
+	make "-j$(nproc)" && \
 	sudo make install && \
 	make clean && \
 	sudo ldconfig
@@ -59,7 +59,7 @@
 	git fetch && git checkout -f -B master origin/master && \
 	autoreconf -fi && \
 	./configure && \
-	make -j1 && \
+	make "-j$(nproc)" && \
 	sudo make install && \
 	make clean && \
 	sudo ldconfig
@@ -70,7 +70,7 @@
 	git fetch && git checkout -f -B master origin/master && \
 	autoreconf -fi && \
 	./configure && \
-	make -j8 && \
+	make "-j$(nproc)" && \
 	sudo make install && \
 	make clean && \
 	sudo ldconfig
@@ -82,7 +82,7 @@
 	git fetch && git checkout -f -B master origin/master && \
 	autoreconf -fi && \
 	./configure && \
-	make -j8 && \
+	make "-j$(nproc)" && \
 	sudo make install && \
 	make clean && \
 	sudo ldconfig
@@ -92,7 +92,7 @@
 	git fetch && git checkout -f -B master origin/master && \
 	autoreconf -fi && \
 	./configure && \
-	make -j8 && \
+	make "-j$(nproc)" && \
 	sudo make install && \
 	make clean && \
 	sudo ldconfig
@@ -102,7 +102,7 @@
 	git fetch && git checkout -f -B master origin/master && \
 	autoreconf -fi && \
 	./configure && \
-	make -j8 && \
+	make "-j$(nproc)" && \
 	sudo make install && \
 	make clean && \
 	sudo ldconfig
@@ -112,7 +112,7 @@
 	git fetch && git checkout -f -B master origin/master && \
 	autoreconf -fi && \
 	./configure && \
-	make -j8 && \
+	make "-j$(nproc)" && \
 	sudo make install && \
 	make clean && \
 	sudo ldconfig
@@ -122,7 +122,7 @@
 	git fetch && git checkout -f -B master origin/master && \
 	autoreconf -fi && \
 	./configure && \
-	make -j8 && \
+	make "-j$(nproc)" && \
 	sudo make install && \
 	make clean && \
 	sudo ldconfig
@@ -132,11 +132,11 @@
 	git fetch && git checkout -f -B master origin/master && \
 	autoreconf -fi && \
 	./configure && \
-	make -j8 && \
+	make "-j$(nproc)" && \
 	sudo make install && \
 	make clean && \
 	sudo ldconfig
 
 
 # example command which builds a single osmo-* application at 'docker run' time in tmpfs
-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'
+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'
diff --git a/osmo-ggsn-master/Dockerfile b/osmo-ggsn-master/Dockerfile
index 81444d8..17ea3c9 100644
--- a/osmo-ggsn-master/Dockerfile
+++ b/osmo-ggsn-master/Dockerfile
@@ -50,7 +50,7 @@
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	autoreconf -fi && \
 	./configure && \
-	make -j8 install && \
+	make "-j$(nproc)" install && \
 	ldconfig
 
 VOLUME	/data
diff --git a/osmo-hlr-master/Dockerfile b/osmo-hlr-master/Dockerfile
index d4727cc..1595c11 100644
--- a/osmo-hlr-master/Dockerfile
+++ b/osmo-hlr-master/Dockerfile
@@ -56,7 +56,7 @@
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	autoreconf -fi && \
 	./configure && \
-	make -j8 install && \
+	make "-j$(nproc)" install && \
 	ldconfig
 
 VOLUME	/data
diff --git a/osmo-hnbgw-master/Dockerfile b/osmo-hnbgw-master/Dockerfile
index 951b95b..215b562 100644
--- a/osmo-hnbgw-master/Dockerfile
+++ b/osmo-hnbgw-master/Dockerfile
@@ -35,7 +35,7 @@
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	autoreconf -fi && \
 	./configure && \
-	make -j8 install && \
+	make "-j$(nproc)" install && \
 	ldconfig
 
 VOLUME	/data
diff --git a/osmo-mgw-master/Dockerfile b/osmo-mgw-master/Dockerfile
index 773c2a5..c07697e 100644
--- a/osmo-mgw-master/Dockerfile
+++ b/osmo-mgw-master/Dockerfile
@@ -56,7 +56,7 @@
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	autoreconf -fi && \
 	./configure && \
-	make -j8 install && \
+	make "-j$(nproc)" install && \
 	ldconfig
 
 VOLUME	/data
diff --git a/osmo-msc-master/Dockerfile b/osmo-msc-master/Dockerfile
index 366e77c..15b59f0 100644
--- a/osmo-msc-master/Dockerfile
+++ b/osmo-msc-master/Dockerfile
@@ -70,7 +70,7 @@
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	autoreconf -fi && \
 	./configure --enable-smpp --enable-iu && \
-	make -j8 install
+	make "-j$(nproc)" install
 
 VOLUME	/data
 
diff --git a/osmo-nitb-master/Dockerfile b/osmo-nitb-master/Dockerfile
index 0dad7fa..cd463fe 100644
--- a/osmo-nitb-master/Dockerfile
+++ b/osmo-nitb-master/Dockerfile
@@ -36,7 +36,7 @@
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	autoreconf -fi && \
 	./configure --enable-nat --enable-osmo-bsc --enable-smpp && \
-	make -j8 install && \
+	make "-j$(nproc)" install && \
 	ldconfig
 
 VOLUME	/data
diff --git a/osmo-pcu-master/Dockerfile b/osmo-pcu-master/Dockerfile
index e8ce5d8..8306837 100644
--- a/osmo-pcu-master/Dockerfile
+++ b/osmo-pcu-master/Dockerfile
@@ -52,7 +52,7 @@
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	autoreconf -fi && \
 	./configure && \
-	make -j8 install
+	make "-j$(nproc)" install
 
 VOLUME	/data
 
diff --git a/osmo-remsim-master/Dockerfile b/osmo-remsim-master/Dockerfile
index bed7f47..2653ac2 100644
--- a/osmo-remsim-master/Dockerfile
+++ b/osmo-remsim-master/Dockerfile
@@ -28,7 +28,7 @@
 
 # build virtualsmartcard
 RUN	git clone https://github.com/frankmorgner/vsmartcard.git
-RUN	cd vsmartcard/virtualsmartcard && autoreconf -fi && ./configure && make -j8 install
+RUN	cd vsmartcard/virtualsmartcard && autoreconf -fi && ./configure && make "-j$(nproc)" install
 
 
 ARG	OSMOCOM_REPO="http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/"
@@ -91,7 +91,7 @@
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	autoreconf -fi && \
 	./configure && \
-	make -j8 install && \
+	make "-j$(nproc)" install && \
 	ldconfig
 
 VOLUME	/data
diff --git a/osmo-sgsn-master/Dockerfile b/osmo-sgsn-master/Dockerfile
index 1121712..d3b2518 100644
--- a/osmo-sgsn-master/Dockerfile
+++ b/osmo-sgsn-master/Dockerfile
@@ -68,7 +68,7 @@
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	autoreconf -fi && \
 	./configure --enable-iu && \
-	make -j8 install && \
+	make "-j$(nproc)" install && \
 	ldconfig
 
 VOLUME	/data
diff --git a/osmo-sip-master/Dockerfile b/osmo-sip-master/Dockerfile
index b15a2c9..1f40ff0 100644
--- a/osmo-sip-master/Dockerfile
+++ b/osmo-sip-master/Dockerfile
@@ -60,7 +60,7 @@
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	autoreconf -fi && \
 	./configure --enable-smpp --enable-iu && \
-	make -j8 install
+	make "-j$(nproc)" install
 
 VOLUME	/data
 
diff --git a/osmo-stp-master/Dockerfile b/osmo-stp-master/Dockerfile
index 6396b32..26ec494 100644
--- a/osmo-stp-master/Dockerfile
+++ b/osmo-stp-master/Dockerfile
@@ -50,7 +50,7 @@
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	autoreconf -fi && \
 	./configure && \
-	make -j8 install && \
+	make "-j$(nproc)" install && \
 	install examples/.libs/sccp_demo_user /usr/local/bin/ && \
 	ldconfig
 
diff --git a/osmo-uecups-master/Dockerfile b/osmo-uecups-master/Dockerfile
index 9684d08..777797f 100644
--- a/osmo-uecups-master/Dockerfile
+++ b/osmo-uecups-master/Dockerfile
@@ -35,7 +35,7 @@
 	git rev-parse --abbrev-ref HEAD && git rev-parse HEAD && \
 	autoreconf -fi && \
 	./configure && \
-	make -j8 install
+	make "-j$(nproc)" install
 
 VOLUME	/data
 
diff --git a/osmocom-bb-host-master/Dockerfile b/osmocom-bb-host-master/Dockerfile
index 1d79f06..4a41085 100644
--- a/osmocom-bb-host-master/Dockerfile
+++ b/osmocom-bb-host-master/Dockerfile
@@ -33,12 +33,12 @@
 RUN	cd osmocom-bb/src/host/trxcon && \
 	autoreconf -fi && \
 	./configure && \
-	make -j8 install
+	make "-j$(nproc)" install
 
 RUN	cd osmocom-bb/src/host/virt_phy && \
 	autoreconf -fi && \
 	./configure && \
-	make -j8 install
+	make "-j$(nproc)" install
 
 RUN	mkdir -p /data/unix
 

-- 
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/19232
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ie93b81a8a9206c47c4e4d4834fc5c03d9bf4254c
Gerrit-Change-Number: 19232
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200714/41f30ae3/attachment.htm>


More information about the gerrit-log mailing list