Merge branch 'master' of https://github.com/luarvique/openwebrx

docker.sh

@@ -14,6 +14,7 @@ IMAGES="${DH_PROJECT}-full ${DH_PROJECT}"
 ALL_ARCHS="x86_64 armv7l aarch64"
 TAG=${TAG:-"latest"}
 ARCHTAG="${TAG}-${ARCH}"
+MAKEFLAGS="${MAKEFLAGS:-"-j4"}"
 
 usage () {
   echo "Usage: ${0} [command]"
@@ -30,11 +31,11 @@ usage () {
 buildn () {
   # build the base images
   echo -ne "\n\nBuilding the base image.\n\n"
-  time docker build --pull -t ${DH_PROJECT}-base:${ARCHTAG} -f docker/Dockerfiles/Dockerfile-base .
+  time docker build --pull --build-arg MAKEFLAGS="$MAKEFLAGS" -t ${DH_PROJECT}-base:${ARCHTAG} -f docker/Dockerfiles/Dockerfile-base .
 
   # AF: uncomment next 2 lines if you're building all images
   #echo -ne "\n\nBuilding soapysdr image.\n\n"
-  #docker build --build-arg ARCHTAG=${ARCHTAG} --build-arg PROJECT=${DH_PROJECT} -t ${DH_PROJECT}-soapysdr-base:${ARCHTAG} -f docker/Dockerfiles/Dockerfile-soapysdr .
+  #docker build --build-arg ARCHTAG=${ARCHTAG} --build-arg PROJECT=${DH_PROJECT} --build-arg MAKEFLAGS="$MAKEFLAGS" -t ${DH_PROJECT}-soapysdr-base:${ARCHTAG} -f docker/Dockerfiles/Dockerfile-soapysdr .
 
   GIT_HASH=$(git rev-parse --short master)
   for image in ${IMAGES}; do
@@ -42,7 +43,7 @@ buildn () {
     # "openwebrx" is a special image that gets tag-aliased later on
     if [[ ! -z "${i}" && "${i}" != "${DH_PROJECT}" ]] ; then
       echo -ne "\n\nBuilding ${i} image.\n\n"
-      docker build --build-arg GIT_HASH=${GIT_HASH} --build-arg ARCHTAG=$ARCHTAG --build-arg PROJECT=${DH_PROJECT} -t ${DH_USERNAME}/${image}:${ARCHTAG} -f docker/Dockerfiles/Dockerfile-${i} .
+      docker build --build-arg GIT_HASH=${GIT_HASH} --build-arg ARCHTAG=$ARCHTAG --build-arg PROJECT=${DH_PROJECT} --build-arg MAKEFLAGS="$MAKEFLAGS" -t ${DH_USERNAME}/${image}:${ARCHTAG} -f docker/Dockerfiles/Dockerfile-${i} .
     fi
   done
 
@@ -71,7 +72,7 @@ buildr () {
   fi
 
   echo -ne "\n\nBuilding release image: $1.\n\n"
-	docker build --pull --build-arg VERSION=$1 -t ${DH_USERNAME}/${DH_PROJECT}:${1} -f docker/deb_based/Dockerfile .
+	docker build --pull --build-arg VERSION=$1 --build-arg MAKEFLAGS="$MAKEFLAGS" -t ${DH_USERNAME}/${DH_PROJECT}:${1} -f docker/deb_based/Dockerfile .
 
   docker tag ${DH_USERNAME}/${DH_PROJECT}:${1} ${DH_USERNAME}/${DH_PROJECT}
 }

docker/Dockerfiles/Dockerfile-airspy

@@ -1,6 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-airspy.sh /
 RUN /install-dependencies-airspy.sh &&\

docker/Dockerfiles/Dockerfile-base

@@ -1,4 +1,5 @@
 FROM debian:bullseye-slim
+ARG MAKEFLAGS
 
 COPY docker/files/js8call/js8call-hamlib.patch \
      docker/files/wsjtx/wsjtx.patch \

docker/Dockerfiles/Dockerfile-bladerf

@@ -1,6 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-bladerf.sh /
 RUN /install-dependencies-bladerf.sh &&\

docker/Dockerfiles/Dockerfile-fcdpp

@@ -1,6 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-fcdpp.sh /
 RUN /install-dependencies-fcdpp.sh &&\

docker/Dockerfiles/Dockerfile-full

@@ -1,6 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
 FROM ${PROJECT}-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-*.sh \
      docker/files/sdrplay/install-lib.*.patch /

docker/Dockerfiles/Dockerfile-hackrf

@@ -1,6 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-hackrf.sh /
 RUN /install-dependencies-hackrf.sh &&\

docker/Dockerfiles/Dockerfile-hpsdr

@@ -1,6 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
 FROM ${PROJECT}-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-hpsdr.sh /
 

docker/Dockerfiles/Dockerfile-limesdr

@@ -1,6 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-limesdr.sh /
 RUN /install-dependencies-limesdr.sh &&\

docker/Dockerfiles/Dockerfile-perseus

@@ -1,6 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
 FROM ${PROJECT}-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-perseus.sh /
 RUN /install-dependencies-perseus.sh &&\

docker/Dockerfiles/Dockerfile-plutosdr

@@ -1,6 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-plutosdr.sh /
 RUN /install-dependencies-plutosdr.sh &&\

docker/Dockerfiles/Dockerfile-radioberry

@@ -1,6 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-radioberry.sh /
 RUN /install-dependencies-radioberry.sh &&\

docker/Dockerfiles/Dockerfile-rtlsdr

@@ -1,6 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
 FROM ${PROJECT}-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-rtlsdr.sh \
      docker/scripts/install-connectors.sh /

docker/Dockerfiles/Dockerfile-rtlsdr-soapy

@@ -1,6 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-rtlsdr-soapy.sh /
 RUN /install-dependencies-rtlsdr-soapy.sh &&\

docker/Dockerfiles/Dockerfile-rtltcp

@@ -1,6 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
 FROM ${PROJECT}-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-connectors.sh /
 

docker/Dockerfiles/Dockerfile-runds

@@ -1,6 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
 FROM ${PROJECT}-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-connectors.sh \
      docker/scripts/install-dependencies-runds.sh /

docker/Dockerfiles/Dockerfile-sdrplay

@@ -1,6 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-sdrplay.sh \
      docker/files/sdrplay/install-lib.*.patch /

docker/Dockerfiles/Dockerfile-soapyremote

@@ -1,6 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-soapyremote.sh /
 RUN /install-dependencies-soapyremote.sh &&\

docker/Dockerfiles/Dockerfile-soapysdr

@@ -1,6 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
 FROM ${PROJECT}-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-soapysdr.sh \
      docker/scripts/install-connectors.sh /

docker/Dockerfiles/Dockerfile-uhd

@@ -1,6 +1,7 @@
 ARG ARCHTAG
 ARG PROJECT
 FROM ${PROJECT}-soapysdr-base:$ARCHTAG
+ARG MAKEFLAGS
 
 COPY docker/scripts/install-dependencies-uhd.sh /
 RUN /install-dependencies-uhd.sh &&\

docker/scripts/add-dependencies.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1

docker/scripts/add-owrx-tools.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1

docker/scripts/install-010-dependencies-rtlsdr.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1

docker/scripts/install-020-dependencies-soapysdr.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1

docker/scripts/install-030-dependencies-hackrf.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1

docker/scripts/install-040-dependencies-sdrplay.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1

docker/scripts/install-050-dependencies-airspy.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1

docker/scripts/install-060-dependencies-rtlsdr-soapy.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 set -euo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1

docker/scripts/install-070-dependencies-plutosdr.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 set -euo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1

docker/scripts/install-080-dependencies-limesdr.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 set -euo pipefail
-export MAKEFLAGS="-j12"
 
 cd /tmp
 

docker/scripts/install-090-dependencies-soapyremote.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 set -euo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1

docker/scripts/install-100-dependencies-perseus.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 set -euxo pipefail
-export MAKEFLAGS="-j12"
 
 cd /tmp
 

docker/scripts/install-110-dependencies-fcdpp.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1

docker/scripts/install-120-dependencies-radioberry.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1

docker/scripts/install-130-dependencies-uhd.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 set -euo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1

docker/scripts/install-140-dependencies-hpsdr.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
-export MAKEFLAGS="-j12"
 
 BUILD_PACKAGES="git wget gcc libc6-dev"
 

docker/scripts/install-150-dependencies-bladerf.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1

docker/scripts/install-500-connectors.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 set -euxo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1

docker/scripts/install-510-dependencies-runds.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 set -euxo pipefail
-export MAKEFLAGS="-j12"
 
 function cmakebuild() {
   cd $1