Skip to content

fix: unblock CI for minisatip, jackett, k8s-sidecar renovate bumps#1824

Merged
Crow-Control merged 2 commits intomainfrom
copilot/fix-containerforge-open-prs
Apr 17, 2026
Merged

fix: unblock CI for minisatip, jackett, k8s-sidecar renovate bumps#1824
Crow-Control merged 2 commits intomainfrom
copilot/fix-containerforge-open-prs

Conversation

Copy link
Copy Markdown
Contributor

Copilot AI commented Apr 17, 2026

Three open renovate version bumps were red because upstream changed the build/packaging contract between releases. This PR rolls the bumps in together with the minimal per-app adjustments to make CI green. Grocy 4.6.0 and the three BREAKING major-version bumps (duplicacy v3, Lychee v7, cops v4) are deliberately deferred — each needs its own dedicated effort.

Changes

  • apps/minisatip (2.0.71 → 2.0.79) — upstream replaced autotools with CMake. Swap ./configure && make DDCI=1 for cmake -B build . && cmake --build build -j…, add cmake to the build/purge set, and move the produced binary to /app/satip/minisatip where start.sh expects it. DDCI is now auto-enabled in CMakeLists.txt when DVBCA (libssl-dev) is detected, so no explicit flag.

  • apps/jackett (v0.24.1167 → v0.24.1614) — the app starts and listens on :9117 fine, but / no longer returns 302, so the Docker healthcheck times out. Drop the explicit statusCode: 302 from container-test.yaml; the healthcheck helper then accepts any 2xx/3xx.

  • apps/k8s-sidecar (2.5.2 → 2.6.0, also supersedes fix(deps): update ghcr.io/kiwigrid/k8s-sidecar docker tag 2.5.2 → 2.5.5 - autoclosed #1718) — upstream moved dependency metadata from src/requirements.txt to a top-level pyproject.toml. Stage the whole project for pip install, then copy src/* into /app so the existing CMD [ "python", "-u", "/app/sidecar.py" ] keeps working:

    tar -xzf /tmp/release.tar.gz -C /tmp/src_temp \
        k8s-sidecar-${VERSION}/pyproject.toml \
        k8s-sidecar-${VERSION}/src && \
    /app/venv/bin/pip install --no-cache-dir /tmp/src_temp/k8s-sidecar-${VERSION} && \
    cp -r /tmp/src_temp/k8s-sidecar-${VERSION}/src/* /app/

Deferred (not in this PR)

Copilot AI and others added 2 commits April 17, 2026 15:58
- minisatip: bump 2.0.71 → 2.0.79 and switch from autotools (./configure,
  make DDCI=1) to the new CMake build that upstream ships. DDCI is derived
  automatically in CMakeLists when DVBCA (libssl-dev) is available, so no
  explicit flag is needed. Move the resulting binary to the location
  start.sh expects. Install/purge cmake alongside other build tools.

- jackett: bump v0.24.1167 → v0.24.1614 and relax container-test
  health-probe. The upstream app starts and serves on :9117 fine, but its
  default / response status changed, so drop the explicit 302 expectation
  and let the healthcheck helper accept any 2xx/3xx.

- k8s-sidecar: bump 2.5.2 → 2.6.0. Upstream moved dependency metadata from
  src/requirements.txt to a top-level pyproject.toml, so stage the whole
  project for pip install and then copy src/* into /app so the existing
  CMD path keeps working.

Agent-Logs-Url: https://github.com/trueforge-org/containerforge/sessions/fd360a2c-f5cf-4bff-8432-a7efafd8071b

Co-authored-by: Crow-Control <7613738+Crow-Control@users.noreply.github.com>
@Crow-Control Crow-Control marked this pull request as ready for review April 17, 2026 16:08
@Crow-Control Crow-Control requested a review from alfi0812 as a code owner April 17, 2026 16:08
Copilot AI review requested due to automatic review settings April 17, 2026 16:08
@Crow-Control Crow-Control merged commit c1f9810 into main Apr 17, 2026
2 checks passed
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Updates three app images to newer upstream versions and applies minimal build/test adjustments to restore CI green after upstream packaging/build changes.

Changes:

  • Bump minisatip to 2.0.79 and switch build from autotools to CMake, placing the built binary where the runtime entrypoint expects it.
  • Bump jackett to v0.24.1614 and relax the HTTP healthcheck to accept any 2xx/3xx response.
  • Bump k8s-sidecar to 2.6.0 and install dependencies via pyproject.toml while keeping the existing runtime CMD path stable.

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
apps/minisatip/docker-bake.hcl Version bump to 2.0.79.
apps/minisatip/Dockerfile Replace autotools build with CMake build and adjust artifact placement/cleanup.
apps/jackett/docker-bake.hcl Version bump to v0.24.1614.
apps/jackett/container-test.yaml Remove strict 302 expectation from HTTP healthcheck.
apps/k8s-sidecar/docker-bake.hcl Version bump to 2.6.0.
apps/k8s-sidecar/Dockerfile Install via pip install from extracted project metadata + sources; keep runtime invocation unchanged.

# Install Python dependencies
RUN /app/venv/bin/pip install --no-cache-dir -r requirements.txt && \
rm requirements.txt && \
RUN curl -L https://github.com/kiwigrid/k8s-sidecar/archive/refs/tags/${VERSION}.tar.gz -o /tmp/release.tar.gz && \
Copy link

Copilot AI Apr 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RELEASE_URL is defined but not used (the curl command repeats the URL literal). Consider either using ${RELEASE_URL} in the download step or dropping the ENV line to avoid drift/misleading configuration.

Suggested change
RUN curl -L https://github.com/kiwigrid/k8s-sidecar/archive/refs/tags/${VERSION}.tar.gz -o /tmp/release.tar.gz && \
RUN curl -L "${RELEASE_URL}" -o /tmp/release.tar.gz && \

Copilot uses AI. Check for mistakes.
Comment on lines +17 to +26
# Download and extract the release. Upstream moved dependency metadata from
# src/requirements.txt to a top-level pyproject.toml starting at 2.5.5, so we
# stage the whole project for pip and copy the source files into /app for the
# existing CMD to find.
ENV RELEASE_URL="https://github.com/kiwigrid/k8s-sidecar/archive/refs/tags/${VERSION}.tar.gz"
RUN curl -L https://github.com/kiwigrid/k8s-sidecar/archive/refs/tags/${VERSION}.tar.gz -o release.tar.gz && \
mkdir src_temp && \
tar -xzf release.tar.gz -C src_temp k8s-sidecar-${VERSION}/src && \
cp -r src_temp/k8s-sidecar-${VERSION}/src/* /app/ && \
rm -rf release.tar.gz src_temp

# Install Python dependencies
RUN /app/venv/bin/pip install --no-cache-dir -r requirements.txt && \
rm requirements.txt && \
RUN curl -L https://github.com/kiwigrid/k8s-sidecar/archive/refs/tags/${VERSION}.tar.gz -o /tmp/release.tar.gz && \
mkdir -p /tmp/src_temp && \
tar -xzf /tmp/release.tar.gz -C /tmp/src_temp \
k8s-sidecar-${VERSION}/pyproject.toml \
k8s-sidecar-${VERSION}/src && \
Copy link

Copilot AI Apr 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment says we “stage the whole project”, but the tar extraction only pulls pyproject.toml and src/. Please either adjust the comment to match what’s actually extracted, or extract the full k8s-sidecar-${VERSION}/ directory so the wording stays accurate and future packaging files aren’t accidentally omitted.

Copilot uses AI. Check for mistakes.
@alfi0812 alfi0812 deleted the copilot/fix-containerforge-open-prs branch April 18, 2026 09:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants