osmith has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/43079?usp=email )
Change subject: debian-{bullseye,bookworm}-titan[-master]: drop libfftranscode ......................................................................
debian-{bullseye,bookworm}-titan[-master]: drop libfftranscode
We've meanwhile migrated to more recent TITAN release that can do ASN.1 PER encoding/decoding, so libfftranscode is no longer needed.
Change-Id: If68f478d29f4728a9f3518b20128b195a8267955 Related: OS#6490 --- M debian-bookworm-titan-master/Dockerfile M debian-bookworm-titan/Dockerfile M debian-bullseye-titan-master/Dockerfile M debian-bullseye-titan/Dockerfile 4 files changed, 0 insertions(+), 39 deletions(-)
Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved
diff --git a/debian-bookworm-titan-master/Dockerfile b/debian-bookworm-titan-master/Dockerfile index d292efe..0f41925 100644 --- a/debian-bookworm-titan-master/Dockerfile +++ b/debian-bookworm-titan-master/Dockerfile @@ -33,15 +33,6 @@ && \ apt-get clean
-# Binary-only transcoding library for RANAP/RUA/HNBAP to work around TITAN only implementing BER -RUN set -x && \ - export DPKG_ARCH="$(dpkg --print-architecture)" && \ - wget https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode0_0.6_$%7BDPKG... && \ - wget https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode-dev_0.6_$%7BD... && \ - dpkg -i ./libfftranscode0_0.6_${DPKG_ARCH}.deb ./libfftranscode-dev_0.6_${DPKG_ARCH}.deb && \ - apt install --fix-broken && \ - rm libfftranscode*.deb - # Install osmo-python-tests (for obtaining talloc reports from SUT) ADD https://gerrit.osmocom.org/plugins/gitiles/python/osmo-python-tests/+/master... /tmp/osmo-python-tests-commit RUN pip3 install --break-system-packages \ diff --git a/debian-bookworm-titan/Dockerfile b/debian-bookworm-titan/Dockerfile index ba07550..05fa0d3 100644 --- a/debian-bookworm-titan/Dockerfile +++ b/debian-bookworm-titan/Dockerfile @@ -38,15 +38,6 @@ # testsuites inside the docker containers. Don't use it by default. ENV USE_CCACHE=0
-# Binary-only transcoding library for RANAP/RUA/HNBAP to work around TITAN only implementing BER -RUN set -x && \ - export DPKG_ARCH="$(dpkg --print-architecture)" && \ - wget https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode0_0.6_$%7BDPKG... && \ - wget https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode-dev_0.6_$%7BD... && \ - dpkg -i ./libfftranscode0_0.6_${DPKG_ARCH}.deb ./libfftranscode-dev_0.6_${DPKG_ARCH}.deb && \ - apt install --fix-broken && \ - rm libfftranscode*.deb - # Install osmo-python-tests (for obtaining talloc reports from SUT) ADD https://gerrit.osmocom.org/plugins/gitiles/python/osmo-python-tests/+/master... /tmp/osmo-python-tests-commit RUN pip3 install --break-system-packages \ diff --git a/debian-bullseye-titan-master/Dockerfile b/debian-bullseye-titan-master/Dockerfile index 1e3a2a7..49624a7 100644 --- a/debian-bullseye-titan-master/Dockerfile +++ b/debian-bullseye-titan-master/Dockerfile @@ -84,16 +84,6 @@ # This is required for obtaining talloc reports from the SUT RUN pip3 install git+https://gitea.osmocom.org/cellular-infrastructure/osmo-python-tests
-# binary-only transcoding library for RANAP/RUA/HNBAP to work around TITAN only implementing BER -RUN apt-get update && \ - apt-get -y install wget -RUN DPKG_ARCH="$(dpkg --print-architecture)" && export $DPKG_ARCH && \ - wget https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode0_0.6_$%7BDPKG... && \ - wget https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode-dev_0.6_$%7BD... && \ - dpkg -i ./libfftranscode0_0.6_${DPKG_ARCH}.deb ./libfftranscode-dev_0.6_${DPKG_ARCH}.deb && \ - apt install --fix-broken && \ - rm libfftranscode*.deb - RUN git config --global user.email docker@dock.er && \ git config --global user.name "Dock Er"
diff --git a/debian-bullseye-titan/Dockerfile b/debian-bullseye-titan/Dockerfile index b099c47..c017cc3 100644 --- a/debian-bullseye-titan/Dockerfile +++ b/debian-bullseye-titan/Dockerfile @@ -40,17 +40,6 @@ # somehow Debian folks updated the gcc version but not titan :/ RUN sed -i 's/^#error///#error/' /usr/include/titan/cversion.h
- -# binary-only transcoding library for RANAP/RUA/HNBAP to work around TITAN only implementing BER -RUN apt-get update && \ - apt-get -y install wget -RUN DPKG_ARCH="$(dpkg --print-architecture)" && export $DPKG_ARCH && \ - wget https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode0_0.6_$%7BDPKG... && \ - wget https://ftp.osmocom.org/binaries/libfftranscode/libfftranscode-dev_0.6_$%7BD... && \ - dpkg -i ./libfftranscode0_0.6_${DPKG_ARCH}.deb ./libfftranscode-dev_0.6_${DPKG_ARCH}.deb && \ - apt install --fix-broken && \ - rm libfftranscode*.deb - RUN git config --global user.email docker@dock.er && \ git config --global user.name "Dock Er"