From 56d453d671e75e37f559947f2c45e57cc969a9c2 Mon Sep 17 00:00:00 2001 From: Boris Shestov Date: Mon, 10 Feb 2025 16:56:55 +0300 Subject: [PATCH] [DO-1573] Add xvfb package for test (#7) [DO-1573] Co-authored-by: Boris Shestov Reviewed-on: https://git.avroid.tech/Docker/tavro-build-linux/pulls/7 --- CHANGELOG.md | 8 ++++++++ Dockerfile | 3 ++- Makefile | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9923c69..f9d4ade 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## 1.6 + +### 10.02.2025 + +ADD: + +* Добавлен пакет xvfb эмулирующий X сервер, выполняющий графические операции в памяти без вывода на экран + ## 1.5 ### 24.01.2025 diff --git a/Dockerfile b/Dockerfile index 3a03d50..2dd0ebe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,6 +46,7 @@ RUN apt update && \ libxrender-dev \ libxtst-dev \ perl \ + xvfb \ yasm && \ apt clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* @@ -64,7 +65,7 @@ RUN wget ${NEXUS_URL}/repository/${NEXUS_QT_REPO}/v${VERSION}/qt-everywhere-open ./configure -release -opensource -confirm-license -nomake tests -nomake examples -skip qt3d -skip qtactiveqt -skip qtandroidextras -skip qtdoc -skip qtmacextras -skip qtscript -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebview -skip qtwinextras -skip qtserialbus -xkbcommon -system-harfbuzz -system-libjpeg && \ make -j$(nproc) && make install -j$(nproc) && cd .. && rm -rf qt-everywhere* /tmp/patches -#Ужасный костыль +#Ужасный костыль RUN ln -s /usr/lib/x86_64-linux-gnu/libvpx.so.9.0.0 /usr/lib/x86_64-linux-gnu/libvpx.so.7 # Personalization #------------------------------------------------------------------------------- diff --git a/Makefile b/Makefile index 8ed0b17..43ae871 100644 --- a/Makefile +++ b/Makefile @@ -2,10 +2,10 @@ IMAGE_NAME = tavro-build-linux IMAGE_GROUP = tavro -IMAGE_TAG = 1.5 +IMAGE_TAG = 1.6 REVISION = DOCKER_REGISTRY = harbor.avroid.tech -CI_FLAGS = +CI_FLAGS = ifeq ($(CI), true) CI_FLAGS = --no-cache