From b7c6ad7c589fd9c6d063511d32aeaa2e4e9cc8fc Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Mon, 8 Jun 2026 20:21:35 -0400 Subject: [PATCH 1/4] fix: remove quoted strings (hadolint) --- Dockerfile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6ef3a61..0f2c5c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,18 @@ -FROM "ubuntu:18.04" +FROM ubuntu:18.04 LABEL maintainer="Julien Cabillot " -ENV DEBIAN_FRONTEND="noninteractive" +ENV DEBIAN_FRONTEND=noninteractive RUN apt-get -qq update && \ apt-get --no-install-recommends -qqy install siege && \ - apt-get -qqy autoremove --purge && \ + apt-get -qqy autoremove --purge && \ apt-get -qq clean && \ - rm -rf "/usr/share/doc/*" \ - "/var/cache/*" \ - "/var/lib/apt/lists/*" \ - "/usr/src/*" \ - "/var/log/"{apt/*,dpkg.log} \ - "/tmp/*" + rm -rf /usr/share/doc/* \ + /var/cache/* \ + /var/lib/apt/lists/* \ + /usr/src/* \ + /var/log/{apt/*,dpkg.log} \ + /tmp/* ENTRYPOINT [ "/usr/bin/siege" ] -CMD [ "--help" ] +CMD [ "--help" ] \ No newline at end of file -- 2.52.0 From ed8fb1df9ca205625d4f160daac8c827a4202220 Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Mon, 8 Jun 2026 20:21:56 -0400 Subject: [PATCH 2/4] 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..f3089fe --- /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" --version -- 2.52.0 From 9ce8dfec616b0864a4759cfd09ec91b3359fd69b Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Mon, 8 Jun 2026 20:23:33 -0400 Subject: [PATCH 3/4] 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 bdc3680..a2f67eb 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/siege - 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/siege:latest + docker push jcabillot/siege:latest -- 2.52.0 From f3732192ba3ca276512a5e1df203ae00fd045d05 Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Mon, 8 Jun 2026 20:26:42 -0400 Subject: [PATCH 4/4] fix: add hadolint ignores DL3008,SC3009 --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0f2c5c9..9f59af4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,7 @@ LABEL maintainer="Julien Cabillot " ENV DEBIAN_FRONTEND=noninteractive +# hadolint ignore=DL3008,SC3009 RUN apt-get -qq update && \ apt-get --no-install-recommends -qqy install siege && \ apt-get -qqy autoremove --purge && \ @@ -11,7 +12,8 @@ RUN apt-get -qq update && \ /var/cache/* \ /var/lib/apt/lists/* \ /usr/src/* \ - /var/log/{apt/*,dpkg.log} \ + /var/log/apt \ + /var/log/dpkg.log \ /tmp/* ENTRYPOINT [ "/usr/bin/siege" ] -- 2.52.0