From cf2daa42e02835868e655dede61081e5a021944a Mon Sep 17 00:00:00 2001
From: cloudix_mcp_server <julien+mcp@cabillot.eu>
Date: Mon, 8 Jun 2026 22:28:04 -0400
Subject: [PATCH 1/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 8ddb491..22ac250 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/troposphere
-          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/troposphere:latest
+          docker push jcabillot/troposphere:latest
-- 
2.52.0


From 0a910ce903eb8efe2d5b552b9ede6863b60c2bcf Mon Sep 17 00:00:00 2001
From: cloudix_mcp_server <julien+mcp@cabillot.eu>
Date: Mon, 8 Jun 2026 22:28:57 -0400
Subject: [PATCH 2/3] Add smoke test for troposphere

---
 tests/test.sh | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 tests/test.sh

diff --git a/tests/test.sh b/tests/test.sh
new file mode 100644
index 0000000..3e7fdbc
--- /dev/null
+++ b/tests/test.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+set -euo pipefail
+
+IMAGE="$1"
+FAILED=0
+PASSED=0
+
+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
+}
+
+TMPDIR="$(mktemp -d)"
+trap 'rm -rf "$TMPDIR"' EXIT
+
+docker run --rm "$IMAGE" python -c "import troposphere; print(troposphere.__version__)" > "$TMPDIR/output" 2>&1 && RC=0 || RC=$?
+assert_eq "import troposphere exits cleanly" "0" "$RC"
+
+if [ -s "$TMPDIR/output" ]; then
+  echo "PASS: import produces version output"
+  PASSED=$((PASSED + 1))
+else
+  echo "FAIL: import produces no output"
+  FAILED=$((FAILED + 1))
+fi
+
+echo ""
+echo "$PASSED/$((PASSED + FAILED)) tests passed"
+if [ "$FAILED" -gt 0 ]; then
+  exit 1
+fi
-- 
2.52.0


From 58597d5d539e39a763a942512bd71fb2b0f08e3e Mon Sep 17 00:00:00 2001
From: cloudix_mcp_server <julien+mcp@cabillot.eu>
Date: Mon, 8 Jun 2026 22:29:43 -0400
Subject: [PATCH 3/3] Add hadolint ignore for apk add and pip install

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index f391a52..e57713d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,10 +4,10 @@ ARG BUILD_DATE
 ARG VCS_REF
 ARG VERSION
 
+# hadolint ignore=DL3018,DL3013
 RUN apk --no-cache add --virtual build-dependencies build-base && \
     pip install --no-cache-dir troposphere && \
     apk --no-cache del build-dependencies
-
 # TODO : vérifier les labels
 LABEL "maintainer"="dockerimages@cabillot.eu" \
       "org.label-schema.name"="troposphere" \
-- 
2.52.0