From ebb490a71ebb50957071bb2fd5b9d381973935fd Mon Sep 17 00:00:00 2001 From: Jakob Ketterl Date: Wed, 30 Aug 2023 02:33:09 +0200 Subject: [PATCH] update docker base to debian bookworm --- docker/Dockerfiles/Dockerfile-base | 2 +- docker/scripts/install-connectors.sh | 2 +- .../scripts/install-dependencies-bladerf.sh | 6 ++--- docker/scripts/install-dependencies-hackrf.sh | 2 +- .../install-dependencies-radioberry.sh | 4 +-- docker/scripts/install-dependencies-runds.sh | 2 +- docker/scripts/install-dependencies.sh | 25 +++++++------------ docker/scripts/install-owrx-tools.sh | 2 +- 8 files changed, 19 insertions(+), 26 deletions(-) diff --git a/docker/Dockerfiles/Dockerfile-base b/docker/Dockerfiles/Dockerfile-base index f59fcdac..2eb00a42 100644 --- a/docker/Dockerfiles/Dockerfile-base +++ b/docker/Dockerfiles/Dockerfile-base @@ -1,4 +1,4 @@ -FROM debian:bullseye-slim +FROM debian:bookworm-slim COPY docker/files/js8call/js8call-hamlib.patch \ docker/files/wsjtx/wsjtx.patch \ diff --git a/docker/scripts/install-connectors.sh b/docker/scripts/install-connectors.sh index d950a4be..b09c106b 100755 --- a/docker/scripts/install-connectors.sh +++ b/docker/scripts/install-connectors.sh @@ -18,7 +18,7 @@ function cmakebuild() { cd /tmp -STATIC_PACKAGES="libfftw3-bin" +STATIC_PACKAGES="libfftw3-single3" BUILD_PACKAGES="git cmake make gcc g++ libsamplerate-dev libfftw3-dev" apt-get update diff --git a/docker/scripts/install-dependencies-bladerf.sh b/docker/scripts/install-dependencies-bladerf.sh index 9a07565c..2b2e5320 100755 --- a/docker/scripts/install-dependencies-bladerf.sh +++ b/docker/scripts/install-dependencies-bladerf.sh @@ -25,11 +25,11 @@ apt-get update apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES git clone https://github.com/Nuand/bladeRF.git -cmakebuild bladeRF 2021.10 +cmakebuild bladeRF 2023.02 git clone https://github.com/pothosware/SoapyBladeRF.git -# latest from master as of 2022-01-12 -cmakebuild SoapyBladeRF 70505a5cdf8c9deabc4af3eb3384aa82a7b6f021 +# latest from master as of 2023-08-30 +cmakebuild SoapyBladeRF 85f6dc554ed4c618304d99395b19c4e1523675b0 apt-get -y purge --autoremove $BUILD_PACKAGES apt-get clean diff --git a/docker/scripts/install-dependencies-hackrf.sh b/docker/scripts/install-dependencies-hackrf.sh index 03704a3c..19a458a3 100755 --- a/docker/scripts/install-dependencies-hackrf.sh +++ b/docker/scripts/install-dependencies-hackrf.sh @@ -18,7 +18,7 @@ function cmakebuild() { cd /tmp -STATIC_PACKAGES="libusb-1.0-0 libfftw3-3 udev" +STATIC_PACKAGES="libusb-1.0-0 libfftw3-single3 udev" BUILD_PACKAGES="git cmake make patch wget sudo gcc g++ libusb-1.0-0-dev libfftw3-dev pkg-config" apt-get update diff --git a/docker/scripts/install-dependencies-radioberry.sh b/docker/scripts/install-dependencies-radioberry.sh index 01724621..44688e0d 100755 --- a/docker/scripts/install-dependencies-radioberry.sh +++ b/docker/scripts/install-dependencies-radioberry.sh @@ -18,8 +18,8 @@ function cmakebuild() { cd /tmp -STATIC_PACKAGES="libusb-1.0-0 libfftw3-3 udev" -BUILD_PACKAGES="git cmake make patch wget sudo gcc g++ libusb-1.0-0-dev libfftw3-dev pkg-config" +STATIC_PACKAGES="" +BUILD_PACKAGES="git cmake make gcc g++" apt-get update apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES diff --git a/docker/scripts/install-dependencies-runds.sh b/docker/scripts/install-dependencies-runds.sh index 6e337175..fdf26301 100755 --- a/docker/scripts/install-dependencies-runds.sh +++ b/docker/scripts/install-dependencies-runds.sh @@ -18,7 +18,7 @@ function cmakebuild() { cd /tmp -STATIC_PACKAGES="libfftw3-bin" +STATIC_PACKAGES="libfftw3-single3" BUILD_PACKAGES="git cmake make gcc g++ pkg-config libfftw3-dev" apt-get update diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh index e77edc2c..35d2ab1a 100755 --- a/docker/scripts/install-dependencies.sh +++ b/docker/scripts/install-dependencies.sh @@ -21,27 +21,20 @@ function cmakebuild() { cd /tmp -STATIC_PACKAGES="libfftw3-bin python3 python3-setuptools netcat-openbsd libsndfile1 liblapack3 libusb-1.0-0 libqt5core5a libreadline8 libgfortran5 libgomp1 libasound2 libudev1 ca-certificates libpulse0 libfaad2 libopus0 libboost-program-options1.74.0 libboost-log1.74.0 libcurl4 libncurses6" -BUILD_PACKAGES="wget git libsndfile1-dev libfftw3-dev cmake make gcc g++ liblapack-dev texinfo gfortran libusb-1.0-0-dev qtbase5-dev qtmultimedia5-dev qttools5-dev libqt5serialport5-dev qttools5-dev-tools asciidoctor asciidoc libasound2-dev libudev-dev libhamlib-dev patch xsltproc qt5-qmake libfaad-dev libopus-dev libboost-dev libboost-program-options-dev libboost-log-dev libboost-regex-dev libpulse-dev libcurl4-openssl-dev libncurses-dev" +STATIC_PACKAGES="libfftw3-single3 python3 python3-setuptools netcat-openbsd libsndfile1 liblapack3 libusb-1.0-0 libqt5core5a libreadline8 libgfortran5 libgomp1 libasound2 libudev1 ca-certificates libpulse0 libfaad2 libopus0 libboost-program-options1.74.0 libboost-log1.74.0 libcurl4 libncurses6" +BUILD_PACKAGES="wget git libsndfile1-dev libfftw3-dev cmake make gcc g++ liblapack-dev texinfo gfortran libusb-1.0-0-dev qtbase5-dev qtmultimedia5-dev qttools5-dev libqt5serialport5-dev qttools5-dev-tools asciidoctor asciidoc libasound2-dev libudev-dev libhamlib-dev patch xsltproc qt5-qmake libfaad-dev libopus-dev libboost-dev libboost-program-options-dev libboost-log-dev libboost-regex-dev libpulse-dev libcurl4-openssl-dev libncurses-dev xz-utils" apt-get update apt-get -y install auto-apt-proxy apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES -case `uname -m` in - arm*) - PLATFORM=armhf - ;; - aarch64*) - PLATFORM=aarch64 - ;; - x86_64*) - PLATFORM=amd64 - ;; -esac +PLATFORM=$(uname -m) -wget https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-${PLATFORM}.tar.gz -tar xzf s6-overlay-${PLATFORM}.tar.gz -C / -rm s6-overlay-${PLATFORM}.tar.gz +wget https://github.com/just-containers/s6-overlay/releases/download/v3.1.5.0/s6-overlay-noarch.tar.xz +tar -Jxpf /tmp/s6-overlay-noarch.tar.xz -C / +rm s6-overlay-noarch.tar.xz +wget https://github.com/just-containers/s6-overlay/releases/download/v3.1.5.0/s6-overlay-${PLATFORM}.tar.xz +tar -Jxpf /tmp/s6-overlay-${PLATFORM}.tar.xz -C / +rm s6-overlay-${PLATFORM}.tar.xz JS8CALL_VERSION=2.2.0 JS8CALL_DIR=js8call diff --git a/docker/scripts/install-owrx-tools.sh b/docker/scripts/install-owrx-tools.sh index 8ba46c6c..45367d1d 100755 --- a/docker/scripts/install-owrx-tools.sh +++ b/docker/scripts/install-owrx-tools.sh @@ -18,7 +18,7 @@ function cmakebuild() { cd /tmp -STATIC_PACKAGES="libfftw3-bin libprotobuf23 libsamplerate0 libicu67 libudev1" +STATIC_PACKAGES="libfftw3-single3 libprotobuf32 libsamplerate0 libicu72 libudev1" BUILD_PACKAGES="git autoconf automake libtool libfftw3-dev pkg-config cmake make gcc g++ libprotobuf-dev protobuf-compiler libsamplerate-dev libicu-dev libpython3-dev libudev-dev" apt-get update apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES