Make --docker-image select the prebuilt path and add missing dev packages
Running the driver with only --docker-image silently ignored the flag (USE_PREBUILT_IMAGE stayed OFF), so ubuntu:26.04 was provisioned from the in-script apt list - which lacks libbz2-dev - and the configure failed with "Could NOT find BZip2" in Z/src/nglcompression. - --docker-image now implies USE_PREBUILT_IMAGE=ON (the usage text already documented it as the image to use); --no-prebuilt-image passed after it still forces the base image. - Add libbz2-dev (BZip2), libgl1-mesa-dev (OpenGL) and pkg-config (FindGrantlee5/FindPopplerQt6) to the apt list of both the non-prebuilt flow and the prebuilt-image Dockerfile.
This commit is contained in:
1 parent
4cabd1d42c
commit
855acba062
1 file changed
+11
@@ -206,6 +206,11 @@ while [[ $# -gt 0 ]]; do
|
||||
--docker-image)
|
||||
DOCKER_IMAGE="$2"
|
||||
shift 2
|
||||
# Naming an image means using it: default to the prebuilt path,
|
||||
# otherwise the flag is silently ignored and ubuntu:26.04 is built
|
||||
# from scratch (missing dev packages like libbz2-dev). Force the
|
||||
# base image by passing --no-prebuilt-image AFTER this flag.
|
||||
USE_PREBUILT_IMAGE="ON"
|
||||
;;
|
||||
--cmake_build_flags)
|
||||
CMAKE_BUILD_FLAGS="$2"
|
||||
@@ -330,6 +335,9 @@ RUN apt-get update -qq && \
|
||||
git \
|
||||
python3-pip \
|
||||
libboost-dev \
|
||||
libbz2-dev \
|
||||
libgl1-mesa-dev \
|
||||
pkg-config \
|
||||
libkf6texttemplate-dev \
|
||||
libgtest-dev \
|
||||
libgmock-dev \
|
||||
@@ -417,6 +425,9 @@ apt-get install -y -qq \
|
||||
git \
|
||||
python3-pip \
|
||||
libboost-dev \
|
||||
libbz2-dev \
|
||||
libgl1-mesa-dev \
|
||||
pkg-config \
|
||||
libkf6texttemplate-dev \
|
||||
libgtest-dev \
|
||||
libgmock-dev \
|
||||
|
||||
Reference in new issue
Block a user