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

Reviewed-on: #9

.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/cipherscan
-          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/cipherscan:latest
+          docker push jcabillot/cipherscan:latest

Dockerfile

@@ -1,23 +1,25 @@
-FROM "ubuntu:18.04"
+FROM ubuntu:26.04
 LABEL maintainer="Julien Cabillot <dockerimages@cabillot.eu>"
 
-RUN export DEBIAN_FRONTEND="noninteractive" && \
-    export BUILD_PACKAGES="git-core" && \
-    export RUNTIME_PACKAGES="python bsdmainutils curl python-six" && \
+# hadolint ignore=DL3008,SC3009,SC2086
+RUN export DEBIAN_FRONTEND=noninteractive && \
+    export BUILD_PACKAGES=git-core && \
+    export RUNTIME_PACKAGES="python3 bsdmainutils curl python3-six ca-certificates" && \
     apt-get -qq update && \
-    apt-get -qq --yes install ${BUILD_PACKAGES} ${RUNTIME_PACKAGES} && \
-    git clone "https://github.com/jvehent/cipherscan.git" && \
+    apt-get -qq --no-install-recommends --yes install ${BUILD_PACKAGES} ${RUNTIME_PACKAGES} && \
+    ln -sf /usr/bin/python3 /usr/bin/python && \
+    git clone https://github.com/jvehent/cipherscan.git && \
     /cipherscan/cscan.sh -l && \
     apt-get -qq --yes remove --purge ${BUILD_PACKAGES} && \
     apt-get -qq --yes autoremove --purge && \
     apt-get -qq --yes clean all && \
-    rm -rf "/usr/share/doc/"* \
-           "/usr/src/"* \
-           "/var/cache/"* \
-           "/var/lib/apt/lists/"* \
-           "/var/log/"{apt/*,dpkg.log} \
-           "/tmp/"*
+    rm -rf /usr/share/doc/* \
+           /usr/src/* \
+           /var/cache/* \
+           /var/lib/apt/lists/* \
+           /var/log/apt \
+           /var/log/dpkg.log \
+           /tmp/*
 
-
-ENTRYPOINT ["/cipherscan/cipherscan"]
-CMD ["--help"]
+ENTRYPOINT [ "/cipherscan/cipherscan" ]
+CMD [ "--help" ]

tests/test.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+set -euo pipefail
+IMAGE="${1:-}"
+if [ -z "$IMAGE" ]; then
+  echo "Usage: $0 <image>"
+  exit 1
+fi
+docker run --rm "$IMAGE" --help