From f32176d5c880249441910582be8020b5ecf5bf20 Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Sat, 13 Jun 2026 17:54:18 -0400 Subject: [PATCH 1/8] Convert main.yaml to standard htpasswd pattern (no artifact upload/download) --- .gitea/workflows/main.yaml | 87 ++++++++++++-------------------------- 1 file changed, 26 insertions(+), 61 deletions(-) diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml index a50312c..076edae 100644 --- a/.gitea/workflows/main.yaml +++ b/.gitea/workflows/main.yaml @@ -1,83 +1,48 @@ -name: Main Branch +name: Main Release on: push: branches: [master] jobs: - build: + hadolint: runs-on: ubuntu-latest + continue-on-error: true steps: - - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4 - - - name: Build - uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0 with: - context: . - push: false - load: true - tags: ci-image:${{ github.sha }} - pull: true - - - 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 # main - 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 # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afddd7de93d0b3df5 # 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 # 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: + build: + needs: [test] runs-on: ubuntu-latest - needs: test steps: - - name: Download artifact - uses: https://github.com/ChristopherHX/gitea-download-artifact@75635f32b4c1c41c4b3d64e8f85210112ed4c9c7 # main + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afddd7de93d0b3df5 # v4 + - run: docker build -t jcabillot/cv:${{ 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 # v4 - 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/cv:latest - docker push jcabillot/cv:latest - - - name: Bump version and push tag - uses: anothrNick/github-tag-action@4ed44965e0db8dab2b466a16da04aec3cc312fd8 # v1.75.0 + git remote set-url origin "https://x-access-token:${{ secrets.SA_TOKEN_ACTION_PUSH_TAGS }}@scm.cabillot.eu/web/cv.git" + - uses: anothrNick/github-tag-action@4ed44965e0db8dab2b466a16da04aec3cc312fd8 # v1.75.0 env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.SA_TOKEN_ACTION_PUSH_TAGS }} DEFAULT_BUMP: patch RELEASE_BRANCHES: master WITH_V: true From 92ac4cf5f7c98366e6bec2e6d4928041254b7f69 Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Sat, 13 Jun 2026 17:54:20 -0400 Subject: [PATCH 2/8] Convert cron.yaml to standard htpasswd pattern, preserve original schedule --- .gitea/workflows/cron.yaml | 84 ++++++++++++++------------------------ 1 file changed, 31 insertions(+), 53 deletions(-) diff --git a/.gitea/workflows/cron.yaml b/.gitea/workflows/cron.yaml index 1910798..ea9d2bf 100644 --- a/.gitea/workflows/cron.yaml +++ b/.gitea/workflows/cron.yaml @@ -5,71 +5,49 @@ on: - cron: '0 0 * * *' jobs: - build: + hadolint: runs-on: ubuntu-latest + continue-on-error: true steps: - - name: Checkout - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4 - - - name: Build - uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0 with: - context: . - push: false - load: true - tags: ci-image:${{ github.sha }} - pull: true - - - 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 # main - 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 # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afddd7de93d0b3df5 # 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 # 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: + build-push: + needs: [test] runs-on: ubuntu-latest - needs: test steps: - - name: Download artifact - uses: https://github.com/ChristopherHX/gitea-download-artifact@75635f32b4c1c41c4b3d64e8f85210112ed4c9c7 # main + - 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 # v4 + fetch-depth: 0 + - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afddd7de93d0b3df5 # v4 + - uses: docker/login-action@650006c6eb7dba73a995cc02b3b0b2d7f5ca915bee # 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/cv:latest - docker push jcabillot/cv:latest + TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "") + echo "tag=$TAG" >> $GITHUB_OUTPUT + - id: meta + uses: docker/metadata-action@80c7e94dd9b9391b9de5a1e3f8b3c7e94dd9b931 # v6 + with: + images: jcabillot/cv + 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 140af7fbb82bf7181da346209110b5f8cb8359d7 Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Sat, 13 Jun 2026 17:54:22 -0400 Subject: [PATCH 3/8] Align pr.yaml with standard htpasswd pattern --- .gitea/workflows/pr.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/pr.yaml b/.gitea/workflows/pr.yaml index 6fdb8b5..281b95a 100644 --- a/.gitea/workflows/pr.yaml +++ b/.gitea/workflows/pr.yaml @@ -10,7 +10,6 @@ jobs: steps: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0 - continue-on-error: true with: dockerfile: Dockerfile @@ -18,6 +17,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4 + - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afddd7de93d0b3df5 # v4 - run: docker build -t ci-image:${{ github.sha }} . - run: bash tests/test.sh ci-image:${{ github.sha }} From 1f606e26df046d2c893310582e9bfdbeaaa871cf Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Sat, 13 Jun 2026 17:54:26 -0400 Subject: [PATCH 4/8] Align tag.yaml with standard htpasswd pattern --- .gitea/workflows/tag.yaml | 46 +++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/.gitea/workflows/tag.yaml b/.gitea/workflows/tag.yaml index c65cac8..1f297c4 100644 --- a/.gitea/workflows/tag.yaml +++ b/.gitea/workflows/tag.yaml @@ -2,36 +2,44 @@ name: Tag Release on: push: - tags: - - 'v*' + tags: ['v*'] jobs: - build-and-push: + 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 # v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afddd7de93d0b3df5 # v4 + - run: docker build -t ci-image:${{ github.sha }} . + - run: bash tests/test.sh ci-image:${{ github.sha }} - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4 - - - name: Login to Docker Hub - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4 + build-push: + needs: [test] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 + - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afddd7de93d0b3df5 # v4 + - uses: docker/login-action@650006c6eb7dba73a995cc02b3b0b2d7f5ca915bee # v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Docker metadata - id: meta - uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6 + - id: meta + uses: docker/metadata-action@80c7e94dd9b9391b9de5a1e3f8b3c7e94dd9b931 # v6 with: images: jcabillot/cv tags: | - type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} - - - name: Build and push - uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7 + type=ref,event=tag + type=ref,event=tag,suffix=-latest + - uses: docker/build-push-action@f9f3042f7e2789586610d7f5c8f03e5195baf # v7.2.0 with: context: . push: true From 08208bc7a73b38da9f85ade398c30acaaff6c972 Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Sat, 13 Jun 2026 19:21:28 -0400 Subject: [PATCH 5/8] fix: correct SHAs in cron.yaml --- .gitea/workflows/cron.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/cron.yaml b/.gitea/workflows/cron.yaml index ea9d2bf..e2bb33e 100644 --- a/.gitea/workflows/cron.yaml +++ b/.gitea/workflows/cron.yaml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afddd7de93d0b3df5 # v4 + - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4 - run: docker build -t ci-image:${{ github.sha }} . - run: bash tests/test.sh ci-image:${{ github.sha }} @@ -29,8 +29,8 @@ jobs: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 with: fetch-depth: 0 - - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afddd7de93d0b3df5 # v4 - - uses: docker/login-action@650006c6eb7dba73a995cc02b3b0b2d7f5ca915bee # v4 + - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4 + - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -39,12 +39,12 @@ jobs: TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "") echo "tag=$TAG" >> $GITHUB_OUTPUT - id: meta - uses: docker/metadata-action@80c7e94dd9b9391b9de5a1e3f8b3c7e94dd9b931 # v6 + uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6 with: images: jcabillot/cv 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 + - uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0 with: context: . push: true From 2beca7394f7aa9138d0e95aa87b054c7dce83c12 Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Sat, 13 Jun 2026 19:21:33 -0400 Subject: [PATCH 6/8] fix: correct SHAs in main.yaml --- .gitea/workflows/main.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml index 076edae..eb536ca 100644 --- a/.gitea/workflows/main.yaml +++ b/.gitea/workflows/main.yaml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afddd7de93d0b3df5 # v4 + - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4 - run: docker build -t ci-image:${{ github.sha }} . - run: bash tests/test.sh ci-image:${{ github.sha }} @@ -27,7 +27,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afddd7de93d0b3df5 # v4 + - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4 - run: docker build -t jcabillot/cv:${{ github.sha }} . tag: From 24de34cdcc0e14711e3d89cedec4ae8376180e11 Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Sat, 13 Jun 2026 19:21:37 -0400 Subject: [PATCH 7/8] fix: correct SHAs in pr.yaml --- .gitea/workflows/pr.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/pr.yaml b/.gitea/workflows/pr.yaml index 281b95a..462b7a5 100644 --- a/.gitea/workflows/pr.yaml +++ b/.gitea/workflows/pr.yaml @@ -17,6 +17,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afddd7de93d0b3df5 # v4 + - 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 9da1a79f70eb618c6517c5442f65a8348b41f00e Mon Sep 17 00:00:00 2001 From: cloudix_mcp_server Date: Sat, 13 Jun 2026 19:21:40 -0400 Subject: [PATCH 8/8] fix: correct SHAs in tag.yaml --- .gitea/workflows/tag.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/tag.yaml b/.gitea/workflows/tag.yaml index 1f297c4..79a1c5b 100644 --- a/.gitea/workflows/tag.yaml +++ b/.gitea/workflows/tag.yaml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afddd7de93d0b3df5 # v4 + - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4 - run: docker build -t ci-image:${{ github.sha }} . - run: bash tests/test.sh ci-image:${{ github.sha }} @@ -27,19 +27,19 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 - - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afddd7de93d0b3df5 # v4 - - uses: docker/login-action@650006c6eb7dba73a995cc02b3b0b2d7f5ca915bee # v4 + - uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4 + - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - id: meta - uses: docker/metadata-action@80c7e94dd9b9391b9de5a1e3f8b3c7e94dd9b931 # v6 + uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6 with: images: jcabillot/cv tags: | type=ref,event=tag type=ref,event=tag,suffix=-latest - - uses: docker/build-push-action@f9f3042f7e2789586610d7f5c8f03e5195baf # v7.2.0 + - uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7.2.0 with: context: . push: true