diff --git a/apps/jackett/container-test.yaml b/apps/jackett/container-test.yaml index 46b4d5b0a..e5e107be0 100644 --- a/apps/jackett/container-test.yaml +++ b/apps/jackett/container-test.yaml @@ -3,4 +3,3 @@ http: - port: '9117' path: / - statusCode: 302 diff --git a/apps/jackett/docker-bake.hcl b/apps/jackett/docker-bake.hcl index f1bda5ae9..2121631a3 100644 --- a/apps/jackett/docker-bake.hcl +++ b/apps/jackett/docker-bake.hcl @@ -6,7 +6,7 @@ variable "APP" { variable "VERSION" { // renovate: datasource=github-releases depName=Jackett/Jackett - default = "v0.24.1167" + default = "v0.24.1614" } variable "LICENSE" { diff --git a/apps/k8s-sidecar/Dockerfile b/apps/k8s-sidecar/Dockerfile index 6e5537eac..0624b94ba 100644 --- a/apps/k8s-sidecar/Dockerfile +++ b/apps/k8s-sidecar/Dockerfile @@ -14,17 +14,19 @@ RUN apt-get update && \ # Create virtual environment and upgrade pip/setuptools RUN python -m venv /app/venv && /app/venv/bin/pip install --no-cache-dir -U pip setuptools -# Download and extract only the src/ folder from the release +# 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 && \ + /app/venv/bin/pip install --no-cache-dir /tmp/src_temp/k8s-sidecar-${VERSION} && \ + cp -r /tmp/src_temp/k8s-sidecar-${VERSION}/src/* /app/ && \ + rm -rf /tmp/release.tar.gz /tmp/src_temp && \ # Remove tests and compiled Python files find /app/venv \( -type d -name test -o -name tests \) -o \( -type f -name '*.pyc' -o -name '*.pyo' \) -exec rm -rf '{}' + diff --git a/apps/k8s-sidecar/docker-bake.hcl b/apps/k8s-sidecar/docker-bake.hcl index e725b49af..eec99bad5 100644 --- a/apps/k8s-sidecar/docker-bake.hcl +++ b/apps/k8s-sidecar/docker-bake.hcl @@ -6,7 +6,7 @@ variable "APP" { variable "VERSION" { // renovate: datasource=docker depName=ghcr.io/kiwigrid/k8s-sidecar - default = "2.5.2" + default = "2.6.0" } variable "LICENSE" { diff --git a/apps/minisatip/Dockerfile b/apps/minisatip/Dockerfile index 7e4c3ae2f..ba1503421 100644 --- a/apps/minisatip/Dockerfile +++ b/apps/minisatip/Dockerfile @@ -15,6 +15,7 @@ RUN \ apt-get update && \ apt-get install --no-install-recommends -y \ build-essential \ + cmake \ git \ libdvbcsa-dev \ libssl-dev \ @@ -31,11 +32,14 @@ RUN \ /tmp/satip.tar.gz -C \ /app/satip --strip-components=1 && \ cd /app/satip && \ - ./configure && \ - make DDCI=1 && \ + cmake -B build . && \ + cmake --build build -j"$(nproc)" && \ + mv /app/satip/build/minisatip /app/satip/minisatip && \ + rm -rf /app/satip/build && \ echo "**** clean up ****" && \ apt-get -y purge \ build-essential \ + cmake \ git \ libssl-dev \ linux-headers-generic \ diff --git a/apps/minisatip/docker-bake.hcl b/apps/minisatip/docker-bake.hcl index 269b41a34..c5fd93b73 100644 --- a/apps/minisatip/docker-bake.hcl +++ b/apps/minisatip/docker-bake.hcl @@ -6,7 +6,7 @@ variable "APP" { variable "VERSION" { // renovate: datasource=github-releases depName=catalinii/minisatip - default = "2.0.71" + default = "2.0.79" } variable "LICENSE" {