mirror of
https://git.jami.net/savoirfairelinux/jami-client-qt.git
synced 2025-07-23 08:55:26 +02:00
misc: replace dockerfile as ubuntu 20.10 will be eol soon
Change-Id: I54cedf53b70fc141e1f2b5f5cecf979b2c2a5433
This commit is contained in:
parent
7529e2e3ec
commit
2865b3841f
3 changed files with 11 additions and 109 deletions
|
@ -1 +1 @@
|
|||
Dockerfile_ubuntu_20.10
|
||||
Dockerfile_ubuntu_20.04
|
|
@ -1,84 +0,0 @@
|
|||
FROM debian:bullseye
|
||||
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
ENV QT_QUICK_BACKEND software
|
||||
ENV QT_QPA_PLATFORM offscreen
|
||||
|
||||
RUN apt-get clean
|
||||
RUN apt-get update
|
||||
RUN apt-get install -y -o Acquire::Retries=10 \
|
||||
python3 \
|
||||
git \
|
||||
autoconf \
|
||||
automake \
|
||||
autopoint \
|
||||
cmake \
|
||||
libtool \
|
||||
libdbus-1-dev \
|
||||
libdbus-c++-dev \
|
||||
libargon2-0-dev \
|
||||
libcanberra-gtk3-dev \
|
||||
libclutter-gtk-1.0-dev \
|
||||
libclutter-1.0-dev \
|
||||
libglib2.0-dev \
|
||||
libgtk-3-dev \
|
||||
libnotify-dev \
|
||||
qtbase5-dev \
|
||||
qttools5-dev \
|
||||
qttools5-dev-tools \
|
||||
yasm \
|
||||
nasm \
|
||||
autotools-dev \
|
||||
gettext \
|
||||
libpulse-dev \
|
||||
libasound2-dev \
|
||||
libexpat1-dev \
|
||||
libpcre3-dev \
|
||||
libyaml-cpp-dev \
|
||||
libboost-dev \
|
||||
libxext-dev \
|
||||
libxfixes-dev \
|
||||
libspeex-dev \
|
||||
libspeexdsp-dev \
|
||||
uuid-dev \
|
||||
libavcodec-dev \
|
||||
libavutil-dev \
|
||||
libavformat-dev \
|
||||
libswscale-dev \
|
||||
libavdevice-dev \
|
||||
libopus-dev \
|
||||
libudev-dev \
|
||||
libgsm1-dev \
|
||||
libjsoncpp-dev \
|
||||
libmsgpack-dev \
|
||||
libnatpmp-dev \
|
||||
libappindicator3-dev \
|
||||
libqrencode-dev \
|
||||
libnm-dev \
|
||||
libwebkit2gtk-4.0-dev \
|
||||
libcrypto++-dev \
|
||||
libva-dev \
|
||||
libvdpau-dev \
|
||||
libssl-dev
|
||||
RUN apt-get install -y qtmultimedia5-dev \
|
||||
libqt5svg5-dev \
|
||||
qtwebengine5-dev \
|
||||
qtdeclarative5-dev \
|
||||
qtquickcontrols2-5-dev \
|
||||
libqt5svg5-dev \
|
||||
qml-module-qtquick2 \
|
||||
qml-module-qtquick-controls \
|
||||
qml-module-qtquick-controls2 \
|
||||
qml-module-qtquick-dialogs \
|
||||
qml-module-qtquick-layouts \
|
||||
qml-module-qtquick-privatewidgets \
|
||||
qml-module-qtquick-shapes \
|
||||
qml-module-qtquick-window2 \
|
||||
qml-module-qtquick-templates2 \
|
||||
qml-module-qt-labs-platform \
|
||||
qml-module-qtwebengine \
|
||||
qml-module-qtwebchannel \
|
||||
qml-module-qttest \
|
||||
pandoc \
|
||||
googletest \
|
||||
libgtest-dev
|
|
@ -1,4 +1,4 @@
|
|||
FROM ubuntu:20.10
|
||||
FROM ubuntu:20.04
|
||||
|
||||
ENV DEBIAN_FRONTEND noninteractive
|
||||
ENV QT_QUICK_BACKEND software
|
||||
|
@ -8,6 +8,14 @@ RUN apt-get clean
|
|||
RUN apt-get update && \
|
||||
apt-get install -y devscripts equivs
|
||||
|
||||
RUN apt install gnupg dirmngr ca-certificates curl --no-install-recommends
|
||||
RUN curl -s https://dl.jami.net/public-key.gpg | tee /usr/share/keyrings/jami-archive-keyring.gpg > /dev/null
|
||||
RUN sh -c "echo 'deb [signed-by=/usr/share/keyrings/jami-archive-keyring.gpg] https://dl.jami.net/nightly/ubuntu_20.04/ jami main' > /etc/apt/sources.list.d/jami.list"
|
||||
RUN apt-get update && apt-get install libqt-jami -y
|
||||
|
||||
ENV QT5_PATH=/usr/lib/libqt-jami/
|
||||
ENV QT5_VER=5.15.2
|
||||
|
||||
RUN apt-get install -y -o Acquire::Retries=10 \
|
||||
python3 \
|
||||
git \
|
||||
|
@ -25,9 +33,6 @@ RUN apt-get install -y -o Acquire::Retries=10 \
|
|||
libglib2.0-dev \
|
||||
libgtk-3-dev \
|
||||
libnotify-dev \
|
||||
qtbase5-dev \
|
||||
qttools5-dev \
|
||||
qttools5-dev-tools \
|
||||
yasm \
|
||||
nasm \
|
||||
autotools-dev \
|
||||
|
@ -62,25 +67,6 @@ RUN apt-get install -y -o Acquire::Retries=10 \
|
|||
libva-dev \
|
||||
libvdpau-dev \
|
||||
libssl-dev
|
||||
RUN apt-get install -y qtmultimedia5-dev \
|
||||
libqt5svg5-dev \
|
||||
qtwebengine5-dev \
|
||||
qtdeclarative5-dev \
|
||||
qtquickcontrols2-5-dev \
|
||||
libqt5svg5-dev \
|
||||
qml-module-qtquick2 \
|
||||
qml-module-qtquick-controls \
|
||||
qml-module-qtquick-controls2 \
|
||||
qml-module-qtquick-dialogs \
|
||||
qml-module-qtquick-layouts \
|
||||
qml-module-qtquick-privatewidgets \
|
||||
qml-module-qtquick-shapes \
|
||||
qml-module-qtquick-window2 \
|
||||
qml-module-qtquick-templates2 \
|
||||
qml-module-qt-labs-platform \
|
||||
qml-module-qtwebengine \
|
||||
qml-module-qtwebchannel \
|
||||
qml-module-qttest \
|
||||
pandoc \
|
||||
RUN apt-get install -y pandoc \
|
||||
googletest \
|
||||
libgtest-dev
|
Loading…
Add table
Reference in a new issue