Consolidate the Release 2 driver into new_docker_build.sh
- new_docker_build.sh is now the Release 2 scope driver (4 build groups, 61 targets, Ninja/RelWithDebInfo, /repo mount, 22-test ctest, DEB via rpmbuild/make_rpm_ubuntu26_release2.py); the separate new_docker_build_release2.sh driver is removed. - The Docker image recipe is the in-tree Dockerfile (single source of truth): Ubuntu 26.04 + apt deps (incl. libbz2-dev, libkf6texttemplate-dev) + Qt 6.10.2 via aqtinstall + KDReports from source + ENV PATH/CMAKE_PREFIX_PATH. The driver builds the image from it when it is missing; --no-prebuilt-image now forces a rebuild (the in-container apt path and the inline recipe are gone). Default image: legatus-qt6:1.0. - rpmbuild/make_rpm_ubuntu26_release2.py: bundle new_docker_build.sh in the build-pipeline DEB. - jenkins-ci-rme/release-16-10-2026.sh: drop the --build-prebuilt-image step (no longer an option; the driver auto-builds the image when missing). - README.md: document the Release 2 driver, the 22-test ctest baseline, the real DEB layout, the options and the known quirks.
This commit is contained in:
1 parent
b18ac87565
commit
679e7a8a9c
6 files changed
+366
-1272
No files matched your search
@@ -1,25 +1,43 @@
|
||||
# Prebuilt build image for the release validation-scope branch
|
||||
# (Ubuntu 26.04 + Qt6 + all dependencies for the legatus release build).
|
||||
# Prebuilt build image for the Release 2 scope
|
||||
# (Ubuntu 26.04 + Qt 6.10.2 + all dependencies for the legatus release 2 build).
|
||||
#
|
||||
# Built by new_docker_build.sh --build-prebuilt-image, which passes the
|
||||
# package list and Qt settings as build args (see build_prebuilt_image()).
|
||||
# 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.
|
||||
|
||||
FROM ubuntu:26.04
|
||||
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
ARG APT_PACKAGES
|
||||
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 \
|
||||
${APT_PACKAGES} \
|
||||
libqt6svg6-dev \
|
||||
build-essential \
|
||||
cmake \
|
||||
ninja-build \
|
||||
git \
|
||||
python3-pip \
|
||||
libboost-dev \
|
||||
libbz2-dev \
|
||||
libgl1-mesa-dev \
|
||||
pkg-config \
|
||||
libkf6texttemplate-dev \
|
||||
libgtest-dev \
|
||||
libgmock-dev \
|
||||
python3-pip && \
|
||||
libpq-dev \
|
||||
postgresql-server-dev-all \
|
||||
libvlc-dev \
|
||||
vlc-plugin-base \
|
||||
libssl-dev \
|
||||
libxml2-dev \
|
||||
libxerces-c-dev \
|
||||
&& \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install Qt6 packages via aqtinstall
|
||||
@@ -30,18 +48,19 @@ RUN pip3 install --break-system-packages --quiet aqtinstall && \
|
||||
--outputdir ${QT_BASE_DIR} && \
|
||||
rm -rf /root/.cache/Aqt
|
||||
|
||||
# Install KDReports from source (apt package not available in Ubuntu 22.04/26.04)
|
||||
# Try apt install first (will fail), then build from KDAB GitHub mirror
|
||||
RUN apt-get install -y -qq libkdreports-dev 2>/dev/null || \
|
||||
(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)
|
||||
# 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
|
||||
|
||||
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"]
|
||||
Reference in new issue
Block a user