From 23e32d1953bbdb82eccd99e4d6b00599d97b6643 Mon Sep 17 00:00:00 2001 From: Gaelle Braud Date: Mon, 12 May 2025 16:02:37 +0200 Subject: [PATCH] docker update : ubuntu 22.04, qt6.9.0 update gitlab ci file --- .../linux-desktop-ubuntu-2204.yml | 171 ++++++++++++++++++ .gitlab-ci.yml | 4 +- docker-files/bc-dev-ubuntu-20-04-lts | 2 +- docker-files/bc-dev-ubuntu-22-04-lts | 100 ++++++++++ 4 files changed, 275 insertions(+), 2 deletions(-) create mode 100644 .gitlab-ci-files/linux-desktop-ubuntu-2204.yml create mode 100644 docker-files/bc-dev-ubuntu-22-04-lts diff --git a/.gitlab-ci-files/linux-desktop-ubuntu-2204.yml b/.gitlab-ci-files/linux-desktop-ubuntu-2204.yml new file mode 100644 index 000000000..51c955ebf --- /dev/null +++ b/.gitlab-ci-files/linux-desktop-ubuntu-2204.yml @@ -0,0 +1,171 @@ +.factorize_ubuntu2204: &docker_image_platform_and_runner_tag + tags: [ "docker" ] + image: gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-ubuntu-22-04-lts:$UBUNTU_2204_IMAGE_VERSION + +ubuntu2204-ninja-gcc: + rules: + - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $DOCKER_UPDATE == null && $SKIP_LINUX == null + variables: + CMAKE_GENERATOR: Ninja + CMAKE_OPTIONS: -DENABLE_PQCRYPTO=ON + CC: gcc + CXX: g++ + extends: .linux-desktop + <<: *docker_image_platform_and_runner_tag + + +################################################# +# Nightly +################################################# + +ubuntu2204-makefile-gcc: + rules: + - !reference [.rules-merge-request-manual, rules] + - if: $NIGHTLY_MASTER + variables: + CMAKE_GENERATOR: Unix Makefiles + CMAKE_OPTIONS: -DENABLE_PQCRYPTO=ON + CC: gcc + CXX: g++ + ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS + extends: .linux-desktop + <<: *docker_image_platform_and_runner_tag + +ubuntu2204-ninja-clang: + rules: + - !reference [.rules-merge-request-manual, rules] + - if: $NIGHTLY_MASTER + variables: + CMAKE_OPTIONS: -DENABLE_DOC=ON -DENABLE_G729=ON -DENABLE_PQCRYPTO=ON -DENABLE_GPL_THIRD_PARTIES=ON + CMAKE_GENERATOR: Ninja + CC: clang + CXX: clang++ + extends: .linux-desktop + allow_failure: true + <<: *docker_image_platform_and_runner_tag + +ubuntu2204-ninja-clang-small: + rules: + - !reference [.rules-merge-request-manual, rules] + - if: $NIGHTLY_MASTER + variables: + CMAKE_OPTIONS: -DENABLE_VIDEO=NO -DENABLE_ADVANCED_IM=NO -DENABLE_DB_STORAGE=NO -DENABLE_PQCRYPTO=OFF + allow_failure: true + extends: ubuntu2204-ninja-clang + +ubuntu2204-makefile-gcc: + rules: + - !reference [.rules-merge-request-manual, rules] + - if: $NIGHTLY_MASTER + - if: $DEPLOY_PLUGINS + variables: + CMAKE_OPTIONS: -DLINPHONE_BUILDER_SIGNING_IDENTITY=$GPG_SIGNING_KEYID -DENABLE_G729=ON -DENABLE_PQCRYPTO=ON -DENABLE_GPL_THIRD_PARTIES=ON + CMAKE_GENERATOR: Unix Makefiles + CC: gcc + CXX: g++ + ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS + APPIMAGETOOL_SIGN_PASSPHRASE: $GPG_SIGNING_PASS + script: + - echo "$GPG_SIGNING_PUB" > file.key && sed -i 's/\r /\n/g' file.key && chmod 600 file.key + - gpg --import file.key + - rm -f file.key + - echo "$GPG_SIGNING_KEY" > file.key && sed -i 's/\r /\n/g' file.key && chmod 600 file.key + - base64 -w 0 file.key | base64 -d | gpg --import --no-tty --batch --yes + - rm -f file.key + - cmake --version + - export CC=$CC + - export CXX=$CXX + - mkdir -p build/OUTPUT + - echo $CI_BUILD_TYPE + - echo $CMAKE_GENERATOR + - echo $DEFAULT_LINUX_CMAKE_OPTIONS + - echo $CMAKE_SANITIZER_OPTIONS + - eval "$(qtchooser -qt=$QT_LINUX_VER -print-env)" + - export PATH=${QTTOOLDIR}:$PATH + - export Qt6_DIR=${QTLIBDIR}/cmake/Qt6 + - echo "Using Qt $QT_LINUX_VER at ${QTLIBDIR}" + - cd build + - cmake .. -G "$CMAKE_GENERATOR" -DCMAKE_VERBOSE_MAKEFILE=ON -DLINPHONESDK_PLATFORM=Desktop -DCMAKE_BUILD_TYPE=$CI_BUILD_TYPE -DLINPHONEAPP_APPLICATION_NAME="$APPLICATION_NAME" -DLINPHONEAPP_EXECUABLE_NAME="$EXECUTABLE_NAME" $DEFAULT_LINUX_CMAKE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS $CMAKE_SANITIZER_OPTIONS + - cmake --build . --target install --config $CI_BUILD_TYPE $LBC_NODEBUG_OPTIONS + extends: .linux-desktop + <<: *docker_image_platform_and_runner_tag + +################################################# +# Package - Nightly +################################################# + +ubuntu2204-makefile-gcc-package: + stage: package + tags: [ "docker" ] + image: gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-ubuntu-22-04-lts:$UBUNTU_2204_IMAGE_VERSION + dependencies: [] + rules: + - !reference [.rules-merge-request-manual, rules] + - if: $NIGHTLY_MASTER + - if: $PACKAGE_LINUX + - if: $DEPLOY_LINUX + variables: + CMAKE_OPTIONS: -DENABLE_APP_PACKAGING=YES -DLINPHONE_BUILDER_SIGNING_IDENTITY=$GPG_SIGNING_KEYID -DENABLE_G729=ON -DLINPHONE_SDK_MAKE_RELEASE_FILE_URL=$MAKE_RELEASE_FILE_URL/$LINUX_PLATFORM/$APP_FOLDER -DENABLE_PQCRYPTO=ON -DENABLE_GPL_THIRD_PARTIES=ON + CMAKE_GENERATOR: Unix Makefiles + CC: gcc + CXX: g++ + APPIMAGETOOL_SIGN_PASSPHRASE: $GPG_SIGNING_PASS + extends: .linux-desktop + script: + - echo "$GPG_SIGNING_PUB" > file.key && sed -i 's/\r /\n/g' file.key && chmod 600 file.key + - gpg --import file.key + - rm -f file.key + - echo "$GPG_SIGNING_KEY" > file.key && sed -i 's/\r /\n/g' file.key && chmod 600 file.key + - base64 -w 0 file.key | base64 -d | gpg --import --no-tty --batch --yes + - rm -f file.key + - cmake --version + - export CC=$CC + - export CXX=$CXX + - mkdir -p build/OUTPUT + - echo $CI_BUILD_TYPE + - echo $CMAKE_GENERATOR + - echo $DEFAULT_LINUX_CMAKE_OPTIONS + - echo $CMAKE_SANITIZER_OPTIONS + - eval "$(qtchooser -qt=$QT_LINUX_VER -print-env)" + - export PATH=${QTTOOLDIR}:$PATH + - cd build + - cmake .. -G "$CMAKE_GENERATOR" -DCMAKE_VERBOSE_MAKEFILE=ON -DLINPHONESDK_PLATFORM=Desktop -DCMAKE_BUILD_TYPE=$CI_BUILD_TYPE -DLINPHONEAPP_APPLICATION_NAME="$APPLICATION_NAME" -DLINPHONEAPP_EXECUTABLE_NAME="$EXECUTABLE_NAME" $DEFAULT_LINUX_CMAKE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS $CMAKE_SANITIZER_OPTIONS + - cmake --build . --target install --config $CI_BUILD_TYPE $LBC_NODEBUG_OPTIONS + artifacts: + paths: + - build/OUTPUT/* + expire_in: 1 week + +################################################# +# Deploy - Nightly +################################################# + +ubuntu2204-makefile-gcc-deploy: + stage: deploy + tags: [ "deploy" ] + needs: + - ubuntu2204-makefile-gcc-package + only: + variables: + - $NIGHTLY_MASTER + - $DEPLOY_LINUX + script: + - rsync -rlv --ignore-existing build/OUTPUT/Packages/*.AppImage $DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$LINUX_PLATFORM/$APP_FOLDER + - |- + if [[ $MAKE_RELEASE_FILE_URL != "" ]]; then + rsync -rlv build/OUTPUT/Packages/RELEASE $DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$LINUX_PLATFORM + rsync -rlv build/OUTPUT/Packages/RELEASE $MAIN_DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$LINUX_PLATFORM + fi + + +ubuntu2204-makefile-gcc-plugins-deploy: + stage: deploy + tags: [ "deploy" ] + needs: + - ubuntu2204-makefile-gcc + only: + variables: + - $DEPLOY_PLUGINS + script: + - rsync -rlv --ignore-existing build/OUTPUT/plugins/app/*.so $DEPLOY_SERVER:$UPLOAD_ROOT_PATH/$LINUX_PLATFORM/$APP_FOLDER/plugins/ + diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 61c696422..f9914def9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,6 +27,7 @@ variables: DEBIAN_10_IMAGE_VERSION: 20210217_python3 UBUNTU_ROLLING_IMAGE_VERSION: 20211012_add_qtwebview UBUNTU_2004_IMAGE_VERSION: 20250226_qt6-8-0 + UBUNTU_2204_IMAGE_VERSION: 20250512_qt6-9-0 workflow: @@ -50,7 +51,8 @@ include: - '.gitlab-ci-files/rules.yml' - '.gitlab-ci-files/linux-prepare.yml' - '.gitlab-ci-files/linux-desktop.yml' - - '.gitlab-ci-files/linux-desktop-ubuntu-2004.yml' + # - '.gitlab-ci-files/linux-desktop-ubuntu-2004.yml' + - '.gitlab-ci-files/linux-desktop-ubuntu-2204.yml' - '.gitlab-ci-files/windows-desktop.yml' - '.gitlab-ci-files/macosx-desktop.yml' diff --git a/docker-files/bc-dev-ubuntu-20-04-lts b/docker-files/bc-dev-ubuntu-20-04-lts index afe0e3484..aac4ac27d 100644 --- a/docker-files/bc-dev-ubuntu-20-04-lts +++ b/docker-files/bc-dev-ubuntu-20-04-lts @@ -10,7 +10,7 @@ ARG QT6_VERSION=6.8.0 #Do not use it. It seems that it cannot be used from python command. #ARG QT_MODULES=qtnetworkauth qtquick3d qtmultimedia -MAINTAINER Gaelle Braud +LABEL Gaelle Braud # Use a Swiss mirror RUN sed -i -E 's/(archive|security)\.ubuntu\.com/ch.archive.ubuntu.com/' /etc/apt/sources.list diff --git a/docker-files/bc-dev-ubuntu-22-04-lts b/docker-files/bc-dev-ubuntu-22-04-lts new file mode 100644 index 000000000..1dbc5ff63 --- /dev/null +++ b/docker-files/bc-dev-ubuntu-22-04-lts @@ -0,0 +1,100 @@ +############################################################################### +# Dockerfile used to make gitlab.linphone.org:4567/bc/public/linphone-desktop/bc-dev-ubuntu-20-04-lts:20231024_add_multimedia +############################################################################### + +FROM ubuntu:22.04 + +# Qt on Ubuntu 22.04 is too old. Use a downloader. +ARG QT_VERSION=5.15.2 +ARG QT6_VERSION=6.9.0 +#Do not use it. It seems that it cannot be used from python command. +#ARG QT_MODULES=qtnetworkauth qtquick3d qtmultimedia + +LABEL Gaelle Braud + +# Use a Swiss mirror +RUN sed -i -E 's/(archive|security)\.ubuntu\.com/ch.archive.ubuntu.com/' /etc/apt/sources.list + +# add fallbacks for timeout connections. + +#France +RUN echo "deb http://fr.archive.ubuntu.com/ubuntu/ jammy main restricted" >> /etc/apt/sources.list +RUN echo "deb http://security.ubuntu.com/ubuntu jammy-security main restricted" >> /etc/apt/sources.list +RUN echo "deb http://ch.archive.ubuntu.com/ubuntu/ jammy-updates main restricted" >> /etc/apt/sources.list +#Belgium +RUN echo "deb http://be.archive.ubuntu.com/ubuntu/ jammy main restricted" >> /etc/apt/sources.list +RUN echo "deb http://security.ubuntu.com/ubuntu jammy-security main restricted" >> /etc/apt/sources.list +RUN echo "deb http://be.archive.ubuntu.com/ubuntu/ jammy-updates main restricted" >> /etc/apt/sources.list +#International +RUN echo "deb http://archive.ubuntu.com/ubuntu/ jammy main restricted" >> /etc/apt/sources.list +RUN echo "deb http://security.ubuntu.com/ubuntu jammy-security main restricted" >> /etc/apt/sources.list +RUN echo "deb http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted" >> /etc/apt/sources.list + +# Configure locale +RUN apt-get update && \ + apt-get install -y locales && \ + apt-get clean && \ + echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \ + locale-gen +ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8' +ENV TZ=Europe/Paris +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone +ARG DEBIAN_FRONTEND=noninteractive + +ENV SHELL=/bin/bash +#ENV PS1='\[\e[33m\]\u@bc-dev-ubuntu-20-04>\[\e[0m\] ' + +# Install common general tools +RUN apt-get update && \ + apt-get install -y nano sudo vim && \ + apt-get clean + +# Install development tools +RUN apt-get update && \ + apt-get install -y alien at autoconf bison ccache clang doxygen elfutils g++ gdb git graphviz intltool libtool lsb-release make ninja-build openssh-client patch perl python3-pip python3-pystache python3-six python3-jsonschema python3-jinja2 meson yasm && \ + apt-get clean + +# Install linphone & flexisip dependencies development packages +RUN apt-get update && \ + apt-get install -y libasound2-dev libavcodec-dev libavutil-dev libbsd-dev libegl1-mesa-dev libglew-dev libgsm1-dev libjansson-dev libmariadb-dev-compat libmbedtls-dev libopus-dev libpq-dev libprotobuf-dev libpulse-dev libqt5svg5-dev libsnmp-dev libspeex-dev libspeexdsp-dev libsqlite3-dev libsrtp2-dev libssl-dev libswscale-dev libturbojpeg0-dev libv4l-dev libvpx-dev libxerces-c-dev libxml2-dev libxv-dev protobuf-compiler qttools5-dev qttools5-dev-tools xsdcxx cmake nasm && \ + apt-get clean + +# Install signing tools +RUN sudo apt-get install -y gnupg2 + +# Install configuration tools +RUN sudo apt-get install -y wget + +# Configure user bc +RUN useradd -ms /bin/bash bc && \ + echo 'bc:cotcot' | chpasswd && \ + echo 'bc ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers + +########### QT + +RUN sudo apt-get update && sudo apt-get install -y libxkbcommon* flite1-dev libspeechd-dev speech-dispatcher libfontconfig1-dev libfreetype6-dev libx11-dev libxext-dev libxfixes-dev libxi-dev libxrender-dev libx11-xcb* libxcb* qdbus-qt5 libqt5dbus5 libdbus-1-dev libdbus-glib-1-dev libatspi2.0-0 libatspi2.0-dev +RUN sudo apt-get update && sudo apt-get install -y libxcb-keysyms1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync0-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0-dev + +USER bc +WORKDIR /home/bc + +# RUN sudo apt install python3-pip --upgrade -y +RUN sudo apt install --upgrade -y python3-importlib-metadata +RUN sudo apt install --upgrade -y python3-setuptools +# RUN sudo apt install python3-ez_setup + +## Install Qt download tool +# installation is split because there is a way where some modules are not downloaded in the first attempt. +RUN sudo apt install -y python3-py7zr +RUN sudo pip3 install --upgrade aqtinstall +RUN sudo python3 -m aqt install-qt linux desktop $QT_VERSION -O /opt/Qt +RUN sudo python3 -m aqt install-qt linux desktop $QT_VERSION -O /opt/Qt --noarchives -m qtnetworkauth qtquick3d +RUN sudo python3 -m aqt install-qt linux desktop $QT6_VERSION -O /opt/Qt +RUN sudo python3 -m aqt install-qt linux desktop $QT6_VERSION -O /opt/Qt --noarchives -m qtnetworkauth qtquick3d qtmultimedia + +RUN sudo chown -R bc:bc /opt/Qt/ + +RUN qtchooser -install $QT_VERSION /opt/Qt/$QT_VERSION/gcc_64/bin/qmake +RUN qtchooser -install $QT6_VERSION /opt/Qt/$QT6_VERSION/gcc_64/bin/qmake + +CMD bash