- CMakeLists.txt: add a $ORIGIN-based CMAKE_BUILD_RPATH entry for the bundled GeographicLib (include/GeographicLib/lib), like the existing RTI entry. The imported GeographicLib target only contributed the absolute container mount path to the build RUNPATH, so binaries could not resolve libGeographicLib.so.26 outside the /repo mount. Verified: ddsview built and run in a container with a different mount prefix resolves it via $ORIGIN and starts (rc=0). - new_docker_build.sh: seed the DEB cmake with ARCGIS_INCLUDE_DIR / ARCGIS_LIBRARY (the staged source copy cannot resolve the ArcGIS SDK, which is a relative symlink to the pipeline root dangling after staging); retry the build-tree removal with a clear error when a concurrent build/IDE keeps the directory busy. - Dockerfile: add a late apt layer with devscripts + debhelper (debuild, dh) for the DEB flow; cached Qt/KDReports layers are preserved. - README.md: document that --run-coverage and --run-jenkins-builder are combinable (DEB step runs after the coverage collection).
78 lines
2.5 KiB
Docker
78 lines
2.5 KiB
Docker
# Prebuilt build image for the Release 2 scope
|
|
# (Ubuntu 26.04 + Qt 6.10.2 + all dependencies for the legatus release 2 build).
|
|
#
|
|
# This is the single source of truth for the image recipe:
|
|
# new_docker_build.sh builds the image from this file when the image is
|
|
# missing (--use-prebuilt-image, the default) or must be rebuilt
|
|
# (--no-prebuilt-image).
|
|
#
|
|
# Note: libbz2-dev (BZip2) is required by Z/src/nglcompression.
|
|
# libpoppler-qt6-dev provides the poppler-qt6 pkg-config module: without it
|
|
# nglwidgets builds without PDF support (HAVE_POPPLER_QT6=OFF) and the
|
|
# test_nglpdfwidget target does not exist.
|
|
|
|
FROM ubuntu:26.04
|
|
|
|
ENV DEBIAN_FRONTEND=noninteractive
|
|
|
|
ARG QT_VERSION=6.10.2
|
|
ARG QT_ARCH=linux_gcc_64
|
|
ARG QT_BASE_DIR=/opt/Qt
|
|
|
|
RUN apt-get update -qq && \
|
|
apt-get install -y -qq \
|
|
build-essential \
|
|
cmake \
|
|
ninja-build \
|
|
git \
|
|
python3-pip \
|
|
libboost-dev \
|
|
libbz2-dev \
|
|
libgl1-mesa-dev \
|
|
libpoppler-qt6-dev \
|
|
pkg-config \
|
|
libkf6texttemplate-dev \
|
|
libgtest-dev \
|
|
libgmock-dev \
|
|
libpq-dev \
|
|
postgresql-server-dev-all \
|
|
libvlc-dev \
|
|
vlc-plugin-base \
|
|
libssl-dev \
|
|
libxml2-dev \
|
|
libxerces-c-dev \
|
|
lcov \
|
|
&& \
|
|
rm -rf /var/lib/apt/lists/*
|
|
|
|
# Install Qt6 packages via aqtinstall
|
|
RUN pip3 install --break-system-packages --quiet aqtinstall && \
|
|
aqt install-qt linux desktop ${QT_VERSION} ${QT_ARCH} \
|
|
-m qtmultimedia qtserialport qtimageformats qtwebsockets qtwebengine \
|
|
qtpdf qtwebview qt5compat qtwebchannel qtpositioning qtlocation qtsensors \
|
|
--outputdir ${QT_BASE_DIR} && \
|
|
rm -rf /root/.cache/Aqt
|
|
|
|
# Install KDReports from source (no apt package on Ubuntu 26.04)
|
|
RUN git clone --depth 1 https://github.com/KDAB/KDReports.git /tmp/KDReports && \
|
|
cd /tmp/KDReports && \
|
|
mkdir build && cd build && \
|
|
cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_PREFIX_PATH=${QT_BASE_DIR} .. && \
|
|
make -j$(nproc) && \
|
|
make install && \
|
|
cd / && rm -rf /tmp/KDReports
|
|
|
|
# Legacy sources include <KDReports/...>
|
|
RUN ln -sfn KDReports-qt6 /usr/local/include/KDReports
|
|
|
|
# Debian packaging tools for the DEB flow (debuild, dh). Separate late layer
|
|
# so the Qt/KDReports layers above stay cached when this list changes.
|
|
RUN apt-get update -qq && \
|
|
apt-get install -y -qq --no-install-recommends devscripts debhelper && \
|
|
rm -rf /var/lib/apt/lists/*
|
|
|
|
ENV PATH="${QT_BASE_DIR}/${QT_VERSION}/gcc_64/bin:${PATH}"
|
|
ENV CMAKE_PREFIX_PATH="${QT_BASE_DIR}/${QT_VERSION}/gcc_64"
|
|
|
|
CMD ["/bin/bash"]
|