From 6297b8f2773a0b0d1b67995c729cf0a922c522bc Mon Sep 17 00:00:00 2001 From: Jakob Ketterl Date: Mon, 30 Dec 2019 00:11:27 +0100 Subject: [PATCH] use explicit revisions so i can use the docker build cache --- .dockerignore | 1 + docker/scripts/install-connectors.sh | 7 +++-- docker/scripts/install-dependencies-airspy.sh | 19 +++++++------ docker/scripts/install-dependencies-hackrf.sh | 6 ++++- docker/scripts/install-dependencies-rtlsdr.sh | 7 +++-- .../scripts/install-dependencies-sdrplay.sh | 7 +++-- .../scripts/install-dependencies-soapysdr.sh | 7 +++-- docker/scripts/install-dependencies.sh | 27 ++++++++++++------- 8 files changed, 54 insertions(+), 27 deletions(-) diff --git a/.dockerignore b/.dockerignore index 52e4ee4..6c2ce7c 100644 --- a/.dockerignore +++ b/.dockerignore @@ -3,3 +3,4 @@ .idea **/*.pyc **/*.swp +black-env diff --git a/docker/scripts/install-connectors.sh b/docker/scripts/install-connectors.sh index e117dc9..ec31bfe 100755 --- a/docker/scripts/install-connectors.sh +++ b/docker/scripts/install-connectors.sh @@ -3,6 +3,9 @@ set -euxo pipefail function cmakebuild() { cd $1 + if [[ ! -z "${2:-}" ]]; then + git checkout $2 + fi mkdir build cd build cmake .. @@ -19,7 +22,7 @@ BUILD_PACKAGES="git cmake make gcc g++ musl-dev" apk add --no-cache --virtual .build-deps $BUILD_PACKAGES -git clone --depth 1 https://github.com/jketterl/owrx_connector.git -cmakebuild owrx_connector +git clone https://github.com/jketterl/owrx_connector.git +cmakebuild owrx_connector 1a1a8615b4d92827d93d3135556e44b7b0bbc98f apk del .build-deps diff --git a/docker/scripts/install-dependencies-airspy.sh b/docker/scripts/install-dependencies-airspy.sh index 5b2c5de..b6cc2f3 100755 --- a/docker/scripts/install-dependencies-airspy.sh +++ b/docker/scripts/install-dependencies-airspy.sh @@ -3,6 +3,9 @@ set -euxo pipefail function cmakebuild() { cd $1 + if [[ ! -z "${2:-}" ]]; then + git checkout $2 + fi mkdir build cd build cmake .. @@ -20,16 +23,16 @@ BUILD_PACKAGES="git libusb-dev cmake make gcc musl-dev g++ linux-headers" apk add --no-cache $STATIC_PACKAGES apk add --no-cache --virtual .build-deps $BUILD_PACKAGES -git clone --depth 1 https://github.com/airspy/airspyone_host.git -cmakebuild airspyone_host +git clone https://github.com/airspy/airspyone_host.git +cmakebuild airspyone_host bceca18f9e3a5f89cff78c4d949c71771d92dfd3 -git clone --depth 1 https://github.com/pothosware/SoapyAirspy.git -cmakebuild SoapyAirspy +git clone https://github.com/pothosware/SoapyAirspy.git +cmakebuild SoapyAirspy 99756be5c3413a2d447baf70cb5a880662452655 -git clone --depth 1 https://github.com/airspy/airspyhf.git -cmakebuild airspyhf +git clone https://github.com/airspy/airspyhf.git +cmakebuild airspyhf 613852a2bb64af42690bf9be2201826af69a9475 -git clone --depth 1 https://github.com/pothosware/SoapyAirspyHF.git -cmakebuild SoapyAirspyHF +git clone https://github.com/pothosware/SoapyAirspyHF.git +cmakebuild SoapyAirspyHF 54f5487dd96207540b2dd562ff9e718e0588770b apk del .build-deps diff --git a/docker/scripts/install-dependencies-hackrf.sh b/docker/scripts/install-dependencies-hackrf.sh index 02ab89d..b9c4ec4 100755 --- a/docker/scripts/install-dependencies-hackrf.sh +++ b/docker/scripts/install-dependencies-hackrf.sh @@ -3,6 +3,9 @@ set -euxo pipefail function cmakebuild() { cd $1 + if [[ ! -z "${2:-}" ]]; then + git checkout $2 + fi mkdir build cd build cmake .. @@ -20,8 +23,9 @@ BUILD_PACKAGES="git cmake make patch wget sudo gcc g++ libusb-dev fftw-dev" apk add --no-cache $STATIC_PACKAGES apk add --no-cache --virtual .build-deps $BUILD_PACKAGES -git clone --depth 1 https://github.com/mossmann/hackrf.git +git clone https://github.com/mossmann/hackrf.git cd hackrf +git checkout 06eb9192cd348083f5f7de9c0da9ead276020011 cmakebuild host cd .. rm -rf hackrf diff --git a/docker/scripts/install-dependencies-rtlsdr.sh b/docker/scripts/install-dependencies-rtlsdr.sh index c0ede17..fdf0f22 100755 --- a/docker/scripts/install-dependencies-rtlsdr.sh +++ b/docker/scripts/install-dependencies-rtlsdr.sh @@ -3,6 +3,9 @@ set -euxo pipefail function cmakebuild() { cd $1 + if [[ ! -z "${2:-}" ]]; then + git checkout $2 + fi mkdir build cd build cmake .. @@ -20,7 +23,7 @@ BUILD_PACKAGES="git libusb-dev cmake make gcc musl-dev g++ linux-headers" apk add --no-cache $STATIC_PACKAGES apk add --no-cache --virtual .build-deps $BUILD_PACKAGES -git clone --depth 1 https://github.com/osmocom/rtl-sdr.git -cmakebuild rtl-sdr +git clone https://github.com/osmocom/rtl-sdr.git +cmakebuild rtl-sdr b5af355b1d833b3c898a61cf1e072b59b0ea3440 apk del .build-deps diff --git a/docker/scripts/install-dependencies-sdrplay.sh b/docker/scripts/install-dependencies-sdrplay.sh index 272ee78..79ca0f4 100755 --- a/docker/scripts/install-dependencies-sdrplay.sh +++ b/docker/scripts/install-dependencies-sdrplay.sh @@ -3,6 +3,9 @@ set -euxo pipefail function cmakebuild() { cd $1 + if [[ ! -z "${2:-}" ]]; then + git checkout $2 + fi mkdir build cd build cmake .. @@ -44,7 +47,7 @@ cd .. rm -rf sdrplay rm $BINARY -git clone --depth 1 https://github.com/pothosware/SoapySDRPlay.git -cmakebuild SoapySDRPlay +git clone https://github.com/pothosware/SoapySDRPlay.git +cmakebuild SoapySDRPlay 14ec39e4ff0dab7ae7fdf1afbbd2d28b49b0ffae apk del .build-deps diff --git a/docker/scripts/install-dependencies-soapysdr.sh b/docker/scripts/install-dependencies-soapysdr.sh index 5d2cf78..8c5bf98 100755 --- a/docker/scripts/install-dependencies-soapysdr.sh +++ b/docker/scripts/install-dependencies-soapysdr.sh @@ -3,6 +3,9 @@ set -euxo pipefail function cmakebuild() { cd $1 + if [[ ! -z "${2:-}" ]]; then + git checkout $2 + fi mkdir build cd build cmake .. @@ -20,7 +23,7 @@ BUILD_PACKAGES="git cmake make patch wget sudo gcc g++" apk add --no-cache $STATIC_PACKAGES apk add --no-cache --virtual .build-deps $BUILD_PACKAGES -git clone --depth 1 https://github.com/pothosware/SoapySDR -cmakebuild SoapySDR +git clone https://github.com/pothosware/SoapySDR +cmakebuild SoapySDR a489f3dca9d3ccd9b276b95a608ac3ef0299f635 apk del .build-deps diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh index c22300b..45a4ed3 100755 --- a/docker/scripts/install-dependencies.sh +++ b/docker/scripts/install-dependencies.sh @@ -3,6 +3,9 @@ set -euxo pipefail function cmakebuild() { cd $1 + if [[ ! -z "${2:-}" ]]; then + git checkout $2 + fi mkdir build cd build cmake .. @@ -20,24 +23,25 @@ BUILD_PACKAGES="git libsndfile-dev fftw-dev cmake ca-certificates make gcc musl- apk add --no-cache $STATIC_PACKAGES apk add --no-cache --virtual .build-deps $BUILD_PACKAGES -git clone --depth 1 https://git.code.sf.net/p/itpp/git itpp -cmakebuild itpp +git clone https://git.code.sf.net/p/itpp/git itpp +cmakebuild itpp bb5c7e95f40e8fdb5c3f3d01a84bcbaf76f3676d -git clone --depth 1 https://github.com/jketterl/csdr.git +git clone https://github.com/jketterl/csdr.git cd csdr +git checkout e8453446fc4795abaa2b3c8ee20fd954b36ada6e make make install cd .. rm -rf csdr -git clone --depth 1 https://github.com/szechyjs/mbelib.git -cmakebuild mbelib +git clone https://github.com/szechyjs/mbelib.git +cmakebuild mbelib 9a04ed5c78176a9965f3d43f7aa1b1f5330e771f -git clone --depth 1 https://github.com/jketterl/digiham.git -cmakebuild digiham +git clone https://github.com/jketterl/digiham.git +cmakebuild digiham 01e1121d7de4d5acdd118c9b4c1c6509535db975 -git clone --depth 1 https://github.com/f4exb/dsd.git -cmakebuild dsd +git clone https://github.com/f4exb/dsd.git +cmakebuild dsd f6939f9edbbc6f66261833616391a4e59cb2b3d7 WSJT_DIR=wsjtx-2.1.2 WSJT_TGZ=${WSJT_DIR}.tgz @@ -53,6 +57,9 @@ make install cd .. rm -rf direwolf -git clone --depth 1 https://github.com/hessu/aprs-symbols /opt/aprs-symbols +git clone https://github.com/hessu/aprs-symbols /opt/aprs-symbols +pushd /opt/aprs-symbols +git checkout 5c2abe2658ee4d2563f3c73b90c6f59124839802 +popd apk del .build-deps