From 7dbcfa5c15751b78ddd2dd1a409b6c4ea8db4ce5 Mon Sep 17 00:00:00 2001 From: "aleksandr.vodyanov" Date: Tue, 28 May 2024 11:25:33 +0300 Subject: [PATCH] [DO-538] tavro linux tests (#1) Reviewed-on: https://git.avroid.tech/Docker/tavro-build-linux/pulls/1 Reviewed-by: Denis Patrakeev Co-authored-by: aleksandr.vodyanov Co-committed-by: aleksandr.vodyanov --- CHANGELOG.md | 8 ++++++++ Dockerfile | 31 ++++++++++++++++++++----------- Makefile | 2 +- 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index caad994..1fc9e7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## 1.1 + +### 27.05.2024 + +CHANGE: + +* Added libraries for tavro tests + ## 1.0 ### 29.09.2023 diff --git a/Dockerfile b/Dockerfile index 7120da8..3d1399d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG DOCKER_REGISTRY=harbor.avroid.tech # https://hub.docker.com/_/ubuntu -FROM ${DOCKER_REGISTRY}/devops/base-build-image:1.0 +FROM ${DOCKER_REGISTRY}/all/base-build-image:1.4 LABEL description="Linux image for Tavro build" \ tools.qt.version="5.6.3" @@ -15,32 +15,41 @@ COPY * /patches/ # Install packages for qt and dependencies RUN apt update && \ apt install -y \ - perl \ + gperf \ + libasound2-dev \ libavcodec-dev \ libavformat-dev \ - libjpeg-dev \ + libegl1-mesa-dev \ + libgbm-dev \ + libgles2-mesa-dev \ + libglib2.0-dev \ + libgstreamer1.0-dev \ + libgstreamer-plugins-base1.0-dev \ + libharfbuzz-dev \ + libjpeg8-dev \ libopus-dev \ libopenh264-dev \ + libpipewire-0.3-dev \ + libpulse-dev \ libswscale-dev \ libssl-dev \ libvpx-dev \ - gperf \ - libegl1-mesa-dev \ - libgles2-mesa-dev \ libfontconfig1-dev \ libfreetype6-dev \ libx11-dev \ libx11-xcb-dev \ + '^libxcb*' \ + libxcomposite-dev \ + libxdamage-dev \ libxext-dev \ libxfixes-dev \ libxi-dev \ - libxrender-dev \ - '^libxcb*' \ libxkbcommon-dev \ libxkbcommon-x11-dev \ - libgstreamer1.0-dev \ - libgstreamer-plugins-base1.0-dev \ - libharfbuzz-dev && \ + libxrender-dev \ + libxtst-dev \ + perl \ + yasm && \ apt clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/Makefile b/Makefile index b530503..daf1b63 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ IMAGE_NAME = tavro-build-linux IMAGE_GROUP = tavro -IMAGE_TAG = 1.0 +IMAGE_TAG = 1.1 REVISION = DOCKER_REGISTRY = harbor.avroid.tech