Skip to content

Commit c1f9810

Browse files
fix: unblock CI for minisatip, jackett, k8s-sidecar renovate bumps (#1824)
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 #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: ```dockerfile 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) - **#1609 grocy 4.6.0** — upstream `composer.json` now requires `php 8.5.*`; base image ships 8.3. Fixing requires switching to a PHP 8.5-capable base (e.g. `ondrej/php` PPA), which isn't a minimal change. - **#1641 duplicacy v3**, **#1643 Lychee v7**, **#1644 cops v4** — all BREAKING upstream rewrites (new distribution URLs, new PHP extension requirements, new composer flow). Each belongs in its own PR. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: Crow-Control <7613738+Crow-Control@users.noreply.github.com>
1 parent baf2a5b commit c1f9810

6 files changed

Lines changed: 21 additions & 16 deletions

File tree

apps/jackett/container-test.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@
33
http:
44
- port: '9117'
55
path: /
6-
statusCode: 302

apps/jackett/docker-bake.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ variable "APP" {
66

77
variable "VERSION" {
88
// renovate: datasource=github-releases depName=Jackett/Jackett
9-
default = "v0.24.1167"
9+
default = "v0.24.1614"
1010
}
1111

1212
variable "LICENSE" {

apps/k8s-sidecar/Dockerfile

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,19 @@ RUN apt-get update && \
1414
# Create virtual environment and upgrade pip/setuptools
1515
RUN python -m venv /app/venv && /app/venv/bin/pip install --no-cache-dir -U pip setuptools
1616

17-
# Download and extract only the src/ folder from the release
17+
# Download and extract the release. Upstream moved dependency metadata from
18+
# src/requirements.txt to a top-level pyproject.toml starting at 2.5.5, so we
19+
# stage the whole project for pip and copy the source files into /app for the
20+
# existing CMD to find.
1821
ENV RELEASE_URL="https://github.com/kiwigrid/k8s-sidecar/archive/refs/tags/${VERSION}.tar.gz"
19-
RUN curl -L https://github.com/kiwigrid/k8s-sidecar/archive/refs/tags/${VERSION}.tar.gz -o release.tar.gz && \
20-
mkdir src_temp && \
21-
tar -xzf release.tar.gz -C src_temp k8s-sidecar-${VERSION}/src && \
22-
cp -r src_temp/k8s-sidecar-${VERSION}/src/* /app/ && \
23-
rm -rf release.tar.gz src_temp
24-
25-
# Install Python dependencies
26-
RUN /app/venv/bin/pip install --no-cache-dir -r requirements.txt && \
27-
rm requirements.txt && \
22+
RUN curl -L https://github.com/kiwigrid/k8s-sidecar/archive/refs/tags/${VERSION}.tar.gz -o /tmp/release.tar.gz && \
23+
mkdir -p /tmp/src_temp && \
24+
tar -xzf /tmp/release.tar.gz -C /tmp/src_temp \
25+
k8s-sidecar-${VERSION}/pyproject.toml \
26+
k8s-sidecar-${VERSION}/src && \
27+
/app/venv/bin/pip install --no-cache-dir /tmp/src_temp/k8s-sidecar-${VERSION} && \
28+
cp -r /tmp/src_temp/k8s-sidecar-${VERSION}/src/* /app/ && \
29+
rm -rf /tmp/release.tar.gz /tmp/src_temp && \
2830
# Remove tests and compiled Python files
2931
find /app/venv \( -type d -name test -o -name tests \) -o \( -type f -name '*.pyc' -o -name '*.pyo' \) -exec rm -rf '{}' +
3032

apps/k8s-sidecar/docker-bake.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ variable "APP" {
66

77
variable "VERSION" {
88
// renovate: datasource=docker depName=ghcr.io/kiwigrid/k8s-sidecar
9-
default = "2.5.2"
9+
default = "2.6.0"
1010
}
1111

1212
variable "LICENSE" {

apps/minisatip/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ RUN \
1515
apt-get update && \
1616
apt-get install --no-install-recommends -y \
1717
build-essential \
18+
cmake \
1819
git \
1920
libdvbcsa-dev \
2021
libssl-dev \
@@ -31,11 +32,14 @@ RUN \
3132
/tmp/satip.tar.gz -C \
3233
/app/satip --strip-components=1 && \
3334
cd /app/satip && \
34-
./configure && \
35-
make DDCI=1 && \
35+
cmake -B build . && \
36+
cmake --build build -j"$(nproc)" && \
37+
mv /app/satip/build/minisatip /app/satip/minisatip && \
38+
rm -rf /app/satip/build && \
3639
echo "**** clean up ****" && \
3740
apt-get -y purge \
3841
build-essential \
42+
cmake \
3943
git \
4044
libssl-dev \
4145
linux-headers-generic \

apps/minisatip/docker-bake.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ variable "APP" {
66

77
variable "VERSION" {
88
// renovate: datasource=github-releases depName=catalinii/minisatip
9-
default = "2.0.71"
9+
default = "2.0.79"
1010
}
1111

1212
variable "LICENSE" {

0 commit comments

Comments
 (0)