From 38a2443c8a91b9a74e7b3cf9261d3f46bafa2ed3 Mon Sep 17 00:00:00 2001 From: Tobias Blomberg Date: Sat, 30 Jan 2021 00:46:49 +0100 Subject: [PATCH] Update Docker build for Ubuntu - Now use Ubuntu 20.04 --- docker/ubuntu-build/Dockerfile | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/docker/ubuntu-build/Dockerfile b/docker/ubuntu-build/Dockerfile index d8444f19..43b7ff37 100644 --- a/docker/ubuntu-build/Dockerfile +++ b/docker/ubuntu-build/Dockerfile @@ -8,7 +8,7 @@ # --privileged -v /dev/snd:/dev/snd # -e HOSTAUDIO_GID=$(stat -c "%g" /dev/snd/timer) # -# To import your git config add (mileage may vary): +# To import your git config add (your mileage may vary): # -v ${HOME}/.gitconfig:/home/svxlink/.gitconfig:ro # # To use a specific git repositoty instead of the default one: @@ -22,21 +22,23 @@ # FROM ubuntu -MAINTAINER Tobias Blomberg +MAINTAINER Tobias Blomberg # Install required packages and set up the svxlink user -RUN apt-get update && \ +RUN apt update && \ export DEBIAN_FRONTEND=noninteractive && \ - apt-get -y install git cmake g++ make libsigc++-2.0-dev libgsm1-dev \ - libpopt-dev tcl8.5-dev libgcrypt11-dev libspeex-dev \ - libasound2-dev alsa-utils vorbis-tools libqt4-dev \ - libopus-dev librtlsdr-dev libcurl4-openssl-dev curl sudo -#RUN apt-get -y install groff doxygen + apt -y install git cmake g++ make libsigc++-2.0-dev libgsm1-dev \ + libpopt-dev tcl-dev libgcrypt20-dev libspeex-dev \ + libasound2-dev alsa-utils vorbis-tools qtbase5-dev \ + qttools5-dev qttools5-dev-tools libopus-dev \ + librtlsdr-dev libjsoncpp-dev libcurl4-openssl-dev \ + curl sudo +#RUN apt -y install groff doxygen # Install svxlink audio files RUN mkdir -p /usr/share/svxlink/sounds && \ cd /usr/share/svxlink/sounds && \ - curl -LO https://github.com/sm0svx/svxlink-sounds-en_US-heather/releases/download/14.08/svxlink-sounds-en_US-heather-16k-13.12.tar.bz2 && \ + curl -LO https://github.com/sm0svx/svxlink-sounds-en_US-heather/releases/download/19.09.99.1/svxlink-sounds-en_US-heather-16k-19.09.99.1.tar.bz2 && \ tar xvaf svxlink-sounds-* && \ ln -s en_US-heather-16k en_US && \ rm svxlink-sounds-*