From 8c22291cb05345af3e3dd1ca2fb7ebd034137f50 Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Mon, 8 Jun 2026 18:56:22 -0400 Subject: [PATCH 1/3] ci: migrate to 4-job pipeline (lint/build/test/push) --- .gitea/workflows/docker-build.yaml | 82 +++++++++++++++++++----------- 1 file changed, 53 insertions(+), 29 deletions(-) diff --git a/.gitea/workflows/docker-build.yaml b/.gitea/workflows/docker-build.yaml index e698e08..111f753 100644 --- a/.gitea/workflows/docker-build.yaml +++ b/.gitea/workflows/docker-build.yaml @@ -2,45 +2,69 @@ name: Docker Build and Push on: pull_request: - branches: [master] push: - branches: [master] 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 + - name: Hadolint + uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v4 + build: + runs-on: ubuntu-latest + needs: lint + steps: + - name: Checkout + 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 }} > image.tar + - name: Upload artifact + uses: ChristopherHX/gitea-upload-artifact@62ac910c5d3dfa85c7cb2df15afe2e342b2407c2 + with: + name: docker-image + path: image.tar + test: + runs-on: ubuntu-latest + needs: build + steps: + - name: Checkout + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 + - name: Download artifact + 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 + if: github.event_name != 'pull_request' + needs: test + steps: + - name: Checkout + uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 + - name: Download artifact + uses: ChristopherHX/gitea-download-artifact@75635f32b4c1c41c4b3d64e8f85210112ed4c9c7 + 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 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Docker metadata - id: meta - uses: docker/metadata-action@v6 - with: - images: jcabillot/ansible-lint - 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/ansible-lint:latest + docker push jcabillot/ansible-lint:latest From 4c6aa39a5f514ef93672a8b3d8d6b037413656f6 Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Mon, 8 Jun 2026 18:56:24 -0400 Subject: [PATCH 2/3] ci: add smoke test for ansible-lint --- tests/test.sh | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 tests/test.sh diff --git a/tests/test.sh b/tests/test.sh new file mode 100644 index 0000000..69a4bec --- /dev/null +++ b/tests/test.sh @@ -0,0 +1,30 @@ +#!/bin/bash +set -euo pipefail + +IMAGE="$1" +FAILED=0 +PASSED=0 + +assert_contains() { + local desc="$1" pattern="$2" file="$3" + if grep -qEi "$pattern" "$file"; then + echo "PASS: $desc" + PASSED=$((PASSED + 1)) + else + echo "FAIL: $desc" + FAILED=$((FAILED + 1)) + fi +} + +TMPDIR="$(mktemp -d)" +trap 'rm -rf "$TMPDIR"' EXIT + +# Test 1: Container runs without error +docker run --rm "$IMAGE" --help > "$TMPDIR/output" 2>&1 || true +assert_contains "Command produces output" "ansible-lint" "$TMPDIR/output" + +echo "" +echo "$PASSED/$((PASSED + FAILED)) tests passed" +if [ "$FAILED" -gt 0 ]; then + exit 1 +fi From 3f9188bf85db678589b1206c37ef7bafec9f6e3c Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Mon, 8 Jun 2026 19:02:35 -0400 Subject: [PATCH 3/3] fix: add hadolint ignore DL3018,DL3013 for apk add and pip install --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index c1580d7..9d19386 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ FROM "python:3.14-alpine" - ARG BUILD_DATE ARG VCS_REF ARG VERSION +# hadolint ignore=DL3018,DL3013 RUN apk --no-cache add --virtual build-dependencies \ build-base libffi-dev libressl-dev && \ pip install --no-cache-dir ansible-lint && \ @@ -25,4 +25,4 @@ LABEL "maintainer"="dockerimages@cabillot.eu" \ "org.label-schema.usage"="docker run --rm -v $(pwd):/data registry.cabillot.eu/jcabillot/ansible-lint -p /data" ENTRYPOINT [ "/usr/local/bin/ansible-lint" ] -CMD [ "--help" ] +CMD [ "--help" ] \ No newline at end of file