From b9f2cd448b399883854807a825ec694c7c751d56 Mon Sep 17 00:00:00 2001 From: Sagent Date: Mon, 8 Jun 2026 19:41:55 +0000 Subject: [PATCH 1/4] feat: add lint, build, test, push pipeline with SHA-pinned actions - Split single build job into 4 jobs: lint, build, test, push - SHA-pin all actions for supply chain security - Use ChristopherHX artifact actions (Gitea-compatible) - Add tests/test.sh with Docker bridge gateway networking - Add hadolint ignore for apt/brace patterns --- .gitea/workflows/docker-build.yaml | 84 +++++++++++++++++++++--------- Dockerfile | 1 + tests/test.sh | 82 +++++++++++++++++++++++++++++ 3 files changed, 143 insertions(+), 24 deletions(-) create mode 100644 tests/test.sh diff --git a/.gitea/workflows/docker-build.yaml b/.gitea/workflows/docker-build.yaml index fe4e0b7..92089d2 100644 --- a/.gitea/workflows/docker-build.yaml +++ b/.gitea/workflows/docker-build.yaml @@ -9,38 +9,74 @@ on: - cron: '0 0 * * *' jobs: + lint: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + + - name: Hadolint + uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf # v3.1.0 + with: + dockerfile: Dockerfile + build: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v6 + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v4 + - name: Build image + run: docker build -t ci-image:${{ github.sha }} . + + - name: Save image + run: docker save -o image.tar ci-image:${{ github.sha }} + + - name: Upload artifact + uses: https://github.com/ChristopherHX/gitea-upload-artifact@62ac910c5d3dfa85c7cb2df15afe2e342b2407c2 # main + with: + name: docker-image + path: image.tar + retention-days: 1 + + test: + runs-on: ubuntu-latest + needs: [lint, build] + steps: + - name: Checkout + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + + - name: Download artifact + uses: https://github.com/ChristopherHX/gitea-download-artifact@75635f32b4c1c41c4b3d64e8f85210112ed4c9c7 # main + with: + name: docker-image + + - name: Load image + run: docker load < image.tar + + - name: Run tests + run: bash tests/test.sh ci-image:${{ github.sha }} + + push: + runs-on: ubuntu-latest + needs: test + if: github.event_name != 'pull_request' + steps: + - name: Download artifact + uses: https://github.com/ChristopherHX/gitea-download-artifact@75635f32b4c1c41c4b3d64e8f85210112ed4c9c7 # main + with: + name: docker-image + + - name: Load image + run: docker load < image.tar - name: Login to Docker Hub - if: github.event_name != 'pull_request' - uses: docker/login-action@v4 + uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Docker metadata - id: meta - uses: docker/metadata-action@v6 - with: - images: jcabillot/sabnzbd - tags: | - #type=ref,event=branch - #type=ref,event=pr - #type=sha - type=raw,value=latest,enable=${{ github.ref == 'refs/heads/master' }} - - - name: Build and push - uses: docker/build-push-action@v7 - with: - context: . - push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - pull: true + - name: Tag and push + run: | + docker tag ci-image:${{ github.sha }} jcabillot/sabnzbd:latest + docker push jcabillot/sabnzbd:latest diff --git a/Dockerfile b/Dockerfile index 5af1efb..d97a848 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,6 +21,7 @@ ENV LANG C.UTF-8 # Install SABnzbd and all required dependencies. # +# hadolint ignore=DL3008,DL3015,SC3009,DL3003 RUN export SABNZBD_VERSION=3.7.2 PAR2CMDLINE_VERSION=v0.6.14-mt1 && \ export DEBIAN_FRONTEND=noninteractive && \ export BUILD_PACKAGES="automake build-essential python3-dev libffi-dev" && \ diff --git a/tests/test.sh b/tests/test.sh new file mode 100644 index 0000000..094729c --- /dev/null +++ b/tests/test.sh @@ -0,0 +1,82 @@ +#!/usr/bin/env bash +set -euo pipefail + +IMAGE="${1:?Usage: test.sh }" +CONTAINER_NAME="test-$(echo "$IMAGE" | tr ':/' '-')-$$" +PASSED=0 +FAILED=0 +TOTAL=0 + +cleanup() { + docker rm -f "$CONTAINER_NAME" >/dev/null 2>&1 || true +} +trap cleanup EXIT + +assert() { + local name="$1" expected="$2" actual="$3" + TOTAL=$((TOTAL + 1)) + if [ "$expected" = "$actual" ]; then + echo " PASS: $name" + PASSED=$((PASSED + 1)) + else + echo " FAIL: $name (expected: '$expected', got: '$actual')" + FAILED=$((FAILED + 1)) + fi +} + +assert_in() { + local name="$1" expected="$2" actual="$3" + TOTAL=$((TOTAL + 1)) + if [ "$actual" -ge "$expected" ] && [ "$actual" -lt 500 ]; then + echo " PASS: $name (got: $actual)" + PASSED=$((PASSED + 1)) + else + echo " FAIL: $name (expected < 500, got: $actual)" + FAILED=$((FAILED + 1)) + fi +} + +assert_match() { + local name="$1" pattern="$2" actual="$3" + TOTAL=$((TOTAL + 1)) + if echo "$actual" | grep -qE "$pattern"; then + echo " PASS: $name" + PASSED=$((PASSED + 1)) + else + echo " FAIL: $name (pattern: '$pattern', got: '$actual')" + FAILED=$((FAILED + 1)) + fi +} + +echo "Running container: $IMAGE" +docker run -d --name "$CONTAINER_NAME" -p 8080:8080 "$IMAGE" >/dev/null + +DOCKER_GW=$(docker network inspect bridge --format '{{range .IPAM.Config}}{{.Gateway}}{{end}}') +BASE_URL="http://${DOCKER_GW}:8080" + +echo "Waiting for SABnzbd on ${DOCKER_GW}:8080 (up to 60s)..." +for i in $(seq 1 60); do + if [ "$(curl -s -o /dev/null -w '%{http_code}' "$BASE_URL/" 2>/dev/null)" != "000" ]; then + echo "Container ready after ${i}s" + break + fi + if [ "$i" -eq 60 ]; then + echo "FAIL: Container did not become ready within 60s" + docker logs "$CONTAINER_NAME" + exit 1 + fi + sleep 1 +done + +echo "" +echo "Test: GET / (SABnzbd web UI)" +RESPONSE=$(curl -s -D - "$BASE_URL/") +STATUS=$(echo "$RESPONSE" | head -1 | grep -oP '\d{3}') +BODY=$(echo "$RESPONSE" | sed -n '/^\r$/,$p' | tail -n +2) + +assert_in "HTTP status is valid" 200 "$STATUS" +assert_match "Body contains SABnzbd" "[Ss][Aa][Bb].*[Nn]zbd" "$BODY" + +echo "" +echo "Results: $PASSED/$TOTAL passed, $FAILED failed" +[ "$FAILED" -eq 0 ] From fb21d41f3268a2eb16797adbef8ab44eca7eb660 Mon Sep 17 00:00:00 2001 From: Sagent Date: Mon, 8 Jun 2026 19:53:14 +0000 Subject: [PATCH 2/4] fix: unquote HEALTHCHECK interval to satisfy hadolint parser --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d97a848..34d37dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -80,5 +80,5 @@ RUN chmod +x "/tini" CMD ["/sabnzbd.sh"] -HEALTHCHECK --interval="10s" \ +HEALTHCHECK --interval=10s \ CMD curl --fail "http://localhost:8080" || exit 1 From c0b250624fc2f94601f7da3b9013547bf97b687d Mon Sep 17 00:00:00 2001 From: Sagent Date: Mon, 8 Jun 2026 20:46:03 +0000 Subject: [PATCH 3/4] fix: add DL3013,DL3042 to hadolint ignore for pip install --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 34d37dd..9a8b59b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ ENV LANG C.UTF-8 # Install SABnzbd and all required dependencies. # -# hadolint ignore=DL3008,DL3015,SC3009,DL3003 +# hadolint ignore=DL3008,DL3015,SC3009,DL3003,DL3013,DL3042 RUN export SABNZBD_VERSION=3.7.2 PAR2CMDLINE_VERSION=v0.6.14-mt1 && \ export DEBIAN_FRONTEND=noninteractive && \ export BUILD_PACKAGES="automake build-essential python3-dev libffi-dev" && \ From 8b6088cee9ca598df27ce46c6786c1a229f5b822 Mon Sep 17 00:00:00 2001 From: Sagent Date: Mon, 8 Jun 2026 21:25:27 +0000 Subject: [PATCH 4/4] fix: redirect deb.debian.org to archive.debian.org for buster EOL --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 9a8b59b..7ea56d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,6 +27,7 @@ RUN export SABNZBD_VERSION=3.7.2 PAR2CMDLINE_VERSION=v0.6.14-mt1 && \ export BUILD_PACKAGES="automake build-essential python3-dev libffi-dev" && \ export RUNTIME_PACKAGES="ca-certificates p7zip-full python3-yenc unrar unzip libgomp1 openssl python3-openssl curl python3-pip" && \ export PIP_PACKAGES="sabyenc" && \ + sed -i 's|http://deb.debian.org|http://archive.debian.org|g' /etc/apt/sources.list && \ sed -i "s/ main$/ main contrib non-free/" /etc/apt/sources.list && \ apt-get -qq update && \ apt-get -qq --yes install $BUILD_PACKAGES $RUNTIME_PACKAGES && \