From c4687816c17a73c650f1648d0f78210d662fd192 Mon Sep 17 00:00:00 2001 From: Jakob Ketterl Date: Fri, 1 Oct 2021 16:23:47 +0200 Subject: [PATCH] update docker to debian bullseye --- docker/Dockerfiles/Dockerfile-base | 2 +- docker/scripts/install-dependencies-uhd.sh | 5 ++--- docker/scripts/install-dependencies.sh | 6 +++--- docker/scripts/install-owrx-tools.sh | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/docker/Dockerfiles/Dockerfile-base b/docker/Dockerfiles/Dockerfile-base index 6fd184f..f59fcda 100644 --- a/docker/Dockerfiles/Dockerfile-base +++ b/docker/Dockerfiles/Dockerfile-base @@ -1,4 +1,4 @@ -FROM debian:buster-slim +FROM debian:bullseye-slim COPY docker/files/js8call/js8call-hamlib.patch \ docker/files/wsjtx/wsjtx.patch \ diff --git a/docker/scripts/install-dependencies-uhd.sh b/docker/scripts/install-dependencies-uhd.sh index c71ff4e..87a5732 100755 --- a/docker/scripts/install-dependencies-uhd.sh +++ b/docker/scripts/install-dependencies-uhd.sh @@ -18,17 +18,16 @@ function cmakebuild() { cd /tmp -STATIC_PACKAGES="libusb-1.0.0 libboost-chrono1.67.0 libboost-date-time1.67.0 libboost-filesystem1.67.0 libboost-program-options1.67.0 libboost-regex1.67.0 libboost-test1.67.0 libboost-serialization1.67.0 libboost-thread1.67.0 libboost-system1.67.0 python3-numpy python3-mako" +STATIC_PACKAGES="libusb-1.0.0 libboost-chrono1.74.0 libboost-date-time1.74.0 libboost-filesystem1.74.0 libboost-program-options1.74.0 libboost-regex1.74.0 libboost-test1.74.0 libboost-serialization1.74.0 libboost-thread1.74.0 libboost-system1.74.0 python3-numpy python3-mako" BUILD_PACKAGES="git cmake make gcc g++ libusb-1.0-0-dev libboost-dev libboost-chrono-dev libboost-date-time-dev libboost-filesystem-dev libboost-program-options-dev libboost-regex-dev libboost-test-dev libboost-serialization-dev libboost-thread-dev libboost-system-dev" apt-get update apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES git clone https://github.com/EttusResearch/uhd.git -# 3.15.0.0 Release mkdir -p uhd/host/build cd uhd/host/build -git checkout v3.15.0.0 +git checkout v4.1.0.4 # see https://github.com/EttusResearch/uhd/issues/350 case `uname -m` in arm*) diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh index ca6d681..708ebf3 100755 --- a/docker/scripts/install-dependencies.sh +++ b/docker/scripts/install-dependencies.sh @@ -18,8 +18,8 @@ function cmakebuild() { cd /tmp -STATIC_PACKAGES="libfftw3-bin python3 python3-setuptools netcat-openbsd libsndfile1 liblapack3 libusb-1.0-0 libqt5core5a libreadline7 libgfortran4 libgomp1 libasound2 libudev1 ca-certificates libpulse0 libfaad2 libopus0 libboost-program-options1.67.0 libboost-log1.67.0" -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-default libfaad-dev libopus-dev libboost-dev libboost-program-options-dev libboost-log-dev libboost-regex-dev" +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" +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" apt-get update apt-get -y install auto-apt-proxy apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES @@ -48,7 +48,7 @@ tar xfz ${JS8CALL_TGZ} # patch allows us to build against the packaged hamlib patch -Np1 -d ${JS8CALL_DIR} < /js8call-hamlib.patch rm /js8call-hamlib.patch -CMAKE_ARGS="-D CMAKE_CXX_FLAGS=-DJS8_USE_HAMLIB_THREE" cmakebuild ${JS8CALL_DIR} +cmakebuild ${JS8CALL_DIR} rm ${JS8CALL_TGZ} WSJT_DIR=wsjtx-2.5.0 diff --git a/docker/scripts/install-owrx-tools.sh b/docker/scripts/install-owrx-tools.sh index bf0a6de..522d02e 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 libprotobuf17 libsamplerate0 libicu63" +STATIC_PACKAGES="libfftw3-bin libprotobuf23 libsamplerate0 libicu67" BUILD_PACKAGES="git autoconf automake libtool libfftw3-dev pkg-config cmake make gcc g++ libprotobuf-dev protobuf-compiler libsamplerate-dev libicu-dev libpython3-dev" apt-get update apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES