From b34e4da58bb96b21ce0a3806770244ada07d4868 Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Mon, 8 Jun 2026 22:26:44 -0400 Subject: [PATCH 1/3] Add CLI smoke test for docker-dynhost --- tests/test.sh | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 tests/test.sh diff --git a/tests/test.sh b/tests/test.sh new file mode 100644 index 0000000..40ceac5 --- /dev/null +++ b/tests/test.sh @@ -0,0 +1,38 @@ +#!/bin/bash +set -euo pipefail + +IMAGE="$1" +FAILED=0 +PASSED=0 + +TMPDIR="$(mktemp -d)" +trap 'rm -rf "$TMPDIR"' EXIT + +assert_eq() { + local desc="$1" expected="$2" actual="$3" + if [ "$expected" = "$actual" ]; then + echo "PASS: $desc" + PASSED=$((PASSED + 1)) + else + echo "FAIL: $desc (expected '$expected', got '$actual')" + FAILED=$((FAILED + 1)) + fi +} + +RC=0 +docker run --rm "$IMAGE" dig -v > "$TMPDIR/output" 2>&1 || RC=$? +assert_eq "dig works" "0" "$RC" + +if [ -s "$TMPDIR/output" ]; then + echo "PASS: Command produces output" + PASSED=$((PASSED + 1)) +else + echo "FAIL: Command produces no output" + FAILED=$((FAILED + 1)) +fi + +echo "" +echo "$PASSED/$((PASSED + FAILED)) tests passed" +if [ "$FAILED" -gt 0 ]; then + exit 1 +fi From 41d279dd4acd042f28c1fbbe3e57c492b33501ad Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Mon, 8 Jun 2026 22:28:03 -0400 Subject: [PATCH 2/3] Migrate CI to 4-job pipeline with SHA-pinned actions --- .gitea/workflows/docker-build.yaml | 83 ++++++++++++++++++------------ 1 file changed, 51 insertions(+), 32 deletions(-) diff --git a/.gitea/workflows/docker-build.yaml b/.gitea/workflows/docker-build.yaml index ca4f302..27556d9 100644 --- a/.gitea/workflows/docker-build.yaml +++ b/.gitea/workflows/docker-build.yaml @@ -1,46 +1,65 @@ name: Docker Build and Push on: - pull_request: - branches: [master] push: - branches: [master] + branches: [master, main] + pull_request: schedule: - - cron: '0 0 * * *' + - cron: '30 3 * * 3' jobs: - build: + lint: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 + - uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf + with: + dockerfile: Dockerfile + failure-threshold: error - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v4 + build: + runs-on: ubuntu-latest + needs: lint + steps: + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 + - name: Build image + run: docker build -t ci-image:${{ github.sha }} . + - name: Save image + run: docker save ci-image:${{ github.sha }} -o image.tar + - uses: ChristopherHX/gitea-upload-artifact@62ac910c5d3dfa85c7cb2df15afe2e342b2407c2 + with: + name: docker-image + path: image.tar - - name: Login to Docker Hub - if: github.event_name != 'pull_request' - uses: docker/login-action@v4 + test: + runs-on: ubuntu-latest + needs: build + steps: + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 + - uses: ChristopherHX/gitea-download-artifact@75635f32b4c1c41c4b3d64e8f85210112ed4c9c7 + 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: + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 + - uses: ChristopherHX/gitea-download-artifact@75635f32b4c1c41c4b3d64e8f85210112ed4c9c7 + with: + name: docker-image + - name: Load image + run: docker load < image.tar + - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Docker metadata - id: meta - uses: docker/metadata-action@v6 - with: - images: jcabillot/dynhost - 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/docker-dynhost:latest + docker push jcabillot/docker-dynhost:latest From 8f2a9fca91d36d9d6e7e7104b6033ac0a4b49976 Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Mon, 8 Jun 2026 22:28:17 -0400 Subject: [PATCH 3/3] Fix hadolint: add DL3018 ignore for apk --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index ad0b089..341b740 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ FROM alpine:3.23 +# hadolint ignore=DL3018 RUN apk add --no-cache bind-tools curl COPY entrypoint.sh /