Docker/tavro-build-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[DO-1171] update ubuntu to 24.04 (#3)

Browse Source 
Reviewed-on: https://git.avroid.tech/Docker/tavro-build-linux/pulls/3
Co-authored-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.tech>
Co-committed-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.tech>
This commit is contained in:
aleksandr.vodyanov
2024-10-08 11:53:48 +03:00
committed by Aleksandr Vodyanov
parent 40ea9163e2
commit 0f23f14d6a
5 changed files with 122 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Dockerfile
View File

@@ -1,12 +1,11 @@
ARG DOCKER_REGISTRY=harbor.avroid.tech
# https://hub.docker.com/_/ubuntu
FROM ${DOCKER_REGISTRY}/all/base-build-image:1.4
FROM ${DOCKER_REGISTRY}/all/base-build-image:1.8
LABEL description="Linux image for Tavro build" \
tools.qt.version="5.15.14"
###QT BUILD###
ARG NEXUS_URL="https://nexus.avroid.tech"
ARG NEXUS_QT_REPO="qt_repo" \
VERSION=5.15.14
@@ -52,22 +51,25 @@ RUN apt update && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
#download, configure and build qt
COPY ./* /tmp/patches/
RUN wget ${NEXUS_URL}/repository/${NEXUS_QT_REPO}/v${VERSION}/qt-everywhere-opensource-src-${VERSION}.tar.xz && tar -xJf qt-everywhere-opensource-src-${VERSION}.tar.xz && \
ln -sf /usr/bin/python3 /usr/bin/python && rm qt-everywhere-opensource-src-${VERSION}.tar.xz && cd qt-everywhere* && \
#install patches \
patch -p1 < /tmp/patches/0015-remove-detected-xkb-keys.patch && \
sed -i '6i #include <cstdint>' qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/geometry.hpp && \
sed -i '7i #include <cstdint>' qtlocation/src/3rdparty/mapbox-gl-native/include/mbgl/util/string.hpp && \
sed -i '4i #include <cstdint>' qtlocation/src/3rdparty/mapbox-gl-native/src/mbgl/gl/stencil_mode.hpp && \
#configure and build qt \
./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 -no-openssl && \
make -j$(nproc) && make install -j$(nproc) && cd .. && rm -rf qt-everywhere*
make -j$(nproc) && make install -j$(nproc) && cd .. && rm -rf qt-everywhere* /tmp/patches
# Personalization
#-------------------------------------------------------------------------------
#
ARG UID=1000
ARG GID=1000
ARG USER=jenkins
ARG USER_GROUP=jenkins
ARG USER=ubuntu
ARG USER_HOME=/home/${USER}
RUN (groupadd -g ${GID} ${USER_GROUP} || true) && \
useradd -d ${USER_HOME} -g ${GID} -u ${UID} --shell /bin/bash ${USER}
USER ${USER}
WORKDIR ${USER_HOME}