diff --git a/.github/workflows/dependabot-version-bump.yml b/.github/workflows/dependabot-version-bump.yml deleted file mode 100644 index cf82b71..0000000 --- a/.github/workflows/dependabot-version-bump.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: Auto bump patch version for dependabot PRs - -# Bumps the "version" field in service.yaml (patch increment) whenever a PR -# with the "dependabot" label is opened or has the label added. -# -# The new version is always computed relative to the PR's target (base) branch, -# so re-labelling never stacks bumps — the result is always base + 1 patch. - -on: - pull_request: - types: [opened, labeled] - -permissions: - contents: write - pull-requests: write - -jobs: - bump-version: - if: contains(github.event.pull_request.labels.*.name, 'dependabot') - runs-on: ubuntu-latest - steps: - - name: Resolve PR branches - id: pr - run: | - echo "head=${{ github.event.pull_request.head.ref }}" >> "$GITHUB_OUTPUT" - echo "base=${{ github.event.pull_request.base.ref }}" >> "$GITHUB_OUTPUT" - - - name: Check out repository - uses: actions/checkout@v4 - - - name: Bump patch version - uses: ./.github/actions/bump-version - with: - bump: patch - base: ${{ steps.pr.outputs.base }} - head: ${{ steps.pr.outputs.head }} - pr: ${{ github.event.pull_request.number }} - github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/Dockerfile b/Dockerfile index 036ab98..1bb8876 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,3 @@ -# CI relies on this ARG. Don't remove or rename it -ARG DOCKER_VERSION=29.6.1 - # DHI source: https://hub.docker.com/repository/docker/octopusdeploy/dhi-golang FROM octopusdeploy/dhi-golang:1.26-alpine3.24-dev@sha256:29fe0a7d2a5ab0c236fbde3a7f63801755585ed260b6f2f564e831c92bfa9f34 AS cleaner COPY cleaner/dind-cleaner/* /go/src/github.com/codefresh-io/dind-cleaner/ @@ -21,7 +18,7 @@ RUN go install go.etcd.io/bbolt/cmd/bbolt@latest FROM octopusdeploy/dhi-node-exporter:1.12.1-alpine3.24@sha256:e77ce1d3ff7a7dfb56dfda8f6485a14f8ab6aecb2d85fa37c6a2fdf41f71ed83 AS node-exporter -FROM docker:${DOCKER_VERSION}-dind AS prod +FROM docker:29.6.1-dind@sha256:66d292e5c26bd33a6f6f61cacb880de2186339a524ecba1ce098dbbaceed6515 AS prod RUN echo 'http://dl-cdn.alpinelinux.org/alpine/v3.24/main' >> /etc/apk/repositories \ && apk upgrade && apk add --no-cache \ bash \ diff --git a/service.yaml b/service.yaml index 105eb87..0d2a937 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -version: 3.0.21 +version: 3.0.22