Pass pinned Jerboa source to Qt container build
ober
0eba40df096350d4ef8bb31aa1f8b6065d3843fa
--- a/Dockerfile.qt +++ b/Dockerfile.qt @@ -16,6 +16,8 @@ ARG BASE_IMAGE=docker.io/library/ubuntu:24.04@sha256:4fbb8e6a8395de5a7550b335094 FROM ${BASE_IMAGE} AS builder ARG JERBOA_VERSION=v0.2.7 +ARG JERBOA_SOURCE_COMMIT=73176e945f656334b8b1cf0d6b11c6c41f8ba427 +ARG JERBOA_SOURCE_TREE=5e2ce0ac497d4b93d3a5859a13856fdbb0987ba3 ARG JBROWSER_SOURCE_COMMIT ARG JBROWSER_SOURCE_TREE ARG APT_SNAPSHOT=20260701T000000Z @@ -53,7 +55,9 @@ RUN sh /tmp/ensure-rust.sh && \ rustc -vV COPY support/ensure-jerboa.sh support/jerboa-release-sha256.txt /tmp/ -RUN sh /tmp/ensure-jerboa.sh "$JERBOA_VERSION" /usr/local/bin && \ +RUN JERBOA_SOURCE_COMMIT="$JERBOA_SOURCE_COMMIT" \ + JERBOA_SOURCE_TREE="$JERBOA_SOURCE_TREE" \ + sh /tmp/ensure-jerboa.sh "$JERBOA_VERSION" /usr/local/bin && \ command -v jerbuild && \ jerbuild --version && \ jerbuild --jerboa-home >/dev/null --- a/Makefile +++ b/Makefile @@ -420,6 +420,8 @@ podman-static-qt: check-podman $(PODMAN) build $(PODMAN_BUILD_FLAGS) --platform $(PODMAN_PLATFORM) \ --build-arg BASE_IMAGE="$(STATIC_QT_BASE_IMAGE)" \ --build-arg JERBOA_VERSION="$(JERBOA_VERSION)" \ + --build-arg JERBOA_SOURCE_COMMIT="$(JERBOA_COMMIT)" \ + --build-arg JERBOA_SOURCE_TREE="$(JERBOA_TREE)" \ --build-arg APT_SNAPSHOT="$(STATIC_QT_APT_SNAPSHOT)" \ --build-arg JBROWSER_SOURCE_COMMIT="$$(git rev-parse HEAD)" \ --build-arg JBROWSER_SOURCE_TREE="$$(git rev-parse 'HEAD^{tree}')" \