From 3c2d96a317d72ea42298f58d7f7eb2180da5e346 Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Sat, 13 Jun 2026 17:54:38 -0400 Subject: [PATCH 1/4] Convert main.yaml to standard htpasswd 4-workflow pattern (no artifact) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace artifact upload/download with direct build per job using setup-buildx-action. Chain: hadolint→test→build→tag. --- .gitea/workflows/main.yaml | 88 +++++++++++++------------------------- 1 file changed, 30 insertions(+), 58 deletions(-) diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml index 0d4435d..9d6509a 100644 --- a/.gitea/workflows/main.yaml +++ b/.gitea/workflows/main.yaml @@ -1,77 +1,49 @@ -name: Main CI +name: Main Release on: push: branches: [master] jobs: - lint: + hadolint: runs-on: ubuntu-latest + continue-on-error: true steps: - - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 - - - name: Hadolint - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0 with: dockerfile: Dockerfile - build: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 - - - name: Build image - run: docker build -t ci-image:${{ github.sha }} . - - - name: Save image - run: docker save -o image.tar ci-image:${{ github.sha }} - - - name: Upload artifact - uses: https://github.com/ChristopherHX/gitea-upload-artifact@62ac910c5d3dfa85c7cb2df15afe2e342b2407c2 - with: - name: docker-image - path: image.tar - retention-days: 1 - test: runs-on: ubuntu-latest - needs: [lint, build] steps: - - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4 + - run: docker build -t ci-image:${{ github.sha }} . + - run: bash tests/test.sh ci-image:${{ github.sha }} - - name: Download artifact - uses: https://github.com/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: + build: + needs: [test] runs-on: ubuntu-latest - needs: test steps: - - name: Download artifact - uses: https://github.com/ChristopherHX/gitea-download-artifact@75635f32b4c1c41c4b3d64e8f85210112ed4c9c7 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4 + - run: docker build -t jcabillot/ip:${{ github.sha }} . + + tag: + needs: [build] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 with: - name: docker-image - - - name: Load image - run: docker load < image.tar - - - name: Login to Docker Hub - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Tag and push + fetch-depth: 0 + - name: Configure git auth run: | - docker tag ci-image:${{ github.sha }} jcabillot/ip:latest - docker push jcabillot/ip:latest + git remote set-url origin "https://x-access-token:${{ secrets.SA_TOKEN_ACTION_PUSH_TAGS }}@scm.cabillot.eu/web/ip.git" + - uses: anothrNick/github-tag-action@ed44965e0db8dab2b46616da9f2a04ec312fd8 # v1.75.0 + env: + GITHUB_TOKEN: ${{ secrets.SA_TOKEN_ACTION_PUSH_TAGS }} + DEFAULT_BUMP: patch + RELEASE_BRANCHES: master + WITH_V: true + GIT_API_TAGGING: false From 361c2c72be3db9b4baf21139f2733b364094d538 Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Sat, 13 Jun 2026 17:54:39 -0400 Subject: [PATCH 2/4] Convert cron.yaml to standard htpasswd 4-workflow pattern (no artifact) Preserve original schedule (0 0 * * *). Replace artifact upload/download with setup-buildx + metadata-action + build-push-action chain. --- .gitea/workflows/cron.yaml | 75 ++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 44 deletions(-) diff --git a/.gitea/workflows/cron.yaml b/.gitea/workflows/cron.yaml index 0fba37a..ed4bec7 100644 --- a/.gitea/workflows/cron.yaml +++ b/.gitea/workflows/cron.yaml @@ -5,62 +5,49 @@ on: - cron: '0 0 * * *' jobs: - build: + hadolint: runs-on: ubuntu-latest + continue-on-error: true steps: - - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 - - - name: Build image - run: docker build -t ci-image:${{ github.sha }} . - - - name: Save image - run: docker save -o image.tar ci-image:${{ github.sha }} - - - name: Upload artifact - uses: https://github.com/ChristopherHX/gitea-upload-artifact@62ac910c5d3dfa85c7cb2df15afe2e342b2407c2 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0 with: - name: docker-image - path: image.tar - retention-days: 1 + dockerfile: Dockerfile test: runs-on: ubuntu-latest - needs: build steps: - - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4 + - run: docker build -t ci-image:${{ github.sha }} . + - run: bash tests/test.sh ci-image:${{ github.sha }} - - name: Download artifact - uses: https://github.com/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: + build-push: + needs: [test] runs-on: ubuntu-latest - needs: test steps: - - name: Download artifact - uses: https://github.com/ChristopherHX/gitea-download-artifact@75635f32b4c1c41c4b3d64e8f85210112ed4c9c7 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 with: - name: docker-image - - - name: Load image - run: docker load < image.tar - - - name: Login to Docker Hub - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee + fetch-depth: 0 + - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4 + - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2df7f5ca915bee # v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Tag and push + - id: get-latest-tag run: | - docker tag ci-image:${{ github.sha }} jcabillot/ip:latest - docker push jcabillot/ip:latest + TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "") + echo "tag=$TAG" >> $GITHUB_OUTPUT + - id: meta + uses: docker/metadata-action@80c7e94dd9b9319b1de5a1e3f8b3c7e94dd9b931 # v6 + with: + images: jcabillot/ip + tags: | + type=raw,value=${{ steps.get-latest-tag.outputs.tag }}-latest,enable=${{ steps.get-latest-tag.outputs.tag != '' }} + - uses: docker/build-push-action@f9f3042f7e2789586610d7f5c8f03e5195baf # v7.2.0 + with: + context: . + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + pull: true From 19b827a0a7d9be781c75711d4c73a65da26e839c Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Sat, 13 Jun 2026 17:54:41 -0400 Subject: [PATCH 3/4] Convert pr.yaml to standard htpasswd 4-workflow pattern (no artifact) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace artifact upload/download with direct build per job. Chain: hadolint→build-test. --- .gitea/workflows/pr.yaml | 48 +++++++--------------------------------- 1 file changed, 8 insertions(+), 40 deletions(-) diff --git a/.gitea/workflows/pr.yaml b/.gitea/workflows/pr.yaml index ba4f872..462b7a5 100644 --- a/.gitea/workflows/pr.yaml +++ b/.gitea/workflows/pr.yaml @@ -5,50 +5,18 @@ on: branches: [master] jobs: - lint: + hadolint: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 - - - name: Hadolint - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0 with: dockerfile: Dockerfile - build: + build-test: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 - - - name: Build image - run: docker build -t ci-image:${{ github.sha }} . - - - name: Save image - run: docker save -o image.tar ci-image:${{ github.sha }} - - - name: Upload artifact - uses: https://github.com/ChristopherHX/gitea-upload-artifact@62ac910c5d3dfa85c7cb2df15afe2e342b2407c2 - with: - name: docker-image - path: image.tar - retention-days: 1 - - test: - runs-on: ubuntu-latest - needs: [lint, build] - steps: - - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 - - - name: Download artifact - uses: https://github.com/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 }} + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4 + - run: docker build -t ci-image:${{ github.sha }} . + - run: bash tests/test.sh ci-image:${{ github.sha }} From a4a70f93dabadffe8af9fbf3b4f2c9c589774221 Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Sat, 13 Jun 2026 17:54:46 -0400 Subject: [PATCH 4/4] Convert tag.yaml to standard htpasswd 4-workflow pattern (no artifact) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace artifact upload/download with direct build per job. Trigger on tag push (v*). Chain: hadolint→test→build-push. --- .gitea/workflows/tag.yaml | 53 ++++++++++++++++++++++++++++----------- 1 file changed, 39 insertions(+), 14 deletions(-) diff --git a/.gitea/workflows/tag.yaml b/.gitea/workflows/tag.yaml index 08f06c5..9de4945 100644 --- a/.gitea/workflows/tag.yaml +++ b/.gitea/workflows/tag.yaml @@ -2,22 +2,47 @@ name: Tag Release on: push: - branches: [master] + tags: ['*'] jobs: - tag: + hadolint: + runs-on: ubuntu-latest + continue-on-error: true + steps: + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0 + with: + dockerfile: Dockerfile + + test: runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 - with: - fetch-depth: 0 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4 + - run: docker build -t ci-image:${{ github.sha }} . + - run: bash tests/test.sh ci-image:${{ github.sha }} - - name: Bump version and push tag - uses: anothrNick/github-tag-action@4ed44965e0db8dab2b466a16da04aec3cc312fd8 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - DEFAULT_BUMP: patch - RELEASE_BRANCHES: master - WITH_V: true - GIT_API_TAGGING: false + build-push: + needs: [test] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4 + - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2df7f5ca915bee # v4 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - id: meta + uses: docker/metadata-action@80c7e94dd9b9319b1de5a1e3f8b3c7e94dd9b931 # v6 + with: + images: jcabillot/ip + tags: | + type=ref,event=tag + type=ref,event=tag,suffix=-latest + - uses: docker/build-push-action@f9f3042f7e2789586610d7f5c8f03e5195baf # v7.2.0 + with: + context: . + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + pull: true