From 77a3f294e0c0a4bdee67165bd8d862ee0d98d319 Mon Sep 17 00:00:00 2001 From: Anthony Gauchy Date: Thu, 1 Apr 2021 18:16:02 +0200 Subject: [PATCH] Update docker image to match sdk 4.5 update --- .../job-linux-desktop-archlinux-latest.yml | 10 +++--- .../job-linux-desktop-centos7.yml | 9 +++-- .../job-linux-desktop-debian10.yml | 12 +++---- .../job-linux-desktop-debian9.yml | 12 +++---- .../job-linux-desktop-ubuntu-rolling.yml | 8 ++--- .gitlab-ci.yml | 6 ++++ docker-files/bc-dev-centos7-fuse-qt-wget | 13 ++++---- docker-files/bc-dev-centos7-fuse-wget | 6 ---- docker-files/bc-dev-debian9 | 28 ---------------- docker-files/bc-dev-debian9-qt-fuse-wget-gpg2 | 6 ++-- docker-files/bc-dev-ubuntu-18.04-LTS | 33 ------------------- docker-files/bc-dev-ubuntu-rolling | 33 ------------------- linphone-sdk | 2 +- 13 files changed, 42 insertions(+), 136 deletions(-) delete mode 100644 docker-files/bc-dev-centos7-fuse-wget delete mode 100644 docker-files/bc-dev-debian9 delete mode 100644 docker-files/bc-dev-ubuntu-18.04-LTS delete mode 100644 docker-files/bc-dev-ubuntu-rolling diff --git a/.gitlab-ci-files/job-linux-desktop-archlinux-latest.yml b/.gitlab-ci-files/job-linux-desktop-archlinux-latest.yml index 92dfb82c7..841524725 100644 --- a/.gitlab-ci-files/job-linux-desktop-archlinux-latest.yml +++ b/.gitlab-ci-files/job-linux-desktop-archlinux-latest.yml @@ -1,6 +1,6 @@ job-archlinux-latest-ninja-clang: tags: [ "docker-archlinux-latest" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:latest + image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:$ARCHLINUX_IMAGE_VERSION except: refs: - schedules @@ -16,7 +16,7 @@ job-archlinux-latest-ninja-clang: job-archlinux-latest-makefile-gcc: tags: [ "docker-archlinux-latest" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:latest + image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:$ARCHLINUX_IMAGE_VERSION only: variables: - $NIGHTLY_MASTER @@ -29,7 +29,7 @@ job-archlinux-latest-makefile-gcc: job-archlinux-latest-makefile-clang: tags: [ "docker-archlinux-latest" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:latest + image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:$ARCHLINUX_IMAGE_VERSION only: variables: - $NIGHTLY_MASTER @@ -42,7 +42,7 @@ job-archlinux-latest-makefile-clang: job-archlinux-latest-ninja-gcc: tags: [ "docker-archlinux-latest" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:latest + image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:$ARCHLINUX_IMAGE_VERSION only: variables: - $NIGHTLY_MASTER @@ -63,7 +63,7 @@ job-archlinux-latest-ninja-gcc-novideo: job-archlinux-latest-ninja-clang-novideo: tags: [ "docker-archlinux-latest" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:latest + image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-archlinux:$ARCHLINUX_IMAGE_VERSION only: variables: - $NIGHTLY_MASTER diff --git a/.gitlab-ci-files/job-linux-desktop-centos7.yml b/.gitlab-ci-files/job-linux-desktop-centos7.yml index 0d8d30694..041e5abc8 100644 --- a/.gitlab-ci-files/job-linux-desktop-centos7.yml +++ b/.gitlab-ci-files/job-linux-desktop-centos7.yml @@ -32,7 +32,7 @@ ################################################# job-centos7-ninja-gcc: tags: [ "docker" ] - image: gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-centos7-qt-fuse-wget:5.12.5 + image: gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-centos7-fuse-qt-wget:$CENTOS_7_QT_IMAGE_VERSION except: refs: - schedules @@ -67,8 +67,7 @@ job-centos7-ninja-gcc: job-centos7-ninja-gcc-package: stage: package tags: [ "docker-test-centos7-liblinphone-nuc" ] - #image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos:7 - image: gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-centos7-qt-fuse-wget:5.12.5 + image: gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-centos7-fuse-qt-wget:$CENTOS_7_QT_IMAGE_VERSION dependencies: [] only: variables: @@ -126,7 +125,7 @@ job-centos7-debug-nuc: stage: deploy tags: [ "docker-test-centos7-liblinphone-nuc" ] #image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos:7 - image: gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-centos7-qt-fuse-wget:5.12.5 + image: gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-centos7-fuse-qt-wget:$CENTOS_7_QT_IMAGE_VERSION dependencies: [] only: variables: @@ -138,7 +137,7 @@ job-centos7-debug: stage: deploy tags: [ "docker" ] #image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos:7 - image: gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-centos7-qt-fuse-wget:5.12.5 + image: gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-centos7-fuse-qt-wget:$CENTOS_7_QT_IMAGE_VERSION dependencies: [] only: variables: diff --git a/.gitlab-ci-files/job-linux-desktop-debian10.yml b/.gitlab-ci-files/job-linux-desktop-debian10.yml index edcfbb40b..e9da76096 100644 --- a/.gitlab-ci-files/job-linux-desktop-debian10.yml +++ b/.gitlab-ci-files/job-linux-desktop-debian10.yml @@ -1,7 +1,7 @@ job-debian10-ninja-gcc: tags: [ "docker-debian10" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:10 + image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian10:$DEBIAN_10_IMAGE_VERSION except: refs: - schedules @@ -17,7 +17,7 @@ job-debian10-ninja-gcc: job-debian10-makefile-gcc: tags: [ "docker-debian10" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:10 + image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian10:$DEBIAN_10_IMAGE_VERSION only: variables: - $NIGHTLY_MASTER @@ -31,7 +31,7 @@ job-debian10-makefile-gcc: job-debian10-ninja-gcc-novideo: tags: [ "docker-debian10" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:10 + image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian10:$DEBIAN_10_IMAGE_VERSION only: variables: - $NIGHTLY_MASTER @@ -45,7 +45,7 @@ job-debian10-ninja-gcc-novideo: job-debian10-ninja-gcc-smallsdk: tags: [ "docker-debian10" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:10 + image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian10:$DEBIAN_10_IMAGE_VERSION only: variables: - $NIGHTLY_MASTER @@ -62,7 +62,7 @@ job-debian10-ninja-clang: only: variables: - $NIGHTLY_MASTER - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:10 + image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian10:$DEBIAN_10_IMAGE_VERSION variables: CMAKE_GENERATOR: Ninja CC: clang @@ -80,7 +80,7 @@ job-debian10-ninja-clang-novideo: job-debian10-makefile-clang: tags: [ "docker-debian10" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:10 + image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian10:$DEBIAN_10_IMAGE_VERSION only: variables: - $NIGHTLY_MASTER diff --git a/.gitlab-ci-files/job-linux-desktop-debian9.yml b/.gitlab-ci-files/job-linux-desktop-debian9.yml index d59ee801f..cfeaf963e 100644 --- a/.gitlab-ci-files/job-linux-desktop-debian9.yml +++ b/.gitlab-ci-files/job-linux-desktop-debian9.yml @@ -2,7 +2,7 @@ job-debian9-ninja-gcc: tags: [ "docker-debian9" ] - image: gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-debian9-fuse-wget-gpg2-qt-release-no-debug-info:5.12.5 + image: gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-debian9-qt-fuse-wget-gpg2:$DEBIAN_9_QT_IMAGE_VERSION except: refs: - schedules @@ -28,7 +28,7 @@ job-debian9-ninja-gcc-smallsdk: job-debian9-makefile-gcc: tags: [ "docker-debian9" ] - image: gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-debian9-fuse-wget-gpg2-qt-release-no-debug-info:5.12.5 + image: gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-debian9-qt-fuse-wget-gpg2:$DEBIAN_9_QT_IMAGE_VERSION only: variables: - $NIGHTLY_MASTER @@ -53,7 +53,7 @@ job-debian9-ninja-clang: only: variables: - $NIGHTLY_MASTER - image: gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-debian9-fuse-wget-gpg2-qt-release-no-debug-info:5.12.5 + image: gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-debian9-qt-fuse-wget-gpg2:$DEBIAN_9_QT_IMAGE_VERSION variables: CMAKE_OPTIONS: -DENABLE_DOC=ON CMAKE_GENERATOR: Ninja @@ -71,7 +71,7 @@ job-debian9-ninja-clang-novideo: job-debian9-makefile-clang: tags: [ "docker-debian9" ] - image: gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-debian9-fuse-wget-gpg2-qt-release-no-debug-info:5.12.5 + image: gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-debian9-qt-fuse-wget-gpg2:$DEBIAN_9_QT_IMAGE_VERSION only: variables: - $NIGHTLY_MASTER @@ -109,7 +109,7 @@ job-debian9-makefile-clang: job-debian9-makefile-clang-package: stage: package tags: [ "docker-test-liblinphone" ] - image: gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-debian9-fuse-wget-gpg2-qt-release-no-debug-info:5.12.5 + image: gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-debian9-qt-fuse-wget-gpg2:$DEBIAN_9_QT_IMAGE_VERSION dependencies: [] only: variables: @@ -180,7 +180,7 @@ job-debian9-makefile-clang-plugins-deploy: job-debian9-debug: stage: deploy tags: [ "docker-test-debian9-liblinphone-nuc" ] - image: gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-debian9-fuse-wget-gpg2-qt-release-no-debug-info:5.12.5 + image: gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-debian9-qt-fuse-wget-gpg2:$DEBIAN_9_QT_IMAGE_VERSION dependencies: [] only: variables: diff --git a/.gitlab-ci-files/job-linux-desktop-ubuntu-rolling.yml b/.gitlab-ci-files/job-linux-desktop-ubuntu-rolling.yml index b90039917..7028d1cf8 100644 --- a/.gitlab-ci-files/job-linux-desktop-ubuntu-rolling.yml +++ b/.gitlab-ci-files/job-linux-desktop-ubuntu-rolling.yml @@ -1,7 +1,7 @@ job-ubuntu-rolling-ninja-clang: tags: [ "docker-ubuntu-rolling" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:rolling + image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu-rolling:$UBUNTU_ROLLING_IMAGE_VERSION except: refs: - schedules @@ -20,7 +20,7 @@ job-ubuntu-rolling-ninja-clang: job-ubuntu-rolling-makefile-gcc: tags: [ "docker-ubuntu-rolling" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:rolling + image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu-rolling:$UBUNTU_ROLLING_IMAGE_VERSION only: variables: - $NIGHTLY_MASTER @@ -34,7 +34,7 @@ job-ubuntu-rolling-makefile-gcc: job-ubuntu-rolling-makefile-clang: tags: [ "docker-ubuntu-rolling" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:rolling + image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu-rolling:$UBUNTU_ROLLING_IMAGE_VERSION only: variables: - $NIGHTLY_MASTER @@ -48,7 +48,7 @@ job-ubuntu-rolling-makefile-clang: job-ubuntu-rolling-ninja-gcc: tags: [ "docker-ubuntu-rolling" ] - image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:rolling + image: gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu-rolling:$UBUNTU_ROLLING_IMAGE_VERSION only: variables: - $NIGHTLY_MASTER diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index af67ef04e..ba074cb2b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,6 +20,12 @@ variables: #build options in CMakeBuilder #CMAKE_OPTIONS: -DENABLE_LIME_X3DH=YES +# Docker image version + ARCHLINUX_IMAGE_VERSION: 20210217_init + CENTOS_7_QT_IMAGE_VERSION: 20210401_python3 + DEBIAN_9_QT_IMAGE_VERSION: 20210401_python3 + DEBIAN_10_IMAGE_VERSION: 20210217_python3 + UBUNTU_ROLLING_IMAGE_VERSION: 20210217_python3 ################################################# # Platforms to test diff --git a/docker-files/bc-dev-centos7-fuse-qt-wget b/docker-files/bc-dev-centos7-fuse-qt-wget index dffa8cbe8..3f18fc2ce 100644 --- a/docker-files/bc-dev-centos7-fuse-qt-wget +++ b/docker-files/bc-dev-centos7-fuse-qt-wget @@ -1,10 +1,13 @@ -FROM gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos:7 +FROM gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-centos7:20210217_python3 MAINTAINER Peio Rigaux -#QT Dependenciesi (pigz is used to parallelize compression) -RUN sudo yum install -y libxkbcommon* libxcb pigz +# QT Dependenciesi (pigz is used to parallelize compression) +RUN sudo yum install -y libxkbcommon* libxcb freeglut-devel pigz icc-profiles-openicc fontconfig fontconfig-devel libfontconfig1-dev freetype-devel +RUN scl enable devtoolset-7 bash +# Configure AppImages dependencies +RUN sudo yum install -y fuse fuse-libs wget # Build qt5.12.5 RUN git clone -b master --single-branch https://gitlab.linphone.org/BC/public/linphone-desktop.git && \ @@ -13,11 +16,9 @@ RUN git clone -b master --single-branch https://gitlab.linphone.org/BC/public/li sudo mv ./linphone-desktop/rpm-linphone-qt-5.12.5/rpmbuild/RPMS/x86_64/*.rpm / && \ sudo rm -rf ./linphone-desktop -# Configure AppImages dependencies -RUN sudo yum install -y fuse fuse-libs wget RUN echo 'source /opt/rh/devtoolset-8/enable' >> /home/bc/.bashrc -RUN echo 'source /opt/rh/devtoolset-8/enable' >> /home/bc/.shrc +RUN echo 'source /opt/rh/devtoolset-8/enable' >> /home/bc/.shrc; exit 0 # This tells /bin/sh to load '~/.shrc' on starting ENV ENV=~/.shrc diff --git a/docker-files/bc-dev-centos7-fuse-wget b/docker-files/bc-dev-centos7-fuse-wget deleted file mode 100644 index 6f94ff308..000000000 --- a/docker-files/bc-dev-centos7-fuse-wget +++ /dev/null @@ -1,6 +0,0 @@ -FROM gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-centos7-qt:5.12.5 - -MAINTAINER Peio Rigaux - -#Appimage deps -RUN sudo yum install -y wget fuse fuse-libs diff --git a/docker-files/bc-dev-debian9 b/docker-files/bc-dev-debian9 deleted file mode 100644 index dbcb41ec6..000000000 --- a/docker-files/bc-dev-debian9 +++ /dev/null @@ -1,28 +0,0 @@ -FROM gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9 - -MAINTAINER Peio Rigaux - -#Tools for QT buid script -RUN sudo apt-get update && sudo apt-get install -y python3 pigz - - -#QT Dependencies -RUN sudo apt-get update && sudo apt-get install -y libxkbcommon* - -# Build qt5.12.5 -RUN git clone -b master --single-branch https://gitlab.linphone.org/BC/public/linphone-desktop.git && \ - ./linphone-desktop/tools/build_qt_rpm && \ - find "./linphone-desktop/rpm-linphone-qt-5.12.5/rpmbuild/RPMS/x86_64/" -iname "*.rpm" -exec sudo fakeroot alien -d {} + && \ - find "." -maxdepth 1 -iname "*.deb" -exec sudo dpkg -i {} + && \ - rm -rf ./linphone-desktop - -ENV Qt5_DIR=/opt/com.belledonne-communications/linphone/lib/cmake -ENV PATH=$PATH:/opt/com.belledonne-communications/linphone/bin - -#Appimage deps -RUN sudo apt-get install -y wget fuse fuse-libs - -USER bc -WORKDIR /home/bc -ENV PS1='\[\e[34m\]\u@bc-dev-centos7>\[\e[0m\] ' -CMD bash diff --git a/docker-files/bc-dev-debian9-qt-fuse-wget-gpg2 b/docker-files/bc-dev-debian9-qt-fuse-wget-gpg2 index 3ca2508a9..abbd1d34f 100644 --- a/docker-files/bc-dev-debian9-qt-fuse-wget-gpg2 +++ b/docker-files/bc-dev-debian9-qt-fuse-wget-gpg2 @@ -1,9 +1,9 @@ -FROM gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian:9 +FROM gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-debian9:20210217_python3 MAINTAINER Peio Rigaux #Tools for QT buid script -RUN sudo apt-get update && sudo apt-get install -y python3 pigz +RUN sudo apt-get update && sudo apt-get install -y pigz #QT Dependencies @@ -23,7 +23,7 @@ RUN git clone -b master --single-branch https://gitlab.linphone.org/BC/public/li rm -rf ./linphone-desktop ENV Qt5_DIR=/opt/com.belledonne-communications/linphone/lib/cmake -ENV PATH=$PATH:/opt/com.belledonne-communications/linphone/bin +ENV PATH=/opt/com.belledonne-communications/linphone/bin:$PATH #Appimage deps RUN sudo apt-get install -y wget fuse libfuse2 gnupg2 diff --git a/docker-files/bc-dev-ubuntu-18.04-LTS b/docker-files/bc-dev-ubuntu-18.04-LTS deleted file mode 100644 index b0ae21b85..000000000 --- a/docker-files/bc-dev-ubuntu-18.04-LTS +++ /dev/null @@ -1,33 +0,0 @@ -FROM gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:18.04 - -MAINTAINER Peio Rigaux - -#Tools for QT buid script -RUN sudo apt-get update && sudo apt-get install -y python3 pigz - - -#QT Dependencies -#atspi and dbus may be used to enable qt accessibility for screan reader -#xkbcommon is needed for special keyboard features -#flite1-dev, libspeechd-dev speech-dispatcher are needed for text to speech -#libfontconfig1-dev is needed to load correct fonts (support of ideograms, etc..) -RUN sudo apt-get update && sudo apt-get install -y libxkbcommon* flite1-dev libspeechd-dev speech-dispatcher libfontconfig1-dev qdbus-qt5 libqt5dbus5 libdbus-1-dev libdbus-glib-1-dev libatspi2.0-0 libatspi2.0-dev - -#needed fot qt to find dbus -ENV PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig -# Build qt5.12.5 -RUN git clone -b master --single-branch https://gitlab.linphone.org/BC/public/linphone-desktop.git && \ - ./linphone-desktop/tools/build_qt_rpm && \ - find "./linphone-desktop/rpm-linphone-qt-5.12.5/rpmbuild/RPMS/x86_64/" -iname "*.rpm" -exec sudo fakeroot alien -d {} + && \ - find "." -maxdepth 1 -iname "*.deb" -exec sudo dpkg -i --force-overwrite {} + && \ - rm -rf ./linphone-desktop - -ENV Qt5_DIR=/opt/com.belledonne-communications/linphone/lib/cmake -ENV PATH=$PATH:/opt/com.belledonne-communications/linphone/bin - -#Appimage deps -RUN sudo apt-get install -y wget fuse libfuse2 gnupg2 - -USER bc -WORKDIR /home/bc -CMD bash diff --git a/docker-files/bc-dev-ubuntu-rolling b/docker-files/bc-dev-ubuntu-rolling deleted file mode 100644 index 9483220cd..000000000 --- a/docker-files/bc-dev-ubuntu-rolling +++ /dev/null @@ -1,33 +0,0 @@ -FROM gitlab.linphone.org:4567/bc/public/linphone-sdk/bc-dev-ubuntu:rolling - -MAINTAINER Peio Rigaux - -#Tools for QT buid script -RUN sudo apt-get update && sudo apt-get install -y python3 pigz - - -#QT Dependencies -#atspi and dbus may be used to enable qt accessibility for screan reader -#xkbcommon is needed for special keyboard features -#flite1-dev, libspeechd-dev speech-dispatcher are needed for text to speech -#libfontconfig1-dev is needed to load correct fonts (support of ideograms, etc..) -RUN sudo apt-get update && sudo apt-get install -y libxkbcommon* flite1-dev libspeechd-dev speech-dispatcher libfontconfig1-dev qdbus-qt5 libqt5dbus5 libdbus-1-dev libdbus-glib-1-dev libatspi2.0-0 libatspi2.0-dev - -#needed fot qt to find dbus -ENV PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig -# Build qt5.12.5 -RUN git clone -b master --single-branch https://gitlab.linphone.org/BC/public/linphone-desktop.git && \ - ./linphone-desktop/tools/build_qt_rpm && \ - find "./linphone-desktop/rpm-linphone-qt-5.12.5/rpmbuild/RPMS/x86_64/" -iname "*.rpm" -exec sudo fakeroot alien -d {} + && \ - find "." -maxdepth 1 -iname "*.deb" -exec sudo dpkg -i --force-overwrite {} + && \ - rm -rf ./linphone-desktop - -ENV Qt5_DIR=/opt/com.belledonne-communications/linphone/lib/cmake -ENV PATH=$PATH:/opt/com.belledonne-communications/linphone/bin - -#Appimage deps -RUN sudo apt-get install -y wget fuse libfuse2 gnupg2 - -USER bc -WORKDIR /home/bc -CMD bash diff --git a/linphone-sdk b/linphone-sdk index d003ba08d..b1d5c79e3 160000 --- a/linphone-sdk +++ b/linphone-sdk @@ -1 +1 @@ -Subproject commit d003ba08decb3462aca72f79d868683073c9cc8d +Subproject commit b1d5c79e31e9b4604a9094ae604143c010051e83