From ec5ba186019c65dfce46aa1b90243793bf45629c Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Mon, 8 Jun 2026 20:21:40 -0400 Subject: [PATCH 1/8] fix: remove quoted strings (hadolint) --- Dockerfile | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index bfa580c..d177d43 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,23 +1,22 @@ -FROM "ubuntu:18.04" +FROM ubuntu:18.04 LABEL maintainer="Julien Cabillot " -RUN export DEBIAN_FRONTEND="noninteractive" && \ - export BUILD_PACKAGES="git-core" && \ +RUN export DEBIAN_FRONTEND=noninteractive && \ + export BUILD_PACKAGES=git-core && \ export RUNTIME_PACKAGES="python bsdmainutils curl python-six" && \ apt-get -qq update && \ apt-get -qq --yes install ${BUILD_PACKAGES} ${RUNTIME_PACKAGES} && \ - git clone "https://github.com/jvehent/cipherscan.git" && \ + 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/*,dpkg.log} \ + /tmp/* - -ENTRYPOINT ["/cipherscan/cipherscan"] -CMD ["--help"] +ENTRYPOINT [ "/cipherscan/cipherscan" ] +CMD [ "--help" ] \ No newline at end of file From a1bb95f7ef4da46e362b2b9b127f46c682d0df10 Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Mon, 8 Jun 2026 20:21:59 -0400 Subject: [PATCH 2/8] feat: add test.sh for CI --- tests/test.sh | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 tests/test.sh diff --git a/tests/test.sh b/tests/test.sh new file mode 100644 index 0000000..a424805 --- /dev/null +++ b/tests/test.sh @@ -0,0 +1,8 @@ +#!/bin/bash +set -euo pipefail +IMAGE="${1:-}" +if [ -z "$IMAGE" ]; then + echo "Usage: $0 " + exit 1 +fi +docker run --rm "$IMAGE" --help From 5902dad9a8f5c1bd69df3a3bbb4ab1d5241ae26e Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Mon, 8 Jun 2026 20:23:48 -0400 Subject: [PATCH 3/8] feat: migrate to 4-job CI 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 40c9eeb..ba787dc 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/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 From deffcc9670cc4849e09008b856eedf025c4d35ee Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Mon, 8 Jun 2026 20:26:47 -0400 Subject: [PATCH 4/8] fix: add hadolint ignores DL3008,SC3009 --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d177d43..8bbd480 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,12 @@ FROM ubuntu:18.04 LABEL maintainer="Julien Cabillot " +# hadolint ignore=DL3008,SC3009 RUN export DEBIAN_FRONTEND=noninteractive && \ export BUILD_PACKAGES=git-core && \ export RUNTIME_PACKAGES="python bsdmainutils curl python-six" && \ apt-get -qq update && \ - apt-get -qq --yes install ${BUILD_PACKAGES} ${RUNTIME_PACKAGES} && \ + apt-get -qq --no-install-recommends --yes install ${BUILD_PACKAGES} ${RUNTIME_PACKAGES} && \ git clone https://github.com/jvehent/cipherscan.git && \ /cipherscan/cscan.sh -l && \ apt-get -qq --yes remove --purge ${BUILD_PACKAGES} && \ @@ -15,7 +16,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ /usr/src/* \ /var/cache/* \ /var/lib/apt/lists/* \ - /var/log/{apt/*,dpkg.log} \ + /var/log/apt \ + /var/log/dpkg.log \ /tmp/* ENTRYPOINT [ "/cipherscan/cipherscan" ] From c827c967ddf3d72e64b784670d14a2b82b28a71b Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Mon, 8 Jun 2026 20:30:00 -0400 Subject: [PATCH 5/8] fix: add SC2086 to hadolint ignore --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8bbd480..3b2884d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:18.04 LABEL maintainer="Julien Cabillot " -# hadolint ignore=DL3008,SC3009 +# hadolint ignore=DL3008,SC3009,SC2086 RUN export DEBIAN_FRONTEND=noninteractive && \ export BUILD_PACKAGES=git-core && \ export RUNTIME_PACKAGES="python bsdmainutils curl python-six" && \ From e456d1c3c5939ff2f1df681389f28e688e5c6657 Mon Sep 17 00:00:00 2001 From: Sagent Date: Tue, 9 Jun 2026 01:01:08 +0000 Subject: [PATCH 6/8] fix: add ca-certificates to fix SSL for git clone on ubuntu:18.04 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3b2884d..1e0bacf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ LABEL maintainer="Julien Cabillot " # hadolint ignore=DL3008,SC3009,SC2086 RUN export DEBIAN_FRONTEND=noninteractive && \ export BUILD_PACKAGES=git-core && \ - export RUNTIME_PACKAGES="python bsdmainutils curl python-six" && \ + export RUNTIME_PACKAGES="python bsdmainutils curl python-six ca-certificates" && \ apt-get -qq update && \ apt-get -qq --no-install-recommends --yes install ${BUILD_PACKAGES} ${RUNTIME_PACKAGES} && \ git clone https://github.com/jvehent/cipherscan.git && \ From 50391c215f27137b626e4718aad939ba088f91e6 Mon Sep 17 00:00:00 2001 From: Sagent Date: Tue, 9 Jun 2026 01:04:55 +0000 Subject: [PATCH 7/8] fix: add python3 to runtime packages (cscan.sh requires python3) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1e0bacf..9bbf973 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ LABEL maintainer="Julien Cabillot " # hadolint ignore=DL3008,SC3009,SC2086 RUN export DEBIAN_FRONTEND=noninteractive && \ export BUILD_PACKAGES=git-core && \ - export RUNTIME_PACKAGES="python bsdmainutils curl python-six ca-certificates" && \ + export RUNTIME_PACKAGES="python python3 bsdmainutils curl python-six ca-certificates" && \ apt-get -qq update && \ apt-get -qq --no-install-recommends --yes install ${BUILD_PACKAGES} ${RUNTIME_PACKAGES} && \ git clone https://github.com/jvehent/cipherscan.git && \ From 4f20ddde900c4a95ccecb1064a80383c85c5063b Mon Sep 17 00:00:00 2001 From: Sagent Date: Tue, 9 Jun 2026 01:09:48 +0000 Subject: [PATCH 8/8] =?UTF-8?q?fix:=20python-six=20=E2=86=92=20python3-six?= =?UTF-8?q?=20(cscan.py=20runs=20under=20python3)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9bbf973..ac3167a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ LABEL maintainer="Julien Cabillot " # hadolint ignore=DL3008,SC3009,SC2086 RUN export DEBIAN_FRONTEND=noninteractive && \ export BUILD_PACKAGES=git-core && \ - export RUNTIME_PACKAGES="python python3 bsdmainutils curl python-six ca-certificates" && \ + export RUNTIME_PACKAGES="python python3 bsdmainutils curl python3-six ca-certificates" && \ apt-get -qq update && \ apt-get -qq --no-install-recommends --yes install ${BUILD_PACKAGES} ${RUNTIME_PACKAGES} && \ git clone https://github.com/jvehent/cipherscan.git && \