-
-
Notifications
You must be signed in to change notification settings - Fork 6
fix: unblock CI for minisatip, jackett, k8s-sidecar renovate bumps #1824
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,4 +3,3 @@ | |
| http: | ||
| - port: '9117' | ||
| path: / | ||
| statusCode: 302 | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 && \ | ||
|
Comment on lines
+17
to
+26
|
||
| /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 '{}' + | ||
|
|
||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
RELEASE_URLis defined but not used (thecurlcommand repeats the URL literal). Consider either using${RELEASE_URL}in the download step or dropping theENVline to avoid drift/misleading configuration.