Merge pull request 'chore(deps): update hadolint/hadolint-action action to v3.3.0' (#11) from renovate/hadolint-hadolint-action-3.x into master

Reviewed-on: #11

.gitea/workflows/docker-build.yaml

@@ -2,45 +2,70 @@ 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 # v6
+      - name: Hadolint
+        uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
 
-      - 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 # v6
+      - 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 # main
+        with:
+          name: docker-image
+          path: image.tar
 
+  test:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Checkout
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+      - name: Download artifact
+        uses: 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
+    if: github.event_name != 'pull_request'
+    needs: test
+    steps:
+      - name: Checkout
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
+      - name: Download artifact
+        uses: 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/awscli
-          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/awscli:latest
+          docker push jcabillot/awscli:latest

Dockerfile

@@ -1,8 +1,9 @@
-FROM python:alpine
+FROM python:3.14-alpine
 LABEL maintainer="Julien Cabillot <dockerimages@cabillot.eu>"
 
-ARG CLI_VERSION=1.16.148
+ARG CLI_VERSION=1.45.27
 
+# hadolint ignore=DL3018,DL3013
 RUN apk --no-cache upgrade && \
     apk --no-cache add --virtual build-dependencies \
         groff \
@@ -16,5 +17,4 @@ RUN apk --no-cache upgrade && \
         /var/tmp/*
 
 WORKDIR /data
-
-ENTRYPOINT ["/usr/local/bin/aws"]
+ENTRYPOINT ["/usr/local/bin/aws"]

renovate.json

@@ -0,0 +1,16 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "gitlabci": {
+    "enabled": false
+  },
+  "customManagers": [
+    {
+      "customType": "regex",
+      "description": "Track awscli pip version from ARG in Dockerfile",
+      "managerFilePatterns": ["/^Dockerfile$/"],
+      "matchStrings": ["ARG CLI_VERSION=(?<currentValue>[\\d.]+)\\n"],
+      "depNameTemplate": "awscli",
+      "datasourceTemplate": "pypi"
+    }
+  ]
+}

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" --version > "$TMPDIR/output" 2>&1 || true
+assert_contains "Command produces output" "aws-cli" "$TMPDIR/output"
+
+echo ""
+echo "$PASSED/$((PASSED + FAILED)) tests passed"
+if [ "$FAILED" -gt 0 ]; then
+  exit 1
+fi