From dd546748435d893ddb2f9e372f75cdfbd8ba38dd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 06:33:04 +0000 Subject: [PATCH 001/157] Add renovate.json --- renovate.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000..5db72dd --- /dev/null +++ b/renovate.json @@ -0,0 +1,6 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "config:recommended" + ] +} From f4763aa27970a692af46207bba835071932ac26d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 06:34:09 +0000 Subject: [PATCH 002/157] chore(deps): update goreleaser/goreleaser-action digest to b508e2e --- .github/workflows/pull-request.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index f6866af..f1540c3 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -64,7 +64,7 @@ jobs: with: go-version: 1.20.x - name: Build - uses: goreleaser/goreleaser-action@7ec5c2b0c6cdda6e8bbb49444bc797dd33d74dd8 #v3 + uses: goreleaser/goreleaser-action@b508e2e3ef3b19d4e4146d4f8fb3ba9db644a757 # v3 with: version: v0.155.0 args: --snapshot --skip-publish --debug diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 370d395..a15064c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -79,7 +79,7 @@ jobs: password: ${{ secrets.BOT_GHCR_PAT }} registry: ghcr.io - name: Build - uses: goreleaser/goreleaser-action@7ec5c2b0c6cdda6e8bbb49444bc797dd33d74dd8 #v3 + uses: goreleaser/goreleaser-action@b508e2e3ef3b19d4e4146d4f8fb3ba9db644a757 # v3 with: version: v0.155.0 args: --debug From 9bdc5faa656460076a2a5900f25d48ed5a870eb5 Mon Sep 17 00:00:00 2001 From: "Jan O. Rundshagen" Date: Mon, 8 Jul 2024 08:38:05 +0200 Subject: [PATCH 003/157] Update CODEOWNERS --- .github/CODEOWNERS | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 42fd645..7ff8c10 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,8 +1 @@ -pkg/notifications/smtp.go @piksel -pkg/notifications/email.go @piksel -pkg/notifications/shoutrrr.go @piksel @simskij @arnested -pkg/container/* @simskij -pkg/api/* @victorcmoura -.devbots/* @simskij -.github/* @simskij -docs/* @containrrr/watchtower-contributors +* @beatkind From f337309440c9a6da6835001d0134c8d56fef1e8b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 06:36:00 +0000 Subject: [PATCH 004/157] chore(deps): update nginx docker tag to v1.27.0 --- dockerfiles/container-networking/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/container-networking/docker-compose.yml b/dockerfiles/container-networking/docker-compose.yml index 24cd00d..e8af28b 100644 --- a/dockerfiles/container-networking/docker-compose.yml +++ b/dockerfiles/container-networking/docker-compose.yml @@ -11,7 +11,7 @@ services: consumer: depends_on: - producer - image: nginx:1.25.1 + image: nginx:1.27.0 network_mode: "service:producer" labels: - "com.centurylinklabs.watchtower.depends-on=/wt-contnet-producer-1" From b6ecfb8a503a97a2f76d918914bac30cbf893a22 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 06:35:56 +0000 Subject: [PATCH 005/157] chore(deps): update alpine docker tag to v3.20.1 --- dockerfiles/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index 2fc571d..4df693c 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM alpine:3.19.0 as alpine +FROM --platform=$BUILDPLATFORM alpine:3.20.1 as alpine RUN apk add --no-cache \ ca-certificates \ From b44f8ef783da228091b12f8ac09b29fddbfb75b2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 06:34:05 +0000 Subject: [PATCH 006/157] chore(deps): update andrewslotin/go-proxy-pull-action digest to 89382de --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a15064c..3753b5f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -189,7 +189,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Pull new module version - uses: andrewslotin/go-proxy-pull-action@50fea06a976087614babb9508e5c528b464f4645 #master@2022-10-14 + uses: andrewslotin/go-proxy-pull-action@89382de145eeb7a85de72f8a27f686a50727bc7a #master@2022-10-14 From c64d1863b283fabf2247ed8a75a5f0862419b36a Mon Sep 17 00:00:00 2001 From: "Jan O. Rundshagen" Date: Mon, 8 Jul 2024 08:41:17 +0200 Subject: [PATCH 007/157] chore(ci): Delete dependabot in favor of renovate --- .github/dependabot.yml | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index fe53bc9..0000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,21 +0,0 @@ -# To get started with Dependabot version updates, you'll need to specify which -# package ecosystems to update and where the package manifests are located. -# Please see the documentation for all configuration options: -# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates - -version: 2 -updates: - - package-ecosystem: "github-actions" # See documentation for possible values - directory: "/" # Location of package manifests - schedule: - interval: "weekly" - - - package-ecosystem: "gomod" # See documentation for possible values - directory: "/" # Location of package manifests - schedule: - interval: "weekly" - - - package-ecosystem: "docker" # See documentation for possible values - directory: "/dockerfiles" # Location of package manifests - schedule: - interval: "weekly" From fa54cc1e66629ccaba159d0480d032ed386c6404 Mon Sep 17 00:00:00 2001 From: "Jan O. Rundshagen" Date: Mon, 8 Jul 2024 08:44:58 +0200 Subject: [PATCH 008/157] chore(ci): Change docker repo --- .github/workflows/release.yml | 72 +++++++++++++++++------------------ 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3753b5f..08da08d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -93,36 +93,36 @@ jobs: run: | export DH_TAG=$(git tag --points-at HEAD | sed 's/^v*//') docker manifest create \ - containrrr/watchtower:$DH_TAG \ - containrrr/watchtower:amd64-$DH_TAG \ - containrrr/watchtower:i386-$DH_TAG \ - containrrr/watchtower:armhf-$DH_TAG \ - containrrr/watchtower:arm64v8-$DH_TAG + beatkind/watchtower:$DH_TAG \ + beatkind/watchtower:amd64-$DH_TAG \ + beatkind/watchtower:i386-$DH_TAG \ + beatkind/watchtower:armhf-$DH_TAG \ + beatkind/watchtower:arm64v8-$DH_TAG docker manifest create \ - ghcr.io/containrrr/watchtower:$DH_TAG \ - ghcr.io/containrrr/watchtower:amd64-$DH_TAG \ - ghcr.io/containrrr/watchtower:i386-$DH_TAG \ - ghcr.io/containrrr/watchtower:armhf-$DH_TAG \ - ghcr.io/containrrr/watchtower:arm64v8-$DH_TAG + ghcr.io/beatkind/watchtower:$DH_TAG \ + ghcr.io/beatkind/watchtower:amd64-$DH_TAG \ + ghcr.io/beatkind/watchtower:i386-$DH_TAG \ + ghcr.io/beatkind/watchtower:armhf-$DH_TAG \ + ghcr.io/beatkind/watchtower:arm64v8-$DH_TAG - name: Annotate manifest for version run: | for REPO in '' ghcr.io/ ; do docker manifest annotate \ - ${REPO}containrrr/watchtower:$(echo $TAG | sed 's/^v*//') \ - ${REPO}containrrr/watchtower:i386-$(echo $TAG | sed 's/^v*//') \ + ${REPO}beatkind/watchtower:$(echo $TAG | sed 's/^v*//') \ + ${REPO}beatkind/watchtower:i386-$(echo $TAG | sed 's/^v*//') \ --os linux \ --arch 386 docker manifest annotate \ - ${REPO}containrrr/watchtower:$(echo $TAG | sed 's/^v*//') \ - ${REPO}containrrr/watchtower:armhf-$(echo $TAG | sed 's/^v*//') \ + ${REPO}beatkind/watchtower:$(echo $TAG | sed 's/^v*//') \ + ${REPO}beatkind/watchtower:armhf-$(echo $TAG | sed 's/^v*//') \ --os linux \ --arch arm docker manifest annotate \ - ${REPO}containrrr/watchtower:$(echo $TAG | sed 's/^v*//') \ - ${REPO}containrrr/watchtower:arm64v8-$(echo $TAG | sed 's/^v*//') \ + ${REPO}beatkind/watchtower:$(echo $TAG | sed 's/^v*//') \ + ${REPO}beatkind/watchtower:arm64v8-$(echo $TAG | sed 's/^v*//') \ --os linux \ --arch arm64 \ --variant v8 @@ -131,36 +131,36 @@ jobs: - name: Create manifest for latest run: | docker manifest create \ - containrrr/watchtower:latest \ - containrrr/watchtower:amd64-latest \ - containrrr/watchtower:i386-latest \ - containrrr/watchtower:armhf-latest \ - containrrr/watchtower:arm64v8-latest + beatkind/watchtower:latest \ + beatkind/watchtower:amd64-latest \ + beatkind/watchtower:i386-latest \ + beatkind/watchtower:armhf-latest \ + beatkind/watchtower:arm64v8-latest docker manifest create \ - ghcr.io/containrrr/watchtower:latest \ - ghcr.io/containrrr/watchtower:amd64-latest \ - ghcr.io/containrrr/watchtower:i386-latest \ - ghcr.io/containrrr/watchtower:armhf-latest \ - ghcr.io/containrrr/watchtower:arm64v8-latest + ghcr.io/beatkind/watchtower:latest \ + ghcr.io/beatkind/watchtower:amd64-latest \ + ghcr.io/beatkind/watchtower:i386-latest \ + ghcr.io/beatkind/watchtower:armhf-latest \ + ghcr.io/beatkind/watchtower:arm64v8-latest - name: Annotate manifest for latest run: | for REPO in '' ghcr.io/ ; do docker manifest annotate \ - ${REPO}containrrr/watchtower:latest \ - ${REPO}containrrr/watchtower:i386-latest \ + ${REPO}beatkind/watchtower:latest \ + ${REPO}beatkind/watchtower:i386-latest \ --os linux \ --arch 386 docker manifest annotate \ - ${REPO}containrrr/watchtower:latest \ - ${REPO}containrrr/watchtower:armhf-latest \ + ${REPO}beatkind/watchtower:latest \ + ${REPO}beatkind/watchtower:armhf-latest \ --os linux \ --arch arm docker manifest annotate \ - ${REPO}containrrr/watchtower:latest \ - ${REPO}containrrr/watchtower:arm64v8-latest \ + ${REPO}beatkind/watchtower:latest \ + ${REPO}beatkind/watchtower:arm64v8-latest \ --os linux \ --arch arm64 \ --variant v8 @@ -172,16 +172,16 @@ jobs: DOCKER_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} run: | docker login -u $DOCKER_USER -p $DOCKER_TOKEN && \ - docker manifest push containrrr/watchtower:$(echo $TAG | sed 's/^v*//') && \ - docker manifest push containrrr/watchtower:latest + docker manifest push beatkind/watchtower:$(echo $TAG | sed 's/^v*//') && \ + docker manifest push beatkind/watchtower:latest - name: Push manifests to GitHub Container Registry env: DOCKER_USER: ${{ secrets.BOT_USERNAME }} DOCKER_TOKEN: ${{ secrets.BOT_GHCR_PAT }} run: | docker login -u $DOCKER_USER -p $DOCKER_TOKEN ghcr.io && \ - docker manifest push ghcr.io/containrrr/watchtower:$(echo $TAG | sed 's/^v*//') && \ - docker manifest push ghcr.io/containrrr/watchtower:latest + docker manifest push ghcr.io/beatkind/watchtower:$(echo $TAG | sed 's/^v*//') && \ + docker manifest push ghcr.io/beatkind/watchtower:latest renew-docs: name: Refresh pkg.go.dev From 6ee8d569c43341f0594474c100f18d85899072dc Mon Sep 17 00:00:00 2001 From: "Jan O. Rundshagen" Date: Mon, 8 Jul 2024 09:01:31 +0200 Subject: [PATCH 009/157] chore(ci): Update release dev --- .github/workflows/release-dev.yaml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml index 95ee68d..042ca13 100644 --- a/.github/workflows/release-dev.yaml +++ b/.github/workflows/release-dev.yaml @@ -44,16 +44,7 @@ jobs: uses: jerray/publish-docker-action@87d84711629b0dc9f6bb127b568413cc92a2088e #master@2022-10-14 with: username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_PASSWORD }} + password: ${{ secrets.DOCKERHUB_TOKEN }} file: dockerfiles/Dockerfile.self-contained - repository: containrrr/watchtower - tags: latest-dev - - name: Publish to GHCR - uses: jerray/publish-docker-action@87d84711629b0dc9f6bb127b568413cc92a2088e #master@2022-10-14 - with: - username: ${{ secrets.BOT_USERNAME }} - password: ${{ secrets.BOT_GHCR_PAT }} - file: dockerfiles/Dockerfile.self-contained - registry: ghcr.io - repository: containrrr/watchtower + repository: beatkind/watchtower tags: latest-dev From f9f982c144b5de5ff181d7783b31a6d9e2d7840c Mon Sep 17 00:00:00 2001 From: "Jan O. Rundshagen" Date: Mon, 8 Jul 2024 09:03:31 +0200 Subject: [PATCH 010/157] chore(ci): update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 78b1bfc..25201d6 100755 --- a/build.sh +++ b/build.sh @@ -6,4 +6,4 @@ if [ -n "$MSYSTEM" ]; then fi VERSION=$(git describe --tags) echo "Building $VERSION..." -go build -o $BINFILE -ldflags "-X github.com/containrrr/watchtower/internal/meta.Version=$VERSION" +go build -o $BINFILE -ldflags "-X github.com/beatkind/watchtower/internal/meta.Version=$VERSION" From 8d5eb97b1a534df7ed3389cd841c62c16df60387 Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Mon, 8 Jul 2024 10:04:50 +0200 Subject: [PATCH 011/157] chore(ci): update workflows --- ...deql-analysis.yml => codeql-analysis.yaml} | 0 ...ot-approve.yml => dependabot-approve.yaml} | 0 .../{greetings.yml => greetings.yaml} | 0 .../{publish-docs.yml => publish-docs.yaml} | 0 .../{pull-request.yml => pull-request.yaml} | 0 .../workflows/{release.yml => release.yaml} | 31 ------------------- .gitignore | 3 +- 7 files changed, 2 insertions(+), 32 deletions(-) rename .github/workflows/{codeql-analysis.yml => codeql-analysis.yaml} (100%) rename .github/workflows/{dependabot-approve.yml => dependabot-approve.yaml} (100%) rename .github/workflows/{greetings.yml => greetings.yaml} (100%) rename .github/workflows/{publish-docs.yml => publish-docs.yaml} (100%) rename .github/workflows/{pull-request.yml => pull-request.yaml} (100%) rename .github/workflows/{release.yml => release.yaml} (79%) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yaml similarity index 100% rename from .github/workflows/codeql-analysis.yml rename to .github/workflows/codeql-analysis.yaml diff --git a/.github/workflows/dependabot-approve.yml b/.github/workflows/dependabot-approve.yaml similarity index 100% rename from .github/workflows/dependabot-approve.yml rename to .github/workflows/dependabot-approve.yaml diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yaml similarity index 100% rename from .github/workflows/greetings.yml rename to .github/workflows/greetings.yaml diff --git a/.github/workflows/publish-docs.yml b/.github/workflows/publish-docs.yaml similarity index 100% rename from .github/workflows/publish-docs.yml rename to .github/workflows/publish-docs.yaml diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yaml similarity index 100% rename from .github/workflows/pull-request.yml rename to .github/workflows/pull-request.yaml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yaml similarity index 79% rename from .github/workflows/release.yml rename to .github/workflows/release.yaml index 08da08d..2b6b59d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yaml @@ -72,12 +72,6 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Login to GHCR - uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc #v2 - with: - username: ${{ secrets.BOT_USERNAME }} - password: ${{ secrets.BOT_GHCR_PAT }} - registry: ghcr.io - name: Build uses: goreleaser/goreleaser-action@b508e2e3ef3b19d4e4146d4f8fb3ba9db644a757 # v3 with: @@ -98,12 +92,6 @@ jobs: beatkind/watchtower:i386-$DH_TAG \ beatkind/watchtower:armhf-$DH_TAG \ beatkind/watchtower:arm64v8-$DH_TAG - docker manifest create \ - ghcr.io/beatkind/watchtower:$DH_TAG \ - ghcr.io/beatkind/watchtower:amd64-$DH_TAG \ - ghcr.io/beatkind/watchtower:i386-$DH_TAG \ - ghcr.io/beatkind/watchtower:armhf-$DH_TAG \ - ghcr.io/beatkind/watchtower:arm64v8-$DH_TAG - name: Annotate manifest for version run: | for REPO in '' ghcr.io/ ; do @@ -136,12 +124,6 @@ jobs: beatkind/watchtower:i386-latest \ beatkind/watchtower:armhf-latest \ beatkind/watchtower:arm64v8-latest - docker manifest create \ - ghcr.io/beatkind/watchtower:latest \ - ghcr.io/beatkind/watchtower:amd64-latest \ - ghcr.io/beatkind/watchtower:i386-latest \ - ghcr.io/beatkind/watchtower:armhf-latest \ - ghcr.io/beatkind/watchtower:arm64v8-latest - name: Annotate manifest for latest run: | for REPO in '' ghcr.io/ ; do @@ -174,14 +156,6 @@ jobs: docker login -u $DOCKER_USER -p $DOCKER_TOKEN && \ docker manifest push beatkind/watchtower:$(echo $TAG | sed 's/^v*//') && \ docker manifest push beatkind/watchtower:latest - - name: Push manifests to GitHub Container Registry - env: - DOCKER_USER: ${{ secrets.BOT_USERNAME }} - DOCKER_TOKEN: ${{ secrets.BOT_GHCR_PAT }} - run: | - docker login -u $DOCKER_USER -p $DOCKER_TOKEN ghcr.io && \ - docker manifest push ghcr.io/beatkind/watchtower:$(echo $TAG | sed 's/^v*//') && \ - docker manifest push ghcr.io/beatkind/watchtower:latest renew-docs: name: Refresh pkg.go.dev @@ -190,8 +164,3 @@ jobs: steps: - name: Pull new module version uses: andrewslotin/go-proxy-pull-action@89382de145eeb7a85de72f8a27f686a50727bc7a #master@2022-10-14 - - - - - diff --git a/.gitignore b/.gitignore index 9519257..aa4f339 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,5 @@ coverage.out *.coverprofile docs/assets/wasm_exec.js -docs/assets/*.wasm \ No newline at end of file +docs/assets/*.wasm +.vscode/settings.json From 55f2b3b84b059f8178b083d295f542f510a62c3a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 08:05:49 +0000 Subject: [PATCH 012/157] chore(deps): update dominikh/staticcheck-action action to v1.3.1 --- .github/workflows/pull-request.yaml | 2 +- .github/workflows/release.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index f1540c3..6c022c4 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -19,7 +19,7 @@ jobs: uses: actions/setup-go@v4 with: go-version: 1.20.x - - uses: dominikh/staticcheck-action@ba605356b4b29a60e87ab9404b712f3461e566dc #v1.3.0 + - uses: dominikh/staticcheck-action@fe1dd0c3658873b46f8c9bb3291096a617310ca6 # v1.3.1 with: version: "2023.1.6" install-go: "false" # StaticCheck uses go v1.17 which does not support `any` diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 2b6b59d..ea938b2 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -20,7 +20,7 @@ jobs: uses: actions/setup-go@v4 with: go-version: 1.20.x - - uses: dominikh/staticcheck-action@ba605356b4b29a60e87ab9404b712f3461e566dc #v1.3.0 + - uses: dominikh/staticcheck-action@fe1dd0c3658873b46f8c9bb3291096a617310ca6 # v1.3.1 with: version: "2022.1.1" install-go: "false" # StaticCheck uses go v1.17 which does not support `any` From 2d85c81249dbb3dc54dea7a75eebf1789e72e9a5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 07:02:23 +0000 Subject: [PATCH 013/157] fix(deps): update module github.com/docker/cli to v24.0.9+incompatible --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 6c20d11..e385304 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/containrrr/shoutrrr v0.8.0 github.com/distribution/reference v0.5.0 - github.com/docker/cli v24.0.7+incompatible + github.com/docker/cli v24.0.9+incompatible github.com/docker/docker v24.0.7+incompatible github.com/docker/go-connections v0.4.0 github.com/onsi/ginkgo v1.16.5 diff --git a/go.sum b/go.sum index cab338f..bcd5c16 100644 --- a/go.sum +++ b/go.sum @@ -19,6 +19,8 @@ github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v24.0.7+incompatible h1:wa/nIwYFW7BVTGa7SWPVyyXU9lgORqUb1xfI36MSkFg= github.com/docker/cli v24.0.7+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v24.0.9+incompatible h1:OxbimnP/z+qVjDLpq9wbeFU3Nc30XhSe+LkwYQisD50= +github.com/docker/cli v24.0.9+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM= From 978231172d1ff8045e7950704b12e6c38ed4bfcb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 08:06:18 +0000 Subject: [PATCH 014/157] fix(deps): update module github.com/spf13/cobra to v1.8.1 --- go.mod | 2 +- go.sum | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index e385304..f040865 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/prometheus/client_golang v1.18.0 github.com/robfig/cron v1.2.0 github.com/sirupsen/logrus v1.9.3 - github.com/spf13/cobra v1.8.0 + github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.18.2 github.com/stretchr/testify v1.8.4 diff --git a/go.sum b/go.sum index bcd5c16..c9da933 100644 --- a/go.sum +++ b/go.sum @@ -9,6 +9,7 @@ github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/containrrr/shoutrrr v0.8.0 h1:mfG2ATzIS7NR2Ec6XL+xyoHzN97H8WPjir8aYzJUSec= github.com/containrrr/shoutrrr v0.8.0/go.mod h1:ioyQAyu1LJY6sILuNyKaQaw+9Ttik5QePU8atnAdO2o= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -136,6 +137,8 @@ github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= +github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= From 9c249fbddbed2a564d0d0bc9f2faa458f9379901 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 08:09:47 +0000 Subject: [PATCH 015/157] fix(deps): update module github.com/docker/docker to v24.0.9+incompatible --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index f040865..99638fe 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/containrrr/shoutrrr v0.8.0 github.com/distribution/reference v0.5.0 github.com/docker/cli v24.0.9+incompatible - github.com/docker/docker v24.0.7+incompatible + github.com/docker/docker v24.0.9+incompatible github.com/docker/go-connections v0.4.0 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.30.0 diff --git a/go.sum b/go.sum index c9da933..5bcdf6f 100644 --- a/go.sum +++ b/go.sum @@ -26,6 +26,8 @@ github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBi github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM= github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v24.0.9+incompatible h1:HPGzNmwfLZWdxHqK9/II92pyi1EpYKsAqcl4G0Of9v0= +github.com/docker/docker v24.0.9+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.1 h1:Dq4iIfcM7cNtddhLVWe9h4QDjsi4OER3Z8voPu/I52g= github.com/docker/docker-credential-helpers v0.6.1/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= From 22d54354d0b5d1861812a1f6e591d16d7b2b3565 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 08:11:21 +0000 Subject: [PATCH 016/157] chore(deps): update actions/setup-go action to v5 --- .github/workflows/publish-docs.yaml | 2 +- .github/workflows/pull-request.yaml | 6 +++--- .github/workflows/release-dev.yaml | 4 ++-- .github/workflows/release.yaml | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/publish-docs.yaml b/.github/workflows/publish-docs.yaml index 4818e54..b05ff86 100644 --- a/.github/workflows/publish-docs.yaml +++ b/.github/workflows/publish-docs.yaml @@ -18,7 +18,7 @@ jobs: with: fetch-depth: 0 - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: 1.20.x - name: Build tplprev diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index 6c022c4..9f8d698 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -16,7 +16,7 @@ jobs: with: fetch-depth: 0 - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: 1.20.x - uses: dominikh/staticcheck-action@fe1dd0c3658873b46f8c9bb3291096a617310ca6 # v1.3.1 @@ -41,7 +41,7 @@ jobs: with: fetch-depth: 0 - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: 1.20.x - name: Run tests @@ -60,7 +60,7 @@ jobs: with: fetch-depth: 0 - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: 1.20.x - name: Build diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml index 042ca13..ec2b250 100644 --- a/.github/workflows/release-dev.yaml +++ b/.github/workflows/release-dev.yaml @@ -14,7 +14,7 @@ jobs: with: fetch-depth: 0 - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: 1.20.x - name: Build @@ -24,7 +24,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: 1.20.x - name: Test diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ea938b2..30081d7 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -17,7 +17,7 @@ jobs: with: fetch-depth: 0 - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: 1.20.x - uses: dominikh/staticcheck-action@fe1dd0c3658873b46f8c9bb3291096a617310ca6 # v1.3.1 @@ -42,7 +42,7 @@ jobs: with: fetch-depth: 0 - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: 1.20.x - name: Run tests @@ -64,7 +64,7 @@ jobs: with: fetch-depth: 0 - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: 1.20.x - name: Login to Docker Hub From 2c0dbd99c1dda9567fa1c8f696031d475aaf0a0d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 08:11:26 +0000 Subject: [PATCH 017/157] chore(deps): update codecov/codecov-action action to v4 --- .github/workflows/pull-request.yaml | 2 +- .github/workflows/release-dev.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index 9f8d698..619b85c 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -48,7 +48,7 @@ jobs: run: | go test -v -coverprofile coverage.out -covermode atomic ./... - name: Publish coverage - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} build: diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml index ec2b250..4a29d70 100644 --- a/.github/workflows/release-dev.yaml +++ b/.github/workflows/release-dev.yaml @@ -30,7 +30,7 @@ jobs: - name: Test run: go test -v -coverprofile coverage.out -covermode atomic ./... - name: Publish coverage - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} publish: From 953e7974d5c03a68e76b00d560d5e5d0632b6cce Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 08:11:29 +0000 Subject: [PATCH 018/157] chore(deps): update docker/login-action action to v3 --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 30081d7..407dca3 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -68,7 +68,7 @@ jobs: with: go-version: 1.20.x - name: Login to Docker Hub - uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc #v2 + uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} From 59154da34cefeb30c161a0fd673bc340c8d32d97 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 08:11:33 +0000 Subject: [PATCH 019/157] chore(deps): update goreleaser/goreleaser-action action to v6 --- .github/workflows/pull-request.yaml | 2 +- .github/workflows/release.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index 619b85c..67c3166 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -64,7 +64,7 @@ jobs: with: go-version: 1.20.x - name: Build - uses: goreleaser/goreleaser-action@b508e2e3ef3b19d4e4146d4f8fb3ba9db644a757 # v3 + uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6 with: version: v0.155.0 args: --snapshot --skip-publish --debug diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 407dca3..13c5b03 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -73,7 +73,7 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build - uses: goreleaser/goreleaser-action@b508e2e3ef3b19d4e4146d4f8fb3ba9db644a757 # v3 + uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6 with: version: v0.155.0 args: --debug From 7006091278f77b8902b6e6ff9224f1a7a8899155 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 09:57:20 +0000 Subject: [PATCH 020/157] fix(deps): update module github.com/docker/go-connections to v0.5.0 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 99638fe..64ac3a0 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/distribution/reference v0.5.0 github.com/docker/cli v24.0.9+incompatible github.com/docker/docker v24.0.9+incompatible - github.com/docker/go-connections v0.4.0 + github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.30.0 github.com/prometheus/client_golang v1.18.0 diff --git a/go.sum b/go.sum index 5bcdf6f..85a3ae3 100644 --- a/go.sum +++ b/go.sum @@ -32,6 +32,8 @@ github.com/docker/docker-credential-helpers v0.6.1 h1:Dq4iIfcM7cNtddhLVWe9h4QDjs github.com/docker/docker-credential-helpers v0.6.1/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= +github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= +github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= From 3c3749d9a799a6fee10dc4f558f56b50658a9421 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 08:16:30 +0000 Subject: [PATCH 021/157] chore(deps): update qmcgaw/gluetun docker tag to v3.38.0 --- dockerfiles/container-networking/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/container-networking/docker-compose.yml b/dockerfiles/container-networking/docker-compose.yml index e8af28b..7cd63ae 100644 --- a/dockerfiles/container-networking/docker-compose.yml +++ b/dockerfiles/container-networking/docker-compose.yml @@ -1,6 +1,6 @@ services: producer: - image: qmcgaw/gluetun:v3.35.0 + image: qmcgaw/gluetun:v3.38.0 cap_add: - NET_ADMIN environment: From 95cbb7ff4b1a84191c67c66f53e5d39871e86229 Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Mon, 8 Jul 2024 15:15:43 +0200 Subject: [PATCH 022/157] chore(go): bump go to 1.22 --- .github/workflows/greetings.yaml | 42 ++++---- .github/workflows/publish-docs.yaml | 2 +- .github/workflows/pull-request.yaml | 8 +- .github/workflows/release-dev.yaml | 4 +- .github/workflows/release.yaml | 10 +- README.md | 162 ++-------------------------- go.mod | 4 +- goreleaser.yml | 26 ++--- 8 files changed, 53 insertions(+), 205 deletions(-) diff --git a/.github/workflows/greetings.yaml b/.github/workflows/greetings.yaml index 83ff8a0..acb985f 100644 --- a/.github/workflows/greetings.yaml +++ b/.github/workflows/greetings.yaml @@ -1,23 +1,23 @@ -name: Greetings +# name: Greetings -on: - # Runs in the context of the target (containrrr/watchtower) repository, and as such has access to GITHUB_TOKEN - pull_request_target: - types: [opened] - issues: - types: [opened] +# on: +# # Runs in the context of the target (beatkind/watchtower) repository, and as such has access to GITHUB_TOKEN +# pull_request_target: +# types: [opened] +# issues: +# types: [opened] -jobs: - greeting: - runs-on: ubuntu-latest - steps: - - uses: actions/first-interaction@v1 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - issue-message: > - Hi there! πŸ‘‹πŸΌ - As you're new to this repo, we'd like to suggest that you read our [code of conduct](https://github.com/containrrr/.github/blob/master/CODE_OF_CONDUCT.md) - as well as our [contribution guidelines](https://github.com/containrrr/watchtower/blob/master/CONTRIBUTING.md). - Thanks a bunch for opening your first issue! πŸ™ - pr-message: > - Congratulations on opening your first pull request! We'll get back to you as soon as possible. In the meantime, please make sure you've updated the documentation to reflect your changes and have added test automation as needed. Thanks! πŸ™πŸΌ +# jobs: +# greeting: +# runs-on: ubuntu-latest +# steps: +# - uses: actions/first-interaction@v1 +# with: +# repo-token: ${{ secrets.GITHUB_TOKEN }} +# issue-message: > +# Hi there! πŸ‘‹πŸΌ +# As you're new to this repo, we'd like to suggest that you read our [code of conduct](https://github.com/beatkind/.github/blob/master/CODE_OF_CONDUCT.md) +# as well as our [contribution guidelines](https://github.com/beatkind/watchtower/blob/master/CONTRIBUTING.md). +# Thanks a bunch for opening your first issue! πŸ™ +# pr-message: > +# Congratulations on opening your first pull request! We'll get back to you as soon as possible. In the meantime, please make sure you've updated the documentation to reflect your changes and have added test automation as needed. Thanks! πŸ™πŸΌ diff --git a/.github/workflows/publish-docs.yaml b/.github/workflows/publish-docs.yaml index b05ff86..2d30837 100644 --- a/.github/workflows/publish-docs.yaml +++ b/.github/workflows/publish-docs.yaml @@ -20,7 +20,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.20.x + go-version: 1.22.x - name: Build tplprev run: scripts/build-tplprev.sh - name: Setup python diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index 67c3166..48fd41c 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -18,7 +18,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.20.x + go-version: 1.22.x - uses: dominikh/staticcheck-action@fe1dd0c3658873b46f8c9bb3291096a617310ca6 # v1.3.1 with: version: "2023.1.6" @@ -29,7 +29,7 @@ jobs: fail-fast: false matrix: go-version: - - 1.20.x + - 1.22.x platform: - macos-latest - windows-latest @@ -43,7 +43,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.20.x + go-version: 1.22.x - name: Run tests run: | go test -v -coverprofile coverage.out -covermode atomic ./... @@ -62,7 +62,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.20.x + go-version: 1.22.x - name: Build uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6 with: diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml index 4a29d70..046429a 100644 --- a/.github/workflows/release-dev.yaml +++ b/.github/workflows/release-dev.yaml @@ -16,7 +16,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.20.x + go-version: 1.22.x - name: Build run: ./build.sh test: @@ -26,7 +26,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.20.x + go-version: 1.22.x - name: Test run: go test -v -coverprofile coverage.out -covermode atomic ./... - name: Publish coverage diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 13c5b03..6c7ed9a 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -19,10 +19,10 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.20.x + go-version: 1.22.x - uses: dominikh/staticcheck-action@fe1dd0c3658873b46f8c9bb3291096a617310ca6 # v1.3.1 with: - version: "2022.1.1" + version: "latest" install-go: "false" # StaticCheck uses go v1.17 which does not support `any` test: @@ -30,7 +30,7 @@ jobs: strategy: matrix: go-version: - - 1.20.x + - 1.22.x platform: - ubuntu-latest - macos-latest @@ -44,7 +44,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.20.x + go-version: 1.22.x - name: Run tests run: | go test ./... -coverprofile coverage.out @@ -66,7 +66,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.20.x + go-version: 1.22.x - name: Login to Docker Hub uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3 with: diff --git a/README.md b/README.md index f550302..518ac8f 100644 --- a/README.md +++ b/README.md @@ -6,15 +6,12 @@ A process for automating Docker container base image updates.

- [![Circle CI](https://circleci.com/gh/containrrr/watchtower.svg?style=shield)](https://circleci.com/gh/containrrr/watchtower) - [![codecov](https://codecov.io/gh/containrrr/watchtower/branch/main/graph/badge.svg)](https://codecov.io/gh/containrrr/watchtower) - [![GoDoc](https://godoc.org/github.com/containrrr/watchtower?status.svg)](https://godoc.org/github.com/containrrr/watchtower) - [![Go Report Card](https://goreportcard.com/badge/github.com/containrrr/watchtower)](https://goreportcard.com/report/github.com/containrrr/watchtower) - [![latest version](https://img.shields.io/github/tag/containrrr/watchtower.svg)](https://github.com/containrrr/watchtower/releases) - [![Apache-2.0 License](https://img.shields.io/github/license/containrrr/watchtower.svg)](https://www.apache.org/licenses/LICENSE-2.0) - [![Codacy Badge](https://app.codacy.com/project/badge/Grade/1c48cfb7646d4009aa8c6f71287670b8)](https://www.codacy.com/gh/containrrr/watchtower/dashboard?utm_source=github.com&utm_medium=referral&utm_content=containrrr/watchtower&utm_campaign=Badge_Grade) - [![All Contributors](https://img.shields.io/github/all-contributors/containrrr/watchtower)](#contributors) - [![Pulls from DockerHub](https://img.shields.io/docker/pulls/containrrr/watchtower.svg)](https://hub.docker.com/r/containrrr/watchtower) + [![codecov](https://codecov.io/gh/beatkind/watchtower/branch/main/graph/badge.svg)](https://codecov.io/gh/beatkind/watchtower) + [![GoDoc](https://godoc.org/github.com/beatkind/watchtower?status.svg)](https://godoc.org/github.com/beatkind/watchtower) + [![Go Report Card](https://goreportcard.com/badge/github.com/beatkind/watchtower)](https://goreportcard.com/report/github.com/beatkind/watchtower) + [![latest version](https://img.shields.io/github/tag/beatkind/watchtower.svg)](https://github.com/beatkind/watchtower/releases) + [![Apache-2.0 License](https://img.shields.io/github/license/beatkind/watchtower.svg)](https://www.apache.org/licenses/LICENSE-2.0) + [![Pulls from DockerHub](https://img.shields.io/docker/pulls/beatkind/watchtower.svg)](https://hub.docker.com/r/beatkind/watchtower) @@ -28,151 +25,10 @@ Watchtower will pull down your new image, gracefully shut down your existing con $ docker run --detach \ --name watchtower \ --volume /var/run/docker.sock:/var/run/docker.sock \ - containrrr/watchtower + beatkind/watchtower ``` -Watchtower is intended to be used in homelabs, media centers, local dev environments, and similar. We do **not** recommend using Watchtower in a commercial or production environment. If that is you, you should be looking into using Kubernetes. If that feels like too big a step for you, please look into solutions like [MicroK8s](https://microk8s.io/) and [k3s](https://k3s.io/) that take away a lot of the toil of running a Kubernetes cluster. +Watchtower is intended to be used in homelabs, media centers, local dev environments, and similar. We do **not** recommend using Watchtower in a commercial or production environment. If that is you, you should be looking into using Kubernetes. If that feels like too big a step for you, please look into solutions like [MicroK8s](https://microk8s.io/) and [k3s](https://k3s.io/) that take away a lot of the toil of running a Kubernetes cluster. ## Documentation -The full documentation is available at https://containrrr.dev/watchtower. - -## Contributors - -Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)): - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
nils mΓ₯sΓ©n
nils mΓ₯sΓ©n
πŸ’» πŸ“– 🚧 πŸ‘€		Simon Aronsson
Simon Aronsson
πŸ’» πŸ“– 🚧 πŸ‘€		James
James
⚠️ πŸ€”		Florian
Florian
πŸ‘€ πŸ“–		Brian DeHamer
Brian DeHamer
πŸ’» 🚧		Ross Cadogan
Ross Cadogan
πŸ’»		stffabi
stffabi
πŸ’» 🚧
Austin
Austin
πŸ“–		David Gardner
David Gardner
πŸ‘€ πŸ“–		Tanguy ⧓ Herrmann
Tanguy ⧓ Herrmann
πŸ’»		Rodrigo Damazio Bovendorp
Rodrigo Damazio Bovendorp
πŸ’» πŸ“–		Ryan Kuba
Ryan Kuba
πŸš‡		cnrmck
cnrmck
πŸ“–		Harry Walter
Harry Walter
πŸ’»
Robotex
Robotex
πŸ“–		Gerald Pape
Gerald Pape
πŸ“–		fomk
fomk
πŸ’»		Sven Gottwald
Sven Gottwald
πŸš‡		techknowlogick
techknowlogick
πŸ’»		waja
waja
πŸ“–		Scott Albertson
Scott Albertson
πŸ“–
Jason Huddleston
Jason Huddleston
πŸ“–		Napster
Napster
πŸ’»		Maxim
Maxim
πŸ’» πŸ“–		Max Schmitt
Max Schmitt
πŸ“–		cron410
cron410
πŸ“–		Paulo Henrique
Paulo Henrique
πŸ“–		Kaleb Elwert
Kaleb Elwert
πŸ“–
Bill Butler
Bill Butler
πŸ“–		Mario Tacke
Mario Tacke
πŸ’»		Mark Woodbridge
Mark Woodbridge
πŸ’»		Ansem93
Ansem93
πŸ“–		Luka Peschke
Luka Peschke
πŸ’» πŸ“–		Zois Pagoulatos
Zois Pagoulatos
πŸ’» πŸ‘€ 🚧		Alexandre Menif
Alexandre Menif
πŸ’»
Andrey
Andrey
πŸ“–		Armando LΓΌscher
Armando LΓΌscher
πŸ“–		Ryan Budke
Ryan Budke
πŸ“–		Kaloyan Raev
Kaloyan Raev
πŸ’» ⚠️		sixth
sixth
πŸ“–		Gina HΓ€ußge
Gina HÀußge
πŸ’»		Max H.
Max H.
πŸ’»
Jungkook Park
Jungkook Park
πŸ“–		Jan Kristof Nidzwetzki
Jan Kristof Nidzwetzki
πŸ“–		lukas
lukas
πŸ’»		Ameya Shenoy
Ameya Shenoy
πŸ’»		Raymon de Looff
Raymon de Looff
πŸ’»		John Clayton
John Clayton
πŸ’»		Germs2004
Germs2004
πŸ“–
Lukas Willburger
Lukas Willburger
πŸ’»		Oliver Cervera
Oliver Cervera
πŸ“–		Victor Moura
Victor Moura
⚠️ πŸ’» πŸ“–		Maximilian Brandau
Maximilian Brandau
πŸ’» ⚠️		Andrew
Andrew
πŸ“–		sixcorners
sixcorners
πŸ“–		Arne JΓΈrgensen
Arne JΓΈrgensen
⚠️ πŸ‘€
PatSki123
PatSki123
πŸ“–		Valentine Zavadsky
Valentine Zavadsky
πŸ’» πŸ“– ⚠️		Alexander Voronin
Alexander Voronin
πŸ’» πŸ›		Oliver Mueller
Oliver Mueller
πŸ“–		Sebastiaan Tammer
Sebastiaan Tammer
πŸ’»		miosame
miosame
πŸ“–		Andrew Metzger
Andrew Metzger
πŸ› πŸ’‘
Pierre Grimaud
Pierre Grimaud
πŸ“–		Matt Doran
Matt Doran
πŸ“–		MihailITPlace
MihailITPlace
πŸ’»		bugficks
bugficks
πŸ’» πŸ“–		Michael
Michael
πŸ’»		D. Domig
D. Domig
πŸ“–		Ben Osheroff
Ben Osheroff
πŸ’»
David H.
David H.
πŸ’»		Chander Ganesan
Chander Ganesan
πŸ“–		yrien30
yrien30
πŸ’»		ksurl
ksurl
πŸ“– πŸ’» πŸš‡		rg9400
rg9400
πŸ’»		Turtle Kalus
Turtle Kalus
πŸ’»		Srihari Thalla
Srihari Thalla
πŸ“–
Thomas Gaudin
Thomas Gaudin
πŸ“–		hydrargyrum
hydrargyrum
πŸ“–		Reinout van Rees
Reinout van Rees
πŸ“–		DasSkelett
DasSkelett
πŸ’»		zenjabba
zenjabba
πŸ“–		Dan Quan
Dan Quan
πŸ“–		modem7
modem7
πŸ“–
Igor Zibarev
Igor Zibarev
πŸ’»		Patrice
Patrice
πŸ’»		James White
James White
πŸ“–		Dirk Kok
Dirk Kok
πŸ’»		EDIflyer
EDIflyer
πŸ“–		Jauder Ho
Jauder Ho
πŸ’»		Tamal Das
Tamal Das
πŸ“–
guangwu
guangwu
πŸ“–		Florian HΓΌbner
Florian HΓΌbner
πŸ“– πŸ’»
Andrii Bratanin
πŸ“–
- - - - - - -This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome! +The full documentation is available at https://beatkind.dev/watchtower. diff --git a/go.mod b/go.mod index 64ac3a0..d9b8767 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ -module github.com/containrrr/watchtower +module github.com/beatkind/watchtower -go 1.20 +go 1.22 require ( github.com/containrrr/shoutrrr v0.8.0 diff --git a/goreleaser.yml b/goreleaser.yml index 1904d5e..a21f94e 100644 --- a/goreleaser.yml +++ b/goreleaser.yml @@ -10,7 +10,7 @@ build: - arm - arm64 ldflags: - - -s -w -X github.com/containrrr/watchtower/internal/meta.Version={{.Version}} + - -s -w -X github.com/beatkind/watchtower/internal/meta.Version={{.Version}} archives: - name_template: "{{.ProjectName}}_{{.Os}}_{{.Arch}}" @@ -36,10 +36,8 @@ dockers: goarm: '' dockerfile: dockerfiles/Dockerfile image_templates: - - containrrr/watchtower:amd64-{{ .Version }} - - containrrr/watchtower:amd64-latest - - ghcr.io/containrrr/watchtower:amd64-{{ .Version }} - - ghcr.io/containrrr/watchtower:amd64-latest + - beatkind/watchtower:amd64-{{ .Version }} + - beatkind/watchtower:amd64-latest binaries: - watchtower - @@ -50,10 +48,8 @@ dockers: goarm: '' dockerfile: dockerfiles/Dockerfile image_templates: - - containrrr/watchtower:i386-{{ .Version }} - - containrrr/watchtower:i386-latest - - ghcr.io/containrrr/watchtower:i386-{{ .Version }} - - ghcr.io/containrrr/watchtower:i386-latest + - beatkind/watchtower:i386-{{ .Version }} + - beatkind/watchtower:i386-latest binaries: - watchtower - @@ -64,10 +60,8 @@ dockers: goarm: 6 dockerfile: dockerfiles/Dockerfile image_templates: - - containrrr/watchtower:armhf-{{ .Version }} - - containrrr/watchtower:armhf-latest - - ghcr.io/containrrr/watchtower:armhf-{{ .Version }} - - ghcr.io/containrrr/watchtower:armhf-latest + - beatkind/watchtower:armhf-{{ .Version }} + - beatkind/watchtower:armhf-latest binaries: - watchtower - @@ -78,9 +72,7 @@ dockers: goarm: '' dockerfile: dockerfiles/Dockerfile image_templates: - - containrrr/watchtower:arm64v8-{{ .Version }} - - containrrr/watchtower:arm64v8-latest - - ghcr.io/containrrr/watchtower:arm64v8-{{ .Version }} - - ghcr.io/containrrr/watchtower:arm64v8-latest + - beatkind/watchtower:arm64v8-{{ .Version }} + - beatkind/watchtower:arm64v8-latest binaries: - watchtower From 89dba8455bcfc983b2194ae707205193e8d1950e Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Mon, 8 Jul 2024 15:18:32 +0200 Subject: [PATCH 023/157] chore(go): rename --- .github/ISSUE_TEMPLATE/config.yml | 2 +- cmd/notify-upgrade.go | 6 +++--- cmd/root.go | 24 +++++++++++------------ code_of_conduct.md | 2 +- dockerfiles/Dockerfile.dev-self-contained | 2 +- dockerfiles/Dockerfile.self-contained | 4 ++-- docs/index.md | 12 ++++++------ internal/actions/actions_suite_test.go | 6 +++--- internal/actions/check.go | 8 ++++---- internal/actions/mocks/client.go | 2 +- internal/actions/mocks/container.go | 4 ++-- internal/actions/mocks/progress.go | 4 ++-- internal/actions/update.go | 12 ++++++------ internal/actions/update_test.go | 6 +++--- main.go | 2 +- mkdocs.yml | 2 +- pkg/api/metrics/metrics.go | 2 +- pkg/api/metrics/metrics_test.go | 6 +++--- pkg/container/cgroup_id.go | 2 +- pkg/container/client.go | 6 +++--- pkg/container/client_test.go | 8 ++++---- pkg/container/container.go | 4 ++-- pkg/container/container_test.go | 2 +- pkg/container/mocks/ApiServer.go | 2 +- pkg/container/mocks/container_ref.go | 2 +- pkg/container/util_test.go | 2 +- pkg/filters/filters.go | 2 +- pkg/filters/filters_test.go | 2 +- pkg/lifecycle/lifecycle.go | 4 ++-- pkg/metrics/metrics.go | 2 +- pkg/notifications/email.go | 2 +- pkg/notifications/gotify.go | 2 +- pkg/notifications/json.go | 2 +- pkg/notifications/json_test.go | 2 +- pkg/notifications/model.go | 2 +- pkg/notifications/msteams.go | 2 +- pkg/notifications/notifier.go | 2 +- pkg/notifications/notifier_test.go | 6 +++--- pkg/notifications/preview/data/data.go | 2 +- pkg/notifications/preview/data/report.go | 2 +- pkg/notifications/preview/data/status.go | 2 +- pkg/notifications/preview/tplprev.go | 4 ++-- pkg/notifications/shoutrrr.go | 4 ++-- pkg/notifications/shoutrrr_test.go | 6 +++--- pkg/notifications/slack.go | 2 +- pkg/registry/auth/auth.go | 4 ++-- pkg/registry/auth/auth_test.go | 6 +++--- pkg/registry/digest/digest.go | 8 ++++---- pkg/registry/digest/digest_test.go | 6 +++--- pkg/registry/helpers/helpers_test.go | 2 +- pkg/registry/manifest/manifest.go | 4 ++-- pkg/registry/manifest/manifest_test.go | 4 ++-- pkg/registry/registry.go | 4 ++-- pkg/registry/registry_test.go | 4 ++-- pkg/registry/trust.go | 4 ++-- pkg/session/container_status.go | 2 +- pkg/session/progress.go | 2 +- pkg/session/report.go | 2 +- pkg/sorter/sort.go | 2 +- tplprev/main.go | 6 +++--- tplprev/main_wasm.go | 6 +++--- 61 files changed, 126 insertions(+), 126 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 01cc777..09b00fa 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,5 +1,5 @@ blank_issues_enabled: false contact_links: - name: Ask a question - url: https://github.com/containrrr/watchtower/discussions + url: https://github.com/beatkind/watchtower/discussions about: Ask questions and discuss with other community members diff --git a/cmd/notify-upgrade.go b/cmd/notify-upgrade.go index 9991ee6..14625a5 100644 --- a/cmd/notify-upgrade.go +++ b/cmd/notify-upgrade.go @@ -9,9 +9,9 @@ import ( "syscall" "time" - "github.com/containrrr/watchtower/internal/flags" - "github.com/containrrr/watchtower/pkg/container" - "github.com/containrrr/watchtower/pkg/notifications" + "github.com/beatkind/watchtower/internal/flags" + "github.com/beatkind/watchtower/pkg/container" + "github.com/beatkind/watchtower/pkg/notifications" "github.com/spf13/cobra" ) diff --git a/cmd/root.go b/cmd/root.go index eef13ce..e0b9ee2 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -11,17 +11,17 @@ import ( "syscall" "time" - "github.com/containrrr/watchtower/internal/actions" - "github.com/containrrr/watchtower/internal/flags" - "github.com/containrrr/watchtower/internal/meta" - "github.com/containrrr/watchtower/pkg/api" - apiMetrics "github.com/containrrr/watchtower/pkg/api/metrics" - "github.com/containrrr/watchtower/pkg/api/update" - "github.com/containrrr/watchtower/pkg/container" - "github.com/containrrr/watchtower/pkg/filters" - "github.com/containrrr/watchtower/pkg/metrics" - "github.com/containrrr/watchtower/pkg/notifications" - t "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/internal/actions" + "github.com/beatkind/watchtower/internal/flags" + "github.com/beatkind/watchtower/internal/meta" + "github.com/beatkind/watchtower/pkg/api" + apiMetrics "github.com/beatkind/watchtower/pkg/api/metrics" + "github.com/beatkind/watchtower/pkg/api/update" + "github.com/beatkind/watchtower/pkg/container" + "github.com/beatkind/watchtower/pkg/filters" + "github.com/beatkind/watchtower/pkg/metrics" + "github.com/beatkind/watchtower/pkg/notifications" + t "github.com/beatkind/watchtower/pkg/types" "github.com/robfig/cron" log "github.com/sirupsen/logrus" @@ -54,7 +54,7 @@ func NewRootCommand() *cobra.Command { Short: "Automatically updates running Docker containers", Long: ` Watchtower automatically updates running Docker containers whenever a new image is released. - More information available at https://github.com/containrrr/watchtower/. + More information available at https://github.com/beatkind/watchtower/. `, Run: Run, PreRun: PreRun, diff --git a/code_of_conduct.md b/code_of_conduct.md index 65d4355..ae04b6b 100644 --- a/code_of_conduct.md +++ b/code_of_conduct.md @@ -1,3 +1,3 @@ ### Containrrr Community Code of Conduct -Please refer to out [Containrrr Community Code of Conduct](https://github.com/containrrr/.github/blob/master/CODE_OF_CONDUCT.md) +Please refer to out [Containrrr Community Code of Conduct](https://github.com/beatkind/.github/blob/master/CODE_OF_CONDUCT.md) diff --git a/dockerfiles/Dockerfile.dev-self-contained b/dockerfiles/Dockerfile.dev-self-contained index 1a39c26..08433c0 100644 --- a/dockerfiles/Dockerfile.dev-self-contained +++ b/dockerfiles/Dockerfile.dev-self-contained @@ -25,7 +25,7 @@ COPY . /watchtower RUN \ cd /watchtower && \ \ - GO111MODULE=on CGO_ENABLED=0 GOOS=linux go build -a -ldflags "-extldflags '-static' -X github.com/containrrr/watchtower/internal/meta.Version=$(git describe --tags)" . && \ + GO111MODULE=on CGO_ENABLED=0 GOOS=linux go build -a -ldflags "-extldflags '-static' -X github.com/beatkind/watchtower/internal/meta.Version=$(git describe --tags)" . && \ GO111MODULE=on go test ./... -v diff --git a/dockerfiles/Dockerfile.self-contained b/dockerfiles/Dockerfile.self-contained index 04a6047..ed62341 100644 --- a/dockerfiles/Dockerfile.self-contained +++ b/dockerfiles/Dockerfile.self-contained @@ -13,12 +13,12 @@ RUN apk add --no-cache \ git \ tzdata -RUN git clone --branch "${WATCHTOWER_VERSION}" https://github.com/containrrr/watchtower.git +RUN git clone --branch "${WATCHTOWER_VERSION}" https://github.com/beatkind/watchtower.git RUN \ cd watchtower && \ \ - GO111MODULE=on CGO_ENABLED=0 GOOS=linux go build -a -ldflags "-extldflags '-static' -X github.com/containrrr/watchtower/internal/meta.Version=$(git describe --tags)" . && \ + GO111MODULE=on CGO_ENABLED=0 GOOS=linux go build -a -ldflags "-extldflags '-static' -X github.com/beatkind/watchtower/internal/meta.Version=$(git describe --tags)" . && \ GO111MODULE=on go test ./... -v diff --git a/docs/index.md b/docs/index.md index 1d0b2cc..55ac113 100644 --- a/docs/index.md +++ b/docs/index.md @@ -14,13 +14,13 @@ Codecov - - GoDoc + + GoDoc - - Go Report Card + + Go Report Card - + latest version @@ -29,7 +29,7 @@ Codacy Badge - + All Contributors diff --git a/internal/actions/actions_suite_test.go b/internal/actions/actions_suite_test.go index c320564..e4c4a07 100644 --- a/internal/actions/actions_suite_test.go +++ b/internal/actions/actions_suite_test.go @@ -6,10 +6,10 @@ import ( "github.com/sirupsen/logrus" - "github.com/containrrr/watchtower/internal/actions" - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/internal/actions" + "github.com/beatkind/watchtower/pkg/types" - . "github.com/containrrr/watchtower/internal/actions/mocks" + . "github.com/beatkind/watchtower/internal/actions/mocks" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/internal/actions/check.go b/internal/actions/check.go index 77a2266..af46081 100644 --- a/internal/actions/check.go +++ b/internal/actions/check.go @@ -5,10 +5,10 @@ import ( "sort" "time" - "github.com/containrrr/watchtower/pkg/container" - "github.com/containrrr/watchtower/pkg/filters" - "github.com/containrrr/watchtower/pkg/sorter" - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/container" + "github.com/beatkind/watchtower/pkg/filters" + "github.com/beatkind/watchtower/pkg/sorter" + "github.com/beatkind/watchtower/pkg/types" log "github.com/sirupsen/logrus" ) diff --git a/internal/actions/mocks/client.go b/internal/actions/mocks/client.go index 737404a..6d5d6aa 100644 --- a/internal/actions/mocks/client.go +++ b/internal/actions/mocks/client.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - t "github.com/containrrr/watchtower/pkg/types" + t "github.com/beatkind/watchtower/pkg/types" ) // MockClient is a mock that passes as a watchtower Client diff --git a/internal/actions/mocks/container.go b/internal/actions/mocks/container.go index e830587..afa30a4 100644 --- a/internal/actions/mocks/container.go +++ b/internal/actions/mocks/container.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "github.com/containrrr/watchtower/pkg/container" - wt "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/container" + wt "github.com/beatkind/watchtower/pkg/types" "github.com/docker/docker/api/types" dockerContainer "github.com/docker/docker/api/types/container" "github.com/docker/go-connections/nat" diff --git a/internal/actions/mocks/progress.go b/internal/actions/mocks/progress.go index 23fc441..ddfec84 100644 --- a/internal/actions/mocks/progress.go +++ b/internal/actions/mocks/progress.go @@ -3,8 +3,8 @@ package mocks import ( "errors" - "github.com/containrrr/watchtower/pkg/session" - wt "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/session" + wt "github.com/beatkind/watchtower/pkg/types" ) // CreateMockProgressReport creates a mock report from a given set of container states diff --git a/internal/actions/update.go b/internal/actions/update.go index 8853c6e..e3460a5 100644 --- a/internal/actions/update.go +++ b/internal/actions/update.go @@ -3,12 +3,12 @@ package actions import ( "errors" - "github.com/containrrr/watchtower/internal/util" - "github.com/containrrr/watchtower/pkg/container" - "github.com/containrrr/watchtower/pkg/lifecycle" - "github.com/containrrr/watchtower/pkg/session" - "github.com/containrrr/watchtower/pkg/sorter" - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/internal/util" + "github.com/beatkind/watchtower/pkg/container" + "github.com/beatkind/watchtower/pkg/lifecycle" + "github.com/beatkind/watchtower/pkg/session" + "github.com/beatkind/watchtower/pkg/sorter" + "github.com/beatkind/watchtower/pkg/types" log "github.com/sirupsen/logrus" ) diff --git a/internal/actions/update_test.go b/internal/actions/update_test.go index 9209dcd..3123c94 100644 --- a/internal/actions/update_test.go +++ b/internal/actions/update_test.go @@ -3,13 +3,13 @@ package actions_test import ( "time" - "github.com/containrrr/watchtower/internal/actions" - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/internal/actions" + "github.com/beatkind/watchtower/pkg/types" dockerTypes "github.com/docker/docker/api/types" dockerContainer "github.com/docker/docker/api/types/container" "github.com/docker/go-connections/nat" - . "github.com/containrrr/watchtower/internal/actions/mocks" + . "github.com/beatkind/watchtower/internal/actions/mocks" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/main.go b/main.go index 9f8a012..34ab903 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/containrrr/watchtower/cmd" + "github.com/beatkind/watchtower/cmd" log "github.com/sirupsen/logrus" ) diff --git a/mkdocs.yml b/mkdocs.yml index 5227004..f6aa742 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,6 +1,6 @@ site_name: Watchtower site_url: https://containrrr.dev/watchtower/ -repo_url: https://github.com/containrrr/watchtower/ +repo_url: https://github.com/beatkind/watchtower/ edit_uri: edit/main/docs/ theme: name: 'material' diff --git a/pkg/api/metrics/metrics.go b/pkg/api/metrics/metrics.go index 4faad4a..876e118 100644 --- a/pkg/api/metrics/metrics.go +++ b/pkg/api/metrics/metrics.go @@ -1,7 +1,7 @@ package metrics import ( - "github.com/containrrr/watchtower/pkg/metrics" + "github.com/beatkind/watchtower/pkg/metrics" "net/http" "github.com/prometheus/client_golang/prometheus/promhttp" diff --git a/pkg/api/metrics/metrics_test.go b/pkg/api/metrics/metrics_test.go index 48b6dd7..c82a33c 100644 --- a/pkg/api/metrics/metrics_test.go +++ b/pkg/api/metrics/metrics_test.go @@ -11,9 +11,9 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "github.com/containrrr/watchtower/pkg/api" - metricsAPI "github.com/containrrr/watchtower/pkg/api/metrics" - "github.com/containrrr/watchtower/pkg/metrics" + "github.com/beatkind/watchtower/pkg/api" + metricsAPI "github.com/beatkind/watchtower/pkg/api/metrics" + "github.com/beatkind/watchtower/pkg/metrics" ) const ( diff --git a/pkg/container/cgroup_id.go b/pkg/container/cgroup_id.go index 1da1dfe..2e690b4 100644 --- a/pkg/container/cgroup_id.go +++ b/pkg/container/cgroup_id.go @@ -5,7 +5,7 @@ import ( "os" "regexp" - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/types" ) var dockerContainerPattern = regexp.MustCompile(`[0-9]+:.*:/docker/([a-f|0-9]{64})`) diff --git a/pkg/container/client.go b/pkg/container/client.go index c6c37de..21d9da7 100644 --- a/pkg/container/client.go +++ b/pkg/container/client.go @@ -15,9 +15,9 @@ import ( log "github.com/sirupsen/logrus" "golang.org/x/net/context" - "github.com/containrrr/watchtower/pkg/registry" - "github.com/containrrr/watchtower/pkg/registry/digest" - t "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/registry" + "github.com/beatkind/watchtower/pkg/registry/digest" + t "github.com/beatkind/watchtower/pkg/types" ) const defaultStopSignal = "SIGTERM" diff --git a/pkg/container/client_test.go b/pkg/container/client_test.go index 4e75409..0bb6177 100644 --- a/pkg/container/client_test.go +++ b/pkg/container/client_test.go @@ -4,10 +4,10 @@ import ( "github.com/docker/docker/api/types/network" "time" - "github.com/containrrr/watchtower/internal/util" - "github.com/containrrr/watchtower/pkg/container/mocks" - "github.com/containrrr/watchtower/pkg/filters" - t "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/internal/util" + "github.com/beatkind/watchtower/pkg/container/mocks" + "github.com/beatkind/watchtower/pkg/filters" + t "github.com/beatkind/watchtower/pkg/types" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/backend" diff --git a/pkg/container/container.go b/pkg/container/container.go index 10ed677..142ef67 100644 --- a/pkg/container/container.go +++ b/pkg/container/container.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/containrrr/watchtower/internal/util" - wt "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/internal/util" + wt "github.com/beatkind/watchtower/pkg/types" "github.com/sirupsen/logrus" "github.com/docker/docker/api/types" diff --git a/pkg/container/container_test.go b/pkg/container/container_test.go index a129afe..a80bf39 100644 --- a/pkg/container/container_test.go +++ b/pkg/container/container_test.go @@ -1,7 +1,7 @@ package container import ( - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/types" dc "github.com/docker/docker/api/types/container" "github.com/docker/go-connections/nat" . "github.com/onsi/ginkgo" diff --git a/pkg/container/mocks/ApiServer.go b/pkg/container/mocks/ApiServer.go index 84756f0..716618a 100644 --- a/pkg/container/mocks/ApiServer.go +++ b/pkg/container/mocks/ApiServer.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strings" - t "github.com/containrrr/watchtower/pkg/types" + t "github.com/beatkind/watchtower/pkg/types" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" diff --git a/pkg/container/mocks/container_ref.go b/pkg/container/mocks/container_ref.go index c46eb93..7826880 100644 --- a/pkg/container/mocks/container_ref.go +++ b/pkg/container/mocks/container_ref.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - t "github.com/containrrr/watchtower/pkg/types" + t "github.com/beatkind/watchtower/pkg/types" ) type imageRef struct { diff --git a/pkg/container/util_test.go b/pkg/container/util_test.go index 00912ba..2477e04 100644 --- a/pkg/container/util_test.go +++ b/pkg/container/util_test.go @@ -1,7 +1,7 @@ package container_test import ( - wt "github.com/containrrr/watchtower/pkg/types" + wt "github.com/beatkind/watchtower/pkg/types" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/pkg/filters/filters.go b/pkg/filters/filters.go index 4fa0bcd..b674790 100644 --- a/pkg/filters/filters.go +++ b/pkg/filters/filters.go @@ -4,7 +4,7 @@ import ( "regexp" "strings" - t "github.com/containrrr/watchtower/pkg/types" + t "github.com/beatkind/watchtower/pkg/types" ) // WatchtowerContainersFilter filters only watchtower containers diff --git a/pkg/filters/filters_test.go b/pkg/filters/filters_test.go index 2b5cb5e..400bfc2 100644 --- a/pkg/filters/filters_test.go +++ b/pkg/filters/filters_test.go @@ -3,7 +3,7 @@ package filters import ( "testing" - "github.com/containrrr/watchtower/pkg/container/mocks" + "github.com/beatkind/watchtower/pkg/container/mocks" "github.com/stretchr/testify/assert" ) diff --git a/pkg/lifecycle/lifecycle.go b/pkg/lifecycle/lifecycle.go index c0f962e..17c0328 100644 --- a/pkg/lifecycle/lifecycle.go +++ b/pkg/lifecycle/lifecycle.go @@ -1,8 +1,8 @@ package lifecycle import ( - "github.com/containrrr/watchtower/pkg/container" - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/container" + "github.com/beatkind/watchtower/pkg/types" log "github.com/sirupsen/logrus" ) diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go index b681733..19ba882 100644 --- a/pkg/metrics/metrics.go +++ b/pkg/metrics/metrics.go @@ -1,7 +1,7 @@ package metrics import ( - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/types" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" ) diff --git a/pkg/notifications/email.go b/pkg/notifications/email.go index 9103d38..6c41968 100644 --- a/pkg/notifications/email.go +++ b/pkg/notifications/email.go @@ -5,8 +5,8 @@ import ( "github.com/spf13/cobra" + t "github.com/beatkind/watchtower/pkg/types" shoutrrrSmtp "github.com/containrrr/shoutrrr/pkg/services/smtp" - t "github.com/containrrr/watchtower/pkg/types" log "github.com/sirupsen/logrus" ) diff --git a/pkg/notifications/gotify.go b/pkg/notifications/gotify.go index c36eb4b..ea7d84a 100644 --- a/pkg/notifications/gotify.go +++ b/pkg/notifications/gotify.go @@ -4,8 +4,8 @@ import ( "net/url" "strings" + t "github.com/beatkind/watchtower/pkg/types" shoutrrrGotify "github.com/containrrr/shoutrrr/pkg/services/gotify" - t "github.com/containrrr/watchtower/pkg/types" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/pflag" diff --git a/pkg/notifications/json.go b/pkg/notifications/json.go index 20da92b..43a8247 100644 --- a/pkg/notifications/json.go +++ b/pkg/notifications/json.go @@ -3,7 +3,7 @@ package notifications import ( "encoding/json" - t "github.com/containrrr/watchtower/pkg/types" + t "github.com/beatkind/watchtower/pkg/types" ) type jsonMap = map[string]interface{} diff --git a/pkg/notifications/json_test.go b/pkg/notifications/json_test.go index ef30c59..bb5a060 100644 --- a/pkg/notifications/json_test.go +++ b/pkg/notifications/json_test.go @@ -1,7 +1,7 @@ package notifications import ( - s "github.com/containrrr/watchtower/pkg/session" + s "github.com/beatkind/watchtower/pkg/session" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/pkg/notifications/model.go b/pkg/notifications/model.go index 83c97ba..37ccac4 100644 --- a/pkg/notifications/model.go +++ b/pkg/notifications/model.go @@ -1,7 +1,7 @@ package notifications import ( - t "github.com/containrrr/watchtower/pkg/types" + t "github.com/beatkind/watchtower/pkg/types" log "github.com/sirupsen/logrus" ) diff --git a/pkg/notifications/msteams.go b/pkg/notifications/msteams.go index cfca30e..6e8460e 100644 --- a/pkg/notifications/msteams.go +++ b/pkg/notifications/msteams.go @@ -3,8 +3,8 @@ package notifications import ( "net/url" + t "github.com/beatkind/watchtower/pkg/types" shoutrrrTeams "github.com/containrrr/shoutrrr/pkg/services/teams" - t "github.com/containrrr/watchtower/pkg/types" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/pkg/notifications/notifier.go b/pkg/notifications/notifier.go index ff7b6b5..62e819b 100644 --- a/pkg/notifications/notifier.go +++ b/pkg/notifications/notifier.go @@ -5,7 +5,7 @@ import ( "strings" "time" - ty "github.com/containrrr/watchtower/pkg/types" + ty "github.com/beatkind/watchtower/pkg/types" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/pkg/notifications/notifier_test.go b/pkg/notifications/notifier_test.go index 96d513c..61ff789 100644 --- a/pkg/notifications/notifier_test.go +++ b/pkg/notifications/notifier_test.go @@ -5,9 +5,9 @@ import ( "net/url" "time" - "github.com/containrrr/watchtower/cmd" - "github.com/containrrr/watchtower/internal/flags" - "github.com/containrrr/watchtower/pkg/notifications" + "github.com/beatkind/watchtower/cmd" + "github.com/beatkind/watchtower/internal/flags" + "github.com/beatkind/watchtower/pkg/notifications" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/pkg/notifications/preview/data/data.go b/pkg/notifications/preview/data/data.go index 4a002ed..ac82af3 100644 --- a/pkg/notifications/preview/data/data.go +++ b/pkg/notifications/preview/data/data.go @@ -7,7 +7,7 @@ import ( "strconv" "time" - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/types" ) type previewData struct { diff --git a/pkg/notifications/preview/data/report.go b/pkg/notifications/preview/data/report.go index 2c8627f..e342bfd 100644 --- a/pkg/notifications/preview/data/report.go +++ b/pkg/notifications/preview/data/report.go @@ -3,7 +3,7 @@ package data import ( "sort" - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/types" ) // State is the outcome of a container in a session report diff --git a/pkg/notifications/preview/data/status.go b/pkg/notifications/preview/data/status.go index 33f9bec..7603452 100644 --- a/pkg/notifications/preview/data/status.go +++ b/pkg/notifications/preview/data/status.go @@ -1,6 +1,6 @@ package data -import wt "github.com/containrrr/watchtower/pkg/types" +import wt "github.com/beatkind/watchtower/pkg/types" type containerStatus struct { containerID wt.ContainerID diff --git a/pkg/notifications/preview/tplprev.go b/pkg/notifications/preview/tplprev.go index 8855416..9911cfb 100644 --- a/pkg/notifications/preview/tplprev.go +++ b/pkg/notifications/preview/tplprev.go @@ -5,8 +5,8 @@ import ( "strings" "text/template" - "github.com/containrrr/watchtower/pkg/notifications/preview/data" - "github.com/containrrr/watchtower/pkg/notifications/templates" + "github.com/beatkind/watchtower/pkg/notifications/preview/data" + "github.com/beatkind/watchtower/pkg/notifications/templates" ) func Render(input string, states []data.State, loglevels []data.LogLevel) (string, error) { diff --git a/pkg/notifications/shoutrrr.go b/pkg/notifications/shoutrrr.go index cc3a931..ad9bdb0 100644 --- a/pkg/notifications/shoutrrr.go +++ b/pkg/notifications/shoutrrr.go @@ -8,10 +8,10 @@ import ( "text/template" "time" + "github.com/beatkind/watchtower/pkg/notifications/templates" + t "github.com/beatkind/watchtower/pkg/types" "github.com/containrrr/shoutrrr" "github.com/containrrr/shoutrrr/pkg/types" - "github.com/containrrr/watchtower/pkg/notifications/templates" - t "github.com/containrrr/watchtower/pkg/types" log "github.com/sirupsen/logrus" ) diff --git a/pkg/notifications/shoutrrr_test.go b/pkg/notifications/shoutrrr_test.go index 703958b..6f7980a 100644 --- a/pkg/notifications/shoutrrr_test.go +++ b/pkg/notifications/shoutrrr_test.go @@ -3,10 +3,10 @@ package notifications import ( "time" + "github.com/beatkind/watchtower/internal/actions/mocks" + "github.com/beatkind/watchtower/internal/flags" + s "github.com/beatkind/watchtower/pkg/session" "github.com/containrrr/shoutrrr/pkg/types" - "github.com/containrrr/watchtower/internal/actions/mocks" - "github.com/containrrr/watchtower/internal/flags" - s "github.com/containrrr/watchtower/pkg/session" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" diff --git a/pkg/notifications/slack.go b/pkg/notifications/slack.go index 9118527..ad5384b 100644 --- a/pkg/notifications/slack.go +++ b/pkg/notifications/slack.go @@ -3,9 +3,9 @@ package notifications import ( "strings" + t "github.com/beatkind/watchtower/pkg/types" shoutrrrDisco "github.com/containrrr/shoutrrr/pkg/services/discord" shoutrrrSlack "github.com/containrrr/shoutrrr/pkg/services/slack" - t "github.com/containrrr/watchtower/pkg/types" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/pkg/registry/auth/auth.go b/pkg/registry/auth/auth.go index 99b05c9..242cc22 100644 --- a/pkg/registry/auth/auth.go +++ b/pkg/registry/auth/auth.go @@ -9,8 +9,8 @@ import ( "net/url" "strings" - "github.com/containrrr/watchtower/pkg/registry/helpers" - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/registry/helpers" + "github.com/beatkind/watchtower/pkg/types" ref "github.com/distribution/reference" "github.com/sirupsen/logrus" ) diff --git a/pkg/registry/auth/auth_test.go b/pkg/registry/auth/auth_test.go index d295310..d26931b 100644 --- a/pkg/registry/auth/auth_test.go +++ b/pkg/registry/auth/auth_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "github.com/containrrr/watchtower/internal/actions/mocks" - "github.com/containrrr/watchtower/pkg/registry/auth" + "github.com/beatkind/watchtower/internal/actions/mocks" + "github.com/beatkind/watchtower/pkg/registry/auth" - wtTypes "github.com/containrrr/watchtower/pkg/types" + wtTypes "github.com/beatkind/watchtower/pkg/types" ref "github.com/distribution/reference" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/pkg/registry/digest/digest.go b/pkg/registry/digest/digest.go index e569599..8c5963b 100644 --- a/pkg/registry/digest/digest.go +++ b/pkg/registry/digest/digest.go @@ -11,10 +11,10 @@ import ( "strings" "time" - "github.com/containrrr/watchtower/internal/meta" - "github.com/containrrr/watchtower/pkg/registry/auth" - "github.com/containrrr/watchtower/pkg/registry/manifest" - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/internal/meta" + "github.com/beatkind/watchtower/pkg/registry/auth" + "github.com/beatkind/watchtower/pkg/registry/manifest" + "github.com/beatkind/watchtower/pkg/types" "github.com/sirupsen/logrus" ) diff --git a/pkg/registry/digest/digest_test.go b/pkg/registry/digest/digest_test.go index a6e6650..aa0d0f7 100644 --- a/pkg/registry/digest/digest_test.go +++ b/pkg/registry/digest/digest_test.go @@ -2,9 +2,9 @@ package digest_test import ( "fmt" - "github.com/containrrr/watchtower/internal/actions/mocks" - "github.com/containrrr/watchtower/pkg/registry/digest" - wtTypes "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/internal/actions/mocks" + "github.com/beatkind/watchtower/pkg/registry/digest" + wtTypes "github.com/beatkind/watchtower/pkg/types" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" diff --git a/pkg/registry/helpers/helpers_test.go b/pkg/registry/helpers/helpers_test.go index a561c2c..7918de7 100644 --- a/pkg/registry/helpers/helpers_test.go +++ b/pkg/registry/helpers/helpers_test.go @@ -31,7 +31,7 @@ var _ = Describe("the helpers", func() { Expect(GetRegistryAddress("localhost/watchtower")).To(Equal("localhost")) }) It("should return the server address if passed a fully qualified image name", func() { - Expect(GetRegistryAddress("github.com/containrrr/config")).To(Equal("github.com")) + Expect(GetRegistryAddress("github.com/beatkind/config")).To(Equal("github.com")) }) }) }) diff --git a/pkg/registry/manifest/manifest.go b/pkg/registry/manifest/manifest.go index c732bae..119b0b7 100644 --- a/pkg/registry/manifest/manifest.go +++ b/pkg/registry/manifest/manifest.go @@ -5,8 +5,8 @@ import ( "fmt" url2 "net/url" - "github.com/containrrr/watchtower/pkg/registry/helpers" - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/registry/helpers" + "github.com/beatkind/watchtower/pkg/types" ref "github.com/distribution/reference" "github.com/sirupsen/logrus" ) diff --git a/pkg/registry/manifest/manifest_test.go b/pkg/registry/manifest/manifest_test.go index b24d9bc..92eef97 100644 --- a/pkg/registry/manifest/manifest_test.go +++ b/pkg/registry/manifest/manifest_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - "github.com/containrrr/watchtower/internal/actions/mocks" - "github.com/containrrr/watchtower/pkg/registry/manifest" + "github.com/beatkind/watchtower/internal/actions/mocks" + "github.com/beatkind/watchtower/pkg/registry/manifest" apiTypes "github.com/docker/docker/api/types" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/pkg/registry/registry.go b/pkg/registry/registry.go index 430b401..5fbfe9f 100644 --- a/pkg/registry/registry.go +++ b/pkg/registry/registry.go @@ -1,8 +1,8 @@ package registry import ( - "github.com/containrrr/watchtower/pkg/registry/helpers" - watchtowerTypes "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/registry/helpers" + watchtowerTypes "github.com/beatkind/watchtower/pkg/types" ref "github.com/distribution/reference" "github.com/docker/docker/api/types" log "github.com/sirupsen/logrus" diff --git a/pkg/registry/registry_test.go b/pkg/registry/registry_test.go index 481c91d..79c94f4 100644 --- a/pkg/registry/registry_test.go +++ b/pkg/registry/registry_test.go @@ -1,8 +1,8 @@ package registry_test import ( - "github.com/containrrr/watchtower/internal/actions/mocks" - unit "github.com/containrrr/watchtower/pkg/registry" + "github.com/beatkind/watchtower/internal/actions/mocks" + unit "github.com/beatkind/watchtower/pkg/registry" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/pkg/registry/trust.go b/pkg/registry/trust.go index 0b20248..86ebf68 100644 --- a/pkg/registry/trust.go +++ b/pkg/registry/trust.go @@ -6,7 +6,7 @@ import ( "errors" "os" - "github.com/containrrr/watchtower/pkg/registry/helpers" + "github.com/beatkind/watchtower/pkg/registry/helpers" cliconfig "github.com/docker/cli/cli/config" "github.com/docker/cli/cli/config/configfile" "github.com/docker/cli/cli/config/credentials" @@ -36,7 +36,7 @@ func EncodedEnvAuth() (string, error) { Username: username, Password: password, } - + log.Debugf("Loaded auth credentials for registry user %s from environment", auth.Username) // CREDENTIAL: Uncomment to log REPO_PASS environment variable // log.Tracef("Using auth password %s", auth.Password) diff --git a/pkg/session/container_status.go b/pkg/session/container_status.go index 8313da1..d7e6368 100644 --- a/pkg/session/container_status.go +++ b/pkg/session/container_status.go @@ -1,6 +1,6 @@ package session -import wt "github.com/containrrr/watchtower/pkg/types" +import wt "github.com/beatkind/watchtower/pkg/types" // State indicates what the current state is of the container type State int diff --git a/pkg/session/progress.go b/pkg/session/progress.go index 57069be..ca415c5 100644 --- a/pkg/session/progress.go +++ b/pkg/session/progress.go @@ -1,7 +1,7 @@ package session import ( - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/types" ) // Progress contains the current session container status diff --git a/pkg/session/report.go b/pkg/session/report.go index 707eb91..20d4acf 100644 --- a/pkg/session/report.go +++ b/pkg/session/report.go @@ -3,7 +3,7 @@ package session import ( "sort" - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/types" ) type report struct { diff --git a/pkg/sorter/sort.go b/pkg/sorter/sort.go index b9d1e12..a365303 100644 --- a/pkg/sorter/sort.go +++ b/pkg/sorter/sort.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/containrrr/watchtower/pkg/types" + "github.com/beatkind/watchtower/pkg/types" ) // ByCreated allows a list of Container structs to be sorted by the container's diff --git a/tplprev/main.go b/tplprev/main.go index 120f968..4a1d9a5 100644 --- a/tplprev/main.go +++ b/tplprev/main.go @@ -7,9 +7,9 @@ import ( "fmt" "os" - "github.com/containrrr/watchtower/internal/meta" - "github.com/containrrr/watchtower/pkg/notifications/preview" - "github.com/containrrr/watchtower/pkg/notifications/preview/data" + "github.com/beatkind/watchtower/internal/meta" + "github.com/beatkind/watchtower/pkg/notifications/preview" + "github.com/beatkind/watchtower/pkg/notifications/preview/data" ) func main() { diff --git a/tplprev/main_wasm.go b/tplprev/main_wasm.go index 5e2ce6a..a6ebc74 100644 --- a/tplprev/main_wasm.go +++ b/tplprev/main_wasm.go @@ -5,9 +5,9 @@ package main import ( "fmt" - "github.com/containrrr/watchtower/internal/meta" - "github.com/containrrr/watchtower/pkg/notifications/preview" - "github.com/containrrr/watchtower/pkg/notifications/preview/data" + "github.com/beatkind/watchtower/internal/meta" + "github.com/beatkind/watchtower/pkg/notifications/preview" + "github.com/beatkind/watchtower/pkg/notifications/preview/data" "syscall/js" ) From be15a74da34ca8d95ecf2a77b750eb2fe9bb230e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 13:28:15 +0000 Subject: [PATCH 024/157] fix(deps): update module github.com/prometheus/client_golang to v1.19.1 --- go.mod | 10 +++++----- go.sum | 10 ++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index d9b8767..ec9a81b 100644 --- a/go.mod +++ b/go.mod @@ -10,14 +10,14 @@ require ( github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.30.0 - github.com/prometheus/client_golang v1.18.0 + github.com/prometheus/client_golang v1.19.1 github.com/robfig/cron v1.2.0 github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.18.2 github.com/stretchr/testify v1.8.4 - golang.org/x/net v0.19.0 + golang.org/x/net v0.20.0 ) require github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect @@ -51,7 +51,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_model v0.5.0 // indirect - github.com/prometheus/common v0.45.0 // indirect + github.com/prometheus/common v0.48.0 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/sagikazarmark/locafero v0.4.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect @@ -63,10 +63,10 @@ require ( go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.9.0 // indirect golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect - golang.org/x/sys v0.15.0 // indirect + golang.org/x/sys v0.17.0 // indirect golang.org/x/text v0.14.0 golang.org/x/time v0.5.0 // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 85a3ae3..0b360b9 100644 --- a/go.sum +++ b/go.sum @@ -116,10 +116,14 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk= github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA= +github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= +github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lneoxM= github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY= +github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= +github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ= @@ -184,6 +188,8 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= +golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -204,6 +210,8 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= @@ -231,6 +239,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= From 107049d823aa757f8285396a825a31eaf2246d68 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 13:35:22 +0000 Subject: [PATCH 025/157] fix(deps): update module golang.org/x/net to v0.27.0 --- go.mod | 6 +++--- go.sum | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ec9a81b..aef02ec 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.18.2 github.com/stretchr/testify v1.8.4 - golang.org/x/net v0.20.0 + golang.org/x/net v0.27.0 ) require github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect @@ -63,8 +63,8 @@ require ( go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.9.0 // indirect golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect - golang.org/x/sys v0.17.0 // indirect - golang.org/x/text v0.14.0 + golang.org/x/sys v0.22.0 // indirect + golang.org/x/text v0.16.0 golang.org/x/time v0.5.0 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index 0b360b9..54ff0a2 100644 --- a/go.sum +++ b/go.sum @@ -190,6 +190,8 @@ golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= +golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -212,10 +214,14 @@ golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= +golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= From 8d27009c265d9e77860df6ef9264afdc23ee030b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 13:42:13 +0000 Subject: [PATCH 026/157] fix(deps): update module github.com/spf13/viper to v1.19.0 --- go.mod | 8 ++++---- go.sum | 8 ++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index aef02ec..fffbacc 100644 --- a/go.mod +++ b/go.mod @@ -15,8 +15,8 @@ require ( github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 - github.com/spf13/viper v1.18.2 - github.com/stretchr/testify v1.8.4 + github.com/spf13/viper v1.19.0 + github.com/stretchr/testify v1.9.0 golang.org/x/net v0.27.0 ) @@ -47,7 +47,7 @@ require ( github.com/nxadm/tail v1.4.8 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.2 // indirect - github.com/pelletier/go-toml/v2 v2.1.0 // indirect + github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_model v0.5.0 // indirect @@ -58,7 +58,7 @@ require ( github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/afero v1.11.0 // indirect github.com/spf13/cast v1.6.0 // indirect - github.com/stretchr/objx v0.5.0 // indirect + github.com/stretchr/objx v0.5.2 // indirect github.com/subosito/gotenv v1.6.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.9.0 // indirect diff --git a/go.sum b/go.sum index 54ff0a2..1361809 100644 --- a/go.sum +++ b/go.sum @@ -108,6 +108,8 @@ github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrB github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= +github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= +github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -152,10 +154,14 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ= github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk= +github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI= +github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= @@ -164,6 +170,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= From 14610caec05af334b3c57b88ed8a6d8e137ef269 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 13:42:07 +0000 Subject: [PATCH 027/157] fix(deps): update module github.com/onsi/gomega to v1.33.1 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index fffbacc..6053d83 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/docker/docker v24.0.9+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 - github.com/onsi/gomega v1.30.0 + github.com/onsi/gomega v1.33.1 github.com/prometheus/client_golang v1.19.1 github.com/robfig/cron v1.2.0 github.com/sirupsen/logrus v1.9.3 diff --git a/go.sum b/go.sum index 1361809..3824de8 100644 --- a/go.sum +++ b/go.sum @@ -102,6 +102,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= +github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= +github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM= From 0636edc70e4dab3cdb0107cb9aad8c09393b02fb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 13:42:24 +0000 Subject: [PATCH 028/157] fix(deps): update module github.com/docker/cli to v27 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 6053d83..3642f49 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22 require ( github.com/containrrr/shoutrrr v0.8.0 github.com/distribution/reference v0.5.0 - github.com/docker/cli v24.0.9+incompatible + github.com/docker/cli v27.0.3+incompatible github.com/docker/docker v24.0.9+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 diff --git a/go.sum b/go.sum index 3824de8..af01648 100644 --- a/go.sum +++ b/go.sum @@ -22,6 +22,8 @@ github.com/docker/cli v24.0.7+incompatible h1:wa/nIwYFW7BVTGa7SWPVyyXU9lgORqUb1x github.com/docker/cli v24.0.7+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v24.0.9+incompatible h1:OxbimnP/z+qVjDLpq9wbeFU3Nc30XhSe+LkwYQisD50= github.com/docker/cli v24.0.9+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v27.0.3+incompatible h1:usGs0/BoBW8MWxGeEtqPMkzOY56jZ6kYlSN5BLDioCQ= +github.com/docker/cli v27.0.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM= From 1e96f9b9c165205192fe35d9f1fff702ac762375 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 13:47:39 +0000 Subject: [PATCH 029/157] fix(deps): update module github.com/onsi/ginkgo to v2 --- go.mod | 1 + go.sum | 1 + 2 files changed, 2 insertions(+) diff --git a/go.mod b/go.mod index 3642f49..55c563f 100644 --- a/go.mod +++ b/go.mod @@ -9,6 +9,7 @@ require ( github.com/docker/docker v24.0.9+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 + github.com/onsi/ginkgo/v2 v2.19.0 github.com/onsi/gomega v1.33.1 github.com/prometheus/client_golang v1.19.1 github.com/robfig/cron v1.2.0 diff --git a/go.sum b/go.sum index af01648..0c3d483 100644 --- a/go.sum +++ b/go.sum @@ -100,6 +100,7 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4= +github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= From 1001ef257dc3951bc525e19210459424128dd911 Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Mon, 8 Jul 2024 16:03:42 +0200 Subject: [PATCH 030/157] chore(ci): fix releaser --- .github/workflows/dependabot-approve.yaml | 12 ------ .github/workflows/release.yaml | 49 ----------------------- 2 files changed, 61 deletions(-) delete mode 100644 .github/workflows/dependabot-approve.yaml diff --git a/.github/workflows/dependabot-approve.yaml b/.github/workflows/dependabot-approve.yaml deleted file mode 100644 index 46f9d18..0000000 --- a/.github/workflows/dependabot-approve.yaml +++ /dev/null @@ -1,12 +0,0 @@ -name: Auto approve dependabot PRs - -on: pull_request_target - -jobs: - auto-approve: - runs-on: ubuntu-latest - permissions: - pull-requests: write - if: github.actor == 'dependabot[bot]' - steps: - - uses: hmarr/auto-approve-action@v3 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 6c7ed9a..6248248 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -92,30 +92,6 @@ jobs: beatkind/watchtower:i386-$DH_TAG \ beatkind/watchtower:armhf-$DH_TAG \ beatkind/watchtower:arm64v8-$DH_TAG - - name: Annotate manifest for version - run: | - for REPO in '' ghcr.io/ ; do - - docker manifest annotate \ - ${REPO}beatkind/watchtower:$(echo $TAG | sed 's/^v*//') \ - ${REPO}beatkind/watchtower:i386-$(echo $TAG | sed 's/^v*//') \ - --os linux \ - --arch 386 - - docker manifest annotate \ - ${REPO}beatkind/watchtower:$(echo $TAG | sed 's/^v*//') \ - ${REPO}beatkind/watchtower:armhf-$(echo $TAG | sed 's/^v*//') \ - --os linux \ - --arch arm - - docker manifest annotate \ - ${REPO}beatkind/watchtower:$(echo $TAG | sed 's/^v*//') \ - ${REPO}beatkind/watchtower:arm64v8-$(echo $TAG | sed 's/^v*//') \ - --os linux \ - --arch arm64 \ - --variant v8 - - done - name: Create manifest for latest run: | docker manifest create \ @@ -124,30 +100,6 @@ jobs: beatkind/watchtower:i386-latest \ beatkind/watchtower:armhf-latest \ beatkind/watchtower:arm64v8-latest - - name: Annotate manifest for latest - run: | - for REPO in '' ghcr.io/ ; do - - docker manifest annotate \ - ${REPO}beatkind/watchtower:latest \ - ${REPO}beatkind/watchtower:i386-latest \ - --os linux \ - --arch 386 - - docker manifest annotate \ - ${REPO}beatkind/watchtower:latest \ - ${REPO}beatkind/watchtower:armhf-latest \ - --os linux \ - --arch arm - - docker manifest annotate \ - ${REPO}beatkind/watchtower:latest \ - ${REPO}beatkind/watchtower:arm64v8-latest \ - --os linux \ - --arch arm64 \ - --variant v8 - - done - name: Push manifests to Dockerhub env: DOCKER_USER: ${{ secrets.DOCKERHUB_USERNAME }} @@ -156,7 +108,6 @@ jobs: docker login -u $DOCKER_USER -p $DOCKER_TOKEN && \ docker manifest push beatkind/watchtower:$(echo $TAG | sed 's/^v*//') && \ docker manifest push beatkind/watchtower:latest - renew-docs: name: Refresh pkg.go.dev needs: build From 45d87dc5766e870ef1c38ab13ad066be48b8b37d Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Mon, 8 Jul 2024 16:10:02 +0200 Subject: [PATCH 031/157] chore(ci): Update goreleaser --- goreleaser.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/goreleaser.yml b/goreleaser.yml index a21f94e..a11364b 100644 --- a/goreleaser.yml +++ b/goreleaser.yml @@ -38,8 +38,6 @@ dockers: image_templates: - beatkind/watchtower:amd64-{{ .Version }} - beatkind/watchtower:amd64-latest - binaries: - - watchtower - use_buildx: true build_flag_templates: [ "--platform=linux/386" ] @@ -50,8 +48,6 @@ dockers: image_templates: - beatkind/watchtower:i386-{{ .Version }} - beatkind/watchtower:i386-latest - binaries: - - watchtower - use_buildx: true build_flag_templates: [ "--platform=linux/arm/v6" ] @@ -62,8 +58,6 @@ dockers: image_templates: - beatkind/watchtower:armhf-{{ .Version }} - beatkind/watchtower:armhf-latest - binaries: - - watchtower - use_buildx: true build_flag_templates: [ "--platform=linux/arm64/v8" ] @@ -73,6 +67,4 @@ dockers: dockerfile: dockerfiles/Dockerfile image_templates: - beatkind/watchtower:arm64v8-{{ .Version }} - - beatkind/watchtower:arm64v8-latest - binaries: - - watchtower + - beatkind/watchtower:arm64v8-latest \ No newline at end of file From 160c4289fde9bdf7362625cdb314c6558728d20a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 13:49:18 +0000 Subject: [PATCH 032/157] fix(deps): update module github.com/docker/docker to v27 --- go.mod | 14 ++++++++++++-- go.sum | 19 +++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 55c563f..d7d808b 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/containrrr/shoutrrr v0.8.0 github.com/distribution/reference v0.5.0 github.com/docker/cli v27.0.3+incompatible - github.com/docker/docker v24.0.9+incompatible + github.com/docker/docker v27.0.3+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 github.com/onsi/ginkgo/v2 v2.19.0 @@ -21,7 +21,17 @@ require ( golang.org/x/net v0.27.0 ) -require github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect +require ( + github.com/felixge/httpsnoop v1.0.4 // indirect + github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect + github.com/moby/docker-image-spec v1.3.1 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect + go.opentelemetry.io/otel v1.24.0 // indirect + go.opentelemetry.io/otel/metric v1.24.0 // indirect + go.opentelemetry.io/otel/trace v1.24.0 // indirect +) require ( github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect diff --git a/go.sum b/go.sum index 0c3d483..847b6f0 100644 --- a/go.sum +++ b/go.sum @@ -30,6 +30,8 @@ github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v24.0.9+incompatible h1:HPGzNmwfLZWdxHqK9/II92pyi1EpYKsAqcl4G0Of9v0= github.com/docker/docker v24.0.9+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v27.0.3+incompatible h1:aBGI9TeQ4MPlhquTQKq9XbK79rKFVwXNUAYz9aXyEBE= +github.com/docker/docker v27.0.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.1 h1:Dq4iIfcM7cNtddhLVWe9h4QDjsi4OER3Z8voPu/I52g= github.com/docker/docker-credential-helpers v0.6.1/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= @@ -40,12 +42,19 @@ github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= @@ -88,6 +97,8 @@ github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvls github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= +github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 h1:dcztxKSvZ4Id8iPpHERQBbIJfabdt4wUm5qy3wOL2Zc= github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c h1:nXxl5PrvVm2L/wCy8dQu6DMTwH4oIuGN8GJDAlqDdVE= @@ -181,6 +192,14 @@ github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= +go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= +go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= +go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI= +go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco= +go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI= +go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= From 034de76896fbe94ca61349c2c02c86c315e4fb29 Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Mon, 8 Jul 2024 16:45:30 +0200 Subject: [PATCH 033/157] chore: update versions --- go.mod | 16 ++++----- go.sum | 105 +++++++++++++++++++++++++-------------------------------- 2 files changed, 53 insertions(+), 68 deletions(-) diff --git a/go.mod b/go.mod index d7d808b..a0c68a2 100644 --- a/go.mod +++ b/go.mod @@ -22,15 +22,17 @@ require ( ) require ( + github.com/containerd/log v0.1.0 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect - go.opentelemetry.io/otel v1.24.0 // indirect - go.opentelemetry.io/otel/metric v1.24.0 // indirect - go.opentelemetry.io/otel/trace v1.24.0 // indirect + go.opentelemetry.io/otel v1.28.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect + go.opentelemetry.io/otel/metric v1.28.0 // indirect + go.opentelemetry.io/otel/sdk v1.28.0 // indirect + go.opentelemetry.io/otel/trace v1.28.0 // indirect ) require ( @@ -39,13 +41,11 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/docker/distribution v2.8.3+incompatible // indirect github.com/docker/docker-credential-helpers v0.6.1 // indirect github.com/docker/go-units v0.4.0 // indirect github.com/fatih/color v1.15.0 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/protobuf v1.5.3 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect @@ -77,7 +77,7 @@ require ( golang.org/x/sys v0.22.0 // indirect golang.org/x/text v0.16.0 golang.org/x/time v0.5.0 // indirect - google.golang.org/protobuf v1.33.0 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 847b6f0..b173d02 100644 --- a/go.sum +++ b/go.sum @@ -4,11 +4,14 @@ github.com/Microsoft/go-winio v0.4.17 h1:iT12IBVClFevaf8PuVyi3UmZOVh4OqnaLxDTW2O github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= +github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= +github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/containrrr/shoutrrr v0.8.0 h1:mfG2ATzIS7NR2Ec6XL+xyoHzN97H8WPjir8aYzJUSec= github.com/containrrr/shoutrrr v0.8.0/go.mod h1:ioyQAyu1LJY6sILuNyKaQaw+9Ttik5QePU8atnAdO2o= -github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= @@ -18,24 +21,12 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0= github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= -github.com/docker/cli v24.0.7+incompatible h1:wa/nIwYFW7BVTGa7SWPVyyXU9lgORqUb1xfI36MSkFg= -github.com/docker/cli v24.0.7+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v24.0.9+incompatible h1:OxbimnP/z+qVjDLpq9wbeFU3Nc30XhSe+LkwYQisD50= -github.com/docker/cli v24.0.9+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v27.0.3+incompatible h1:usGs0/BoBW8MWxGeEtqPMkzOY56jZ6kYlSN5BLDioCQ= github.com/docker/cli v27.0.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= -github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM= -github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v24.0.9+incompatible h1:HPGzNmwfLZWdxHqK9/II92pyi1EpYKsAqcl4G0Of9v0= -github.com/docker/docker v24.0.9+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v27.0.3+incompatible h1:aBGI9TeQ4MPlhquTQKq9XbK79rKFVwXNUAYz9aXyEBE= github.com/docker/docker v27.0.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.1 h1:Dq4iIfcM7cNtddhLVWe9h4QDjsi4OER3Z8voPu/I52g= github.com/docker/docker-credential-helpers v0.6.1/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= -github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= -github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= @@ -45,18 +36,20 @@ github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBD github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= +github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -66,26 +59,30 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE= +github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 h1:k7nVchz72niMH6YLQNvHSdIE7iqsQxK1P41mySCvssg= +github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jarcoal/httpmock v1.3.0 h1:2RJ8GP0IIaWwcC9Fp2BmVi8Kog3v2Hn7VXM3fTd+nuc= +github.com/jarcoal/httpmock v1.3.0/go.mod h1:3yb8rc4BI7TCBhFY8ng0gjuLKJNquuDNiPaZjnENuYg= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= @@ -93,8 +90,6 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg= -github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= @@ -114,16 +109,12 @@ github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4 github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= -github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM= github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= -github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -132,14 +123,10 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk= -github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA= github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= -github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lneoxM= -github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY= github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= @@ -147,6 +134,7 @@ github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3c github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ= github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ= github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= @@ -161,20 +149,15 @@ github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= -github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= -github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ= -github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk= github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI= github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= @@ -184,7 +167,6 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= @@ -194,12 +176,20 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= -go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= -go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= -go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI= -go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco= -go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI= -go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU= +go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= +go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 h1:j9+03ymgYhPKmeXGk5Zu+cIZOlVzd9Zv7QIiyItjFBU= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0/go.mod h1:Y5+XiUG4Emn1hTfciPzGPJaSI+RpDts6BnCIir0SLqk= +go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= +go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= +go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= +go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= +go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= +go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= @@ -218,10 +208,6 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= -golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= -golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -242,16 +228,10 @@ golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= @@ -262,25 +242,30 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.13.0 h1:Iey4qkscZuv0VvIt8E0neZjtPVQFSc870HQ448QgEmQ= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= +golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y= +google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= +google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= +google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= -google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= From 784f87187858c7b761248641d3715d6545d033c5 Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Mon, 8 Jul 2024 16:43:55 +0200 Subject: [PATCH 034/157] feat: bump docker versions, remove deprecations --- go.mod | 34 +++++++------- go.sum | 76 +++++++++++++++----------------- pkg/container/client.go | 16 +++---- pkg/container/client_test.go | 5 ++- pkg/container/mocks/ApiServer.go | 5 ++- pkg/registry/registry.go | 20 +++------ 6 files changed, 73 insertions(+), 83 deletions(-) diff --git a/go.mod b/go.mod index a0c68a2..0ba5d52 100644 --- a/go.mod +++ b/go.mod @@ -4,12 +4,11 @@ go 1.22 require ( github.com/containrrr/shoutrrr v0.8.0 - github.com/distribution/reference v0.5.0 + github.com/distribution/reference v0.6.0 github.com/docker/cli v27.0.3+incompatible github.com/docker/docker v27.0.3+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 - github.com/onsi/ginkgo/v2 v2.19.0 github.com/onsi/gomega v1.33.1 github.com/prometheus/client_golang v1.19.1 github.com/robfig/cron v1.2.0 @@ -27,7 +26,9 @@ require ( github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/onsi/ginkgo/v2 v2.19.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect go.opentelemetry.io/otel/metric v1.28.0 // indirect @@ -37,13 +38,13 @@ require ( require ( github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect - github.com/Microsoft/go-winio v0.4.17 // indirect + github.com/Microsoft/go-winio v0.6.2 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/docker/docker-credential-helpers v0.6.1 // indirect - github.com/docker/go-units v0.4.0 // indirect - github.com/fatih/color v1.15.0 // indirect + github.com/docker/docker-credential-helpers v0.8.2 // indirect + github.com/docker/go-units v0.5.0 // indirect + github.com/fatih/color v1.17.0 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/google/go-cmp v0.6.0 // indirect @@ -51,29 +52,28 @@ require ( github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.17 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c // indirect github.com/nxadm/tail v1.4.8 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect - github.com/opencontainers/image-spec v1.0.2 // indirect + github.com/opencontainers/image-spec v1.1.0 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/prometheus/client_model v0.5.0 // indirect - github.com/prometheus/common v0.48.0 // indirect - github.com/prometheus/procfs v0.12.0 // indirect - github.com/sagikazarmark/locafero v0.4.0 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect + github.com/sagikazarmark/locafero v0.6.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/afero v1.11.0 // indirect github.com/spf13/cast v1.6.0 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/subosito/gotenv v1.6.0 // indirect - go.uber.org/atomic v1.9.0 // indirect - go.uber.org/multierr v1.9.0 // indirect - golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect + go.uber.org/multierr v1.11.0 // indirect + golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect golang.org/x/sys v0.22.0 // indirect golang.org/x/text v0.16.0 golang.org/x/time v0.5.0 // indirect diff --git a/go.sum b/go.sum index b173d02..e25888d 100644 --- a/go.sum +++ b/go.sum @@ -1,13 +1,13 @@ github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= -github.com/Microsoft/go-winio v0.4.17 h1:iT12IBVClFevaf8PuVyi3UmZOVh4OqnaLxDTW2O6j3w= -github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= +github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= +github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= -github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= -github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/containrrr/shoutrrr v0.8.0 h1:mfG2ATzIS7NR2Ec6XL+xyoHzN97H8WPjir8aYzJUSec= @@ -19,20 +19,20 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0= -github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= +github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= +github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v27.0.3+incompatible h1:usGs0/BoBW8MWxGeEtqPMkzOY56jZ6kYlSN5BLDioCQ= github.com/docker/cli v27.0.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/docker v27.0.3+incompatible h1:aBGI9TeQ4MPlhquTQKq9XbK79rKFVwXNUAYz9aXyEBE= github.com/docker/docker v27.0.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker-credential-helpers v0.6.1 h1:Dq4iIfcM7cNtddhLVWe9h4QDjsi4OER3Z8voPu/I52g= -github.com/docker/docker-credential-helpers v0.6.1/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= +github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo= +github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= -github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= -github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= -github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= +github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= +github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4= +github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= @@ -88,8 +88,8 @@ github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3v github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= -github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= @@ -98,6 +98,8 @@ github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 h1:dcztxKSvZ4Id8iPpHERQB github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c h1:nXxl5PrvVm2L/wCy8dQu6DMTwH4oIuGN8GJDAlqDdVE= github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= @@ -105,7 +107,7 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4= +github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= @@ -113,8 +115,8 @@ github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= -github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM= -github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= +github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= +github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM= github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -125,22 +127,21 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= -github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= -github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= -github.com/prometheus/common v0.48.0 h1:QO8U2CdOzSn1BBsmXJXduaaW+dY/5QLjfB8svtSzKKE= -github.com/prometheus/common v0.48.0/go.mod h1:0/KsvlIEfPQCQ5I2iNSAWKPZziNCvRs5EC6ILDTlAPc= -github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= -github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= +github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ= github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ= -github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= +github.com/sagikazarmark/locafero v0.6.0 h1:ON7AQg37yzcRPU69mt7gwhFEBwxI6P9T4Qu3N51bwOk= +github.com/sagikazarmark/locafero v0.6.0/go.mod h1:77OmuIc6VTraTXKXIs/uvUxKGUXjE1GbemJYHqdNjX0= github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= -github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= @@ -161,8 +162,6 @@ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSS github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -174,8 +173,8 @@ github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY= @@ -190,15 +189,13 @@ go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+ go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= -go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= -go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= -go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g= -golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k= +golang.org/x/exp v0.0.0-20240707233637-46b078467d37 h1:uLDX+AfeFCct3a2C7uIWBKMJIR3CJMhcgfrUAqjRK6w= +golang.org/x/exp v0.0.0-20240707233637-46b078467d37/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -219,15 +216,14 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -242,8 +238,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg= -golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg= +golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/pkg/container/client.go b/pkg/container/client.go index 21d9da7..0ca46ac 100644 --- a/pkg/container/client.go +++ b/pkg/container/client.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/filters" + "github.com/docker/docker/api/types/image" "github.com/docker/docker/api/types/network" sdkClient "github.com/docker/docker/client" log "github.com/sirupsen/logrus" @@ -109,7 +109,7 @@ func (client dockerClient) ListContainers(fn t.Filter) ([]t.Container, error) { filter := client.createListFilter() containers, err := client.api.ContainerList( bg, - types.ContainerListOptions{ + container.ListOptions{ Filters: filter, }) @@ -206,7 +206,7 @@ func (client dockerClient) StopContainer(c t.Container, timeout time.Duration) e } else { log.Debugf("Removing container %s", shortID) - if err := client.api.ContainerRemove(bg, idStr, types.ContainerRemoveOptions{Force: true, RemoveVolumes: client.RemoveVolumes}); err != nil { + if err := client.api.ContainerRemove(bg, idStr, container.RemoveOptions{Force: true, RemoveVolumes: client.RemoveVolumes}); err != nil { if sdkClient.IsErrNotFound(err) { log.Debugf("Container %s not found, skipping removal.", shortID) return nil @@ -303,7 +303,7 @@ func (client dockerClient) doStartContainer(bg context.Context, c t.Container, c name := c.Name() log.Debugf("Starting container %s (%s)", name, t.ContainerID(creation.ID).ShortID()) - err := client.api.ContainerStart(bg, creation.ID, types.ContainerStartOptions{}) + err := client.api.ContainerStart(bg, creation.ID, container.StartOptions{}) if err != nil { return err } @@ -411,7 +411,7 @@ func (client dockerClient) RemoveImageByID(id t.ImageID) error { items, err := client.api.ImageRemove( context.Background(), string(id), - types.ImageRemoveOptions{ + image.RemoveOptions{ Force: true, }) @@ -444,7 +444,7 @@ func (client dockerClient) ExecuteCommand(containerID t.ContainerID, command str clog := log.WithField("containerID", containerID) // Create the exec - execConfig := types.ExecConfig{ + execConfig := container.ExecOptions{ Tty: true, Detach: false, Cmd: []string{"sh", "-c", command}, @@ -455,7 +455,7 @@ func (client dockerClient) ExecuteCommand(containerID t.ContainerID, command str return false, err } - response, attachErr := client.api.ContainerExecAttach(bg, exec.ID, types.ExecStartCheck{ + response, attachErr := client.api.ContainerExecAttach(bg, exec.ID, container.ExecStartOptions{ Tty: true, Detach: false, }) @@ -464,7 +464,7 @@ func (client dockerClient) ExecuteCommand(containerID t.ContainerID, command str } // Run the exec - execStartCheck := types.ExecStartCheck{Detach: false, Tty: true} + execStartCheck := container.ExecStartOptions{Detach: false, Tty: true} err = client.api.ContainerExecStart(bg, exec.ID, execStartCheck) if err != nil { return false, err diff --git a/pkg/container/client_test.go b/pkg/container/client_test.go index 0bb6177..d4bcb40 100644 --- a/pkg/container/client_test.go +++ b/pkg/container/client_test.go @@ -11,6 +11,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/backend" + "github.com/docker/docker/api/types/container" cli "github.com/docker/docker/client" "github.com/docker/docker/errdefs" "github.com/onsi/gomega/gbytes" @@ -270,7 +271,7 @@ var _ = Describe("the client", func() { // API.ContainerExecCreate ghttp.CombineHandlers( ghttp.VerifyRequest("POST", HaveSuffix("containers/%v/exec", containerID)), - ghttp.VerifyJSONRepresenting(types.ExecConfig{ + ghttp.VerifyJSONRepresenting(container.ExecOptions{ User: user, Detach: false, Tty: true, @@ -285,7 +286,7 @@ var _ = Describe("the client", func() { // API.ContainerExecStart ghttp.CombineHandlers( ghttp.VerifyRequest("POST", HaveSuffix("exec/%v/start", execID)), - ghttp.VerifyJSONRepresenting(types.ExecStartCheck{ + ghttp.VerifyJSONRepresenting(container.ExecStartOptions{ Detach: false, Tty: true, }), diff --git a/pkg/container/mocks/ApiServer.go b/pkg/container/mocks/ApiServer.go index 716618a..25a02ad 100644 --- a/pkg/container/mocks/ApiServer.go +++ b/pkg/container/mocks/ApiServer.go @@ -13,6 +13,7 @@ import ( t "github.com/beatkind/watchtower/pkg/types" "github.com/docker/docker/api/types" + I "github.com/docker/docker/api/types/image" "github.com/docker/docker/api/types/filters" O "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" @@ -262,12 +263,12 @@ func RemoveImageHandler(imagesWithParents map[string][]string) http.HandlerFunc image := parts[len(parts)-1] if parents, found := imagesWithParents[image]; found { - items := []types.ImageDeleteResponseItem{ + items := []I.DeleteResponse{ {Untagged: image}, {Deleted: image}, } for _, parent := range parents { - items = append(items, types.ImageDeleteResponseItem{Deleted: parent}) + items = append(items, I.DeleteResponse{Deleted: parent}) } ghttp.RespondWithJSONEncoded(http.StatusOK, items)(w, r) } else { diff --git a/pkg/registry/registry.go b/pkg/registry/registry.go index 5fbfe9f..7fdad4a 100644 --- a/pkg/registry/registry.go +++ b/pkg/registry/registry.go @@ -4,39 +4,31 @@ import ( "github.com/beatkind/watchtower/pkg/registry/helpers" watchtowerTypes "github.com/beatkind/watchtower/pkg/types" ref "github.com/distribution/reference" - "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/image" log "github.com/sirupsen/logrus" ) // GetPullOptions creates a struct with all options needed for pulling images from a registry -func GetPullOptions(imageName string) (types.ImagePullOptions, error) { +func GetPullOptions(imageName string) (image.PullOptions, error) { auth, err := EncodedAuth(imageName) log.Debugf("Got image name: %s", imageName) if err != nil { - return types.ImagePullOptions{}, err + return image.PullOptions{}, err } if auth == "" { - return types.ImagePullOptions{}, nil + return image.PullOptions{}, nil } // CREDENTIAL: Uncomment to log docker config auth // log.Tracef("Got auth value: %s", auth) - return types.ImagePullOptions{ + return image.PullOptions{ RegistryAuth: auth, - PrivilegeFunc: DefaultAuthHandler, + // PrivilegeFunc: DefaultAuthHandler, }, nil } -// DefaultAuthHandler will be invoked if an AuthConfig is rejected -// It could be used to return a new value for the "X-Registry-Auth" authentication header, -// but there's no point trying again with the same value as used in AuthConfig -func DefaultAuthHandler() (string, error) { - log.Debug("Authentication request was rejected. Trying again without authentication") - return "", nil -} - // WarnOnAPIConsumption will return true if the registry is known-expected // to respond well to HTTP HEAD in checking the container digest -- or if there // are problems parsing the container hostname. From 52c45042a5764146b0cc41ac630572b26302f597 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 15:21:34 +0000 Subject: [PATCH 035/157] fix(deps): update module github.com/onsi/ginkgo to v2 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 0ba5d52..76d7ca3 100644 --- a/go.mod +++ b/go.mod @@ -9,6 +9,7 @@ require ( github.com/docker/docker v27.0.3+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 + github.com/onsi/ginkgo/v2 v2.19.0 github.com/onsi/gomega v1.33.1 github.com/prometheus/client_golang v1.19.1 github.com/robfig/cron v1.2.0 @@ -27,7 +28,6 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/onsi/ginkgo/v2 v2.19.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect From b1a8282311a10cfe7f1d0fb4f24720ee37269322 Mon Sep 17 00:00:00 2001 From: "Jan O. Rundshagen" Date: Tue, 9 Jul 2024 08:45:41 +0200 Subject: [PATCH 036/157] Create CNAME --- CNAME | 1 + 1 file changed, 1 insertion(+) create mode 100644 CNAME diff --git a/CNAME b/CNAME new file mode 100644 index 0000000..e7de50f --- /dev/null +++ b/CNAME @@ -0,0 +1 @@ +watchtower.devcdn.net \ No newline at end of file From 7382727c74ed99b86ca803aa59d2017a7d881c77 Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Tue, 9 Jul 2024 09:00:00 +0200 Subject: [PATCH 037/157] chore: Update readme, add some hints, fix markdown --- .github/workflows/codeql-analysis.yaml | 72 -------------------------- .github/workflows/greetings.yaml | 23 -------- CONTRIBUTING.md | 26 +++++++--- README.md | 35 ++++++++----- SECURITY.md | 12 +---- code_of_conduct.md | 4 +- 6 files changed, 43 insertions(+), 129 deletions(-) delete mode 100644 .github/workflows/codeql-analysis.yaml delete mode 100644 .github/workflows/greetings.yaml diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml deleted file mode 100644 index c479d05..0000000 --- a/.github/workflows/codeql-analysis.yaml +++ /dev/null @@ -1,72 +0,0 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -name: "CodeQL" - -on: - push: - branches: [main] - pull_request: - # The branches below must be a subset of the branches above - branches: [main] - schedule: - - cron: '0 1 * * 4' - workflow_dispatch: - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - - strategy: - fail-fast: false - matrix: - # Override automatic language detection by changing the below list - # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python'] - language: ['go'] - # Learn more... - # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - with: - # We must fetch at least the immediate parents so that if this is - # a pull request then we can checkout the head. - fetch-depth: 2 - - # If this run was triggered by a pull request event, then checkout - # the head of the pull request instead of the merge commit. - - run: git checkout HEAD^2 - if: ${{ github.event_name == 'pull_request' }} - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v3 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main - - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v3 - - # ℹ️ Command-line programs to run using the OS shell. - # πŸ“š https://git.io/JvXDl - - # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language - - #- run: | - # make bootstrap - # make release - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/greetings.yaml b/.github/workflows/greetings.yaml deleted file mode 100644 index acb985f..0000000 --- a/.github/workflows/greetings.yaml +++ /dev/null @@ -1,23 +0,0 @@ -# name: Greetings - -# on: -# # Runs in the context of the target (beatkind/watchtower) repository, and as such has access to GITHUB_TOKEN -# pull_request_target: -# types: [opened] -# issues: -# types: [opened] - -# jobs: -# greeting: -# runs-on: ubuntu-latest -# steps: -# - uses: actions/first-interaction@v1 -# with: -# repo-token: ${{ secrets.GITHUB_TOKEN }} -# issue-message: > -# Hi there! πŸ‘‹πŸΌ -# As you're new to this repo, we'd like to suggest that you read our [code of conduct](https://github.com/beatkind/.github/blob/master/CODE_OF_CONDUCT.md) -# as well as our [contribution guidelines](https://github.com/beatkind/watchtower/blob/master/CONTRIBUTING.md). -# Thanks a bunch for opening your first issue! πŸ™ -# pr-message: > -# Congratulations on opening your first pull request! We'll get back to you as soon as possible. In the meantime, please make sure you've updated the documentation to reflect your changes and have added test automation as needed. Thanks! πŸ™πŸΌ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0202384..37f1b1e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,25 +1,33 @@ +# Contributing + ## Prerequisites + To contribute code changes to this project you will need the following development kits. - * [Go](https://golang.org/doc/install) - * [Docker](https://docs.docker.com/engine/installation/) - + +* [Go](https://golang.org/doc/install) +* [Docker](https://docs.docker.com/engine/installation/) + As watchtower utilizes go modules for vendor locking, you'll need at least Go 1.11. You can check your current version of the go language as follows: + ```bash ~ $ go version - go version go1.12.1 darwin/amd64 + go version go1.22.x darwin/amd64 ``` - ## Checking out the code + Do not place your code in the go source path. + ```bash git clone git@github.com:/watchtower.git cd watchtower ``` ## Building and testing + watchtower is a go application and is built with go commands. The following commands assume that you are at the root level of your repo. + ```bash go build # compiles and packages an executable binary, watchtower go test ./... -v # runs tests with verbose output @@ -29,10 +37,12 @@ go test ./... -v # runs tests with verbose output If you dont have it enabled, you'll either have to prefix each command with `GO111MODULE=on` or run `export GO111MODULE=on` before running the commands. [You can read more about modules here.](https://github.com/golang/go/wiki/Modules) To build a Watchtower image of your own, use the self-contained Dockerfiles. As the main Dockerfile, they can be found in `dockerfiles/`: -- `dockerfiles/Dockerfile.dev-self-contained` will build an image based on your current local Watchtower files. -- `dockerfiles/Dockerfile.self-contained` will build an image based on current Watchtower's repository on GitHub. + +* `dockerfiles/Dockerfile.dev-self-contained` will build an image based on your current local Watchtower files. +* `dockerfiles/Dockerfile.self-contained` will build an image based on current Watchtower's repository on GitHub. e.g.: + ```bash sudo docker build . -f dockerfiles/Dockerfile.dev-self-contained -t containrrr/watchtower # to build an image from local files -``` \ No newline at end of file +``` diff --git a/README.md b/README.md index 518ac8f..f0c0c53 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,25 @@ +# Watchtower + +> [!NOTE] +> This is a fork of the really nice project from [containrrr](https://github.com/containrrr) called [watchtower](https://github.com/containrrr/watchtower). +> +> I am not the original author of this project. I just forked it to make some changes to it and keep it up-to-date as properly as I can. +> +> Contributions, tips and hints are welcome. Just open an issue or a pull request. Please be aware that I am by no means a professional developer. I am just a Platform Engineer. +
- + - # Watchtower +A process for automating Docker container base image updates. + +

- A process for automating Docker container base image updates. -

- - [![codecov](https://codecov.io/gh/beatkind/watchtower/branch/main/graph/badge.svg)](https://codecov.io/gh/beatkind/watchtower) - [![GoDoc](https://godoc.org/github.com/beatkind/watchtower?status.svg)](https://godoc.org/github.com/beatkind/watchtower) - [![Go Report Card](https://goreportcard.com/badge/github.com/beatkind/watchtower)](https://goreportcard.com/report/github.com/beatkind/watchtower) - [![latest version](https://img.shields.io/github/tag/beatkind/watchtower.svg)](https://github.com/beatkind/watchtower/releases) - [![Apache-2.0 License](https://img.shields.io/github/license/beatkind/watchtower.svg)](https://www.apache.org/licenses/LICENSE-2.0) - [![Pulls from DockerHub](https://img.shields.io/docker/pulls/beatkind/watchtower.svg)](https://hub.docker.com/r/beatkind/watchtower) +[![codecov](https://codecov.io/gh/beatkind/watchtower/branch/main/graph/badge.svg)](https://codecov.io/gh/beatkind/watchtower) +[![GoDoc](https://godoc.org/github.com/beatkind/watchtower?status.svg)](https://godoc.org/github.com/beatkind/watchtower) +[![Go Report Card](https://goreportcard.com/badge/github.com/beatkind/watchtower)](https://goreportcard.com/report/github.com/beatkind/watchtower) +[![latest version](https://img.shields.io/github/tag/beatkind/watchtower.svg)](https://github.com/beatkind/watchtower/releases) +[![Apache-2.0 License](https://img.shields.io/github/license/beatkind/watchtower.svg)](https://www.apache.org/licenses/LICENSE-2.0) +[![Pulls from DockerHub](https://img.shields.io/docker/pulls/beatkind/watchtower.svg)](https://hub.docker.com/r/beatkind/watchtower)
@@ -21,7 +29,7 @@ With watchtower you can update the running version of your containerized app sim Watchtower will pull down your new image, gracefully shut down your existing container and restart it with the same options that were used when it was deployed initially. Run the watchtower container with the following command: -``` +```bash $ docker run --detach \ --name watchtower \ --volume /var/run/docker.sock:/var/run/docker.sock \ @@ -31,4 +39,5 @@ $ docker run --detach \ Watchtower is intended to be used in homelabs, media centers, local dev environments, and similar. We do **not** recommend using Watchtower in a commercial or production environment. If that is you, you should be looking into using Kubernetes. If that feels like too big a step for you, please look into solutions like [MicroK8s](https://microk8s.io/) and [k3s](https://k3s.io/) that take away a lot of the toil of running a Kubernetes cluster. ## Documentation -The full documentation is available at https://beatkind.dev/watchtower. + +The full documentation is available at . diff --git a/SECURITY.md b/SECURITY.md index 550f904..f217592 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,13 +1,3 @@ # Security Policy -## Supported Versions - -Security updates will always only be applied to the latest version of Watchtower. -As the software by default is set to auto-update if you use the `latest` tag, you will get these security updates automatically as soon as they are released. - -## Reporting a Vulnerability - -Critical vulnerabilities that might open up for external attacks are best reported directly either to simme@arcticbit.se or nils@piksel.se. -We'll always try to get back to you as swiftly as possible, but keep in mind that since this is a community project, we can't really leave any guarantees about the speed. - -Non-critical vulnerabilities may be reported as regular GitHub issues. +Nothing here yet. We'll figure it out. Message me if you need something under: . diff --git a/code_of_conduct.md b/code_of_conduct.md index ae04b6b..f871c31 100644 --- a/code_of_conduct.md +++ b/code_of_conduct.md @@ -1,3 +1,3 @@ -### Containrrr Community Code of Conduct +# Containrrr Community Code of Conduct -Please refer to out [Containrrr Community Code of Conduct](https://github.com/beatkind/.github/blob/master/CODE_OF_CONDUCT.md) +Nothing here yet. We'll figure it our, once it is at that point. From 156d25ccea30d657b5a7d9559e604e4628a5b291 Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Tue, 9 Jul 2024 09:22:02 +0200 Subject: [PATCH 038/157] chore(docs): Update docs --- docs/arguments.md | 10 +++++----- docs/container-selection.md | 8 ++++---- docs/http-api-mode.md | 2 +- docs/index.md | 31 ++++++++++++++---------------- docs/introduction.md | 2 +- docs/notifications.md | 26 ++++++++++++------------- docs/private-registries.md | 10 +++++----- docs/remote-hosts.md | 4 ++-- docs/running-multiple-instances.md | 6 +++--- docs/secure-connections.md | 2 +- docs/updating.md | 2 +- docs/usage-overview.md | 10 +++++----- 12 files changed, 55 insertions(+), 58 deletions(-) diff --git a/docs/arguments.md b/docs/arguments.md index d7ed0b0..9d7b1d1 100644 --- a/docs/arguments.md +++ b/docs/arguments.md @@ -7,7 +7,7 @@ launching watchtower. $ docker run -d \ --name watchtower \ -v /var/run/docker.sock:/var/run/docker.sock \ - containrrr/watchtower \ + beatkind/watchtower \ nginx redis ``` @@ -18,7 +18,7 @@ the watchtower container after its execution. ```bash $ docker run --rm \ -v /var/run/docker.sock:/var/run/docker.sock \ - containrrr/watchtower \ + beatkind/watchtower \ --run-once \ nginx redis ``` @@ -245,7 +245,7 @@ Environment Variable: WATCHTOWER_DISABLE_CONTAINERS ## Without updating containers Will only monitor for new images, send notifications and invoke -the [pre-check/post-check hooks](https://containrrr.dev/watchtower/lifecycle-hooks/), but will __not__ update the +the [pre-check/post-check hooks](https://watchtower.devcdn.nelifecycle-hooks/), but will __not__ update the containers. !!! note @@ -325,7 +325,7 @@ Environment Variable: WATCHTOWER_RUN_ONCE ## HTTP API Mode Runs Watchtower in HTTP API mode, only allowing image updates to be triggered by an HTTP request. -For details see [HTTP API](https://containrrr.dev/watchtower/http-api-mode). +For details see [HTTP API](https://watchtower.devcdn.nehttp-api-mode). ```text Argument: --http-api-update @@ -357,7 +357,7 @@ Environment Variable: WATCHTOWER_HTTP_API_PERIODIC_POLLS ## Filter by scope Update containers that have a `com.centurylinklabs.watchtower.scope` label set with the same value as the given argument. -This enables [running multiple instances](https://containrrr.dev/watchtower/running-multiple-instances). +This enables [running multiple instances](https://watchtower.devcdn.nerunning-multiple-instances). !!! note "Filter by lack of scope" If you want other instances of watchtower to ignore the scoped containers, set this argument to `none`. diff --git a/docs/container-selection.md b/docs/container-selection.md index 8327c66..2be8f61 100644 --- a/docs/container-selection.md +++ b/docs/container-selection.md @@ -3,7 +3,7 @@ By default, watchtower will watch all containers. However, sometimes only some c There are two options: - **Fully exclude**: You can choose to exclude containers entirely from being watched by watchtower. -- **Monitor only**: In this mode, watchtower checks for container updates, sends notifications and invokes the [pre-check/post-check hooks](https://containrrr.dev/watchtower/lifecycle-hooks/) on the containers but does **not** perform the update. +- **Monitor only**: In this mode, watchtower checks for container updates, sends notifications and invokes the [pre-check/post-check hooks](https://watchtower.devcdn.nelifecycle-hooks/) on the containers but does **not** perform the update. ## Full Exclude @@ -31,7 +31,7 @@ If you need to exclude some containers, set the _com.centurylinklabs.watchtower. - "com.centurylinklabs.watchtower.enable=false" ``` -If instead you want to [only include containers with the enable label](https://containrrr.github.io/watchtower/arguments/#filter_by_enable_label), pass the `--label-enable` flag or the `WATCHTOWER_LABEL_ENABLE` environment variable on startup for watchtower and set the _com.centurylinklabs.watchtower.enable_ label with a value of `true` on the containers you want to watch. +If instead you want to [only include containers with the enable label](https://watchtower.devcdn.net/arguments/#filter_by_enable_label), pass the `--label-enable` flag or the `WATCHTOWER_LABEL_ENABLE` environment variable on startup for watchtower and set the _com.centurylinklabs.watchtower.enable_ label with a value of `true` on the containers you want to watch. === "dockerfile" @@ -55,7 +55,7 @@ If instead you want to [only include containers with the enable label](https://c - "com.centurylinklabs.watchtower.enable=true" ``` -If you wish to create a monitoring scope, you will need to [run multiple instances and set a scope for each of them](https://containrrr.github.io/watchtower/running-multiple-instances). +If you wish to create a monitoring scope, you will need to [run multiple instances and set a scope for each of them](https://watchtower.devcdn.net/running-multiple-instances). Watchtower filters running containers by testing them against each configured criteria. A container is monitored if all criteria are met. For example: @@ -78,4 +78,4 @@ Or, it can be specified as part of the `docker run` command line: docker run -d --label=com.centurylinklabs.watchtower.monitor-only=true someimage ``` -When the label is specified on a container, watchtower treats that container exactly as if [`WATCHTOWER_MONITOR_ONLY`](https://containrrr.dev/watchtower/arguments/#without_updating_containers) was set, but the effect is limited to the individual container. +When the label is specified on a container, watchtower treats that container exactly as if [`WATCHTOWER_MONITOR_ONLY`](https://watchtower.devcdn.nearguments/#without_updating_containers) was set, but the effect is limited to the individual container. diff --git a/docs/http-api-mode.md b/docs/http-api-mode.md index 69812bb..9702096 100644 --- a/docs/http-api-mode.md +++ b/docs/http-api-mode.md @@ -16,7 +16,7 @@ services: - "com.centurylinklabs.watchtower.enable=true" watchtower: - image: containrrr/watchtower + image: beatkind/watchtower volumes: - /var/run/docker.sock:/var/run/docker.sock command: --debug --http-api-update diff --git a/docs/index.md b/docs/index.md index 55ac113..0ed9bcf 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,4 +1,10 @@

+> [!NOTE] +> This is a fork of the really nice project from [containrrr](https://github.com/containrrr) called [watchtower](https://github.com/containrrr/watchtower). +> +> I am not the original author of this project. I just forked it to make some changes to it and keep it up-to-date as properly as I can. +> +> Contributions, tips and hints are welcome. Just open an issue or a pull request. Please be aware that I am by no means a professional developer. I am just a Platform Engineer. Logotype depicting a lighthouse

@@ -8,11 +14,8 @@

A container-based solution for automating Docker container base image updates.

- - Circle CI - - - Codecov + + Codecov GoDoc @@ -21,19 +24,13 @@ Go Report Card - latest version + latest version - Apache-2.0 License + Apache-2.0 License - - Codacy Badge - - - All Contributors - - - Pulls from DockerHub + + Pulls from DockerHub

@@ -50,7 +47,7 @@ the following command: $ docker run -d \ --name watchtower \ -v /var/run/docker.sock:/var/run/docker.sock \ - containrrr/watchtower + beatkind/watchtower ``` === "docker-compose.yml" @@ -59,7 +56,7 @@ the following command: version: "3" services: watchtower: - image: containrrr/watchtower + image: beatkind/watchtower volumes: - /var/run/docker.sock:/var/run/docker.sock ``` diff --git a/docs/introduction.md b/docs/introduction.md index cbbc3a3..7158ecd 100644 --- a/docs/introduction.md +++ b/docs/introduction.md @@ -8,7 +8,7 @@ For example, let's say you were running watchtower along with an instance of _ce $ docker ps CONTAINER ID IMAGE STATUS PORTS NAMES 967848166a45 centurylink/wetty-cli Up 10 minutes 0.0.0.0:8080->3000/tcp wetty -6cc4d2a9d1a5 containrrr/watchtower Up 15 minutes watchtower +6cc4d2a9d1a5 beatkind/watchtower Up 15 minutes watchtower ``` Every day watchtower will pull the latest _centurylink/wetty-cli_ image and compare it to the one that was used to run the "wetty" container. If it sees that the image has changed it will stop/remove the "wetty" container and then restart it using the new image and the same `docker run` options that were used to start the container initially (in this case, that would include the `-p 8080:3000` port mapping). diff --git a/docs/notifications.md b/docs/notifications.md index d5da4fe..2a5fc01 100644 --- a/docs/notifications.md +++ b/docs/notifications.md @@ -19,7 +19,7 @@ system, [logrus](http://github.com/sirupsen/logrus). - `--notifications-level` (env. `WATCHTOWER_NOTIFICATIONS_LEVEL`): Controls the log level which is used for the notifications. If omitted, the default log level is `info`. Possible values are: `panic`, `fatal`, `error`, `warn`, `info`, `debug` or `trace`. - `--notifications-hostname` (env. `WATCHTOWER_NOTIFICATIONS_HOSTNAME`): Custom hostname specified in subject/title. Useful to override the operating system hostname. - `--notifications-delay` (env. `WATCHTOWER_NOTIFICATIONS_DELAY`): Delay before sending notifications expressed in seconds. -- Watchtower will post a notification every time it is started. This behavior [can be changed](https://containrrr.github.io/watchtower/arguments/#without_sending_a_startup_message) with an argument. +- Watchtower will post a notification every time it is started. This behavior [can be changed](https://watchtower.devcdn.net/arguments/#without_sending_a_startup_message) with an argument. - `--notification-title-tag` (env. `WATCHTOWER_NOTIFICATION_TITLE_TAG`): Prefix to include in the title. Useful when running multiple watchtowers. - `--notification-skip-title` (env. `WATCHTOWER_NOTIFICATION_SKIP_TITLE`): Do not pass the title param to notifications. This will not pass a dynamic title override to notification services. If no title is configured for the service, it will remove the title all together. - `--notification-log-stdout` (env. `WATCHTOWER_NOTIFICATION_LOG_STDOUT`): Enable output from `logger://` shoutrrr service to stdout. @@ -69,7 +69,7 @@ docker run -d \ -v /var/run/docker.sock:/var/run/docker.sock \ -e WATCHTOWER_NOTIFICATION_URL="discord://token@channel slack://watchtower@token-a/token-b/token-c" \ -e WATCHTOWER_NOTIFICATION_TEMPLATE="{{range .}}{{.Time.Format \"2006-01-02 15:04:05\"}} ({{.Level}}): {{.Message}}{{println}}{{end}}" \ - containrrr/watchtower + beatkind/watchtower ``` ## Report templates @@ -138,7 +138,7 @@ Example using a custom report template that always sends a session report after {{range .Entries -}}{{.Message}}{{\"\n\"}}{{- end -}} {{- end -}} " \ - containrrr/watchtower + beatkind/watchtower ``` === "docker-compose" @@ -147,7 +147,7 @@ Example using a custom report template that always sends a session report after version: "3" services: watchtower: - image: containrrr/watchtower + image: beatkind/watchtower volumes: - /var/run/docker.sock:/var/run/docker.sock env: @@ -199,7 +199,7 @@ If watchtower is started with `notify-upgrade` as it's first argument, it will g -v /var/run/docker.sock:/var/run/docker.sock \ -e WATCHTOWER_NOTIFICATIONS=slack \ -e WATCHTOWER_NOTIFICATION_SLACK_HOOK_URL="https://hooks.slack.com/services/xxx/yyyyyyyyyyyyyyy" \ - containrrr/watchtower \ + beatkind/watchtower \ notify-upgrade ``` @@ -209,7 +209,7 @@ If watchtower is started with `notify-upgrade` as it's first argument, it will g version: "3" services: watchtower: - image: containrrr/watchtower + image: beatkind/watchtower volumes: - /var/run/docker.sock:/var/run/docker.sock env: @@ -228,7 +228,7 @@ You can then copy this file from the container (a message with the full command --name watchtower \ -v /var/run/docker.sock:/var/run/docker.sock \ --env-file watchtower-notifications.env \ - containrrr/watchtower + beatkind/watchtower ``` === "docker-compose.yml" @@ -237,7 +237,7 @@ You can then copy this file from the container (a message with the full command version: "3" services: watchtower: - image: containrrr/watchtower + image: beatkind/watchtower volumes: - /var/run/docker.sock:/var/run/docker.sock env_file: @@ -272,7 +272,7 @@ docker run -d \ -e WATCHTOWER_NOTIFICATION_EMAIL_SERVER_USER=fromaddress@gmail.com \ -e WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PASSWORD=app_password \ -e WATCHTOWER_NOTIFICATION_EMAIL_DELAY=2 \ - containrrr/watchtower + beatkind/watchtower ``` The previous example assumes, that you already have an SMTP server up and running you can connect to. If you don't or you want to bring up watchtower with your own simple SMTP relay the following `docker-compose.yml` might be a good start for you. @@ -285,7 +285,7 @@ Example including an SMTP relay: version: '3.8' services: watchtower: - image: containrrr/watchtower:latest + image: beatkind/watchtower:latest container_name: watchtower environment: WATCHTOWER_MONITOR_ONLY: 'true' @@ -347,7 +347,7 @@ docker run -d \ -e WATCHTOWER_NOTIFICATION_SLACK_HOOK_URL="https://hooks.slack.com/services/xxx/yyyyyyyyyyyyyyy" \ -e WATCHTOWER_NOTIFICATION_SLACK_IDENTIFIER=watchtower-server-1 \ -e WATCHTOWER_NOTIFICATION_SLACK_CHANNEL=#my-custom-channel \ - containrrr/watchtower + beatkind/watchtower ``` ### Microsoft Teams @@ -367,7 +367,7 @@ docker run -d \ -e WATCHTOWER_NOTIFICATIONS=msteams \ -e WATCHTOWER_NOTIFICATION_MSTEAMS_HOOK_URL="https://outlook.office.com/webhook/xxxxxxxx@xxxxxxx/IncomingWebhook/yyyyyyyy/zzzzzzzzzz" \ -e WATCHTOWER_NOTIFICATION_MSTEAMS_USE_LOG_DATA=true \ - containrrr/watchtower + beatkind/watchtower ``` ### Gotify @@ -381,7 +381,7 @@ docker run -d \ -e WATCHTOWER_NOTIFICATIONS=gotify \ -e WATCHTOWER_NOTIFICATION_GOTIFY_URL="https://my.gotify.tld/" \ -e WATCHTOWER_NOTIFICATION_GOTIFY_TOKEN="SuperSecretToken" \ - containrrr/watchtower + beatkind/watchtower ``` `-e WATCHTOWER_NOTIFICATION_GOTIFY_TOKEN` or `--notification-gotify-token` can also reference a file, in which case the contents of the file are used. diff --git a/docs/private-registries.md b/docs/private-registries.md index 5367a8c..3a3ba43 100644 --- a/docs/private-registries.md +++ b/docs/private-registries.md @@ -63,7 +63,7 @@ When the watchtower Docker container is started, the created configuration file (`/config.json` in this example) needs to be passed to the container: ```bash -docker run [...] -v /config.json:/config.json containrrr/watchtower +docker run [...] -v /config.json:/config.json beatkind/watchtower ``` ### Share the Docker configuration file @@ -76,7 +76,7 @@ additional configuration file is not necessary. When the Docker container is started, pass the configuration file to watchtower: ```bash -docker run [...] -v /.docker/config.json:/config.json containrrr/watchtower +docker run [...] -v /.docker/config.json:/config.json beatkind/watchtower ``` When creating the watchtower container via docker-compose, use the following lines: @@ -85,7 +85,7 @@ When creating the watchtower container via docker-compose, use the following lin version: "3.4" services: watchtower: - image: containrrr/watchtower:latest + image: beatkind/watchtower:latest volumes: - /var/run/docker.sock:/var/run/docker.sock - /.docker/config.json:/config.json @@ -101,7 +101,7 @@ version: "3.4" services: watchtower: - image: containrrr/watchtower + image: beatkind/watchtower environment: DOCKER_CONFIG: /config volumes: @@ -178,7 +178,7 @@ in a volume that may be mounted onto your watchtower container. # Check for new images and restart things if a new image exists # for any of our containers. watchtower: - image: containrrr/watchtower:latest + image: beatkind/watchtower:latest volumes: - /var/run/docker.sock:/var/run/docker.sock - .docker/config.json:/config.json diff --git a/docs/remote-hosts.md b/docs/remote-hosts.md index 22c3f94..b1808d8 100644 --- a/docs/remote-hosts.md +++ b/docs/remote-hosts.md @@ -3,7 +3,7 @@ By default, watchtower is set-up to monitor the local Docker daemon (the same da ```bash docker run -d \ --name watchtower \ - containrrr/watchtower --host "tcp://10.0.1.2:2375" + beatkind/watchtower --host "tcp://10.0.1.2:2375" ``` or @@ -12,7 +12,7 @@ or docker run -d \ --name watchtower \ -e DOCKER_HOST="tcp://10.0.1.2:2375" \ - containrrr/watchtower + beatkind/watchtower ``` Note in both of the examples above that it is unnecessary to mount the _/var/run/docker.sock_ into the watchtower container. diff --git a/docs/running-multiple-instances.md b/docs/running-multiple-instances.md index 5a82c80..470b9e1 100644 --- a/docs/running-multiple-instances.md +++ b/docs/running-multiple-instances.md @@ -1,4 +1,4 @@ -By default, Watchtower will clean up other instances and won't allow multiple instances running on the same Docker host or swarm. It is possible to override this behavior by defining a [scope](https://containrrr.github.io/watchtower/arguments/#filter_by_scope) to each running instance. +By default, Watchtower will clean up other instances and won't allow multiple instances running on the same Docker host or swarm. It is possible to override this behavior by defining a [scope](https://watchtower.devcdn.net/arguments/#filter_by_scope) to each running instance. !!! note - Multiple instances can't run with the same scope; @@ -18,7 +18,7 @@ services: labels: [ "com.centurylinklabs.watchtower.scope=myscope" ] scoped-watchtower: - image: containrrr/watchtower + image: beatkind/watchtower volumes: [ "/var/run/docker.sock:/var/run/docker.sock" ] command: --interval 30 --scope myscope labels: [ "com.centurylinklabs.watchtower.scope=myscope" ] @@ -35,7 +35,7 @@ services: labels: [ "com.centurylinklabs.watchtower.scope=" ] unscoped-watchtower: - image: containrrr/watchtower + image: beatkind/watchtower volumes: [ "/var/run/docker.sock:/var/run/docker.sock" ] command: --interval 30 --scope none ``` diff --git a/docs/secure-connections.md b/docs/secure-connections.md index 0c2a900..debb59e 100644 --- a/docs/secure-connections.md +++ b/docs/secure-connections.md @@ -10,5 +10,5 @@ docker run -d \ -e DOCKER_HOST=$DOCKER_HOST \ -e DOCKER_CERT_PATH=/etc/ssl/docker \ -v $DOCKER_CERT_PATH:/etc/ssl/docker \ - containrrr/watchtower --tlsverify + beatkind/watchtower --tlsverify ``` diff --git a/docs/updating.md b/docs/updating.md index 952a0f9..4b95775 100644 --- a/docs/updating.md +++ b/docs/updating.md @@ -2,5 +2,5 @@ If watchtower is monitoring the same Docker daemon under which the watchtower container itself is running (i.e. if you volume-mounted `/var/run/docker.sock` into the watchtower container) then it has the ability to update itself. -If a new version of the `containrrr/watchtower` image is pushed to the Docker Hub, your watchtower will pull down the +If a new version of the `beatkind/watchtower` image is pushed to the Docker Hub, your watchtower will pull down the new image and restart itself automatically. diff --git a/docs/usage-overview.md b/docs/usage-overview.md index 1cac352..a5e213c 100644 --- a/docs/usage-overview.md +++ b/docs/usage-overview.md @@ -1,4 +1,4 @@ -Watchtower is itself packaged as a Docker container so installation is as simple as pulling the `containrrr/watchtower` image. If you are using ARM based architecture, pull the appropriate `containrrr/watchtower:armhf-` image from the [containrrr Docker Hub](https://hub.docker.com/r/containrrr/watchtower/tags/). +Watchtower is itself packaged as a Docker container so installation is as simple as pulling the `beatkind/watchtower` image. If you are using ARM based architecture, pull the appropriate `beatkind/watchtower:armhf-` image from the [beatkind Docker Hub](https://hub.docker.com/r/beatkind/watchtower/tags/). Since the watchtower code needs to interact with the Docker API in order to monitor the running containers, you need to mount _/var/run/docker.sock_ into the container with the `-v` flag when you run it. @@ -8,7 +8,7 @@ Run the `watchtower` container with the following command: docker run -d \ --name watchtower \ -v /var/run/docker.sock:/var/run/docker.sock \ - containrrr/watchtower + beatkind/watchtower ``` If pulling images from private Docker registries, supply registry authentication credentials with the environment variables `REPO_USER` and `REPO_PASS` @@ -22,7 +22,7 @@ docker run -d \ -e REPO_USER=username \ -e REPO_PASS=password \ -v /var/run/docker.sock:/var/run/docker.sock \ - containrrr/watchtower container_to_watch --debug + beatkind/watchtower container_to_watch --debug ``` Also check out [this Stack Overflow answer](https://stackoverflow.com/a/30494145/7872793) for more options on how to pass environment variables. @@ -34,7 +34,7 @@ docker run -d \ --name watchtower \ -v $HOME/.docker/config.json:/config.json \ -v /var/run/docker.sock:/var/run/docker.sock \ - containrrr/watchtower container_to_watch --debug + beatkind/watchtower container_to_watch --debug ``` !!! note "Changes to config.json while running" @@ -60,7 +60,7 @@ services: - "443:3443" - "80:3080" watchtower: - image: containrrr/watchtower + image: beatkind/watchtower volumes: - /var/run/docker.sock:/var/run/docker.sock - /root/.docker/config.json:/config.json From ce8ec063eb8d7fc707d66fa45c42ca3c7542534b Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Tue, 9 Jul 2024 09:29:36 +0200 Subject: [PATCH 039/157] chore: update docs --- docs/index.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/index.md b/docs/index.md index 0ed9bcf..25d7faa 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,10 +1,9 @@

-> [!NOTE] -> This is a fork of the really nice project from [containrrr](https://github.com/containrrr) called [watchtower](https://github.com/containrrr/watchtower). -> -> I am not the original author of this project. I just forked it to make some changes to it and keep it up-to-date as properly as I can. -> + +> :warning: This is a fork of the really nice project from [containrrr](https://github.com/containrrr) called [watchtower](https://github.com/containrrr/watchtower). +> I am not the original author of this project. I just forked it to make some changes to it and keep it up-to-date as properly as I can. > Contributions, tips and hints are welcome. Just open an issue or a pull request. Please be aware that I am by no means a professional developer. I am just a Platform Engineer. + Logotype depicting a lighthouse

From c9a12c46a7a0067b2972c90a0b4026dbad1501bd Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Tue, 9 Jul 2024 09:33:44 +0200 Subject: [PATCH 040/157] chore: update docs --- docs/index.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/index.md b/docs/index.md index 25d7faa..e42fa3c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,9 +1,4 @@

- -> :warning: This is a fork of the really nice project from [containrrr](https://github.com/containrrr) called [watchtower](https://github.com/containrrr/watchtower). -> I am not the original author of this project. I just forked it to make some changes to it and keep it up-to-date as properly as I can. -> Contributions, tips and hints are welcome. Just open an issue or a pull request. Please be aware that I am by no means a professional developer. I am just a Platform Engineer. - Logotype depicting a lighthouse

@@ -33,6 +28,12 @@

+# Overview + +> :warning: This is a fork of the really nice project from [containrrr](https://github.com/containrrr) called [watchtower](https://github.com/containrrr/watchtower). +> I am not the original author of this project. I just forked it to make some changes to it and keep it up-to-date as properly as I can. +> Contributions, tips and hints are welcome. Just open an issue or a pull request. Please be aware that I am by no means a professional developer. I am just a Platform Engineer. + ## Quick Start With watchtower you can update the running version of your containerized app simply by pushing a new image to the Docker From 8da0c43aa52e277c7e17cd566b6a32333fc2117e Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Tue, 9 Jul 2024 09:40:32 +0200 Subject: [PATCH 041/157] chore: format warning docs --- docs/index.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/index.md b/docs/index.md index e42fa3c..343d501 100644 --- a/docs/index.md +++ b/docs/index.md @@ -30,9 +30,10 @@ # Overview -> :warning: This is a fork of the really nice project from [containrrr](https://github.com/containrrr) called [watchtower](https://github.com/containrrr/watchtower). -> I am not the original author of this project. I just forked it to make some changes to it and keep it up-to-date as properly as I can. -> Contributions, tips and hints are welcome. Just open an issue or a pull request. Please be aware that I am by no means a professional developer. I am just a Platform Engineer. +!!! note "Watchtower fork" + This is a fork of the really nice project from [containrrr](https://github.com/containrrr) called [watchtower](https://github.com/containrrr/watchtower). + I am not the original author of this project. I just forked it to make some changes to it and keep it up-to-date as properly as I can. + Contributions, tips and hints are welcome. Just open an issue or a pull request. Please be aware that I am by no means a professional developer. I am just a Platform Engineer. ## Quick Start From e6b2af486b1ac671c56764780152d0c1efdec0b0 Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Tue, 9 Jul 2024 09:41:57 +0200 Subject: [PATCH 042/157] chore: add custom domain --- docs/CNAME | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/CNAME diff --git a/docs/CNAME b/docs/CNAME new file mode 100644 index 0000000..e7de50f --- /dev/null +++ b/docs/CNAME @@ -0,0 +1 @@ +watchtower.devcdn.net \ No newline at end of file From 3dca7132bf866709ff8b51c617b12d017616dd60 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jul 2024 18:14:33 +0000 Subject: [PATCH 043/157] fix(deps): update module github.com/onsi/ginkgo to v2 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 76d7ca3..54797df 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/docker/cli v27.0.3+incompatible github.com/docker/docker v27.0.3+incompatible github.com/docker/go-connections v0.5.0 - github.com/onsi/ginkgo v1.16.5 + github.com/onsi/ginkgo/v2 v2.19.0 github.com/onsi/ginkgo/v2 v2.19.0 github.com/onsi/gomega v1.33.1 github.com/prometheus/client_golang v1.19.1 From aff541a7a5042f3f823af9c4f66218c5e74c0ac8 Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Sun, 14 Jul 2024 13:56:12 +0200 Subject: [PATCH 044/157] chore: update go.mod for ginkgo --- go.mod | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 54797df..0ba5d52 100644 --- a/go.mod +++ b/go.mod @@ -8,8 +8,7 @@ require ( github.com/docker/cli v27.0.3+incompatible github.com/docker/docker v27.0.3+incompatible github.com/docker/go-connections v0.5.0 - github.com/onsi/ginkgo/v2 v2.19.0 - github.com/onsi/ginkgo/v2 v2.19.0 + github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.33.1 github.com/prometheus/client_golang v1.19.1 github.com/robfig/cron v1.2.0 @@ -28,6 +27,7 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/onsi/ginkgo/v2 v2.19.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect From 861e33a0a80ce97727befe84bfbf67387da5be78 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 14 Jul 2024 12:06:27 +0000 Subject: [PATCH 045/157] fix(deps): update module github.com/onsi/ginkgo to v2 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 0ba5d52..76d7ca3 100644 --- a/go.mod +++ b/go.mod @@ -9,6 +9,7 @@ require ( github.com/docker/docker v27.0.3+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 + github.com/onsi/ginkgo/v2 v2.19.0 github.com/onsi/gomega v1.33.1 github.com/prometheus/client_golang v1.19.1 github.com/robfig/cron v1.2.0 @@ -27,7 +28,6 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/onsi/ginkgo/v2 v2.19.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect From 70e75e8bb3a78b573de56ae0018493e939a74db5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 22 Jul 2024 11:30:51 +0000 Subject: [PATCH 046/157] chore(deps): update docker/login-action digest to 9780b0c --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 6248248..6cd811f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -68,7 +68,7 @@ jobs: with: go-version: 1.22.x - name: Login to Docker Hub - uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3 + uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} From a3bc5ab9819ff5c6955074579b7f2cec0d92a35d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 23 Jul 2024 02:25:18 +0000 Subject: [PATCH 047/157] chore(deps): update alpine docker tag to v3.20.2 --- dockerfiles/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index 4df693c..28da9df 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM alpine:3.20.1 as alpine +FROM --platform=$BUILDPLATFORM alpine:3.20.2 as alpine RUN apk add --no-cache \ ca-certificates \ From 2292c32b277a3691744293b073fdec7a599e1167 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Jul 2024 01:05:08 +0000 Subject: [PATCH 048/157] fix(deps): update module github.com/docker/docker to v27.1.1+incompatible --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 76d7ca3..f406080 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/containrrr/shoutrrr v0.8.0 github.com/distribution/reference v0.6.0 github.com/docker/cli v27.0.3+incompatible - github.com/docker/docker v27.0.3+incompatible + github.com/docker/docker v27.1.1+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 github.com/onsi/ginkgo/v2 v2.19.0 diff --git a/go.sum b/go.sum index e25888d..3969cbb 100644 --- a/go.sum +++ b/go.sum @@ -25,6 +25,8 @@ github.com/docker/cli v27.0.3+incompatible h1:usGs0/BoBW8MWxGeEtqPMkzOY56jZ6kYlS github.com/docker/cli v27.0.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/docker v27.0.3+incompatible h1:aBGI9TeQ4MPlhquTQKq9XbK79rKFVwXNUAYz9aXyEBE= github.com/docker/docker v27.0.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v27.1.1+incompatible h1:hO/M4MtV36kzKldqnA37IWhebRA+LnqqcqDja6kVaKY= +github.com/docker/docker v27.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo= github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= From 909480cefbfc152930bf332b3ccb79f5d6ae7885 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 30 Jul 2024 07:53:57 +0000 Subject: [PATCH 049/157] fix(deps): update module github.com/docker/cli to v27.1.1+incompatible --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index f406080..d818b96 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22 require ( github.com/containrrr/shoutrrr v0.8.0 github.com/distribution/reference v0.6.0 - github.com/docker/cli v27.0.3+incompatible + github.com/docker/cli v27.1.1+incompatible github.com/docker/docker v27.1.1+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 diff --git a/go.sum b/go.sum index 3969cbb..46e9177 100644 --- a/go.sum +++ b/go.sum @@ -23,6 +23,8 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v27.0.3+incompatible h1:usGs0/BoBW8MWxGeEtqPMkzOY56jZ6kYlSN5BLDioCQ= github.com/docker/cli v27.0.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v27.1.1+incompatible h1:goaZxOqs4QKxznZjjBWKONQci/MywhtRv2oNn0GkeZE= +github.com/docker/cli v27.1.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/docker v27.0.3+incompatible h1:aBGI9TeQ4MPlhquTQKq9XbK79rKFVwXNUAYz9aXyEBE= github.com/docker/docker v27.0.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v27.1.1+incompatible h1:hO/M4MtV36kzKldqnA37IWhebRA+LnqqcqDja6kVaKY= From 84c708e8fc67c92b61e9f4cabb5a46463d47072a Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Tue, 30 Jul 2024 10:10:43 +0200 Subject: [PATCH 050/157] feat: Checking if DOCKER_API_VERSION is set, if not set it to 1.44, if its lower then 1.44 log warning --- cmd/root.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/cmd/root.go b/cmd/root.go index e0b9ee2..e6245a9 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -122,6 +122,17 @@ func PreRun(cmd *cobra.Command, _ []string) { log.Warn("Using `WATCHTOWER_NO_PULL` and `WATCHTOWER_MONITOR_ONLY` simultaneously might lead to no action being taken at all. If this is intentional, you may safely ignore this message.") } + // check if DOCKER_API_VERSION is set + if os.Getenv("DOCKER_API_VERSION") == "" { + log.Warn("The DOCKER_API_VERSION environment variable is not set. This may cause unexpected behavior while recreating docker containers. Defaulting to 1.44") + // set DOCKER_API_VERSION to 1.44 + os.Setenv("DOCKER_API_VERSION", "1.44") + } + // check if DOCKER_API_VERSION is set to minimum 1.44 or higher + if os.Getenv("DOCKER_API_VERSION") < "1.44" { + log.Warn("The DOCKER_API_VERSION environment variable is set to a version lower than 1.44. This may cause unexpected behavior while recreating docker containers.") + } + client = container.NewClient(container.ClientOptions{ IncludeStopped: includeStopped, ReviveStopped: reviveStopped, From 0eb5736b217169e078274cb7ce8f058b727d0ce8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 6 Aug 2024 22:02:19 +0000 Subject: [PATCH 051/157] fix(deps): update module golang.org/x/net to v0.28.0 --- go.mod | 6 +++--- go.sum | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index d818b96..b1729fa 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.9.0 - golang.org/x/net v0.27.0 + golang.org/x/net v0.28.0 ) require ( @@ -74,8 +74,8 @@ require ( github.com/subosito/gotenv v1.6.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect - golang.org/x/sys v0.22.0 // indirect - golang.org/x/text v0.16.0 + golang.org/x/sys v0.23.0 // indirect + golang.org/x/text v0.17.0 golang.org/x/time v0.5.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index 46e9177..7666b73 100644 --- a/go.sum +++ b/go.sum @@ -211,6 +211,8 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= +golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= +golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -230,10 +232,14 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= +golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= +golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= +golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= From 4a70a70ff07112c644afc01558394372169665a5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 19:37:50 +0000 Subject: [PATCH 052/157] chore(deps): update nginx docker tag to v1.27.1 --- dockerfiles/container-networking/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/container-networking/docker-compose.yml b/dockerfiles/container-networking/docker-compose.yml index 7cd63ae..0fb7b0b 100644 --- a/dockerfiles/container-networking/docker-compose.yml +++ b/dockerfiles/container-networking/docker-compose.yml @@ -11,7 +11,7 @@ services: consumer: depends_on: - producer - image: nginx:1.27.0 + image: nginx:1.27.1 network_mode: "service:producer" labels: - "com.centurylinklabs.watchtower.depends-on=/wt-contnet-producer-1" From b33013bbeb4028047f7a7f8a601caa7b05a4b0a3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 16:26:04 +0000 Subject: [PATCH 053/157] fix(deps): update module github.com/prometheus/client_golang to v1.20.0 --- go.mod | 3 ++- go.sum | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index b1729fa..d3731a3 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/onsi/ginkgo v1.16.5 github.com/onsi/ginkgo/v2 v2.19.0 github.com/onsi/gomega v1.33.1 - github.com/prometheus/client_golang v1.19.1 + github.com/prometheus/client_golang v1.20.0 github.com/robfig/cron v1.2.0 github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.8.1 @@ -26,6 +26,7 @@ require ( github.com/felixge/httpsnoop v1.0.4 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect + github.com/klauspost/compress v1.17.9 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect diff --git a/go.sum b/go.sum index 7666b73..b2a3523 100644 --- a/go.sum +++ b/go.sum @@ -83,6 +83,8 @@ github.com/jarcoal/httpmock v1.3.0 h1:2RJ8GP0IIaWwcC9Fp2BmVi8Kog3v2Hn7VXM3fTd+nu github.com/jarcoal/httpmock v1.3.0/go.mod h1:3yb8rc4BI7TCBhFY8ng0gjuLKJNquuDNiPaZjnENuYg= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -131,6 +133,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_golang v1.20.0 h1:jBzTZ7B099Rg24tny+qngoynol8LtVYlA2bqx3vEloI= +github.com/prometheus/client_golang v1.20.0/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= From 29eb2f83be05e4c783091637a791e4d614b05760 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 9 Aug 2024 09:59:48 +0000 Subject: [PATCH 054/157] chore(deps): update qmcgaw/gluetun docker tag to v3.39.0 --- dockerfiles/container-networking/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/container-networking/docker-compose.yml b/dockerfiles/container-networking/docker-compose.yml index 0fb7b0b..18da5c9 100644 --- a/dockerfiles/container-networking/docker-compose.yml +++ b/dockerfiles/container-networking/docker-compose.yml @@ -1,6 +1,6 @@ services: producer: - image: qmcgaw/gluetun:v3.38.0 + image: qmcgaw/gluetun:v3.39.0 cap_add: - NET_ADMIN environment: From f6973d076f227df7b5b3cac6f780522f2302c451 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 13 Aug 2024 17:06:51 +0000 Subject: [PATCH 055/157] fix(deps): update module github.com/docker/docker to v27.1.2+incompatible --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index d3731a3..b8d3ccd 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/containrrr/shoutrrr v0.8.0 github.com/distribution/reference v0.6.0 github.com/docker/cli v27.1.1+incompatible - github.com/docker/docker v27.1.1+incompatible + github.com/docker/docker v27.1.2+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 github.com/onsi/ginkgo/v2 v2.19.0 diff --git a/go.sum b/go.sum index b2a3523..7cde51d 100644 --- a/go.sum +++ b/go.sum @@ -29,6 +29,8 @@ github.com/docker/docker v27.0.3+incompatible h1:aBGI9TeQ4MPlhquTQKq9XbK79rKFVwX github.com/docker/docker v27.0.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v27.1.1+incompatible h1:hO/M4MtV36kzKldqnA37IWhebRA+LnqqcqDja6kVaKY= github.com/docker/docker v27.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v27.1.2+incompatible h1:AhGzR1xaQIy53qCkxARaFluI00WPGtXn0AJuoQsVYTY= +github.com/docker/docker v27.1.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo= github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= From 839e1473548a0287e42aeee7393fe89c31918c70 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 18 Aug 2024 04:12:54 +0000 Subject: [PATCH 056/157] fix(deps): update module github.com/onsi/gomega to v1.34.1 --- go.mod | 4 ++-- go.sum | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index b8d3ccd..06f4ce1 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 github.com/onsi/ginkgo/v2 v2.19.0 - github.com/onsi/gomega v1.33.1 + github.com/onsi/gomega v1.34.1 github.com/prometheus/client_golang v1.20.0 github.com/robfig/cron v1.2.0 github.com/sirupsen/logrus v1.9.3 @@ -74,7 +74,7 @@ require ( github.com/stretchr/objx v0.5.2 // indirect github.com/subosito/gotenv v1.6.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect + golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect golang.org/x/sys v0.23.0 // indirect golang.org/x/text v0.17.0 golang.org/x/time v0.5.0 // indirect diff --git a/go.sum b/go.sum index 7cde51d..4dac200 100644 --- a/go.sum +++ b/go.sum @@ -121,6 +121,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= +github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= +github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= @@ -206,6 +208,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20240707233637-46b078467d37 h1:uLDX+AfeFCct3a2C7uIWBKMJIR3CJMhcgfrUAqjRK6w= golang.org/x/exp v0.0.0-20240707233637-46b078467d37/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= From fa6227ab09247de9b2445fe5a941bad29d7932e8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 18 Aug 2024 04:14:08 +0000 Subject: [PATCH 057/157] fix(deps): update module github.com/docker/cli to v27.1.2+incompatible --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 06f4ce1..3d8b964 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22 require ( github.com/containrrr/shoutrrr v0.8.0 github.com/distribution/reference v0.6.0 - github.com/docker/cli v27.1.1+incompatible + github.com/docker/cli v27.1.2+incompatible github.com/docker/docker v27.1.2+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 diff --git a/go.sum b/go.sum index 4dac200..f7174a3 100644 --- a/go.sum +++ b/go.sum @@ -25,6 +25,8 @@ github.com/docker/cli v27.0.3+incompatible h1:usGs0/BoBW8MWxGeEtqPMkzOY56jZ6kYlS github.com/docker/cli v27.0.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v27.1.1+incompatible h1:goaZxOqs4QKxznZjjBWKONQci/MywhtRv2oNn0GkeZE= github.com/docker/cli v27.1.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v27.1.2+incompatible h1:nYviRv5Y+YAKx3dFrTvS1ErkyVVunKOhoweCTE1BsnI= +github.com/docker/cli v27.1.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/docker v27.0.3+incompatible h1:aBGI9TeQ4MPlhquTQKq9XbK79rKFVwXNUAYz9aXyEBE= github.com/docker/docker v27.0.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v27.1.1+incompatible h1:hO/M4MtV36kzKldqnA37IWhebRA+LnqqcqDja6kVaKY= From 48ec3520f85dcc793b7008177fa130e5addf180f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2024 20:21:09 +0000 Subject: [PATCH 058/157] fix(deps): update module github.com/prometheus/client_golang to v1.20.2 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 3d8b964..7c311d5 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/onsi/ginkgo v1.16.5 github.com/onsi/ginkgo/v2 v2.19.0 github.com/onsi/gomega v1.34.1 - github.com/prometheus/client_golang v1.20.0 + github.com/prometheus/client_golang v1.20.2 github.com/robfig/cron v1.2.0 github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.8.1 diff --git a/go.sum b/go.sum index f7174a3..de709a7 100644 --- a/go.sum +++ b/go.sum @@ -141,6 +141,8 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_golang v1.20.0 h1:jBzTZ7B099Rg24tny+qngoynol8LtVYlA2bqx3vEloI= github.com/prometheus/client_golang v1.20.0/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_golang v1.20.2 h1:5ctymQzZlyOON1666svgwn3s6IKWgfbjsejTMiXIyjg= +github.com/prometheus/client_golang v1.20.2/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= From 5bc07dcc9b8114bc9381b0995417ee865cd113df Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 6 Sep 2024 23:10:19 +0000 Subject: [PATCH 059/157] chore(deps): update alpine docker tag to v3.20.3 --- dockerfiles/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index 28da9df..007c8b1 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM alpine:3.20.2 as alpine +FROM --platform=$BUILDPLATFORM alpine:3.20.3 as alpine RUN apk add --no-cache \ ca-certificates \ From e22263f8e990d6974d679e4166414c494f62f167 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2024 18:18:36 +0000 Subject: [PATCH 060/157] fix(deps): update module golang.org/x/net to v0.29.0 --- go.mod | 6 +++--- go.sum | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7c311d5..0d76f45 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.9.0 - golang.org/x/net v0.28.0 + golang.org/x/net v0.29.0 ) require ( @@ -75,8 +75,8 @@ require ( github.com/subosito/gotenv v1.6.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect - golang.org/x/sys v0.23.0 // indirect - golang.org/x/text v0.17.0 + golang.org/x/sys v0.25.0 // indirect + golang.org/x/text v0.18.0 golang.org/x/time v0.5.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index de709a7..cf3f922 100644 --- a/go.sum +++ b/go.sum @@ -227,6 +227,8 @@ golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= +golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= +golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -248,12 +250,16 @@ golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= +golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= From 7ac047b480330bf2ca0226b76bc6293cbc059d36 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2024 13:54:06 +0000 Subject: [PATCH 061/157] fix(deps): update module github.com/prometheus/client_golang to v1.20.3 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 0d76f45..ff7931e 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/onsi/ginkgo v1.16.5 github.com/onsi/ginkgo/v2 v2.19.0 github.com/onsi/gomega v1.34.1 - github.com/prometheus/client_golang v1.20.2 + github.com/prometheus/client_golang v1.20.3 github.com/robfig/cron v1.2.0 github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.8.1 diff --git a/go.sum b/go.sum index cf3f922..6c9a55e 100644 --- a/go.sum +++ b/go.sum @@ -143,6 +143,8 @@ github.com/prometheus/client_golang v1.20.0 h1:jBzTZ7B099Rg24tny+qngoynol8LtVYlA github.com/prometheus/client_golang v1.20.0/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_golang v1.20.2 h1:5ctymQzZlyOON1666svgwn3s6IKWgfbjsejTMiXIyjg= github.com/prometheus/client_golang v1.20.2/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_golang v1.20.3 h1:oPksm4K8B+Vt35tUhw6GbSNSgVlVSBH0qELP/7u83l4= +github.com/prometheus/client_golang v1.20.3/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= From ae71dde8003ad5adb5aa12d0b02035dae45463bb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 21:24:09 +0000 Subject: [PATCH 062/157] fix(deps): update module github.com/docker/docker to v27.2.0+incompatible --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index ff7931e..9490af5 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/containrrr/shoutrrr v0.8.0 github.com/distribution/reference v0.6.0 github.com/docker/cli v27.1.2+incompatible - github.com/docker/docker v27.1.2+incompatible + github.com/docker/docker v27.2.0+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 github.com/onsi/ginkgo/v2 v2.19.0 diff --git a/go.sum b/go.sum index 6c9a55e..974e31a 100644 --- a/go.sum +++ b/go.sum @@ -33,6 +33,8 @@ github.com/docker/docker v27.1.1+incompatible h1:hO/M4MtV36kzKldqnA37IWhebRA+Lnq github.com/docker/docker v27.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v27.1.2+incompatible h1:AhGzR1xaQIy53qCkxARaFluI00WPGtXn0AJuoQsVYTY= github.com/docker/docker v27.1.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v27.2.0+incompatible h1:Rk9nIVdfH3+Vz4cyI/uhbINhEZ/oLmc+CBXmH6fbNk4= +github.com/docker/docker v27.2.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo= github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= From 45336e600a08a5f74199e5f5788bb8791aa9b1fe Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 8 Sep 2024 13:29:48 +0000 Subject: [PATCH 063/157] fix(deps): update module github.com/onsi/ginkgo/v2 to v2.20.2 --- go.mod | 2 +- go.sum | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 9490af5..701a296 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/docker/docker v27.2.0+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 - github.com/onsi/ginkgo/v2 v2.19.0 + github.com/onsi/ginkgo/v2 v2.20.2 github.com/onsi/gomega v1.34.1 github.com/prometheus/client_golang v1.20.3 github.com/robfig/cron v1.2.0 diff --git a/go.sum b/go.sum index 974e31a..757fce9 100644 --- a/go.sum +++ b/go.sum @@ -121,6 +121,7 @@ github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= +github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= From b622f55994465ead5312bff8e35beeabb28fda99 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 8 Sep 2024 13:32:26 +0000 Subject: [PATCH 064/157] fix(deps): update module github.com/docker/cli to v27.2.0+incompatible --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 701a296..8ca34c4 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22 require ( github.com/containrrr/shoutrrr v0.8.0 github.com/distribution/reference v0.6.0 - github.com/docker/cli v27.1.2+incompatible + github.com/docker/cli v27.2.0+incompatible github.com/docker/docker v27.2.0+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 diff --git a/go.sum b/go.sum index 757fce9..6365862 100644 --- a/go.sum +++ b/go.sum @@ -27,6 +27,8 @@ github.com/docker/cli v27.1.1+incompatible h1:goaZxOqs4QKxznZjjBWKONQci/MywhtRv2 github.com/docker/cli v27.1.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v27.1.2+incompatible h1:nYviRv5Y+YAKx3dFrTvS1ErkyVVunKOhoweCTE1BsnI= github.com/docker/cli v27.1.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v27.2.0+incompatible h1:yHD1QEB1/0vr5eBNpu8tncu8gWxg8EydFPOSKHzXSMM= +github.com/docker/cli v27.2.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/docker v27.0.3+incompatible h1:aBGI9TeQ4MPlhquTQKq9XbK79rKFVwXNUAYz9aXyEBE= github.com/docker/docker v27.0.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v27.1.1+incompatible h1:hO/M4MtV36kzKldqnA37IWhebRA+LnqqcqDja6kVaKY= From 15ed312aed5dae932341221ec30a986d448b0bca Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 8 Sep 2024 13:33:03 +0000 Subject: [PATCH 065/157] fix(deps): update module github.com/onsi/gomega to v1.34.2 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 8ca34c4..7d55420 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 github.com/onsi/ginkgo/v2 v2.20.2 - github.com/onsi/gomega v1.34.1 + github.com/onsi/gomega v1.34.2 github.com/prometheus/client_golang v1.20.3 github.com/robfig/cron v1.2.0 github.com/sirupsen/logrus v1.9.3 diff --git a/go.sum b/go.sum index 6365862..7c55ae1 100644 --- a/go.sum +++ b/go.sum @@ -130,6 +130,8 @@ github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= +github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8= +github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= From 7eac4ab5fd752c3c76bcfea36f4d33c4a9f26349 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 17 Sep 2024 11:48:29 +0000 Subject: [PATCH 066/157] fix(deps): update module github.com/prometheus/client_golang to v1.20.4 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 7d55420..ea29b1f 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/onsi/ginkgo v1.16.5 github.com/onsi/ginkgo/v2 v2.20.2 github.com/onsi/gomega v1.34.2 - github.com/prometheus/client_golang v1.20.3 + github.com/prometheus/client_golang v1.20.4 github.com/robfig/cron v1.2.0 github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.8.1 diff --git a/go.sum b/go.sum index 7c55ae1..bd06865 100644 --- a/go.sum +++ b/go.sum @@ -152,6 +152,8 @@ github.com/prometheus/client_golang v1.20.2 h1:5ctymQzZlyOON1666svgwn3s6IKWgfbjs github.com/prometheus/client_golang v1.20.2/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_golang v1.20.3 h1:oPksm4K8B+Vt35tUhw6GbSNSgVlVSBH0qELP/7u83l4= github.com/prometheus/client_golang v1.20.3/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI= +github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= From 5aa09aceac3a82d40c607249caab2097ced923ea Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 20 Sep 2024 20:15:29 +0000 Subject: [PATCH 067/157] fix(deps): update module github.com/docker/docker to v27.3.1+incompatible --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index ea29b1f..6d3aa63 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/containrrr/shoutrrr v0.8.0 github.com/distribution/reference v0.6.0 github.com/docker/cli v27.2.0+incompatible - github.com/docker/docker v27.2.0+incompatible + github.com/docker/docker v27.3.1+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 github.com/onsi/ginkgo/v2 v2.20.2 diff --git a/go.sum b/go.sum index bd06865..313e66b 100644 --- a/go.sum +++ b/go.sum @@ -37,6 +37,8 @@ github.com/docker/docker v27.1.2+incompatible h1:AhGzR1xaQIy53qCkxARaFluI00WPGtX github.com/docker/docker v27.1.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v27.2.0+incompatible h1:Rk9nIVdfH3+Vz4cyI/uhbINhEZ/oLmc+CBXmH6fbNk4= github.com/docker/docker v27.2.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v27.3.1+incompatible h1:KttF0XoteNTicmUtBO0L2tP+J7FGRFTjaEF4k6WdhfI= +github.com/docker/docker v27.3.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo= github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= From 4b227a93b7c25363261fc56195f407f4c2360135 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 21 Sep 2024 06:49:17 +0000 Subject: [PATCH 068/157] fix(deps): update module github.com/docker/cli to v27.3.1+incompatible --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 6d3aa63..f73dcfd 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22 require ( github.com/containrrr/shoutrrr v0.8.0 github.com/distribution/reference v0.6.0 - github.com/docker/cli v27.2.0+incompatible + github.com/docker/cli v27.3.1+incompatible github.com/docker/docker v27.3.1+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 diff --git a/go.sum b/go.sum index 313e66b..7b3ecfd 100644 --- a/go.sum +++ b/go.sum @@ -29,6 +29,8 @@ github.com/docker/cli v27.1.2+incompatible h1:nYviRv5Y+YAKx3dFrTvS1ErkyVVunKOhow github.com/docker/cli v27.1.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v27.2.0+incompatible h1:yHD1QEB1/0vr5eBNpu8tncu8gWxg8EydFPOSKHzXSMM= github.com/docker/cli v27.2.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v27.3.1+incompatible h1:qEGdFBF3Xu6SCvCYhc7CzaQTlBmqDuzxPDpigSyeKQQ= +github.com/docker/cli v27.3.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/docker v27.0.3+incompatible h1:aBGI9TeQ4MPlhquTQKq9XbK79rKFVwXNUAYz9aXyEBE= github.com/docker/docker v27.0.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v27.1.1+incompatible h1:hO/M4MtV36kzKldqnA37IWhebRA+LnqqcqDja6kVaKY= From 316a62fb97e228e94c85d615080afd5b812ebd19 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 19:39:03 +0000 Subject: [PATCH 069/157] chore(deps): update codecov/codecov-action action to v5 --- .github/workflows/pull-request.yaml | 2 +- .github/workflows/release-dev.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index 48fd41c..391e7a2 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -48,7 +48,7 @@ jobs: run: | go test -v -coverprofile coverage.out -covermode atomic ./... - name: Publish coverage - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 with: token: ${{ secrets.CODECOV_TOKEN }} build: diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml index 046429a..2faa842 100644 --- a/.github/workflows/release-dev.yaml +++ b/.github/workflows/release-dev.yaml @@ -30,7 +30,7 @@ jobs: - name: Test run: go test -v -coverprofile coverage.out -covermode atomic ./... - name: Publish coverage - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 with: token: ${{ secrets.CODECOV_TOKEN }} publish: From e1e60efe87e594b27a93e63bdb5bd4312b0a0a61 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2024 15:55:49 +0000 Subject: [PATCH 070/157] chore(deps): update goreleaser/goreleaser-action digest to 9ed2f89 --- .github/workflows/pull-request.yaml | 2 +- .github/workflows/release.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index 391e7a2..c8e4c25 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -64,7 +64,7 @@ jobs: with: go-version: 1.22.x - name: Build - uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6 + uses: goreleaser/goreleaser-action@9ed2f89a662bf1735a48bc8557fd212fa902bebf # v6 with: version: v0.155.0 args: --snapshot --skip-publish --debug diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 6cd811f..497ffc4 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -73,7 +73,7 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build - uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6 + uses: goreleaser/goreleaser-action@9ed2f89a662bf1735a48bc8557fd212fa902bebf # v6 with: version: v0.155.0 args: --debug From 5ea99b1447d24f8e86149bf3e6983840d04d890d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 4 Nov 2024 13:45:57 +0000 Subject: [PATCH 071/157] fix(deps): update module github.com/onsi/gomega to v1.35.1 --- go.mod | 10 +++++----- go.sum | 10 ++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index f73dcfd..cb3f29b 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 github.com/onsi/ginkgo/v2 v2.20.2 - github.com/onsi/gomega v1.34.2 + github.com/onsi/gomega v1.35.1 github.com/prometheus/client_golang v1.20.4 github.com/robfig/cron v1.2.0 github.com/sirupsen/logrus v1.9.3 @@ -18,7 +18,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.9.0 - golang.org/x/net v0.29.0 + golang.org/x/net v0.30.0 ) require ( @@ -75,10 +75,10 @@ require ( github.com/subosito/gotenv v1.6.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect - golang.org/x/sys v0.25.0 // indirect - golang.org/x/text v0.18.0 + golang.org/x/sys v0.26.0 // indirect + golang.org/x/text v0.19.0 golang.org/x/time v0.5.0 // indirect - google.golang.org/protobuf v1.34.2 // indirect + google.golang.org/protobuf v1.35.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 7b3ecfd..18f0a0b 100644 --- a/go.sum +++ b/go.sum @@ -136,6 +136,8 @@ github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8= github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc= +github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4= +github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= @@ -244,6 +246,8 @@ golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= +golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= +golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -267,6 +271,8 @@ golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= @@ -275,6 +281,8 @@ golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= +golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -304,6 +312,8 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= +google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= +google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= From e21dbc16e77c109e8dfcdf8574f44d3dceffb808 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 29 Sep 2024 21:01:56 +0000 Subject: [PATCH 072/157] chore(deps): update qmcgaw/gluetun docker tag to v3.39.1 --- dockerfiles/container-networking/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/container-networking/docker-compose.yml b/dockerfiles/container-networking/docker-compose.yml index 18da5c9..0379229 100644 --- a/dockerfiles/container-networking/docker-compose.yml +++ b/dockerfiles/container-networking/docker-compose.yml @@ -1,6 +1,6 @@ services: producer: - image: qmcgaw/gluetun:v3.39.0 + image: qmcgaw/gluetun:v3.39.1 cap_add: - NET_ADMIN environment: From 7996e02bd6c576a2346ef688693e5da5991befce Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 06:15:34 +0000 Subject: [PATCH 073/157] chore(deps): update nginx docker tag to v1.27.2 --- dockerfiles/container-networking/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/container-networking/docker-compose.yml b/dockerfiles/container-networking/docker-compose.yml index 0379229..cc6da3d 100644 --- a/dockerfiles/container-networking/docker-compose.yml +++ b/dockerfiles/container-networking/docker-compose.yml @@ -11,7 +11,7 @@ services: consumer: depends_on: - producer - image: nginx:1.27.1 + image: nginx:1.27.2 network_mode: "service:producer" labels: - "com.centurylinklabs.watchtower.depends-on=/wt-contnet-producer-1" From 1f4eb2bf7b4a48b2ab0f0cbeb174ce6af1e05f9e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2024 05:35:41 +0000 Subject: [PATCH 074/157] fix(deps): update module github.com/prometheus/client_golang to v1.20.5 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index cb3f29b..9372b3f 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/onsi/ginkgo v1.16.5 github.com/onsi/ginkgo/v2 v2.20.2 github.com/onsi/gomega v1.35.1 - github.com/prometheus/client_golang v1.20.4 + github.com/prometheus/client_golang v1.20.5 github.com/robfig/cron v1.2.0 github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.8.1 diff --git a/go.sum b/go.sum index 18f0a0b..bd557f0 100644 --- a/go.sum +++ b/go.sum @@ -160,6 +160,8 @@ github.com/prometheus/client_golang v1.20.3 h1:oPksm4K8B+Vt35tUhw6GbSNSgVlVSBH0q github.com/prometheus/client_golang v1.20.3/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI= github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y= +github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= From 57fe457faaf31cce53f96866c3c48158332047e1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2024 05:35:46 +0000 Subject: [PATCH 075/157] fix(deps): update module github.com/onsi/ginkgo/v2 to v2.22.0 --- go.mod | 6 ++++-- go.sum | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 9372b3f..0010a91 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ module github.com/beatkind/watchtower -go 1.22 +go 1.22.0 + +toolchain go1.23.3 require ( github.com/containrrr/shoutrrr v0.8.0 @@ -9,7 +11,7 @@ require ( github.com/docker/docker v27.3.1+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 - github.com/onsi/ginkgo/v2 v2.20.2 + github.com/onsi/ginkgo/v2 v2.22.0 github.com/onsi/gomega v1.35.1 github.com/prometheus/client_golang v1.20.5 github.com/robfig/cron v1.2.0 diff --git a/go.sum b/go.sum index bd557f0..b477ba3 100644 --- a/go.sum +++ b/go.sum @@ -128,6 +128,7 @@ github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042 github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag= +github.com/onsi/ginkgo/v2 v2.22.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= From 7c1afb6dd3ae9fca4ec4fc19f5a21043c6a11405 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2024 05:35:50 +0000 Subject: [PATCH 076/157] fix(deps): update module golang.org/x/net to v0.31.0 --- go.mod | 6 +++--- go.sum | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 0010a91..6d90c88 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.9.0 - golang.org/x/net v0.30.0 + golang.org/x/net v0.31.0 ) require ( @@ -77,8 +77,8 @@ require ( github.com/subosito/gotenv v1.6.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect - golang.org/x/sys v0.26.0 // indirect - golang.org/x/text v0.19.0 + golang.org/x/sys v0.27.0 // indirect + golang.org/x/text v0.20.0 golang.org/x/time v0.5.0 // indirect google.golang.org/protobuf v1.35.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index b477ba3..42401b8 100644 --- a/go.sum +++ b/go.sum @@ -251,6 +251,8 @@ golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= +golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo= +golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -276,6 +278,8 @@ golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= +golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= @@ -286,6 +290,8 @@ golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= +golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= From 5dd5db1b6043f90373a0ba064f979d7dfa6c149f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 01:44:24 +0000 Subject: [PATCH 077/157] chore(deps): update nginx docker tag to v1.27.3 --- dockerfiles/container-networking/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/container-networking/docker-compose.yml b/dockerfiles/container-networking/docker-compose.yml index cc6da3d..dae42ef 100644 --- a/dockerfiles/container-networking/docker-compose.yml +++ b/dockerfiles/container-networking/docker-compose.yml @@ -11,7 +11,7 @@ services: consumer: depends_on: - producer - image: nginx:1.27.2 + image: nginx:1.27.3 network_mode: "service:producer" labels: - "com.centurylinklabs.watchtower.depends-on=/wt-contnet-producer-1" From 3c449fcdb4da53605c9295bc42a6d41a191160d6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 6 Dec 2024 00:29:49 +0000 Subject: [PATCH 078/157] chore(deps): update alpine docker tag to v3.21.0 --- dockerfiles/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index 007c8b1..fe7ae25 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM alpine:3.20.3 as alpine +FROM --platform=$BUILDPLATFORM alpine:3.21.0 as alpine RUN apk add --no-cache \ ca-certificates \ From 9fdb3c8e9fefb1baf8ad988abdb3e223d5917e79 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2024 22:06:42 +0000 Subject: [PATCH 079/157] chore(deps): update dependency go to v1.23.4 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 6d90c88..52a7bda 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/beatkind/watchtower go 1.22.0 -toolchain go1.23.3 +toolchain go1.23.4 require ( github.com/containrrr/shoutrrr v0.8.0 From 5319d725dfebfd5ea60ac26560800d7433677904 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2024 13:38:44 +0000 Subject: [PATCH 080/157] fix(deps): update module github.com/stretchr/testify to v1.10.0 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 52a7bda..61bfadd 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ require ( github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.19.0 - github.com/stretchr/testify v1.9.0 + github.com/stretchr/testify v1.10.0 golang.org/x/net v0.31.0 ) diff --git a/go.sum b/go.sum index 42401b8..b01559b 100644 --- a/go.sum +++ b/go.sum @@ -205,6 +205,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= From bfee111e7d27afc0e50957b7957d017944bcde63 Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Sun, 5 Jan 2025 12:23:23 +0100 Subject: [PATCH 081/157] chore: bump ci/cd to 1.23 GO version --- .github/workflows/publish-docs.yaml | 2 +- .github/workflows/pull-request.yaml | 8 ++++---- .github/workflows/release-dev.yaml | 4 ++-- .github/workflows/release.yaml | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/publish-docs.yaml b/.github/workflows/publish-docs.yaml index 2d30837..040f0dc 100644 --- a/.github/workflows/publish-docs.yaml +++ b/.github/workflows/publish-docs.yaml @@ -20,7 +20,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.22.x + go-version: 1.23.x - name: Build tplprev run: scripts/build-tplprev.sh - name: Setup python diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index c8e4c25..fff9f52 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -18,7 +18,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.22.x + go-version: 1.23.x - uses: dominikh/staticcheck-action@fe1dd0c3658873b46f8c9bb3291096a617310ca6 # v1.3.1 with: version: "2023.1.6" @@ -29,7 +29,7 @@ jobs: fail-fast: false matrix: go-version: - - 1.22.x + - 1.23.x platform: - macos-latest - windows-latest @@ -43,7 +43,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.22.x + go-version: 1.23.x - name: Run tests run: | go test -v -coverprofile coverage.out -covermode atomic ./... @@ -62,7 +62,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.22.x + go-version: 1.23.x - name: Build uses: goreleaser/goreleaser-action@9ed2f89a662bf1735a48bc8557fd212fa902bebf # v6 with: diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml index 2faa842..82a21b3 100644 --- a/.github/workflows/release-dev.yaml +++ b/.github/workflows/release-dev.yaml @@ -16,7 +16,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.22.x + go-version: 1.23.x - name: Build run: ./build.sh test: @@ -26,7 +26,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.22.x + go-version: 1.23.x - name: Test run: go test -v -coverprofile coverage.out -covermode atomic ./... - name: Publish coverage diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 497ffc4..169b882 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -19,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.22.x + go-version: 1.23.x - uses: dominikh/staticcheck-action@fe1dd0c3658873b46f8c9bb3291096a617310ca6 # v1.3.1 with: version: "latest" @@ -30,7 +30,7 @@ jobs: strategy: matrix: go-version: - - 1.22.x + - 1.23.x platform: - ubuntu-latest - macos-latest @@ -44,7 +44,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.22.x + go-version: 1.23.x - name: Run tests run: | go test ./... -coverprofile coverage.out @@ -66,7 +66,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.22.x + go-version: 1.23.x - name: Login to Docker Hub uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3 with: From d5608faa7b327f6aaa9f7ac45318266ea05ff254 Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Sun, 5 Jan 2025 12:29:41 +0100 Subject: [PATCH 082/157] feat: bump go version to 1.23 --- go.mod | 10 ++++------ go.sum | 10 ---------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 61bfadd..3171034 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/beatkind/watchtower -go 1.22.0 - -toolchain go1.23.4 +go 1.23 require ( github.com/containrrr/shoutrrr v0.8.0 @@ -11,9 +9,8 @@ require ( github.com/docker/docker v27.3.1+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 - github.com/onsi/ginkgo/v2 v2.22.0 - github.com/onsi/gomega v1.35.1 - github.com/prometheus/client_golang v1.20.5 + github.com/onsi/gomega v1.33.1 + github.com/prometheus/client_golang v1.19.1 github.com/robfig/cron v1.2.0 github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.8.1 @@ -31,6 +28,7 @@ require ( github.com/klauspost/compress v1.17.9 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/onsi/ginkgo/v2 v2.19.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect diff --git a/go.sum b/go.sum index b01559b..5ba5370 100644 --- a/go.sum +++ b/go.sum @@ -21,18 +21,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= -github.com/docker/cli v27.0.3+incompatible h1:usGs0/BoBW8MWxGeEtqPMkzOY56jZ6kYlSN5BLDioCQ= -github.com/docker/cli v27.0.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v27.1.1+incompatible h1:goaZxOqs4QKxznZjjBWKONQci/MywhtRv2oNn0GkeZE= github.com/docker/cli v27.1.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v27.1.2+incompatible h1:nYviRv5Y+YAKx3dFrTvS1ErkyVVunKOhoweCTE1BsnI= -github.com/docker/cli v27.1.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v27.2.0+incompatible h1:yHD1QEB1/0vr5eBNpu8tncu8gWxg8EydFPOSKHzXSMM= -github.com/docker/cli v27.2.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v27.3.1+incompatible h1:qEGdFBF3Xu6SCvCYhc7CzaQTlBmqDuzxPDpigSyeKQQ= -github.com/docker/cli v27.3.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/docker v27.0.3+incompatible h1:aBGI9TeQ4MPlhquTQKq9XbK79rKFVwXNUAYz9aXyEBE= -github.com/docker/docker v27.0.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v27.1.1+incompatible h1:hO/M4MtV36kzKldqnA37IWhebRA+LnqqcqDja6kVaKY= github.com/docker/docker v27.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v27.1.2+incompatible h1:AhGzR1xaQIy53qCkxARaFluI00WPGtXn0AJuoQsVYTY= From 813ae1c584f05d4e5c95576bb1da0f855c38a096 Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Sun, 5 Jan 2025 12:28:40 +0100 Subject: [PATCH 083/157] chore: fix linting ci step --- .github/workflows/pull-request.yaml | 21 ++++++++++----------- .github/workflows/release.yaml | 29 ++++++++++++++--------------- 2 files changed, 24 insertions(+), 26 deletions(-) diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index fff9f52..36b8c2a 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -6,23 +6,22 @@ on: branches: - main +permissions: + contents: read + jobs: lint: name: Lint runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v4 + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 with: - fetch-depth: 0 - - name: Set up Go - uses: actions/setup-go@v5 + go-version: stable + - name: golangci-lint + uses: golangci/golangci-lint-action@v6 with: - go-version: 1.23.x - - uses: dominikh/staticcheck-action@fe1dd0c3658873b46f8c9bb3291096a617310ca6 # v1.3.1 - with: - version: "2023.1.6" - install-go: "false" # StaticCheck uses go v1.17 which does not support `any` + version: v1.60 test: name: Test strategy: @@ -46,7 +45,7 @@ jobs: go-version: 1.23.x - name: Run tests run: | - go test -v -coverprofile coverage.out -covermode atomic ./... + go test -v -coverprofile coverage.out -covermode atomic ./... - name: Publish coverage uses: codecov/codecov-action@v5 with: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 169b882..9c2bd5d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -4,26 +4,25 @@ on: workflow_dispatch: {} push: tags: - - 'v[0-9]+.[0-9]+.[0-9]+' - - '**/v[0-9]+.[0-9]+.[0-9]+' + - "v[0-9]+.[0-9]+.[0-9]+" + - "**/v[0-9]+.[0-9]+.[0-9]+" + +permissions: + contents: read jobs: lint: name: Lint runs-on: ubuntu-latest steps: - - name: Checkout - uses: actions/checkout@v4 + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 with: - fetch-depth: 0 - - name: Set up Go - uses: actions/setup-go@v5 + go-version: stable + - name: golangci-lint + uses: golangci/golangci-lint-action@v6 with: - go-version: 1.23.x - - uses: dominikh/staticcheck-action@fe1dd0c3658873b46f8c9bb3291096a617310ca6 # v1.3.1 - with: - version: "latest" - install-go: "false" # StaticCheck uses go v1.17 which does not support `any` + version: v1.60 test: name: Test @@ -52,7 +51,7 @@ jobs: build: name: Build runs-on: ubuntu-latest - needs: + needs: - test - lint env: @@ -113,5 +112,5 @@ jobs: needs: build runs-on: ubuntu-latest steps: - - name: Pull new module version - uses: andrewslotin/go-proxy-pull-action@89382de145eeb7a85de72f8a27f686a50727bc7a #master@2022-10-14 + - name: Pull new module version + uses: andrewslotin/go-proxy-pull-action@89382de145eeb7a85de72f8a27f686a50727bc7a #master@2022-10-14 From 21f9142b35a701b097a688fd09af8de1be8e281c Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Sun, 5 Jan 2025 12:32:28 +0100 Subject: [PATCH 084/157] fix: go files --- go.mod | 1 - go.sum | 59 ++-------------------------------------------------------- 2 files changed, 2 insertions(+), 58 deletions(-) diff --git a/go.mod b/go.mod index 3171034..63cdbd0 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,6 @@ require ( github.com/felixge/httpsnoop v1.0.4 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/klauspost/compress v1.17.9 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/onsi/ginkgo/v2 v2.19.0 // indirect diff --git a/go.sum b/go.sum index 5ba5370..f92c13a 100644 --- a/go.sum +++ b/go.sum @@ -21,14 +21,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= -github.com/docker/cli v27.1.1+incompatible h1:goaZxOqs4QKxznZjjBWKONQci/MywhtRv2oNn0GkeZE= -github.com/docker/cli v27.1.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/docker v27.1.1+incompatible h1:hO/M4MtV36kzKldqnA37IWhebRA+LnqqcqDja6kVaKY= -github.com/docker/docker v27.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v27.1.2+incompatible h1:AhGzR1xaQIy53qCkxARaFluI00WPGtXn0AJuoQsVYTY= -github.com/docker/docker v27.1.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v27.2.0+incompatible h1:Rk9nIVdfH3+Vz4cyI/uhbINhEZ/oLmc+CBXmH6fbNk4= -github.com/docker/docker v27.2.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/cli v27.3.1+incompatible h1:qEGdFBF3Xu6SCvCYhc7CzaQTlBmqDuzxPDpigSyeKQQ= +github.com/docker/cli v27.3.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/docker v27.3.1+incompatible h1:KttF0XoteNTicmUtBO0L2tP+J7FGRFTjaEF4k6WdhfI= github.com/docker/docker v27.3.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo= @@ -85,8 +79,6 @@ github.com/jarcoal/httpmock v1.3.0 h1:2RJ8GP0IIaWwcC9Fp2BmVi8Kog3v2Hn7VXM3fTd+nu github.com/jarcoal/httpmock v1.3.0/go.mod h1:3yb8rc4BI7TCBhFY8ng0gjuLKJNquuDNiPaZjnENuYg= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= -github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -117,18 +109,10 @@ github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= -github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag= -github.com/onsi/ginkgo/v2 v2.22.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= -github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= -github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= -github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8= -github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc= -github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4= -github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= @@ -143,16 +127,6 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= -github.com/prometheus/client_golang v1.20.0 h1:jBzTZ7B099Rg24tny+qngoynol8LtVYlA2bqx3vEloI= -github.com/prometheus/client_golang v1.20.0/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= -github.com/prometheus/client_golang v1.20.2 h1:5ctymQzZlyOON1666svgwn3s6IKWgfbjsejTMiXIyjg= -github.com/prometheus/client_golang v1.20.2/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= -github.com/prometheus/client_golang v1.20.3 h1:oPksm4K8B+Vt35tUhw6GbSNSgVlVSBH0qELP/7u83l4= -github.com/prometheus/client_golang v1.20.3/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= -github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI= -github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= -github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y= -github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= @@ -193,7 +167,6 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= @@ -222,8 +195,6 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/exp v0.0.0-20240707233637-46b078467d37 h1:uLDX+AfeFCct3a2C7uIWBKMJIR3CJMhcgfrUAqjRK6w= -golang.org/x/exp v0.0.0-20240707233637-46b078467d37/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -235,14 +206,6 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= -golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= -golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= -golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= -golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= -golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= -golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= -golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo= golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -262,26 +225,10 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= -golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM= -golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= -golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= -golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= -golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= -golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= -golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= -golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= -golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= -golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= -golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= @@ -311,8 +258,6 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= -google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From fdf3dcb42968381232a34acc9b555033806d756e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 5 Jan 2025 11:19:16 +0000 Subject: [PATCH 085/157] chore(deps): update qmcgaw/gluetun docker tag to v3.40.0 --- dockerfiles/container-networking/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/container-networking/docker-compose.yml b/dockerfiles/container-networking/docker-compose.yml index dae42ef..7795d2d 100644 --- a/dockerfiles/container-networking/docker-compose.yml +++ b/dockerfiles/container-networking/docker-compose.yml @@ -1,6 +1,6 @@ services: producer: - image: qmcgaw/gluetun:v3.39.1 + image: qmcgaw/gluetun:v3.40.0 cap_add: - NET_ADMIN environment: From 6ff58148d9398caffb528f88fc8347535dad3b01 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 5 Jan 2025 11:37:03 +0000 Subject: [PATCH 086/157] fix(deps): update module github.com/onsi/gomega to v1.36.2 --- go.mod | 12 ++++++------ go.sum | 11 +++++++++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 63cdbd0..4cca1a6 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/docker/docker v27.3.1+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 - github.com/onsi/gomega v1.33.1 + github.com/onsi/gomega v1.36.2 github.com/prometheus/client_golang v1.19.1 github.com/robfig/cron v1.2.0 github.com/sirupsen/logrus v1.9.3 @@ -17,7 +17,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.10.0 - golang.org/x/net v0.31.0 + golang.org/x/net v0.33.0 ) require ( @@ -27,7 +27,7 @@ require ( github.com/go-logr/stdr v1.2.2 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/onsi/ginkgo/v2 v2.19.0 // indirect + github.com/onsi/ginkgo/v2 v2.22.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect @@ -74,10 +74,10 @@ require ( github.com/subosito/gotenv v1.6.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect - golang.org/x/sys v0.27.0 // indirect - golang.org/x/text v0.20.0 + golang.org/x/sys v0.28.0 // indirect + golang.org/x/text v0.21.0 golang.org/x/time v0.5.0 // indirect - google.golang.org/protobuf v1.35.1 // indirect + google.golang.org/protobuf v1.36.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index f92c13a..acd7785 100644 --- a/go.sum +++ b/go.sum @@ -109,10 +109,13 @@ github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= +github.com/onsi/ginkgo/v2 v2.22.1/go.mod h1:S6aTpoRsSq2cZOd+pssHAlKW/Q/jZt6cPrPlnj4a1xM= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= +github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8= +github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= @@ -208,6 +211,8 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo= golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -227,10 +232,14 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -260,6 +269,8 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk= +google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= From fd9b3a21158c1362b77d114ee8d2c83991eb595d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 5 Jan 2025 11:36:55 +0000 Subject: [PATCH 087/157] fix(deps): update module github.com/docker/cli to v27.4.1+incompatible --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 4cca1a6..bc18821 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23 require ( github.com/containrrr/shoutrrr v0.8.0 github.com/distribution/reference v0.6.0 - github.com/docker/cli v27.3.1+incompatible + github.com/docker/cli v27.4.1+incompatible github.com/docker/docker v27.3.1+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 diff --git a/go.sum b/go.sum index acd7785..200c221 100644 --- a/go.sum +++ b/go.sum @@ -23,6 +23,8 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v27.3.1+incompatible h1:qEGdFBF3Xu6SCvCYhc7CzaQTlBmqDuzxPDpigSyeKQQ= github.com/docker/cli v27.3.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v27.4.1+incompatible h1:VzPiUlRJ/xh+otB75gva3r05isHMo5wXDfPRi5/b4hI= +github.com/docker/cli v27.4.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/docker v27.3.1+incompatible h1:KttF0XoteNTicmUtBO0L2tP+J7FGRFTjaEF4k6WdhfI= github.com/docker/docker v27.3.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo= From 88a5ed7af44c7229a3947d877bcbe1a16a2d23b1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 5 Jan 2025 11:57:06 +0000 Subject: [PATCH 088/157] fix(deps): update module github.com/docker/docker to v27.4.1+incompatible --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index bc18821..57806cd 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/containrrr/shoutrrr v0.8.0 github.com/distribution/reference v0.6.0 github.com/docker/cli v27.4.1+incompatible - github.com/docker/docker v27.3.1+incompatible + github.com/docker/docker v27.4.1+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.36.2 diff --git a/go.sum b/go.sum index 200c221..0b33fc3 100644 --- a/go.sum +++ b/go.sum @@ -27,6 +27,8 @@ github.com/docker/cli v27.4.1+incompatible h1:VzPiUlRJ/xh+otB75gva3r05isHMo5wXDf github.com/docker/cli v27.4.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/docker v27.3.1+incompatible h1:KttF0XoteNTicmUtBO0L2tP+J7FGRFTjaEF4k6WdhfI= github.com/docker/docker v27.3.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v27.4.1+incompatible h1:ZJvcY7gfwHn1JF48PfbyXg7Jyt9ZCWDW+GGXOIxEwp4= +github.com/docker/docker v27.4.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo= github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= From 680d615bde1c6415e41ddb17b405d7dc955b696e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 5 Jan 2025 12:02:19 +0000 Subject: [PATCH 089/157] fix(deps): update module github.com/prometheus/client_golang to v1.20.5 --- go.mod | 3 ++- go.sum | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 57806cd..75b8206 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.36.2 - github.com/prometheus/client_golang v1.19.1 + github.com/prometheus/client_golang v1.20.5 github.com/robfig/cron v1.2.0 github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.8.1 @@ -25,6 +25,7 @@ require ( github.com/felixge/httpsnoop v1.0.4 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect + github.com/klauspost/compress v1.17.9 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/onsi/ginkgo/v2 v2.22.1 // indirect diff --git a/go.sum b/go.sum index 0b33fc3..54653d0 100644 --- a/go.sum +++ b/go.sum @@ -83,6 +83,8 @@ github.com/jarcoal/httpmock v1.3.0 h1:2RJ8GP0IIaWwcC9Fp2BmVi8Kog3v2Hn7VXM3fTd+nu github.com/jarcoal/httpmock v1.3.0/go.mod h1:3yb8rc4BI7TCBhFY8ng0gjuLKJNquuDNiPaZjnENuYg= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -134,6 +136,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y= +github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= From 1c218caea47e7e7d58b097be53ff895c727103c0 Mon Sep 17 00:00:00 2001 From: "Jan O. Rundshagen" Date: Sun, 5 Jan 2025 15:47:48 +0100 Subject: [PATCH 090/157] chore:fix go releaser --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 9c2bd5d..7e5ab9c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -8,7 +8,7 @@ on: - "**/v[0-9]+.[0-9]+.[0-9]+" permissions: - contents: read + contents: write jobs: lint: From 43004c836302a578c0cdddd2903c3f057517a704 Mon Sep 17 00:00:00 2001 From: "Jan O. Rundshagen" Date: Sun, 5 Jan 2025 15:48:34 +0100 Subject: [PATCH 091/157] chore: remove pkg step --- .github/workflows/release.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 7e5ab9c..59ab0e6 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -107,10 +107,3 @@ jobs: docker login -u $DOCKER_USER -p $DOCKER_TOKEN && \ docker manifest push beatkind/watchtower:$(echo $TAG | sed 's/^v*//') && \ docker manifest push beatkind/watchtower:latest - renew-docs: - name: Refresh pkg.go.dev - needs: build - runs-on: ubuntu-latest - steps: - - name: Pull new module version - uses: andrewslotin/go-proxy-pull-action@89382de145eeb7a85de72f8a27f686a50727bc7a #master@2022-10-14 From 5c1d3dac6ca12e6c7bc4fb639248d8f268098a78 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 29 Jan 2025 20:22:12 +0000 Subject: [PATCH 092/157] fix(deps): update module github.com/spf13/pflag to v1.0.6 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 75b8206..6d0331c 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/robfig/cron v1.2.0 github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.8.1 - github.com/spf13/pflag v1.0.5 + github.com/spf13/pflag v1.0.6 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.10.0 golang.org/x/net v0.33.0 diff --git a/go.sum b/go.sum index 54653d0..2b87260 100644 --- a/go.sum +++ b/go.sum @@ -166,6 +166,8 @@ github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3k github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= +github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI= github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= From d9054f123702f631d72032d21d3116a9cb6789e0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2025 21:21:55 +0000 Subject: [PATCH 093/157] fix(deps): update module github.com/docker/docker to v27.5.1+incompatible --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 6d0331c..c7b4f28 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/containrrr/shoutrrr v0.8.0 github.com/distribution/reference v0.6.0 github.com/docker/cli v27.4.1+incompatible - github.com/docker/docker v27.4.1+incompatible + github.com/docker/docker v27.5.1+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.36.2 diff --git a/go.sum b/go.sum index 2b87260..ff20aa5 100644 --- a/go.sum +++ b/go.sum @@ -29,6 +29,8 @@ github.com/docker/docker v27.3.1+incompatible h1:KttF0XoteNTicmUtBO0L2tP+J7FGRFT github.com/docker/docker v27.3.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v27.4.1+incompatible h1:ZJvcY7gfwHn1JF48PfbyXg7Jyt9ZCWDW+GGXOIxEwp4= github.com/docker/docker v27.4.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v27.5.1+incompatible h1:4PYU5dnBYqRQi0294d1FBECqT9ECWeQAIfE8q4YnPY8= +github.com/docker/docker v27.5.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo= github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= From 7f7c4e3083b5bcd7be518cb47833e9dec811c5b3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 22:25:37 +0000 Subject: [PATCH 094/157] chore(deps): update alpine docker tag to v3.21.2 --- dockerfiles/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index fe7ae25..68d2ee5 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM alpine:3.21.0 as alpine +FROM --platform=$BUILDPLATFORM alpine:3.21.2 as alpine RUN apk add --no-cache \ ca-certificates \ From b496df68f76e1f35a5395516a18b8e926e0ff7ca Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 20:34:33 +0000 Subject: [PATCH 095/157] fix(deps): update module golang.org/x/net to v0.34.0 --- go.mod | 4 ++-- go.sum | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index c7b4f28..9599231 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/spf13/pflag v1.0.6 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.10.0 - golang.org/x/net v0.33.0 + golang.org/x/net v0.34.0 ) require ( @@ -75,7 +75,7 @@ require ( github.com/subosito/gotenv v1.6.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect - golang.org/x/sys v0.28.0 // indirect + golang.org/x/sys v0.29.0 // indirect golang.org/x/text v0.21.0 golang.org/x/time v0.5.0 // indirect google.golang.org/protobuf v1.36.1 // indirect diff --git a/go.sum b/go.sum index ff20aa5..8d79eca 100644 --- a/go.sum +++ b/go.sum @@ -225,6 +225,8 @@ golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo= golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM= golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= +golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= +golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -246,6 +248,8 @@ golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= +golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= From e07234a37968b3d311d1a1c3333dc02fb54b81a1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 2 Feb 2025 15:17:57 +0000 Subject: [PATCH 096/157] fix(deps): update module github.com/docker/cli to v27.5.1+incompatible --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 9599231..8fa6b72 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23 require ( github.com/containrrr/shoutrrr v0.8.0 github.com/distribution/reference v0.6.0 - github.com/docker/cli v27.4.1+incompatible + github.com/docker/cli v27.5.1+incompatible github.com/docker/docker v27.5.1+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 diff --git a/go.sum b/go.sum index 8d79eca..5d941d7 100644 --- a/go.sum +++ b/go.sum @@ -25,6 +25,8 @@ github.com/docker/cli v27.3.1+incompatible h1:qEGdFBF3Xu6SCvCYhc7CzaQTlBmqDuzxPD github.com/docker/cli v27.3.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v27.4.1+incompatible h1:VzPiUlRJ/xh+otB75gva3r05isHMo5wXDfPRi5/b4hI= github.com/docker/cli v27.4.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v27.5.1+incompatible h1:JB9cieUT9YNiMITtIsguaN55PLOHhBSz3LKVc6cqWaY= +github.com/docker/cli v27.5.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/docker v27.3.1+incompatible h1:KttF0XoteNTicmUtBO0L2tP+J7FGRFTjaEF4k6WdhfI= github.com/docker/docker v27.3.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v27.4.1+incompatible h1:ZJvcY7gfwHn1JF48PfbyXg7Jyt9ZCWDW+GGXOIxEwp4= From c571dc4b6a5834df8660d867cbd99c4fa07748bf Mon Sep 17 00:00:00 2001 From: invis-z <22781620+invis-z@users.noreply.github.com> Date: Tue, 4 Feb 2025 12:54:57 +0800 Subject: [PATCH 097/157] Fix links --- docs/arguments.md | 6 +++--- docs/container-selection.md | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/arguments.md b/docs/arguments.md index 9d7b1d1..cef7c88 100644 --- a/docs/arguments.md +++ b/docs/arguments.md @@ -245,7 +245,7 @@ Environment Variable: WATCHTOWER_DISABLE_CONTAINERS ## Without updating containers Will only monitor for new images, send notifications and invoke -the [pre-check/post-check hooks](https://watchtower.devcdn.nelifecycle-hooks/), but will __not__ update the +the [pre-check/post-check hooks](https://watchtower.devcdn.net/lifecycle-hooks/), but will __not__ update the containers. !!! note @@ -325,7 +325,7 @@ Environment Variable: WATCHTOWER_RUN_ONCE ## HTTP API Mode Runs Watchtower in HTTP API mode, only allowing image updates to be triggered by an HTTP request. -For details see [HTTP API](https://watchtower.devcdn.nehttp-api-mode). +For details see [HTTP API](https://watchtower.devcdn.net/http-api-mode). ```text Argument: --http-api-update @@ -357,7 +357,7 @@ Environment Variable: WATCHTOWER_HTTP_API_PERIODIC_POLLS ## Filter by scope Update containers that have a `com.centurylinklabs.watchtower.scope` label set with the same value as the given argument. -This enables [running multiple instances](https://watchtower.devcdn.nerunning-multiple-instances). +This enables [running multiple instances](https://watchtower.devcdn.net/running-multiple-instances). !!! note "Filter by lack of scope" If you want other instances of watchtower to ignore the scoped containers, set this argument to `none`. diff --git a/docs/container-selection.md b/docs/container-selection.md index 2be8f61..81d7971 100644 --- a/docs/container-selection.md +++ b/docs/container-selection.md @@ -3,7 +3,7 @@ By default, watchtower will watch all containers. However, sometimes only some c There are two options: - **Fully exclude**: You can choose to exclude containers entirely from being watched by watchtower. -- **Monitor only**: In this mode, watchtower checks for container updates, sends notifications and invokes the [pre-check/post-check hooks](https://watchtower.devcdn.nelifecycle-hooks/) on the containers but does **not** perform the update. +- **Monitor only**: In this mode, watchtower checks for container updates, sends notifications and invokes the [pre-check/post-check hooks](https://watchtower.devcdn.net/lifecycle-hooks/) on the containers but does **not** perform the update. ## Full Exclude @@ -78,4 +78,4 @@ Or, it can be specified as part of the `docker run` command line: docker run -d --label=com.centurylinklabs.watchtower.monitor-only=true someimage ``` -When the label is specified on a container, watchtower treats that container exactly as if [`WATCHTOWER_MONITOR_ONLY`](https://watchtower.devcdn.nearguments/#without_updating_containers) was set, but the effect is limited to the individual container. +When the label is specified on a container, watchtower treats that container exactly as if [`WATCHTOWER_MONITOR_ONLY`](https://watchtower.devcdn.net/arguments/#without_updating_containers) was set, but the effect is limited to the individual container. From 5e2974d1e86e8c281a1049a165e742829d354116 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2025 17:22:37 +0000 Subject: [PATCH 098/157] fix(deps): update module golang.org/x/text to v0.22.0 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 8fa6b72..85f6ca3 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,7 @@ require ( go.uber.org/multierr v1.11.0 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect golang.org/x/sys v0.29.0 // indirect - golang.org/x/text v0.21.0 + golang.org/x/text v0.22.0 golang.org/x/time v0.5.0 // indirect google.golang.org/protobuf v1.36.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index 5d941d7..67b8efb 100644 --- a/go.sum +++ b/go.sum @@ -258,6 +258,8 @@ golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= +golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= From ed78a5bbed8704f267a5d33d986b4ac215c295ee Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2025 05:09:05 +0000 Subject: [PATCH 099/157] chore(deps): update nginx docker tag to v1.27.4 --- dockerfiles/container-networking/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/container-networking/docker-compose.yml b/dockerfiles/container-networking/docker-compose.yml index 7795d2d..2320348 100644 --- a/dockerfiles/container-networking/docker-compose.yml +++ b/dockerfiles/container-networking/docker-compose.yml @@ -11,7 +11,7 @@ services: consumer: depends_on: - producer - image: nginx:1.27.3 + image: nginx:1.27.4 network_mode: "service:producer" labels: - "com.centurylinklabs.watchtower.depends-on=/wt-contnet-producer-1" From 434bd067cffe25d7579edc17325139e069c9ef56 Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Sun, 16 Feb 2025 17:26:12 +0100 Subject: [PATCH 100/157] fix: increase default DOCKER_API_VERSION to 1.44 --- cmd/root.go | 11 ----------- docs/arguments.md | 2 +- internal/flags/flags.go | 2 +- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index e6245a9..e0b9ee2 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -122,17 +122,6 @@ func PreRun(cmd *cobra.Command, _ []string) { log.Warn("Using `WATCHTOWER_NO_PULL` and `WATCHTOWER_MONITOR_ONLY` simultaneously might lead to no action being taken at all. If this is intentional, you may safely ignore this message.") } - // check if DOCKER_API_VERSION is set - if os.Getenv("DOCKER_API_VERSION") == "" { - log.Warn("The DOCKER_API_VERSION environment variable is not set. This may cause unexpected behavior while recreating docker containers. Defaulting to 1.44") - // set DOCKER_API_VERSION to 1.44 - os.Setenv("DOCKER_API_VERSION", "1.44") - } - // check if DOCKER_API_VERSION is set to minimum 1.44 or higher - if os.Getenv("DOCKER_API_VERSION") < "1.44" { - log.Warn("The DOCKER_API_VERSION environment variable is set to a version lower than 1.44. This may cause unexpected behavior while recreating docker containers.") - } - client = container.NewClient(container.ClientOptions{ IncludeStopped: includeStopped, ReviveStopped: reviveStopped, diff --git a/docs/arguments.md b/docs/arguments.md index cef7c88..0ebf868 100644 --- a/docs/arguments.md +++ b/docs/arguments.md @@ -172,7 +172,7 @@ The API version to use by the Docker client for connecting to the Docker daemon. Argument: --api-version, -a Environment Variable: DOCKER_API_VERSION Type: String - Default: "1.24" + Default: "1.44" ``` ## Include restarting diff --git a/internal/flags/flags.go b/internal/flags/flags.go index c11cdae..cc7d9e7 100644 --- a/internal/flags/flags.go +++ b/internal/flags/flags.go @@ -17,7 +17,7 @@ import ( // DockerAPIMinVersion is the minimum version of the docker api required to // use watchtower -const DockerAPIMinVersion string = "1.25" +const DockerAPIMinVersion string = "1.44" var defaultInterval = int((time.Hour * 24).Seconds()) From 1050c000025b96facc2eb41b115938a979f8f8d8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 17 Feb 2025 01:43:19 +0000 Subject: [PATCH 101/157] fix(deps): update module github.com/spf13/cobra to v1.9.1 --- go.mod | 2 +- go.sum | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 85f6ca3..3bfa894 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/prometheus/client_golang v1.20.5 github.com/robfig/cron v1.2.0 github.com/sirupsen/logrus v1.9.3 - github.com/spf13/cobra v1.8.1 + github.com/spf13/cobra v1.9.1 github.com/spf13/pflag v1.0.6 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.10.0 diff --git a/go.sum b/go.sum index 67b8efb..f359e31 100644 --- a/go.sum +++ b/go.sum @@ -13,6 +13,7 @@ github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3 github.com/containrrr/shoutrrr v0.8.0 h1:mfG2ATzIS7NR2Ec6XL+xyoHzN97H8WPjir8aYzJUSec= github.com/containrrr/shoutrrr v0.8.0/go.mod h1:ioyQAyu1LJY6sILuNyKaQaw+9Ttik5QePU8atnAdO2o= github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -167,6 +168,8 @@ github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= +github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo= +github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= From 3eb31053040ff4531ee6e80aa5102acce5016e55 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 14 Feb 2025 23:25:38 +0000 Subject: [PATCH 102/157] chore(deps): update alpine docker tag to v3.21.3 --- dockerfiles/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index 68d2ee5..3506149 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM alpine:3.21.2 as alpine +FROM --platform=$BUILDPLATFORM alpine:3.21.3 as alpine RUN apk add --no-cache \ ca-certificates \ From 89c58f07cace1441f1f7270e387f7005e17e9959 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2025 20:58:26 +0000 Subject: [PATCH 103/157] fix(deps): update module golang.org/x/net to v0.35.0 --- go.mod | 4 ++-- go.sum | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 3bfa894..fa3af0f 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/spf13/pflag v1.0.6 github.com/spf13/viper v1.19.0 github.com/stretchr/testify v1.10.0 - golang.org/x/net v0.34.0 + golang.org/x/net v0.35.0 ) require ( @@ -75,7 +75,7 @@ require ( github.com/subosito/gotenv v1.6.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect - golang.org/x/sys v0.29.0 // indirect + golang.org/x/sys v0.30.0 // indirect golang.org/x/text v0.22.0 golang.org/x/time v0.5.0 // indirect google.golang.org/protobuf v1.36.1 // indirect diff --git a/go.sum b/go.sum index f359e31..70f900f 100644 --- a/go.sum +++ b/go.sum @@ -232,6 +232,8 @@ golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= +golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= +golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -255,6 +257,8 @@ golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= +golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= From 5e32fdfbdee761b0c90bdbab21ee31d2a61ca0df Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Feb 2025 10:47:40 +0000 Subject: [PATCH 104/157] fix(deps): update module github.com/prometheus/client_golang to v1.21.0 --- go.mod | 6 +++--- go.sum | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index fa3af0f..a85c2d8 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.36.2 - github.com/prometheus/client_golang v1.20.5 + github.com/prometheus/client_golang v1.21.0 github.com/robfig/cron v1.2.0 github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.9.1 @@ -25,7 +25,7 @@ require ( github.com/felixge/httpsnoop v1.0.4 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/klauspost/compress v1.17.9 // indirect + github.com/klauspost/compress v1.17.11 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/onsi/ginkgo/v2 v2.22.1 // indirect @@ -64,7 +64,7 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/common v0.62.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/sagikazarmark/locafero v0.6.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect diff --git a/go.sum b/go.sum index 70f900f..7ce068e 100644 --- a/go.sum +++ b/go.sum @@ -90,6 +90,8 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= +github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -143,10 +145,14 @@ github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y= github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_golang v1.21.0 h1:DIsaGmiaBkSangBgMtWdNfxbMNdku5IK6iNhrEqWvdA= +github.com/prometheus/client_golang v1.21.0/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io= +github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ= From 21cd2aa32a51b40f0c4d625585aa9a64e86e76f4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 20 Feb 2025 03:15:50 +0000 Subject: [PATCH 105/157] fix(deps): update module github.com/docker/cli to v28 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index a85c2d8..4ccb8cf 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23 require ( github.com/containrrr/shoutrrr v0.8.0 github.com/distribution/reference v0.6.0 - github.com/docker/cli v27.5.1+incompatible + github.com/docker/cli v28.0.0+incompatible github.com/docker/docker v27.5.1+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 diff --git a/go.sum b/go.sum index 7ce068e..725f686 100644 --- a/go.sum +++ b/go.sum @@ -28,6 +28,8 @@ github.com/docker/cli v27.4.1+incompatible h1:VzPiUlRJ/xh+otB75gva3r05isHMo5wXDf github.com/docker/cli v27.4.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v27.5.1+incompatible h1:JB9cieUT9YNiMITtIsguaN55PLOHhBSz3LKVc6cqWaY= github.com/docker/cli v27.5.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v28.0.0+incompatible h1:ido37VmLUqEp+5NFb9icd6BuBB+SNDgCn+5kPCr2buA= +github.com/docker/cli v28.0.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/docker v27.3.1+incompatible h1:KttF0XoteNTicmUtBO0L2tP+J7FGRFTjaEF4k6WdhfI= github.com/docker/docker v27.3.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v27.4.1+incompatible h1:ZJvcY7gfwHn1JF48PfbyXg7Jyt9ZCWDW+GGXOIxEwp4= From 64dcbeceb3ff8f1bf99ecc3abc5d2fd2c707698d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 23 Feb 2025 15:37:42 +0000 Subject: [PATCH 106/157] fix(deps): update module github.com/docker/docker to v28 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 4ccb8cf..94eb4ca 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/containrrr/shoutrrr v0.8.0 github.com/distribution/reference v0.6.0 github.com/docker/cli v28.0.0+incompatible - github.com/docker/docker v27.5.1+incompatible + github.com/docker/docker v28.0.0+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.36.2 diff --git a/go.sum b/go.sum index 725f686..de18a7e 100644 --- a/go.sum +++ b/go.sum @@ -36,6 +36,8 @@ github.com/docker/docker v27.4.1+incompatible h1:ZJvcY7gfwHn1JF48PfbyXg7Jyt9ZCWD github.com/docker/docker v27.4.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v27.5.1+incompatible h1:4PYU5dnBYqRQi0294d1FBECqT9ECWeQAIfE8q4YnPY8= github.com/docker/docker v27.5.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v28.0.0+incompatible h1:Olh0KS820sJ7nPsBKChVhk5pzqcwDR15fumfAd/p9hM= +github.com/docker/docker v28.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo= github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= From cbb8904122520339cb13325531b8ba4634e5e57e Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Sun, 23 Feb 2025 16:54:35 +0100 Subject: [PATCH 107/157] chore(ci): Remove lint from needs for production release --- .github/workflows/release.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 59ab0e6..d7d6193 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -53,7 +53,6 @@ jobs: runs-on: ubuntu-latest needs: - test - - lint env: CGO_ENABLED: 0 TAG: ${{ github.ref_name }} From f33f3b5d608e52dd10ef47c694f2d887a95a1dce Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 15 Mar 2025 13:00:02 +0100 Subject: [PATCH 108/157] update min docker api version --- internal/flags/flags.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/flags/flags.go b/internal/flags/flags.go index cc7d9e7..50d0246 100644 --- a/internal/flags/flags.go +++ b/internal/flags/flags.go @@ -17,7 +17,7 @@ import ( // DockerAPIMinVersion is the minimum version of the docker api required to // use watchtower -const DockerAPIMinVersion string = "1.44" +const DockerAPIMinVersion string = "1.45" var defaultInterval = int((time.Hour * 24).Seconds()) From 5463a57af02fd4d61721b86dc9666f1cb0d2130f Mon Sep 17 00:00:00 2001 From: ivan Date: Sun, 16 Mar 2025 14:04:30 +0100 Subject: [PATCH 109/157] Update minimum Docker API version Changed the default Docker API version from 1.44 to 1.45 in the documentation. --- docs/arguments.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/arguments.md b/docs/arguments.md index 0ebf868..36739d2 100644 --- a/docs/arguments.md +++ b/docs/arguments.md @@ -172,7 +172,7 @@ The API version to use by the Docker client for connecting to the Docker daemon. Argument: --api-version, -a Environment Variable: DOCKER_API_VERSION Type: String - Default: "1.44" + Default: "1.45" ``` ## Include restarting From ca370c32c251fe50f9c99178b87cb65a62f011ae Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 14 Mar 2025 11:39:11 +0000 Subject: [PATCH 110/157] chore(deps): update docker/login-action digest to 74a5d14 --- .github/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index d7d6193..a93aaa8 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -66,7 +66,7 @@ jobs: with: go-version: 1.23.x - name: Login to Docker Hub - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3 + uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} From ddff2839f39346050b3900ddb62402ca79c8297e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Mar 2025 19:52:05 +0000 Subject: [PATCH 111/157] chore(deps): update dependency python to 3.13 --- .github/workflows/publish-docs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-docs.yaml b/.github/workflows/publish-docs.yaml index 040f0dc..808cfed 100644 --- a/.github/workflows/publish-docs.yaml +++ b/.github/workflows/publish-docs.yaml @@ -26,7 +26,7 @@ jobs: - name: Setup python uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.13' cache: 'pip' cache-dependency-path: | docs-requirements.txt From ac20f2e4d60abcd03a8957b3f231d3ad65d83781 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 4 Mar 2025 19:33:03 +0000 Subject: [PATCH 112/157] fix(deps): update module github.com/prometheus/client_golang to v1.21.1 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 94eb4ca..bd1e6b1 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.36.2 - github.com/prometheus/client_golang v1.21.0 + github.com/prometheus/client_golang v1.21.1 github.com/robfig/cron v1.2.0 github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.9.1 diff --git a/go.sum b/go.sum index de18a7e..5ba8cf6 100644 --- a/go.sum +++ b/go.sum @@ -151,6 +151,8 @@ github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+ github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_golang v1.21.0 h1:DIsaGmiaBkSangBgMtWdNfxbMNdku5IK6iNhrEqWvdA= github.com/prometheus/client_golang v1.21.0/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg= +github.com/prometheus/client_golang v1.21.1 h1:DOvXXTqVzvkIewV/CDPFdejpMCGeMcbGCQ8YOmu+Ibk= +github.com/prometheus/client_golang v1.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= From 594cdc34bdf2c6dec6dd3cb39064497fb78ce316 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 26 Feb 2025 18:19:40 +0000 Subject: [PATCH 113/157] fix(deps): update module github.com/docker/cli to v28.0.1+incompatible --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index bd1e6b1..9ac258b 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23 require ( github.com/containrrr/shoutrrr v0.8.0 github.com/distribution/reference v0.6.0 - github.com/docker/cli v28.0.0+incompatible + github.com/docker/cli v28.0.1+incompatible github.com/docker/docker v28.0.0+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 diff --git a/go.sum b/go.sum index 5ba8cf6..80c92dc 100644 --- a/go.sum +++ b/go.sum @@ -30,6 +30,8 @@ github.com/docker/cli v27.5.1+incompatible h1:JB9cieUT9YNiMITtIsguaN55PLOHhBSz3L github.com/docker/cli v27.5.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v28.0.0+incompatible h1:ido37VmLUqEp+5NFb9icd6BuBB+SNDgCn+5kPCr2buA= github.com/docker/cli v28.0.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v28.0.1+incompatible h1:g0h5NQNda3/CxIsaZfH4Tyf6vpxFth7PYl3hgCPOKzs= +github.com/docker/cli v28.0.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/docker v27.3.1+incompatible h1:KttF0XoteNTicmUtBO0L2tP+J7FGRFTjaEF4k6WdhfI= github.com/docker/docker v27.3.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v27.4.1+incompatible h1:ZJvcY7gfwHn1JF48PfbyXg7Jyt9ZCWDW+GGXOIxEwp4= From a44622770b8488d5a4bda101e4d3282024ea7193 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Mar 2025 09:51:39 +0000 Subject: [PATCH 114/157] fix(deps): update module github.com/docker/docker to v28.0.1+incompatible --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 9ac258b..4e98fd5 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/containrrr/shoutrrr v0.8.0 github.com/distribution/reference v0.6.0 github.com/docker/cli v28.0.1+incompatible - github.com/docker/docker v28.0.0+incompatible + github.com/docker/docker v28.0.1+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.36.2 diff --git a/go.sum b/go.sum index 80c92dc..880da98 100644 --- a/go.sum +++ b/go.sum @@ -40,6 +40,8 @@ github.com/docker/docker v27.5.1+incompatible h1:4PYU5dnBYqRQi0294d1FBECqT9ECWeQ github.com/docker/docker v27.5.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v28.0.0+incompatible h1:Olh0KS820sJ7nPsBKChVhk5pzqcwDR15fumfAd/p9hM= github.com/docker/docker v28.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v28.0.1+incompatible h1:FCHjSRdXhNRFjlHMTv4jUNlIBbTeRjrWfeFuJp7jpo0= +github.com/docker/docker v28.0.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo= github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= From 149af7827b68e07c137ce791321ee99ea5d6b3d0 Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Wed, 19 Mar 2025 14:41:00 +0100 Subject: [PATCH 115/157] feat(notifications): add support for custom sender name in email notifications --- internal/flags/flags.go | 7 +++++++ pkg/notifications/email.go | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/internal/flags/flags.go b/internal/flags/flags.go index 50d0246..71a5735 100644 --- a/internal/flags/flags.go +++ b/internal/flags/flags.go @@ -246,6 +246,12 @@ func RegisterNotificationFlags(rootCmd *cobra.Command) { envString("WATCHTOWER_NOTIFICATION_EMAIL_FROM"), "Address to send notification emails from") + flags.StringP( + "notification-email-from-name", + "", + envString("WATCHTOWER_NOTIFICATION_EMAIL_FROM_NAME"), + "Name to send notification emails from") + flags.StringP( "notification-email-to", "", @@ -425,6 +431,7 @@ func SetDefaults() { viper.SetDefault("WATCHTOWER_TIMEOUT", time.Second*10) viper.SetDefault("WATCHTOWER_NOTIFICATIONS", []string{}) viper.SetDefault("WATCHTOWER_NOTIFICATIONS_LEVEL", "info") + viper.SetDefault("WATCHTOWER_NOTIFICATION_EMAIL_FROM", "Watchtower") viper.SetDefault("WATCHTOWER_NOTIFICATION_EMAIL_SERVER_PORT", 25) viper.SetDefault("WATCHTOWER_NOTIFICATION_EMAIL_SUBJECTTAG", "") viper.SetDefault("WATCHTOWER_NOTIFICATION_SLACK_IDENTIFIER", "watchtower") diff --git a/pkg/notifications/email.go b/pkg/notifications/email.go index 6c41968..40a6ca9 100644 --- a/pkg/notifications/email.go +++ b/pkg/notifications/email.go @@ -15,7 +15,7 @@ const ( ) type emailTypeNotifier struct { - From, To string + From, FromName, To string Server, User, Password string Port int tlsSkipVerify bool @@ -27,6 +27,7 @@ func newEmailNotifier(c *cobra.Command) t.ConvertibleNotifier { flags := c.Flags() from, _ := flags.GetString("notification-email-from") + fromName, _ := flags.GetString("notification-email-from-name") to, _ := flags.GetString("notification-email-to") server, _ := flags.GetString("notification-email-server") user, _ := flags.GetString("notification-email-server-user") @@ -38,6 +39,7 @@ func newEmailNotifier(c *cobra.Command) t.ConvertibleNotifier { n := &emailTypeNotifier{ entries: []*log.Entry{}, From: from, + FromName: fromName, To: to, Server: server, User: user, @@ -53,7 +55,7 @@ func newEmailNotifier(c *cobra.Command) t.ConvertibleNotifier { func (e *emailTypeNotifier) GetURL(c *cobra.Command) (string, error) { conf := &shoutrrrSmtp.Config{ FromAddress: e.From, - FromName: "Watchtower", + FromName: e.FromName, ToAddresses: []string{e.To}, Port: uint16(e.Port), Host: e.Server, From 6a9b1967da1220186839ea124f2faaa23197cec0 Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Wed, 19 Mar 2025 15:12:36 +0100 Subject: [PATCH 116/157] fix(docs): correct formatting and punctuation in documentation files --- docs/arguments.md | 26 +++++++++++++------------- docs/notifications.md | 10 +++++----- pkg/notifications/notifier_test.go | 8 ++++++-- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/docs/arguments.md b/docs/arguments.md index 36739d2..414eace 100644 --- a/docs/arguments.md +++ b/docs/arguments.md @@ -98,8 +98,8 @@ Environment Variable: WATCHTOWER_REMOVE_VOLUMES ## Debug Enable debug mode with verbose logging. -!!! note "Notes" - Alias for `--log-level debug`. See [Maximum log level](#maximum-log-level). +!!! note "Notes" + Alias for `--log-level debug`. See [Maximum log level](#maximum-log-level). Does _not_ take an argument when used as an argument. Using `--debug true` will **not** work. ```text @@ -112,8 +112,8 @@ Environment Variable: WATCHTOWER_DEBUG ## Trace Enable trace mode with very verbose logging. Caution: exposes credentials! -!!! note "Notes" - Alias for `--log-level trace`. See [Maximum log level](#maximum-log-level). +!!! note "Notes" + Alias for `--log-level trace`. See [Maximum log level](#maximum-log-level). Does _not_ take an argument when used as an argument. Using `--trace true` will **not** work. ```text @@ -226,8 +226,8 @@ Environment Variable: WATCHTOWER_LABEL_ENABLE ``` ## Filter by disable label -__Do not__ Monitor and update containers that have `com.centurylinklabs.watchtower.enable` label set to false and -no `--label-enable` argument is passed. Note that only one or the other (targeting by enable label) can be +__Do not__ Monitor and update containers that have `com.centurylinklabs.watchtower.enable` label set to false and +no `--label-enable` argument is passed. Note that only one or the other (targeting by enable label) can be used at the same time to target containers. ## Filter by disabling specific container names @@ -324,7 +324,7 @@ Environment Variable: WATCHTOWER_RUN_ONCE ``` ## HTTP API Mode -Runs Watchtower in HTTP API mode, only allowing image updates to be triggered by an HTTP request. +Runs Watchtower in HTTP API mode, only allowing image updates to be triggered by an HTTP request. For details see [HTTP API](https://watchtower.devcdn.net/http-api-mode). ```text @@ -346,7 +346,7 @@ Environment Variable: WATCHTOWER_HTTP_API_TOKEN ``` ## HTTP API periodic polls -Keep running periodic updates if the HTTP API mode is enabled, otherwise the HTTP API would prevent periodic polls. +Keep running periodic updates if the HTTP API mode is enabled, otherwise the HTTP API would prevent periodic polls. ```text Argument: --http-api-periodic-polls @@ -356,7 +356,7 @@ Environment Variable: WATCHTOWER_HTTP_API_PERIODIC_POLLS ``` ## Filter by scope -Update containers that have a `com.centurylinklabs.watchtower.scope` label set with the same value as the given argument. +Update containers that have a `com.centurylinklabs.watchtower.scope` label set with the same value as the given argument. This enables [running multiple instances](https://watchtower.devcdn.net/running-multiple-instances). !!! note "Filter by lack of scope" @@ -369,10 +369,10 @@ This enables [running multiple instances](https://watchtower.devcdn.net/running- Environment Variable: WATCHTOWER_SCOPE Type: String Default: - -``` +``` ## HTTP API Metrics -Enables a metrics endpoint, exposing prometheus metrics via HTTP. See [Metrics](metrics.md) for details. +Enables a metrics endpoint, exposing prometheus metrics via HTTP. See [Metrics](metrics.md) for details. ```text Argument: --http-api-metrics @@ -450,8 +450,8 @@ Returns a success exit code to enable usage with docker `HEALTHCHECK`. This chec ## Programatic Output (porcelain) -Writes the session results to STDOUT using a stable, machine-readable format (indicated by the argument VERSION). - +Writes the session results to STDOUT using a stable, machine-readable format (indicated by the argument VERSION). + Alias for: ```text diff --git a/docs/notifications.md b/docs/notifications.md index 2a5fc01..f4e0bf1 100644 --- a/docs/notifications.md +++ b/docs/notifications.md @@ -1,11 +1,11 @@ # Notifications Watchtower can send notifications when containers are updated. Notifications are sent via hooks in the logging -system, [logrus](http://github.com/sirupsen/logrus). +system, [logrus](http://github.com/sirupsen/logrus). !!! note "Using multiple notifications with environment variables" There is currently a bug in Viper (https://github.com/spf13/viper/issues/380), which prevents comma-separated slices to - be used when using the environment variable. + be used when using the environment variable. A workaround is available where we instead put quotes around the environment variable value and replace the commas with spaces: ``` @@ -54,7 +54,7 @@ outputs timestamp and log level. !!! tip "Custom date format" If you want to adjust the date/time format it must show how the [reference time](https://golang.org/pkg/time/#pkg-constants) (_Mon Jan 2 15:04:05 MST 2006_) would be displayed in your - custom format. + custom format. i.e., The day of the year has to be 1, the month has to be 2 (february), the hour 3 (or 15 for 24h time) etc. !!! note "Skipping notifications" @@ -179,7 +179,7 @@ Example using a custom report template that always sends a session report after ## Legacy notifications -For backwards compatibility, the notifications can also be configured using legacy notification options. These will automatically be converted to shoutrrr URLs when used. +For backwards compatibility, the notifications can also be configured using legacy notification options. These will automatically be converted to shoutrrr URLs when used. The types of notifications to send are set by passing a comma-separated list of values to the `--notifications` option (or corresponding environment variable `WATCHTOWER_NOTIFICATIONS`), which has the following valid values: @@ -249,6 +249,7 @@ You can then copy this file from the container (a message with the full command To receive notifications by email, the following command-line options, or their corresponding environment variables, can be set: - `--notification-email-from` (env. `WATCHTOWER_NOTIFICATION_EMAIL_FROM`): The e-mail address from which notifications will be sent. +- `--notification-email-from-name` (env. `WATCHTOWER_NOTIFICATION_EMAIL_FROM_NAME`): The name from which notifications will be sent. - `--notification-email-to` (env. `WATCHTOWER_NOTIFICATION_EMAIL_TO`): The e-mail address to which notifications will be sent. - `--notification-email-server` (env. `WATCHTOWER_NOTIFICATION_EMAIL_SERVER`): The SMTP server to send e-mails through. - `--notification-email-server-tls-skip-verify` (env. `WATCHTOWER_NOTIFICATION_EMAIL_SERVER_TLS_SKIP_VERIFY`): Do not verify the TLS certificate of the mail server. This should be used only for testing. @@ -387,4 +388,3 @@ docker run -d \ `-e WATCHTOWER_NOTIFICATION_GOTIFY_TOKEN` or `--notification-gotify-token` can also reference a file, in which case the contents of the file are used. If you want to disable TLS verification for the Gotify instance, you can use either `-e WATCHTOWER_NOTIFICATION_GOTIFY_TLS_SKIP_VERIFY=true` or `--notification-gotify-tls-skip-verify`. - diff --git a/pkg/notifications/notifier_test.go b/pkg/notifications/notifier_test.go index 61ff789..12a5894 100644 --- a/pkg/notifications/notifier_test.go +++ b/pkg/notifications/notifier_test.go @@ -308,6 +308,8 @@ var _ = Describe("notifications", func() { "email", "--notification-email-from", fromAddress, + "--notification-email-from-name", + "Watchtower1", "--notification-email-to", "mail@example.com", "--notification-email-server-user", @@ -334,6 +336,8 @@ var _ = Describe("notifications", func() { "email", "--notification-email-from", fromAddress, + "--notification-email-from-name", + "Watchtower1", "--notification-email-to", toAddress, "--notification-email-server-user", @@ -342,7 +346,7 @@ var _ = Describe("notifications", func() { "secret-password", "--notification-email-server", "mail.containrrr.dev", - "--notification-email-delay", + "--notifications-delay", fmt.Sprint(expectedDelay.Seconds()), } @@ -353,7 +357,7 @@ var _ = Describe("notifications", func() { }) func buildExpectedURL(username string, password string, host string, port int, from string, to string, auth string) string { - var template = "smtp://%s:%s@%s:%d/?auth=%s&fromaddress=%s&fromname=Watchtower&subject=&toaddresses=%s" + var template = "smtp://%s:%s@%s:%d/?auth=%s&fromaddress=%s&fromname=Watchtower1&subject=&toaddresses=%s" return fmt.Sprintf(template, url.QueryEscape(username), url.QueryEscape(password), From 4b46603a7a664c08d439ddeb3301c4a8a13bbe19 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Mar 2025 19:20:54 +0000 Subject: [PATCH 117/157] fix(deps): update module github.com/docker/cli to v28.0.2+incompatible --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 4e98fd5..4a88358 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23 require ( github.com/containrrr/shoutrrr v0.8.0 github.com/distribution/reference v0.6.0 - github.com/docker/cli v28.0.1+incompatible + github.com/docker/cli v28.0.2+incompatible github.com/docker/docker v28.0.1+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 diff --git a/go.sum b/go.sum index 880da98..df7c124 100644 --- a/go.sum +++ b/go.sum @@ -32,6 +32,8 @@ github.com/docker/cli v28.0.0+incompatible h1:ido37VmLUqEp+5NFb9icd6BuBB+SNDgCn+ github.com/docker/cli v28.0.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v28.0.1+incompatible h1:g0h5NQNda3/CxIsaZfH4Tyf6vpxFth7PYl3hgCPOKzs= github.com/docker/cli v28.0.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v28.0.2+incompatible h1:cRPZ77FK3/IXTAIQQj1vmhlxiLS5m+MIUDwS6f57lrE= +github.com/docker/cli v28.0.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/docker v27.3.1+incompatible h1:KttF0XoteNTicmUtBO0L2tP+J7FGRFTjaEF4k6WdhfI= github.com/docker/docker v27.3.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v27.4.1+incompatible h1:ZJvcY7gfwHn1JF48PfbyXg7Jyt9ZCWDW+GGXOIxEwp4= From 3a6a0957ede124d0b1d27db1c298200d5b13362d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 20 Mar 2025 07:48:17 +0000 Subject: [PATCH 118/157] fix(deps): update module github.com/docker/docker to v28.0.2+incompatible --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 4a88358..30af3e9 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/containrrr/shoutrrr v0.8.0 github.com/distribution/reference v0.6.0 github.com/docker/cli v28.0.2+incompatible - github.com/docker/docker v28.0.1+incompatible + github.com/docker/docker v28.0.2+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.36.2 diff --git a/go.sum b/go.sum index df7c124..1c8a7a3 100644 --- a/go.sum +++ b/go.sum @@ -44,6 +44,8 @@ github.com/docker/docker v28.0.0+incompatible h1:Olh0KS820sJ7nPsBKChVhk5pzqcwDR1 github.com/docker/docker v28.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v28.0.1+incompatible h1:FCHjSRdXhNRFjlHMTv4jUNlIBbTeRjrWfeFuJp7jpo0= github.com/docker/docker v28.0.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v28.0.2+incompatible h1:9BILleFwug5FSSqWBgVevgL3ewDJfWWWyZVqlDMttE8= +github.com/docker/docker v28.0.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo= github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= From 353936cf90c2151c94ca654da9e3866002527c48 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Feb 2025 04:22:42 +0000 Subject: [PATCH 119/157] chore(deps): update goreleaser/goreleaser-action digest to 90a3faa --- .github/workflows/pull-request.yaml | 2 +- .github/workflows/release.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index 36b8c2a..8c17877 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -63,7 +63,7 @@ jobs: with: go-version: 1.23.x - name: Build - uses: goreleaser/goreleaser-action@9ed2f89a662bf1735a48bc8557fd212fa902bebf # v6 + uses: goreleaser/goreleaser-action@90a3faa9d0182683851fbfa97ca1a2cb983bfca3 # v6 with: version: v0.155.0 args: --snapshot --skip-publish --debug diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index a93aaa8..fd10677 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -71,7 +71,7 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build - uses: goreleaser/goreleaser-action@9ed2f89a662bf1735a48bc8557fd212fa902bebf # v6 + uses: goreleaser/goreleaser-action@90a3faa9d0182683851fbfa97ca1a2cb983bfca3 # v6 with: version: v0.155.0 args: --debug From ca09f754fe225f99ff0dc73a6958542b6790fabd Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Thu, 27 Mar 2025 14:11:26 +0100 Subject: [PATCH 120/157] chore(workflows): comment out lint job in pull-request and release workflows --- .github/workflows/pull-request.yaml | 24 ++++++++++++------------ .github/workflows/release.yaml | 24 ++++++++++++------------ 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index 8c17877..14342a6 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -10,18 +10,18 @@ permissions: contents: read jobs: - lint: - name: Lint - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 - with: - go-version: stable - - name: golangci-lint - uses: golangci/golangci-lint-action@v6 - with: - version: v1.60 + # lint: + # name: Lint + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v4 + # - uses: actions/setup-go@v5 + # with: + # go-version: stable + # - name: golangci-lint + # uses: golangci/golangci-lint-action@v6 + # with: + # version: v1.60 test: name: Test strategy: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index fd10677..7fdf5a8 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -11,18 +11,18 @@ permissions: contents: write jobs: - lint: - name: Lint - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 - with: - go-version: stable - - name: golangci-lint - uses: golangci/golangci-lint-action@v6 - with: - version: v1.60 + # lint: + # name: Lint + # runs-on: ubuntu-latest + # steps: + # - uses: actions/checkout@v4 + # - uses: actions/setup-go@v5 + # with: + # go-version: stable + # - name: golangci-lint + # uses: golangci/golangci-lint-action@v6 + # with: + # version: v1.60 test: name: Test From bc4fadc69f5048387c1986a7d592683059e77466 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Mar 2025 19:51:59 +0000 Subject: [PATCH 121/157] chore(deps): update dependency go to 1.24.x --- .github/workflows/publish-docs.yaml | 2 +- .github/workflows/pull-request.yaml | 4 ++-- .github/workflows/release-dev.yaml | 4 ++-- .github/workflows/release.yaml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish-docs.yaml b/.github/workflows/publish-docs.yaml index 808cfed..5e6eb97 100644 --- a/.github/workflows/publish-docs.yaml +++ b/.github/workflows/publish-docs.yaml @@ -20,7 +20,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.23.x + go-version: 1.24.x - name: Build tplprev run: scripts/build-tplprev.sh - name: Setup python diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index 14342a6..201ed7f 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -42,7 +42,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.23.x + go-version: 1.24.x - name: Run tests run: | go test -v -coverprofile coverage.out -covermode atomic ./... @@ -61,7 +61,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.23.x + go-version: 1.24.x - name: Build uses: goreleaser/goreleaser-action@90a3faa9d0182683851fbfa97ca1a2cb983bfca3 # v6 with: diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml index 82a21b3..ad7c718 100644 --- a/.github/workflows/release-dev.yaml +++ b/.github/workflows/release-dev.yaml @@ -16,7 +16,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.23.x + go-version: 1.24.x - name: Build run: ./build.sh test: @@ -26,7 +26,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.23.x + go-version: 1.24.x - name: Test run: go test -v -coverprofile coverage.out -covermode atomic ./... - name: Publish coverage diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 7fdf5a8..58d23cd 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -43,7 +43,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.23.x + go-version: 1.24.x - name: Run tests run: | go test ./... -coverprofile coverage.out @@ -64,7 +64,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.23.x + go-version: 1.24.x - name: Login to Docker Hub uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3 with: From 9656e2823f73abf2fa86313b4978dd53783ac4c9 Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Fri, 28 Mar 2025 12:42:10 +0100 Subject: [PATCH 122/157] fix(go.mod): update Go version to 1.24 and remove unused dependency --- go.mod | 3 +-- go.sum | 68 ++++++---------------------------------------------------- 2 files changed, 8 insertions(+), 63 deletions(-) diff --git a/go.mod b/go.mod index 30af3e9..2e65d7a 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/beatkind/watchtower -go 1.23 +go 1.24 require ( github.com/containrrr/shoutrrr v0.8.0 @@ -28,7 +28,6 @@ require ( github.com/klauspost/compress v1.17.11 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/onsi/ginkgo/v2 v2.22.1 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect go.opentelemetry.io/otel v1.28.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect diff --git a/go.sum b/go.sum index 1c8a7a3..8e9150d 100644 --- a/go.sum +++ b/go.sum @@ -12,7 +12,6 @@ github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/containrrr/shoutrrr v0.8.0 h1:mfG2ATzIS7NR2Ec6XL+xyoHzN97H8WPjir8aYzJUSec= github.com/containrrr/shoutrrr v0.8.0/go.mod h1:ioyQAyu1LJY6sILuNyKaQaw+9Ttik5QePU8atnAdO2o= -github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= @@ -22,28 +21,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= -github.com/docker/cli v27.3.1+incompatible h1:qEGdFBF3Xu6SCvCYhc7CzaQTlBmqDuzxPDpigSyeKQQ= -github.com/docker/cli v27.3.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v27.4.1+incompatible h1:VzPiUlRJ/xh+otB75gva3r05isHMo5wXDfPRi5/b4hI= -github.com/docker/cli v27.4.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v27.5.1+incompatible h1:JB9cieUT9YNiMITtIsguaN55PLOHhBSz3LKVc6cqWaY= -github.com/docker/cli v27.5.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v28.0.0+incompatible h1:ido37VmLUqEp+5NFb9icd6BuBB+SNDgCn+5kPCr2buA= -github.com/docker/cli v28.0.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/cli v28.0.1+incompatible h1:g0h5NQNda3/CxIsaZfH4Tyf6vpxFth7PYl3hgCPOKzs= -github.com/docker/cli v28.0.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v28.0.2+incompatible h1:cRPZ77FK3/IXTAIQQj1vmhlxiLS5m+MIUDwS6f57lrE= github.com/docker/cli v28.0.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/docker v27.3.1+incompatible h1:KttF0XoteNTicmUtBO0L2tP+J7FGRFTjaEF4k6WdhfI= -github.com/docker/docker v27.3.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v27.4.1+incompatible h1:ZJvcY7gfwHn1JF48PfbyXg7Jyt9ZCWDW+GGXOIxEwp4= -github.com/docker/docker v27.4.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v27.5.1+incompatible h1:4PYU5dnBYqRQi0294d1FBECqT9ECWeQAIfE8q4YnPY8= -github.com/docker/docker v27.5.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v28.0.0+incompatible h1:Olh0KS820sJ7nPsBKChVhk5pzqcwDR15fumfAd/p9hM= -github.com/docker/docker v28.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v28.0.1+incompatible h1:FCHjSRdXhNRFjlHMTv4jUNlIBbTeRjrWfeFuJp7jpo0= -github.com/docker/docker v28.0.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v28.0.2+incompatible h1:9BILleFwug5FSSqWBgVevgL3ewDJfWWWyZVqlDMttE8= github.com/docker/docker v28.0.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo= @@ -85,8 +64,8 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 h1:k7nVchz72niMH6YLQNvHSdIE7iqsQxK1P41mySCvssg= -github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= +github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad h1:a6HEuzUHeKH6hwfN/ZoQgRgVIWFJljSWa/zetS2WTvg= +github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= @@ -100,14 +79,14 @@ github.com/jarcoal/httpmock v1.3.0 h1:2RJ8GP0IIaWwcC9Fp2BmVi8Kog3v2Hn7VXM3fTd+nu github.com/jarcoal/httpmock v1.3.0/go.mod h1:3yb8rc4BI7TCBhFY8ng0gjuLKJNquuDNiPaZjnENuYg= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= -github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= @@ -132,13 +111,10 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= -github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= +github.com/onsi/ginkgo/v2 v2.22.1 h1:QW7tbJAUDyVDVOM5dFa7qaybo+CRfR7bemlQUN6Z8aM= github.com/onsi/ginkgo/v2 v2.22.1/go.mod h1:S6aTpoRsSq2cZOd+pssHAlKW/Q/jZt6cPrPlnj4a1xM= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= -github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8= github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= @@ -153,18 +129,10 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= -github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= -github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y= -github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= -github.com/prometheus/client_golang v1.21.0 h1:DIsaGmiaBkSangBgMtWdNfxbMNdku5IK6iNhrEqWvdA= -github.com/prometheus/client_golang v1.21.0/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg= github.com/prometheus/client_golang v1.21.1 h1:DOvXXTqVzvkIewV/CDPFdejpMCGeMcbGCQ8YOmu+Ibk= github.com/prometheus/client_golang v1.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= -github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io= github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= @@ -186,13 +154,9 @@ github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= -github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= -github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo= github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI= @@ -246,12 +210,6 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo= -golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM= -golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= -golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= -golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= -golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -271,20 +229,10 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= -golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= -golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= -golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= @@ -295,8 +243,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg= -golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI= +golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8= +golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -314,8 +262,6 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= -google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk= google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From 211288a94adbad2a9695f75c77c0e65cca0e25e1 Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Fri, 28 Mar 2025 12:45:27 +0100 Subject: [PATCH 123/157] fix(deps): update golang.org/x/text to v0.23.0 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 2e65d7a..79e7b0a 100644 --- a/go.mod +++ b/go.mod @@ -75,7 +75,7 @@ require ( go.uber.org/multierr v1.11.0 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect golang.org/x/sys v0.30.0 // indirect - golang.org/x/text v0.22.0 + golang.org/x/text v0.23.0 golang.org/x/time v0.5.0 // indirect google.golang.org/protobuf v1.36.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/go.sum b/go.sum index 8e9150d..bd3943b 100644 --- a/go.sum +++ b/go.sum @@ -233,8 +233,8 @@ golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= -golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= +golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= +golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= From d4dc6c8643419192dfb4ae687d8b17bdc19fb803 Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Fri, 28 Mar 2025 12:46:23 +0100 Subject: [PATCH 124/157] fix(deps): update viper, OpenTelemetry, and other dependencies --- go.mod | 30 +++++++++------------ go.sum | 82 +++++++++++++++++++++++----------------------------------- 2 files changed, 45 insertions(+), 67 deletions(-) diff --git a/go.mod b/go.mod index 79e7b0a..fee3e9b 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.9.1 github.com/spf13/pflag v1.0.6 - github.com/spf13/viper v1.19.0 + github.com/spf13/viper v1.20.1 github.com/stretchr/testify v1.10.0 golang.org/x/net v0.35.0 ) @@ -25,15 +25,15 @@ require ( github.com/felixge/httpsnoop v1.0.4 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect + github.com/go-viper/mapstructure/v2 v2.2.1 // indirect github.com/klauspost/compress v1.17.11 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect - go.opentelemetry.io/otel v1.28.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect + go.opentelemetry.io/otel v1.29.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect - go.opentelemetry.io/otel/metric v1.28.0 // indirect - go.opentelemetry.io/otel/sdk v1.28.0 // indirect - go.opentelemetry.io/otel/trace v1.28.0 // indirect + go.opentelemetry.io/otel/metric v1.29.0 // indirect + go.opentelemetry.io/otel/trace v1.29.0 // indirect ) require ( @@ -45,40 +45,34 @@ require ( github.com/docker/docker-credential-helpers v0.8.2 // indirect github.com/docker/go-units v0.5.0 // indirect github.com/fatih/color v1.17.0 // indirect - github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/fsnotify/fsnotify v1.8.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/google/go-cmp v0.6.0 // indirect - github.com/hashicorp/hcl v1.0.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect - github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c // indirect github.com/nxadm/tail v1.4.8 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0 // indirect - github.com/pelletier/go-toml/v2 v2.2.2 // indirect + github.com/pelletier/go-toml/v2 v2.2.3 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.62.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect - github.com/sagikazarmark/locafero v0.6.0 // indirect - github.com/sagikazarmark/slog-shim v0.1.0 // indirect + github.com/sagikazarmark/locafero v0.7.0 // indirect github.com/sourcegraph/conc v0.3.0 // indirect - github.com/spf13/afero v1.11.0 // indirect - github.com/spf13/cast v1.6.0 // indirect + github.com/spf13/afero v1.12.0 // indirect + github.com/spf13/cast v1.7.1 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/subosito/gotenv v1.6.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect golang.org/x/sys v0.30.0 // indirect golang.org/x/text v0.23.0 - golang.org/x/time v0.5.0 // indirect + golang.org/x/time v0.8.0 // indirect google.golang.org/protobuf v1.36.1 // indirect - gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gotest.tools/v3 v3.0.3 // indirect diff --git a/go.sum b/go.sum index bd3943b..819a5df 100644 --- a/go.sum +++ b/go.sum @@ -39,8 +39,8 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHk github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= -github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M= +github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= @@ -50,6 +50,8 @@ github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg78 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= +github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss= +github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -70,8 +72,6 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= -github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= -github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= @@ -87,15 +87,11 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= -github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= -github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 h1:dcztxKSvZ4Id8iPpHERQBbIJfabdt4wUm5qy3wOL2Zc= @@ -121,8 +117,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM= -github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= -github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= +github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M= +github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -142,56 +138,48 @@ github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfm github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/sagikazarmark/locafero v0.6.0 h1:ON7AQg37yzcRPU69mt7gwhFEBwxI6P9T4Qu3N51bwOk= -github.com/sagikazarmark/locafero v0.6.0/go.mod h1:77OmuIc6VTraTXKXIs/uvUxKGUXjE1GbemJYHqdNjX0= -github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= -github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= +github.com/sagikazarmark/locafero v0.7.0 h1:5MqpDsTGNDhY8sGp0Aowyf0qKsPrhewaLSsFaodPcyo= +github.com/sagikazarmark/locafero v0.7.0/go.mod h1:2za3Cg5rMaTMoG/2Ulr9AwtFaIppKXTRYnozin4aB5k= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= -github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= -github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= -github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= -github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= +github.com/spf13/afero v1.12.0 h1:UcOPyRBYczmFn6yvphxkn9ZEOY65cpwGKb5mL36mrqs= +github.com/spf13/afero v1.12.0/go.mod h1:ZTlWwG4/ahT8W7T0WQ5uYmjI9duaLQGy3Q2OAl4sk/4= +github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y= +github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo= github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o= github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI= -github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg= +github.com/spf13/viper v1.20.1 h1:ZMi+z/lvLyPSCoNtFCpqjy0S4kPbirhpTMwl8BkW9X4= +github.com/spf13/viper v1.20.1/go.mod h1:P9Mdzt1zoHIG8m2eZQinpiBjo6kCmZSKBClNNqjJvu4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= -go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= -go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 h1:TT4fX+nBOA/+LUkobKGW1ydGcn+G3vRw9+g5HwCphpk= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0/go.mod h1:L7UH0GbB0p47T4Rri3uHjbpCFYrVrwc1I25QhNPiGK8= +go.opentelemetry.io/otel v1.29.0 h1:PdomN/Al4q/lN6iBJEN3AwPvUiHPMlt93c8bqTG5Llw= +go.opentelemetry.io/otel v1.29.0/go.mod h1:N/WtXPs1CNCUEx+Agz5uouwCba+i+bJGFicT8SR4NP8= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 h1:j9+03ymgYhPKmeXGk5Zu+cIZOlVzd9Zv7QIiyItjFBU= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0/go.mod h1:Y5+XiUG4Emn1hTfciPzGPJaSI+RpDts6BnCIir0SLqk= -go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= -go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= -go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= -go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= -go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= -go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= +go.opentelemetry.io/otel/metric v1.29.0 h1:vPf/HFWTNkPu1aYeIsc98l4ktOQaL6LeSoeV2g+8YLc= +go.opentelemetry.io/otel/metric v1.29.0/go.mod h1:auu/QWieFVWx+DmQOUMgj0F8LHWdgalxXqvp7BII/W8= +go.opentelemetry.io/otel/sdk v1.29.0 h1:vkqKjk7gwhS8VaWb0POZKmIEDimRCMsopNYnriHyryo= +go.opentelemetry.io/otel/sdk v1.29.0/go.mod h1:pM8Dx5WKnvxLCb+8lG1PRNIDxu9g9b9g59Qr7hfAAok= +go.opentelemetry.io/otel/trace v1.29.0 h1:J/8ZNK4XgR7a21DZUAsbF8pZ5Jcw1VhACmnYt39JTi4= +go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+MMTlEh3nsQgWQ= go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= @@ -199,8 +187,6 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= -golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -235,8 +221,8 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= -golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= -golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg= +golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -249,13 +235,13 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 h1:9+tzLLstTlPTRyJTh+ah5wIMsBW5c4tQwGTN3thOW9Y= -google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= -google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= -google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= -google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 h1:ToEetK57OidYuqD4Q5w+vfEnPvPpuTwedCNVohYJfNk= +google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 h1:CkkIfIt50+lT6NHAVoRYEyAvQGFM7xEwXUUywFvEb3Q= +google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576/go.mod h1:1R3kvZ1dtP3+4p4d3G8uJ8rFk/fWlScl38vanWACI08= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 h1:TqExAhdPaB60Ux47Cn0oLV07rGnxZzIsaRhQaqS666A= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8/go.mod h1:lcTa1sDdWEIHMWlITnIczmw5w60CF9ffkb8Z+DVmmjA= +google.golang.org/grpc v1.67.3 h1:OgPcDAFKHnH8X3O4WcO4XUc8GRDeKsKReqbQtiCj7N8= +google.golang.org/grpc v1.67.3/go.mod h1:YGaHCc6Oap+FzBJTZLBzkGSYt/cvGPFTPxkn7QfSU8s= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -268,8 +254,6 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= -gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= From b135385b6c703569e29b53f92d0b47f6e0885c3a Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Fri, 28 Mar 2025 12:47:01 +0100 Subject: [PATCH 125/157] fix(deps): update gomega, net, cmp, sys, and protobuf dependencies --- go.mod | 10 +++++----- go.sum | 28 ++++++++++++++-------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/go.mod b/go.mod index fee3e9b..4f2b22d 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/docker/docker v28.0.2+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 - github.com/onsi/gomega v1.36.2 + github.com/onsi/gomega v1.36.3 github.com/prometheus/client_golang v1.21.1 github.com/robfig/cron v1.2.0 github.com/sirupsen/logrus v1.9.3 @@ -17,7 +17,7 @@ require ( github.com/spf13/pflag v1.0.6 github.com/spf13/viper v1.20.1 github.com/stretchr/testify v1.10.0 - golang.org/x/net v0.35.0 + golang.org/x/net v0.37.0 ) require ( @@ -47,7 +47,7 @@ require ( github.com/fatih/color v1.17.0 // indirect github.com/fsnotify/fsnotify v1.8.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/google/go-cmp v0.6.0 // indirect + github.com/google/go-cmp v0.7.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect @@ -69,10 +69,10 @@ require ( github.com/stretchr/objx v0.5.2 // indirect github.com/subosito/gotenv v1.6.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/sys v0.30.0 // indirect + golang.org/x/sys v0.31.0 // indirect golang.org/x/text v0.23.0 golang.org/x/time v0.8.0 // indirect - google.golang.org/protobuf v1.36.1 // indirect + google.golang.org/protobuf v1.36.5 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gotest.tools/v3 v3.0.3 // indirect diff --git a/go.sum b/go.sum index 819a5df..5649e6f 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,8 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad h1:a6HEuzUHeKH6hwfN/ZoQgRgVIWFJljSWa/zetS2WTvg= github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= @@ -107,12 +107,12 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.22.1 h1:QW7tbJAUDyVDVOM5dFa7qaybo+CRfR7bemlQUN6Z8aM= -github.com/onsi/ginkgo/v2 v2.22.1/go.mod h1:S6aTpoRsSq2cZOd+pssHAlKW/Q/jZt6cPrPlnj4a1xM= +github.com/onsi/ginkgo/v2 v2.23.3 h1:edHxnszytJ4lD9D5Jjc4tiDkPBZ3siDeJJkUZJJVkp0= +github.com/onsi/ginkgo/v2 v2.23.3/go.mod h1:zXTP6xIp3U8aVuXN8ENK9IXRaTjFnpVB9mGmaSRvxnM= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8= -github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY= +github.com/onsi/gomega v1.36.3 h1:hID7cr8t3Wp26+cYnfcjR6HpJ00fdogN6dqZ1t6IylU= +github.com/onsi/gomega v1.36.3/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= @@ -196,8 +196,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= -golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= +golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c= +golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -215,8 +215,8 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= -golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= +golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= @@ -229,8 +229,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8= -golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw= +golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY= +golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -248,8 +248,8 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk= -google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM= +google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= From a4ade4ebd019af34b7b360b3271ea8041bd6247f Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Fri, 28 Mar 2025 12:47:39 +0100 Subject: [PATCH 126/157] fix(deps): update docker/cli and docker/docker dependencies to v28.0.4 --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 4f2b22d..7318a01 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,8 @@ go 1.24 require ( github.com/containrrr/shoutrrr v0.8.0 github.com/distribution/reference v0.6.0 - github.com/docker/cli v28.0.2+incompatible - github.com/docker/docker v28.0.2+incompatible + github.com/docker/cli v28.0.4+incompatible + github.com/docker/docker v28.0.4+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.36.3 diff --git a/go.sum b/go.sum index 5649e6f..3638ccf 100644 --- a/go.sum +++ b/go.sum @@ -21,10 +21,10 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= -github.com/docker/cli v28.0.2+incompatible h1:cRPZ77FK3/IXTAIQQj1vmhlxiLS5m+MIUDwS6f57lrE= -github.com/docker/cli v28.0.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/docker v28.0.2+incompatible h1:9BILleFwug5FSSqWBgVevgL3ewDJfWWWyZVqlDMttE8= -github.com/docker/docker v28.0.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/cli v28.0.4+incompatible h1:pBJSJeNd9QeIWPjRcV91RVJihd/TXB77q1ef64XEu4A= +github.com/docker/cli v28.0.4+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/docker v28.0.4+incompatible h1:JNNkBctYKurkw6FrHfKqY0nKIDf5nrbxjVBtS+cdcok= +github.com/docker/docker v28.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo= github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= From d57b5eeb84e0419e206a118e46bcef8c387a2b45 Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Fri, 28 Mar 2025 12:52:22 +0100 Subject: [PATCH 127/157] fix(ci): update Go version in pull request workflow to 1.24.x --- .github/workflows/pull-request.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index 201ed7f..6fbafb7 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -28,7 +28,7 @@ jobs: fail-fast: false matrix: go-version: - - 1.23.x + - 1.24.x platform: - macos-latest - windows-latest From d084f5604defafcdb255190bab07635c964cf587 Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Fri, 28 Mar 2025 13:12:11 +0100 Subject: [PATCH 128/157] fix: update minimum Docker API version to 1.44 in documentation and code --- docs/arguments.md | 4 ++-- internal/flags/flags.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/arguments.md b/docs/arguments.md index 414eace..2966370 100644 --- a/docs/arguments.md +++ b/docs/arguments.md @@ -166,13 +166,13 @@ Environment Variable: DOCKER_HOST ``` ## Docker API version -The API version to use by the Docker client for connecting to the Docker daemon. The minimum supported version is 1.24. +The API version to use by the Docker client for connecting to the Docker daemon. The minimum supported version is 1.44. ```text Argument: --api-version, -a Environment Variable: DOCKER_API_VERSION Type: String - Default: "1.45" + Default: "1.44" ``` ## Include restarting diff --git a/internal/flags/flags.go b/internal/flags/flags.go index 71a5735..e71d02c 100644 --- a/internal/flags/flags.go +++ b/internal/flags/flags.go @@ -17,7 +17,7 @@ import ( // DockerAPIMinVersion is the minimum version of the docker api required to // use watchtower -const DockerAPIMinVersion string = "1.45" +const DockerAPIMinVersion string = "1.44" var defaultInterval = int((time.Hour * 24).Seconds()) From ca0d37a4ac6118b6784b8a842465b3295d800a50 Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Sat, 29 Mar 2025 12:39:57 +0100 Subject: [PATCH 129/157] chore: update Docker API types to use new image package --- .all-contributorsrc | 889 ------------------------- internal/actions/mocks/container.go | 40 +- internal/actions/update_test.go | 4 +- pkg/container/client.go | 6 +- pkg/container/client_test.go | 17 +- pkg/container/container.go | 12 +- pkg/container/container_mock_test.go | 26 +- pkg/container/container_test.go | 38 +- pkg/container/mocks/ApiServer.go | 19 +- pkg/registry/manifest/manifest_test.go | 4 +- pkg/types/container.go | 12 +- 11 files changed, 89 insertions(+), 978 deletions(-) delete mode 100644 .all-contributorsrc diff --git a/.all-contributorsrc b/.all-contributorsrc deleted file mode 100644 index 270f462..0000000 --- a/.all-contributorsrc +++ /dev/null @@ -1,889 +0,0 @@ -{ - "files": [ - "README.md" - ], - "imageSize": 100, - "commit": false, - "contributors": [ - { - "login": "piksel", - "name": "nils mΓ₯sΓ©n", - "avatar_url": "https://avatars2.githubusercontent.com/u/807383?v=4", - "profile": "https://piksel.se", - "contributions": [ - "code", - "doc", - "maintenance", - "review" - ] - }, - { - "login": "simskij", - "name": "Simon Aronsson", - "avatar_url": "https://avatars0.githubusercontent.com/u/1596025?v=4", - "profile": "http://simme.dev", - "contributions": [ - "code", - "doc", - "maintenance", - "review" - ] - }, - { - "login": "Codelica", - "name": "James", - "avatar_url": "https://avatars3.githubusercontent.com/u/386101?v=4", - "profile": "http://codelica.com", - "contributions": [ - "test", - "ideas" - ] - }, - { - "login": "KopfKrieg", - "name": "Florian", - "avatar_url": "https://avatars2.githubusercontent.com/u/5047813?v=4", - "profile": "https://kopfkrieg.org", - "contributions": [ - "review", - "doc" - ] - }, - { - "login": "bdehamer", - "name": "Brian DeHamer", - "avatar_url": "https://avatars1.githubusercontent.com/u/398027?v=4", - "profile": "https://github.com/bdehamer", - "contributions": [ - "code", - "maintenance" - ] - }, - { - "login": "rosscado", - "name": "Ross Cadogan", - "avatar_url": "https://avatars1.githubusercontent.com/u/16578183?v=4", - "profile": "https://github.com/rosscado", - "contributions": [ - "code" - ] - }, - { - "login": "stffabi", - "name": "stffabi", - "avatar_url": "https://avatars0.githubusercontent.com/u/9464631?v=4", - "profile": "https://github.com/stffabi", - "contributions": [ - "code", - "maintenance" - ] - }, - { - "login": "ATCUSA", - "name": "Austin", - "avatar_url": "https://avatars3.githubusercontent.com/u/3581228?v=4", - "profile": "https://github.com/ATCUSA", - "contributions": [ - "doc" - ] - }, - { - "login": "davidgardner11", - "name": "David Gardner", - "avatar_url": "https://avatars2.githubusercontent.com/u/6181487?v=4", - "profile": "https://labs.ctl.io", - "contributions": [ - "review", - "doc" - ] - }, - { - "login": "dolanor", - "name": "Tanguy ⧓ Herrmann", - "avatar_url": "https://avatars3.githubusercontent.com/u/928722?v=4", - "profile": "https://github.com/dolanor", - "contributions": [ - "code" - ] - }, - { - "login": "rdamazio", - "name": "Rodrigo Damazio Bovendorp", - "avatar_url": "https://avatars3.githubusercontent.com/u/997641?v=4", - "profile": "https://github.com/rdamazio", - "contributions": [ - "code", - "doc" - ] - }, - { - "login": "thelamer", - "name": "Ryan Kuba", - "avatar_url": "https://avatars3.githubusercontent.com/u/1852688?v=4", - "profile": "https://www.taisun.io/", - "contributions": [ - "infra" - ] - }, - { - "login": "cnrmck", - "name": "cnrmck", - "avatar_url": "https://avatars2.githubusercontent.com/u/22061955?v=4", - "profile": "https://github.com/cnrmck", - "contributions": [ - "doc" - ] - }, - { - "login": "haswalt", - "name": "Harry Walter", - "avatar_url": "https://avatars3.githubusercontent.com/u/338588?v=4", - "profile": "http://harrywalter.co.uk", - "contributions": [ - "code" - ] - }, - { - "login": "Robotex", - "name": "Robotex", - "avatar_url": "https://avatars3.githubusercontent.com/u/74515?v=4", - "profile": "http://projectsperanza.com", - "contributions": [ - "doc" - ] - }, - { - "login": "ubergesundheit", - "name": "Gerald Pape", - "avatar_url": "https://avatars0.githubusercontent.com/u/1494211?v=4", - "profile": "http://geraldpape.io", - "contributions": [ - "doc" - ] - }, - { - "login": "fomk", - "name": "fomk", - "avatar_url": "https://avatars0.githubusercontent.com/u/17636183?v=4", - "profile": "https://github.com/fomk", - "contributions": [ - "code" - ] - }, - { - "login": "svengo", - "name": "Sven Gottwald", - "avatar_url": "https://avatars3.githubusercontent.com/u/2502366?v=4", - "profile": "https://github.com/svengo", - "contributions": [ - "infra" - ] - }, - { - "login": "techknowlogick", - "name": "techknowlogick", - "avatar_url": "https://avatars1.githubusercontent.com/u/164197?v=4", - "profile": "https://liberapay.com/techknowlogick/", - "contributions": [ - "code" - ] - }, - { - "login": "waja", - "name": "waja", - "avatar_url": "https://avatars1.githubusercontent.com/u/1449568?v=4", - "profile": "http://log.c5t.org/about/", - "contributions": [ - "doc" - ] - }, - { - "login": "salbertson", - "name": "Scott Albertson", - "avatar_url": "https://avatars2.githubusercontent.com/u/154463?v=4", - "profile": "http://scottalbertson.com", - "contributions": [ - "doc" - ] - }, - { - "login": "huddlesj", - "name": "Jason Huddleston", - "avatar_url": "https://avatars1.githubusercontent.com/u/11966535?v=4", - "profile": "https://github.com/huddlesj", - "contributions": [ - "doc" - ] - }, - { - "login": "napstr", - "name": "Napster", - "avatar_url": "https://avatars3.githubusercontent.com/u/6048348?v=4", - "profile": "https://npstr.space/", - "contributions": [ - "code" - ] - }, - { - "login": "darknode", - "name": "Maxim", - "avatar_url": "https://avatars1.githubusercontent.com/u/809429?v=4", - "profile": "https://github.com/darknode", - "contributions": [ - "code", - "doc" - ] - }, - { - "login": "mxschmitt", - "name": "Max Schmitt", - "avatar_url": "https://avatars0.githubusercontent.com/u/17984549?v=4", - "profile": "https://schmitt.cat", - "contributions": [ - "doc" - ] - }, - { - "login": "cron410", - "name": "cron410", - "avatar_url": "https://avatars1.githubusercontent.com/u/3082899?v=4", - "profile": "https://github.com/cron410", - "contributions": [ - "doc" - ] - }, - { - "login": "Cardoso222", - "name": "Paulo Henrique", - "avatar_url": "https://avatars3.githubusercontent.com/u/7026517?v=4", - "profile": "https://github.com/Cardoso222", - "contributions": [ - "doc" - ] - }, - { - "login": "belak", - "name": "Kaleb Elwert", - "avatar_url": "https://avatars0.githubusercontent.com/u/107097?v=4", - "profile": "https://coded.io", - "contributions": [ - "doc" - ] - }, - { - "login": "wmbutler", - "name": "Bill Butler", - "avatar_url": "https://avatars1.githubusercontent.com/u/1254810?v=4", - "profile": "https://github.com/wmbutler", - "contributions": [ - "doc" - ] - }, - { - "login": "mariotacke", - "name": "Mario Tacke", - "avatar_url": "https://avatars2.githubusercontent.com/u/4942019?v=4", - "profile": "https://www.mariotacke.io", - "contributions": [ - "code" - ] - }, - { - "login": "mrw34", - "name": "Mark Woodbridge", - "avatar_url": "https://avatars2.githubusercontent.com/u/1101318?v=4", - "profile": "https://markwoodbridge.com", - "contributions": [ - "code" - ] - }, - { - "login": "Ansem93", - "name": "Ansem93", - "avatar_url": "https://avatars3.githubusercontent.com/u/6626218?v=4", - "profile": "https://github.com/Ansem93", - "contributions": [ - "doc" - ] - }, - { - "login": "lukapeschke", - "name": "Luka Peschke", - "avatar_url": "https://avatars1.githubusercontent.com/u/17085536?v=4", - "profile": "https://github.com/lukapeschke", - "contributions": [ - "code", - "doc" - ] - }, - { - "login": "zoispag", - "name": "Zois Pagoulatos", - "avatar_url": "https://avatars0.githubusercontent.com/u/21138205?v=4", - "profile": "https://github.com/zoispag", - "contributions": [ - "code", - "review", - "maintenance" - ] - }, - { - "login": "alexandremenif", - "name": "Alexandre Menif", - "avatar_url": "https://avatars0.githubusercontent.com/u/16152103?v=4", - "profile": "https://alexandre.menif.name", - "contributions": [ - "code" - ] - }, - { - "login": "chugunov", - "name": "Andrey", - "avatar_url": "https://avatars1.githubusercontent.com/u/4140479?v=4", - "profile": "https://github.com/chugunov", - "contributions": [ - "doc" - ] - }, - { - "login": "noplanman", - "name": "Armando LΓΌscher", - "avatar_url": "https://avatars3.githubusercontent.com/u/9423417?v=4", - "profile": "https://noplanman.ch", - "contributions": [ - "doc" - ] - }, - { - "login": "rjbudke", - "name": "Ryan Budke", - "avatar_url": "https://avatars2.githubusercontent.com/u/273485?v=4", - "profile": "https://github.com/rjbudke", - "contributions": [ - "doc" - ] - }, - { - "login": "kaloyan-raev", - "name": "Kaloyan Raev", - "avatar_url": "https://avatars2.githubusercontent.com/u/468091?v=4", - "profile": "http://kaloyan.raev.name", - "contributions": [ - "code", - "test" - ] - }, - { - "login": "sixth", - "name": "sixth", - "avatar_url": "https://avatars3.githubusercontent.com/u/11591445?v=4", - "profile": "https://github.com/sixth", - "contributions": [ - "doc" - ] - }, - { - "login": "foosel", - "name": "Gina HΓ€ußge", - "avatar_url": "https://avatars0.githubusercontent.com/u/83657?v=4", - "profile": "https://foosel.net", - "contributions": [ - "code" - ] - }, - { - "login": "8ear", - "name": "Max H.", - "avatar_url": "https://avatars0.githubusercontent.com/u/10329648?v=4", - "profile": "https://github.com/8ear", - "contributions": [ - "code" - ] - }, - { - "login": "pjknkda", - "name": "Jungkook Park", - "avatar_url": "https://avatars0.githubusercontent.com/u/4986524?v=4", - "profile": "https://pjknkda.github.io", - "contributions": [ - "doc" - ] - }, - { - "login": "jnidzwetzki", - "name": "Jan Kristof Nidzwetzki", - "avatar_url": "https://avatars1.githubusercontent.com/u/5753622?v=4", - "profile": "https://achfrag.net", - "contributions": [ - "doc" - ] - }, - { - "login": "mindrunner", - "name": "lukas", - "avatar_url": "https://avatars0.githubusercontent.com/u/1413542?v=4", - "profile": "https://www.lukaselsner.de", - "contributions": [ - "code" - ] - }, - { - "login": "codingCoffee", - "name": "Ameya Shenoy", - "avatar_url": "https://avatars3.githubusercontent.com/u/13611153?v=4", - "profile": "https://codingcoffee.dev", - "contributions": [ - "code" - ] - }, - { - "login": "raymondelooff", - "name": "Raymon de Looff", - "avatar_url": "https://avatars0.githubusercontent.com/u/9716806?v=4", - "profile": "https://github.com/raymondelooff", - "contributions": [ - "code" - ] - }, - { - "login": "jsclayton", - "name": "John Clayton", - "avatar_url": "https://avatars2.githubusercontent.com/u/704034?v=4", - "profile": "http://codemonkeylabs.com", - "contributions": [ - "code" - ] - }, - { - "login": "Germs2004", - "name": "Germs2004", - "avatar_url": "https://avatars2.githubusercontent.com/u/5519340?v=4", - "profile": "https://github.com/Germs2004", - "contributions": [ - "doc" - ] - }, - { - "login": "lukwil", - "name": "Lukas Willburger", - "avatar_url": "https://avatars1.githubusercontent.com/u/30203234?v=4", - "profile": "https://github.com/lukwil", - "contributions": [ - "code" - ] - }, - { - "login": "auanasgheps", - "name": "Oliver Cervera", - "avatar_url": "https://avatars2.githubusercontent.com/u/20586878?v=4", - "profile": "https://github.com/auanasgheps", - "contributions": [ - "doc" - ] - }, - { - "login": "victorcmoura", - "name": "Victor Moura", - "avatar_url": "https://avatars1.githubusercontent.com/u/26290053?v=4", - "profile": "https://github.com/victorcmoura", - "contributions": [ - "test", - "code", - "doc" - ] - }, - { - "login": "mbrandau", - "name": "Maximilian Brandau", - "avatar_url": "https://avatars3.githubusercontent.com/u/12972798?v=4", - "profile": "https://github.com/mbrandau", - "contributions": [ - "code", - "test" - ] - }, - { - "login": "aneisch", - "name": "Andrew", - "avatar_url": "https://avatars1.githubusercontent.com/u/6991461?v=4", - "profile": "https://github.com/aneisch", - "contributions": [ - "doc" - ] - }, - { - "login": "sixcorners", - "name": "sixcorners", - "avatar_url": "https://avatars0.githubusercontent.com/u/585501?v=4", - "profile": "https://github.com/sixcorners", - "contributions": [ - "doc" - ] - }, - { - "login": "arnested", - "name": "Arne JΓΈrgensen", - "avatar_url": "https://avatars2.githubusercontent.com/u/190005?v=4", - "profile": "https://arnested.dk", - "contributions": [ - "test", - "review" - ] - }, - { - "login": "patski123", - "name": "PatSki123", - "avatar_url": "https://avatars1.githubusercontent.com/u/19295295?v=4", - "profile": "https://github.com/patski123", - "contributions": [ - "doc" - ] - }, - { - "login": "Saicheg", - "name": "Valentine Zavadsky", - "avatar_url": "https://avatars2.githubusercontent.com/u/624999?v=4", - "profile": "https://rubyroidlabs.com/", - "contributions": [ - "code", - "doc", - "test" - ] - }, - { - "login": "bopoh24", - "name": "Alexander Voronin", - "avatar_url": "https://avatars2.githubusercontent.com/u/4086631?v=4", - "profile": "https://github.com/bopoh24", - "contributions": [ - "code", - "bug" - ] - }, - { - "login": "ogmueller", - "name": "Oliver Mueller", - "avatar_url": "https://avatars0.githubusercontent.com/u/788989?v=4", - "profile": "http://www.teqneers.de", - "contributions": [ - "doc" - ] - }, - { - "login": "tammert", - "name": "Sebastiaan Tammer", - "avatar_url": "https://avatars0.githubusercontent.com/u/8885250?v=4", - "profile": "https://github.com/tammert", - "contributions": [ - "code" - ] - }, - { - "login": "miosame", - "name": "miosame", - "avatar_url": "https://avatars1.githubusercontent.com/u/8201077?v=4", - "profile": "https://github.com/Miosame", - "contributions": [ - "doc" - ] - }, - { - "login": "andrewjmetzger", - "name": "Andrew Metzger", - "avatar_url": "https://avatars3.githubusercontent.com/u/590246?v=4", - "profile": "https://mtz.gr", - "contributions": [ - "bug", - "example" - ] - }, - { - "login": "pgrimaud", - "name": "Pierre Grimaud", - "avatar_url": "https://avatars1.githubusercontent.com/u/1866496?v=4", - "profile": "https://github.com/pgrimaud", - "contributions": [ - "doc" - ] - }, - { - "login": "mattdoran", - "name": "Matt Doran", - "avatar_url": "https://avatars0.githubusercontent.com/u/577779?v=4", - "profile": "https://github.com/mattdoran", - "contributions": [ - "doc" - ] - }, - { - "login": "MihailITPlace", - "name": "MihailITPlace", - "avatar_url": "https://avatars2.githubusercontent.com/u/28401551?v=4", - "profile": "https://github.com/MihailITPlace", - "contributions": [ - "code" - ] - }, - { - "login": "bugficks", - "name": "bugficks", - "avatar_url": "https://avatars1.githubusercontent.com/u/2992895?v=4", - "profile": "https://github.com/bugficks", - "contributions": [ - "code", - "doc" - ] - }, - { - "login": "MichaelSp", - "name": "Michael", - "avatar_url": "https://avatars0.githubusercontent.com/u/448282?v=4", - "profile": "https://github.com/MichaelSp", - "contributions": [ - "code" - ] - }, - { - "login": "jokay", - "name": "D. Domig", - "avatar_url": "https://avatars0.githubusercontent.com/u/18613935?v=4", - "profile": "https://github.com/jokay", - "contributions": [ - "doc" - ] - }, - { - "login": "osheroff", - "name": "Ben Osheroff", - "avatar_url": "https://avatars1.githubusercontent.com/u/260084?v=4", - "profile": "https://maxwells-daemon.io", - "contributions": [ - "code" - ] - }, - { - "login": "dhet", - "name": "David H.", - "avatar_url": "https://avatars3.githubusercontent.com/u/2668621?v=4", - "profile": "https://github.com/dhet", - "contributions": [ - "code" - ] - }, - { - "login": "chander", - "name": "Chander Ganesan", - "avatar_url": "https://avatars1.githubusercontent.com/u/671887?v=4", - "profile": "http://www.gridgeo.com", - "contributions": [ - "doc" - ] - }, - { - "login": "yrien30", - "name": "yrien30", - "avatar_url": "https://avatars1.githubusercontent.com/u/26816162?v=4", - "profile": "https://github.com/yrien30", - "contributions": [ - "code" - ] - }, - { - "login": "ksurl", - "name": "ksurl", - "avatar_url": "https://avatars1.githubusercontent.com/u/1371562?v=4", - "profile": "https://github.com/ksurl", - "contributions": [ - "doc", - "code", - "infra" - ] - }, - { - "login": "rg9400", - "name": "rg9400", - "avatar_url": "https://avatars2.githubusercontent.com/u/39887349?v=4", - "profile": "https://github.com/rg9400", - "contributions": [ - "code" - ] - }, - { - "login": "tkalus", - "name": "Turtle Kalus", - "avatar_url": "https://avatars2.githubusercontent.com/u/287181?v=4", - "profile": "https://github.com/tkalus", - "contributions": [ - "code" - ] - }, - { - "login": "SrihariThalla", - "name": "Srihari Thalla", - "avatar_url": "https://avatars1.githubusercontent.com/u/7479937?v=4", - "profile": "https://github.com/SrihariThalla", - "contributions": [ - "doc" - ] - }, - { - "login": "nymous", - "name": "Thomas Gaudin", - "avatar_url": "https://avatars1.githubusercontent.com/u/4216559?v=4", - "profile": "https://nymous.io", - "contributions": [ - "doc" - ] - }, - { - "login": "hydrargyrum", - "name": "hydrargyrum", - "avatar_url": "https://avatars.githubusercontent.com/u/2804645?v=4", - "profile": "https://indigo.re/", - "contributions": [ - "doc" - ] - }, - { - "login": "reinout", - "name": "Reinout van Rees", - "avatar_url": "https://avatars.githubusercontent.com/u/121433?v=4", - "profile": "https://reinout.vanrees.org", - "contributions": [ - "doc" - ] - }, - { - "login": "DasSkelett", - "name": "DasSkelett", - "avatar_url": "https://avatars.githubusercontent.com/u/28812678?v=4", - "profile": "https://github.com/DasSkelett", - "contributions": [ - "code" - ] - }, - { - "login": "zenjabba", - "name": "zenjabba", - "avatar_url": "https://avatars.githubusercontent.com/u/679864?v=4", - "profile": "https://github.com/zenjabba", - "contributions": [ - "doc" - ] - }, - { - "login": "djquan", - "name": "Dan Quan", - "avatar_url": "https://avatars.githubusercontent.com/u/3526705?v=4", - "profile": "https://quan.io", - "contributions": [ - "doc" - ] - }, - { - "login": "modem7", - "name": "modem7", - "avatar_url": "https://avatars.githubusercontent.com/u/4349962?v=4", - "profile": "https://github.com/modem7", - "contributions": [ - "doc" - ] - }, - { - "login": "hypnoglow", - "name": "Igor Zibarev", - "avatar_url": "https://avatars.githubusercontent.com/u/4853075?v=4", - "profile": "https://github.com/hypnoglow", - "contributions": [ - "code" - ] - }, - { - "login": "patricegautier", - "name": "Patrice", - "avatar_url": "https://avatars.githubusercontent.com/u/38435239?v=4", - "profile": "https://github.com/patricegautier", - "contributions": [ - "code" - ] - }, - { - "login": "jamesmacwhite", - "name": "James White", - "avatar_url": "https://avatars.githubusercontent.com/u/8067792?v=4", - "profile": "http://jamesw.link/me", - "contributions": [ - "doc" - ] - }, - { - "login": "Foxite", - "name": "Dirk Kok", - "avatar_url": "https://avatars.githubusercontent.com/u/20421657?v=4", - "profile": "https://ko-fi.com/foxite", - "contributions": [ - "code" - ] - }, - { - "login": "EDIflyer", - "name": "EDIflyer", - "avatar_url": "https://avatars.githubusercontent.com/u/13610277?v=4", - "profile": "https://github.com/EDIflyer", - "contributions": [ - "doc" - ] - }, - { - "login": "jauderho", - "name": "Jauder Ho", - "avatar_url": "https://avatars.githubusercontent.com/u/13562?v=4", - "profile": "https://github.com/jauderho", - "contributions": [ - "code" - ] - }, - { - "login": "andriibratanin", - "name": "Andrii Bratanin", - "avatar_url": "https://avatars.githubusercontent.com/u/20169213?v=4", - "profile": "https://github.com/andriibratanin" - }, - { - "login": "IAmTamal", - "name": "Tamal Das ", - "avatar_url": "https://avatars.githubusercontent.com/u/72851613?v=4", - "profile": "https://tamal.vercel.app/", - "contributions": [ - "doc" - ] - }, - { - "login": "testwill", - "name": "guangwu", - "avatar_url": "https://avatars.githubusercontent.com/u/8717479?v=4", - "profile": "https://github.com/testwill", - "contributions": [ - "doc" - ] - }, - { - "login": "nothub", - "name": "Florian HΓΌbner", - "avatar_url": "https://avatars.githubusercontent.com/u/48992448?v=4", - "profile": "http://hub.lol", - "contributions": [ - "doc", - "code" - ] - } - ], - "contributorsPerLine": 7, - "projectName": "watchtower", - "projectOwner": "containrrr", - "repoType": "github", - "repoHost": "https://github.com", - "commitConvention": "none", - "skipCi": true, - "commitType": "docs" -} diff --git a/internal/actions/mocks/container.go b/internal/actions/mocks/container.go index afa30a4..3d464c5 100644 --- a/internal/actions/mocks/container.go +++ b/internal/actions/mocks/container.go @@ -8,15 +8,15 @@ import ( "github.com/beatkind/watchtower/pkg/container" wt "github.com/beatkind/watchtower/pkg/types" - "github.com/docker/docker/api/types" dockerContainer "github.com/docker/docker/api/types/container" + dockerImage "github.com/docker/docker/api/types/image" "github.com/docker/go-connections/nat" ) // CreateMockContainer creates a container substitute valid for testing func CreateMockContainer(id string, name string, image string, created time.Time) wt.Container { - content := types.ContainerJSON{ - ContainerJSONBase: &types.ContainerJSONBase{ + content := dockerContainer.InspectResponse{ + ContainerJSONBase: &dockerContainer.ContainerJSONBase{ ID: id, Image: image, Name: name, @@ -38,24 +38,24 @@ func CreateMockContainer(id string, name string, image string, created time.Time } // CreateMockImageInfo returns a mock image info struct based on the passed image -func CreateMockImageInfo(image string) *types.ImageInspect { - return &types.ImageInspect{ - ID: image, - RepoDigests: []string{ - image, - }, - } +func CreateMockImageInfo(image string) *dockerImage.InspectResponse { + return &dockerImage.InspectResponse{ + ID: image, + RepoTags: []string{ + image, + }, + } } // CreateMockContainerWithImageInfo should only be used for testing -func CreateMockContainerWithImageInfo(id string, name string, image string, created time.Time, imageInfo types.ImageInspect) wt.Container { +func CreateMockContainerWithImageInfo(id string, name string, image string, created time.Time, imageInfo dockerImage.InspectResponse) wt.Container { return CreateMockContainerWithImageInfoP(id, name, image, created, &imageInfo) } // CreateMockContainerWithImageInfoP should only be used for testing -func CreateMockContainerWithImageInfoP(id string, name string, image string, created time.Time, imageInfo *types.ImageInspect) wt.Container { - content := types.ContainerJSON{ - ContainerJSONBase: &types.ContainerJSONBase{ +func CreateMockContainerWithImageInfoP(id string, name string, image string, created time.Time, imageInfo *dockerImage.InspectResponse) wt.Container { + content := dockerContainer.InspectResponse{ + ContainerJSONBase: &dockerContainer.ContainerJSONBase{ ID: id, Image: image, Name: name, @@ -81,12 +81,12 @@ func CreateMockContainerWithDigest(id string, name string, image string, created // CreateMockContainerWithConfig creates a container substitute valid for testing func CreateMockContainerWithConfig(id string, name string, image string, running bool, restarting bool, created time.Time, config *dockerContainer.Config) wt.Container { - content := types.ContainerJSON{ - ContainerJSONBase: &types.ContainerJSONBase{ + content := dockerContainer.InspectResponse{ + ContainerJSONBase: &dockerContainer.ContainerJSONBase{ ID: id, Image: image, Name: name, - State: &types.ContainerState{ + State: &dockerContainer.State{ Running: running, Restarting: restarting, }, @@ -120,9 +120,9 @@ func CreateContainerForProgress(index int, idPrefix int, nameFormat string) (wt. } // CreateMockContainerWithLinks should only be used for testing -func CreateMockContainerWithLinks(id string, name string, image string, created time.Time, links []string, imageInfo *types.ImageInspect) wt.Container { - content := types.ContainerJSON{ - ContainerJSONBase: &types.ContainerJSONBase{ +func CreateMockContainerWithLinks(id string, name string, image string, created time.Time, links []string, imageInfo *dockerImage.InspectResponse) wt.Container { + content := dockerContainer.InspectResponse{ + ContainerJSONBase: &dockerContainer.ContainerJSONBase{ ID: id, Image: image, Name: name, diff --git a/internal/actions/update_test.go b/internal/actions/update_test.go index 3123c94..a9bcae2 100644 --- a/internal/actions/update_test.go +++ b/internal/actions/update_test.go @@ -5,8 +5,8 @@ import ( "github.com/beatkind/watchtower/internal/actions" "github.com/beatkind/watchtower/pkg/types" - dockerTypes "github.com/docker/docker/api/types" dockerContainer "github.com/docker/docker/api/types/container" + dockerImage "github.com/docker/docker/api/types/image" "github.com/docker/go-connections/nat" . "github.com/beatkind/watchtower/internal/actions/mocks" @@ -44,7 +44,7 @@ func getLinkedTestData(withImageInfo bool) *TestData { "fake-image1:latest", time.Now().AddDate(0, 0, -1)) - var imageInfo *dockerTypes.ImageInspect + var imageInfo *dockerImage.InspectResponse if withImageInfo { imageInfo = CreateMockImageInfo("test-container-02") } diff --git a/pkg/container/client.go b/pkg/container/client.go index 0ca46ac..26e1595 100644 --- a/pkg/container/client.go +++ b/pkg/container/client.go @@ -77,7 +77,7 @@ const ( ) type dockerClient struct { - api sdkClient.CommonAPIClient + api sdkClient.APIClient ClientOptions } @@ -172,7 +172,7 @@ func (client dockerClient) GetContainer(containerID t.ContainerID) (t.Container, } } - imageInfo, _, err := client.api.ImageInspectWithRaw(bg, containerInfo.Image) + imageInfo, err := client.api.ImageInspect(bg, containerInfo.Image) if err != nil { log.Warnf("Failed to retrieve container image info: %v", err) return &Container{containerInfo: &containerInfo, imageInfo: nil}, nil @@ -332,7 +332,7 @@ func (client dockerClient) HasNewImage(ctx context.Context, container t.Containe currentImageID := t.ImageID(container.ContainerInfo().ContainerJSONBase.Image) imageName := container.ImageName() - newImageInfo, _, err := client.api.ImageInspectWithRaw(ctx, imageName) + newImageInfo, err := client.api.ImageInspect(ctx, imageName) if err != nil { return false, currentImageID, err } diff --git a/pkg/container/client_test.go b/pkg/container/client_test.go index d4bcb40..ba3f0dd 100644 --- a/pkg/container/client_test.go +++ b/pkg/container/client_test.go @@ -9,9 +9,8 @@ import ( "github.com/beatkind/watchtower/pkg/filters" t "github.com/beatkind/watchtower/pkg/types" - "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/backend" - "github.com/docker/docker/api/types/container" + dockerContainer "github.com/docker/docker/api/types/container" cli "github.com/docker/docker/client" "github.com/docker/docker/errdefs" "github.com/onsi/gomega/gbytes" @@ -79,8 +78,8 @@ var _ = Describe("the client", func() { When("removing a running container", func() { When("the container still exist after stopping", func() { It("should attempt to remove the container", func() { - container := MockContainer(WithContainerState(types.ContainerState{Running: true})) - containerStopped := MockContainer(WithContainerState(types.ContainerState{Running: false})) + container := MockContainer(WithContainerState(dockerContainer.State{Running: true})) + containerStopped := MockContainer(WithContainerState(dockerContainer.State{Running: false})) cid := container.ContainerInfo().ID mockServer.AppendHandlers( @@ -95,7 +94,7 @@ var _ = Describe("the client", func() { }) When("the container does not exist after stopping", func() { It("should not cause an error", func() { - container := MockContainer(WithContainerState(types.ContainerState{Running: true})) + container := MockContainer(WithContainerState(dockerContainer.State{Running: true})) cid := container.ContainerInfo().ID mockServer.AppendHandlers( @@ -271,7 +270,7 @@ var _ = Describe("the client", func() { // API.ContainerExecCreate ghttp.CombineHandlers( ghttp.VerifyRequest("POST", HaveSuffix("containers/%v/exec", containerID)), - ghttp.VerifyJSONRepresenting(container.ExecOptions{ + ghttp.VerifyJSONRepresenting(dockerContainer.ExecOptions{ User: user, Detach: false, Tty: true, @@ -281,12 +280,12 @@ var _ = Describe("the client", func() { cmd, }, }), - ghttp.RespondWithJSONEncoded(http.StatusOK, types.IDResponse{ID: execID}), + ghttp.RespondWithJSONEncoded(http.StatusOK, dockerContainer.CommitResponse{ID: execID}), ), // API.ContainerExecStart ghttp.CombineHandlers( ghttp.VerifyRequest("POST", HaveSuffix("exec/%v/start", execID)), - ghttp.VerifyJSONRepresenting(container.ExecStartOptions{ + ghttp.VerifyJSONRepresenting(dockerContainer.ExecStartOptions{ Detach: false, Tty: true, }), @@ -330,7 +329,7 @@ var _ = Describe("the client", func() { endpoints := map[string]*network.EndpointSettings{ `test`: {Aliases: aliases}, } - container.containerInfo.NetworkSettings = &types.NetworkSettings{Networks: endpoints} + container.containerInfo.NetworkSettings = &dockerContainer.NetworkSettings{Networks: endpoints} Expect(container.ContainerInfo().NetworkSettings.Networks[`test`].Aliases).To(Equal(aliases)) Expect(client.GetNetworkConfig(container).EndpointsConfig[`test`].Aliases).To(Equal([]string{"One", "Two", "Four"})) }) diff --git a/pkg/container/container.go b/pkg/container/container.go index 142ef67..3776905 100644 --- a/pkg/container/container.go +++ b/pkg/container/container.go @@ -11,14 +11,14 @@ import ( wt "github.com/beatkind/watchtower/pkg/types" "github.com/sirupsen/logrus" - "github.com/docker/docker/api/types" dockercontainer "github.com/docker/docker/api/types/container" + "github.com/docker/docker/api/types/image" "github.com/docker/go-connections/nat" ) // NewContainer returns a new Container instance instantiated with the // specified ContainerInfo and ImageInfo structs. -func NewContainer(containerInfo *types.ContainerJSON, imageInfo *types.ImageInspect) *Container { +func NewContainer(containerInfo *dockercontainer.InspectResponse, imageInfo *image.InspectResponse) *Container { return &Container{ containerInfo: containerInfo, imageInfo: imageInfo, @@ -30,8 +30,8 @@ type Container struct { LinkedToRestarting bool Stale bool - containerInfo *types.ContainerJSON - imageInfo *types.ImageInspect + containerInfo *dockercontainer.InspectResponse + imageInfo *image.InspectResponse } // IsLinkedToRestarting returns the current value of the LinkedToRestarting field for the container @@ -55,7 +55,7 @@ func (c *Container) SetStale(value bool) { } // ContainerInfo fetches JSON info for the container -func (c Container) ContainerInfo() *types.ContainerJSON { +func (c Container) ContainerInfo() *dockercontainer.InspectResponse { return c.containerInfo } @@ -368,7 +368,7 @@ func (c Container) HasImageInfo() bool { } // ImageInfo fetches the ImageInspect data of the current container -func (c Container) ImageInfo() *types.ImageInspect { +func (c Container) ImageInfo() *image.InspectResponse { return c.imageInfo } diff --git a/pkg/container/container_mock_test.go b/pkg/container/container_mock_test.go index 8aa1470..04641fd 100644 --- a/pkg/container/container_mock_test.go +++ b/pkg/container/container_mock_test.go @@ -1,16 +1,16 @@ package container import ( - "github.com/docker/docker/api/types" dockerContainer "github.com/docker/docker/api/types/container" + "github.com/docker/docker/api/types/image" "github.com/docker/go-connections/nat" ) -type MockContainerUpdate func(*types.ContainerJSON, *types.ImageInspect) +type MockContainerUpdate func(*dockerContainer.InspectResponse, *image.InspectResponse) func MockContainer(updates ...MockContainerUpdate) *Container { - containerInfo := types.ContainerJSON{ - ContainerJSONBase: &types.ContainerJSONBase{ + containerInfo := dockerContainer.InspectResponse{ + ContainerJSONBase: &dockerContainer.ContainerJSONBase{ ID: "container_id", Image: "image", Name: "test-containrrr", @@ -20,7 +20,7 @@ func MockContainer(updates ...MockContainerUpdate) *Container { Labels: map[string]string{}, }, } - image := types.ImageInspect{ + image := image.InspectResponse{ ID: "image_id", Config: &dockerContainer.Config{}, } @@ -32,7 +32,7 @@ func MockContainer(updates ...MockContainerUpdate) *Container { } func WithPortBindings(portBindingSources ...string) MockContainerUpdate { - return func(c *types.ContainerJSON, i *types.ImageInspect) { + return func(c *dockerContainer.InspectResponse, i *image.InspectResponse) { portBindings := nat.PortMap{} for _, pbs := range portBindingSources { portBindings[nat.Port(pbs)] = []nat.PortBinding{} @@ -42,38 +42,38 @@ func WithPortBindings(portBindingSources ...string) MockContainerUpdate { } func WithImageName(name string) MockContainerUpdate { - return func(c *types.ContainerJSON, i *types.ImageInspect) { + return func(c *dockerContainer.InspectResponse, i *image.InspectResponse) { c.Config.Image = name i.RepoTags = append(i.RepoTags, name) } } func WithLinks(links []string) MockContainerUpdate { - return func(c *types.ContainerJSON, i *types.ImageInspect) { + return func(c *dockerContainer.InspectResponse, i *image.InspectResponse) { c.HostConfig.Links = links } } func WithLabels(labels map[string]string) MockContainerUpdate { - return func(c *types.ContainerJSON, i *types.ImageInspect) { + return func(c *dockerContainer.InspectResponse, i *image.InspectResponse) { c.Config.Labels = labels } } -func WithContainerState(state types.ContainerState) MockContainerUpdate { - return func(cnt *types.ContainerJSON, img *types.ImageInspect) { +func WithContainerState(state dockerContainer.State) MockContainerUpdate { + return func(cnt *dockerContainer.InspectResponse, img *image.InspectResponse) { cnt.State = &state } } func WithHealthcheck(healthConfig dockerContainer.HealthConfig) MockContainerUpdate { - return func(cnt *types.ContainerJSON, img *types.ImageInspect) { + return func(cnt *dockerContainer.InspectResponse, img *image.InspectResponse) { cnt.Config.Healthcheck = &healthConfig } } func WithImageHealthcheck(healthConfig dockerContainer.HealthConfig) MockContainerUpdate { - return func(cnt *types.ContainerJSON, img *types.ImageInspect) { + return func(cnt *dockerContainer.InspectResponse, img *image.InspectResponse) { img.Config.Healthcheck = &healthConfig } } diff --git a/pkg/container/container_test.go b/pkg/container/container_test.go index a80bf39..d7721b3 100644 --- a/pkg/container/container_test.go +++ b/pkg/container/container_test.go @@ -2,7 +2,7 @@ package container import ( "github.com/beatkind/watchtower/pkg/types" - dc "github.com/docker/docker/api/types/container" + dockerContainer "github.com/docker/docker/api/types/container" "github.com/docker/go-connections/nat" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -71,51 +71,51 @@ var _ = Describe("the container", func() { Describe("GetCreateConfig", func() { When("container healthcheck config is equal to image config", func() { It("should return empty healthcheck values", func() { - c := MockContainer(WithHealthcheck(dc.HealthConfig{ + c := MockContainer(WithHealthcheck(dockerContainer.HealthConfig{ Test: []string{"/usr/bin/sleep", "1s"}, - }), WithImageHealthcheck(dc.HealthConfig{ + }), WithImageHealthcheck(dockerContainer.HealthConfig{ Test: []string{"/usr/bin/sleep", "1s"}, })) - Expect(c.GetCreateConfig().Healthcheck).To(Equal(&dc.HealthConfig{})) + Expect(c.GetCreateConfig().Healthcheck).To(Equal(&dockerContainer.HealthConfig{})) - c = MockContainer(WithHealthcheck(dc.HealthConfig{ + c = MockContainer(WithHealthcheck(dockerContainer.HealthConfig{ Timeout: 30, - }), WithImageHealthcheck(dc.HealthConfig{ + }), WithImageHealthcheck(dockerContainer.HealthConfig{ Timeout: 30, })) - Expect(c.GetCreateConfig().Healthcheck).To(Equal(&dc.HealthConfig{})) + Expect(c.GetCreateConfig().Healthcheck).To(Equal(&dockerContainer.HealthConfig{})) - c = MockContainer(WithHealthcheck(dc.HealthConfig{ + c = MockContainer(WithHealthcheck(dockerContainer.HealthConfig{ StartPeriod: 30, - }), WithImageHealthcheck(dc.HealthConfig{ + }), WithImageHealthcheck(dockerContainer.HealthConfig{ StartPeriod: 30, })) - Expect(c.GetCreateConfig().Healthcheck).To(Equal(&dc.HealthConfig{})) + Expect(c.GetCreateConfig().Healthcheck).To(Equal(&dockerContainer.HealthConfig{})) - c = MockContainer(WithHealthcheck(dc.HealthConfig{ + c = MockContainer(WithHealthcheck(dockerContainer.HealthConfig{ Retries: 30, - }), WithImageHealthcheck(dc.HealthConfig{ + }), WithImageHealthcheck(dockerContainer.HealthConfig{ Retries: 30, })) - Expect(c.GetCreateConfig().Healthcheck).To(Equal(&dc.HealthConfig{})) + Expect(c.GetCreateConfig().Healthcheck).To(Equal(&dockerContainer.HealthConfig{})) }) }) When("container healthcheck config is different to image config", func() { It("should return the container healthcheck values", func() { - c := MockContainer(WithHealthcheck(dc.HealthConfig{ + c := MockContainer(WithHealthcheck(dockerContainer.HealthConfig{ Test: []string{"/usr/bin/sleep", "1s"}, Interval: 30, Timeout: 30, StartPeriod: 10, Retries: 2, - }), WithImageHealthcheck(dc.HealthConfig{ + }), WithImageHealthcheck(dockerContainer.HealthConfig{ Test: []string{"/usr/bin/sleep", "10s"}, Interval: 10, Timeout: 60, StartPeriod: 30, Retries: 10, })) - Expect(c.GetCreateConfig().Healthcheck).To(Equal(&dc.HealthConfig{ + Expect(c.GetCreateConfig().Healthcheck).To(Equal(&dockerContainer.HealthConfig{ Test: []string{"/usr/bin/sleep", "1s"}, Interval: 30, Timeout: 30, @@ -126,7 +126,7 @@ var _ = Describe("the container", func() { }) When("container healthcheck config is empty", func() { It("should not panic", func() { - c := MockContainer(WithImageHealthcheck(dc.HealthConfig{ + c := MockContainer(WithImageHealthcheck(dockerContainer.HealthConfig{ Test: []string{"/usr/bin/sleep", "10s"}, Interval: 10, Timeout: 60, @@ -138,14 +138,14 @@ var _ = Describe("the container", func() { }) When("container image healthcheck config is empty", func() { It("should not panic", func() { - c := MockContainer(WithHealthcheck(dc.HealthConfig{ + c := MockContainer(WithHealthcheck(dockerContainer.HealthConfig{ Test: []string{"/usr/bin/sleep", "1s"}, Interval: 30, Timeout: 30, StartPeriod: 10, Retries: 2, })) - Expect(c.GetCreateConfig().Healthcheck).To(Equal(&dc.HealthConfig{ + Expect(c.GetCreateConfig().Healthcheck).To(Equal(&dockerContainer.HealthConfig{ Test: []string{"/usr/bin/sleep", "1s"}, Interval: 30, Timeout: 30, diff --git a/pkg/container/mocks/ApiServer.go b/pkg/container/mocks/ApiServer.go index 25a02ad..d9d321e 100644 --- a/pkg/container/mocks/ApiServer.go +++ b/pkg/container/mocks/ApiServer.go @@ -3,18 +3,19 @@ package mocks import ( "encoding/json" "fmt" - "github.com/onsi/ginkgo" "net/http" "net/url" "os" "path/filepath" "strings" + "github.com/onsi/ginkgo" + t "github.com/beatkind/watchtower/pkg/types" - "github.com/docker/docker/api/types" - I "github.com/docker/docker/api/types/image" + dockerContainer "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/filters" + dockerImage "github.com/docker/docker/api/types/image" O "github.com/onsi/gomega" "github.com/onsi/gomega/ghttp" ) @@ -166,7 +167,7 @@ func getContainerHandler(containerId string, responseHandler http.HandlerFunc) h } // GetContainerHandler mocks the GET containers/{id}/json endpoint -func GetContainerHandler(containerID string, containerInfo *types.ContainerJSON) http.HandlerFunc { +func GetContainerHandler(containerID string, containerInfo *dockerContainer.InspectResponse) http.HandlerFunc { responseHandler := containerNotFoundResponse(containerID) if containerInfo != nil { responseHandler = ghttp.RespondWithJSONEncoded(http.StatusOK, containerInfo) @@ -175,7 +176,7 @@ func GetContainerHandler(containerID string, containerInfo *types.ContainerJSON) } // GetImageHandler mocks the GET images/{id}/json endpoint -func GetImageHandler(imageInfo *types.ImageInspect) http.HandlerFunc { +func GetImageHandler(imageInfo *dockerImage.InspectResponse) http.HandlerFunc { return getImageHandler(t.ImageID(imageInfo.ID), ghttp.RespondWithJSONEncoded(http.StatusOK, imageInfo)) } @@ -196,8 +197,8 @@ func ListContainersHandler(statuses ...string) http.HandlerFunc { func respondWithFilteredContainers(filters filters.Args) http.HandlerFunc { containersJSON, err := getMockJSONFile("./mocks/data/containers.json") O.ExpectWithOffset(2, err).ShouldNot(O.HaveOccurred()) - var filteredContainers []types.Container - var containers []types.Container + var filteredContainers []dockerContainer.Summary + var containers []dockerContainer.Summary O.ExpectWithOffset(2, json.Unmarshal(containersJSON, &containers)).To(O.Succeed()) for _, v := range containers { for _, key := range filters.Get("status") { @@ -263,12 +264,12 @@ func RemoveImageHandler(imagesWithParents map[string][]string) http.HandlerFunc image := parts[len(parts)-1] if parents, found := imagesWithParents[image]; found { - items := []I.DeleteResponse{ + items := []dockerImage.DeleteResponse{ {Untagged: image}, {Deleted: image}, } for _, parent := range parents { - items = append(items, I.DeleteResponse{Deleted: parent}) + items = append(items, dockerImage.DeleteResponse{Deleted: parent}) } ghttp.RespondWithJSONEncoded(http.StatusOK, items)(w, r) } else { diff --git a/pkg/registry/manifest/manifest_test.go b/pkg/registry/manifest/manifest_test.go index 92eef97..fa918b8 100644 --- a/pkg/registry/manifest/manifest_test.go +++ b/pkg/registry/manifest/manifest_test.go @@ -6,7 +6,7 @@ import ( "github.com/beatkind/watchtower/internal/actions/mocks" "github.com/beatkind/watchtower/pkg/registry/manifest" - apiTypes "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/image" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) @@ -60,7 +60,7 @@ var _ = Describe("the manifest module", func() { }) func buildMockContainerManifestURL(imageRef string) (string, error) { - imageInfo := apiTypes.ImageInspect{ + imageInfo := image.InspectResponse{ RepoTags: []string{ imageRef, }, diff --git a/pkg/types/container.go b/pkg/types/container.go index 8a22f44..3dbc71b 100644 --- a/pkg/types/container.go +++ b/pkg/types/container.go @@ -3,8 +3,8 @@ package types import ( "strings" - "github.com/docker/docker/api/types" - dc "github.com/docker/docker/api/types/container" + dockerContainer "github.com/docker/docker/api/types/container" + "github.com/docker/docker/api/types/image" ) // ImageID is a hash string representing a container image @@ -44,7 +44,7 @@ func shortID(longID string) string { // Container is a docker container running an image type Container interface { - ContainerInfo() *types.ContainerJSON + ContainerInfo() *dockerContainer.InspectResponse ID() ContainerID IsRunning() bool Name() string @@ -59,7 +59,7 @@ type Container interface { IsWatchtower() bool StopSignal() string HasImageInfo() bool - ImageInfo() *types.ImageInspect + ImageInfo() *image.InspectResponse GetLifecyclePreCheckCommand() string GetLifecyclePostCheckCommand() string GetLifecyclePreUpdateCommand() string @@ -73,6 +73,6 @@ type Container interface { PreUpdateTimeout() int PostUpdateTimeout() int IsRestarting() bool - GetCreateConfig() *dc.Config - GetCreateHostConfig() *dc.HostConfig + GetCreateConfig() *dockerContainer.Config + GetCreateHostConfig() *dockerContainer.HostConfig } From d2a21afcfec5c9654e14e5d035c80cc26a391741 Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Sat, 29 Mar 2025 13:11:47 +0100 Subject: [PATCH 130/157] docs: update documentation with new sections and improve clarity --- .gitignore | 2 ++ CONTRIBUTING.md | 4 +-- SECURITY.md | 2 +- docs/arguments.md | 53 ++++++++++++++++++++++++------ docs/container-selection.md | 12 +++---- docs/http-api-mode.md | 4 ++- docs/index.md | 3 +- docs/introduction.md | 3 +- docs/lifecycle-hooks.md | 25 +++++++------- docs/linked-containers.md | 2 ++ docs/metrics.md | 4 ++- docs/notifications.md | 7 ++-- docs/private-registries.md | 46 +++++++++++++++----------- docs/remote-hosts.md | 2 ++ docs/running-multiple-instances.md | 10 +++--- docs/secure-connections.md | 2 ++ docs/stop-signals.md | 2 ++ docs/updating.md | 8 ++--- docs/usage-overview.md | 8 +++-- mkdocs.yml | 2 +- 20 files changed, 128 insertions(+), 73 deletions(-) diff --git a/.gitignore b/.gitignore index aa4f339..fd6098c 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ coverage.out docs/assets/wasm_exec.js docs/assets/*.wasm .vscode/settings.json + +.env diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 37f1b1e..bb49839 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -12,7 +12,7 @@ You can check your current version of the go language as follows: ```bash ~ $ go version - go version go1.22.x darwin/amd64 + go version go1.24.x darwin/amd64 ``` ## Checking out the code @@ -44,5 +44,5 @@ To build a Watchtower image of your own, use the self-contained Dockerfiles. As e.g.: ```bash -sudo docker build . -f dockerfiles/Dockerfile.dev-self-contained -t containrrr/watchtower # to build an image from local files +sudo docker build . -f dockerfiles/Dockerfile.dev-self-contained -t beatkind/watchtower # to build an image from local files ``` diff --git a/SECURITY.md b/SECURITY.md index f217592..34679e1 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,3 +1,3 @@ # Security Policy -Nothing here yet. We'll figure it out. Message me if you need something under: . +Nothing here yet. We'll figure it out. Message me if you need something under: . diff --git a/docs/arguments.md b/docs/arguments.md index 2966370..4378b88 100644 --- a/docs/arguments.md +++ b/docs/arguments.md @@ -1,3 +1,5 @@ +# Arguments + By default, watchtower will monitor all containers running within the Docker daemon to which it is pointed (in most cases this will be the local Docker daemon, but you can override it with the `--host` option described in the next section). However, you can restrict watchtower to monitoring a subset of the running containers by specifying the container names as arguments when @@ -33,14 +35,16 @@ Some arguments can also reference a file, in which case the contents of the file This can be used to avoid putting secrets in the configuration file or command line. The following arguments are currently supported (including their corresponding `WATCHTOWER_` environment variables): - - `notification-url` - - `notification-email-server-password` - - `notification-slack-hook-url` - - `notification-msteams-hook` - - `notification-gotify-token` - - `http-api-token` + +- `notification-url` +- `notification-email-server-password` +- `notification-slack-hook-url` +- `notification-msteams-hook` +- `notification-gotify-token` +- `http-api-token` ### Example docker-compose usage + ```yaml secrets: access_token: @@ -55,6 +59,7 @@ services: ``` ## Help + Shows documentation about the supported flags. ```text @@ -65,6 +70,7 @@ Environment Variable: N/A ``` ## Time Zone + Sets the time zone to be used by WatchTower's logs and the optional Cron scheduling argument (--schedule). If this environment variable is not set, Watchtower will use the default time zone: UTC. To find out the right value, see [this list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones), find your location and use the value in _TZ Database Name_, e.g _Europe/Rome_. The timezone can alternatively be set by volume mounting your hosts /etc/localtime file. `-v /etc/localtime:/etc/localtime:ro` @@ -76,6 +82,7 @@ Environment Variable: TZ ``` ## Cleanup + Removes old images after updating. When this flag is specified, watchtower will remove the old image after restarting a container with a new image. Use this option to prevent the accumulation of orphaned images on your system as containers are updated. ```text @@ -86,6 +93,7 @@ Environment Variable: WATCHTOWER_CLEANUP ``` ## Remove anonymous volumes + Removes anonymous volumes after updating. When this flag is specified, watchtower will remove all anonymous volumes from the container before restarting with a new image. Named volumes will not be removed! ```text @@ -96,6 +104,7 @@ Environment Variable: WATCHTOWER_REMOVE_VOLUMES ``` ## Debug + Enable debug mode with verbose logging. !!! note "Notes" @@ -110,6 +119,7 @@ Environment Variable: WATCHTOWER_DEBUG ``` ## Trace + Enable trace mode with very verbose logging. Caution: exposes credentials! !!! note "Notes" @@ -146,6 +156,7 @@ Environment Variable: WATCHTOWER_LOG_FORMAT ``` ## ANSI colors + Disable ANSI color escape codes in log output. ```text @@ -156,6 +167,7 @@ Environment Variable: NO_COLOR ``` ## Docker host + Docker daemon socket to connect to. Can be pointed at a remote Docker host by specifying a TCP endpoint as "tcp://hostname:port". ```text @@ -166,6 +178,7 @@ Environment Variable: DOCKER_HOST ``` ## Docker API version + The API version to use by the Docker client for connecting to the Docker daemon. The minimum supported version is 1.44. ```text @@ -176,6 +189,7 @@ Environment Variable: DOCKER_API_VERSION ``` ## Include restarting + Will also include restarting containers. ```text @@ -186,6 +200,7 @@ Environment Variable: WATCHTOWER_INCLUDE_RESTARTING ``` ## Include stopped + Will also include created and exited containers. ```text @@ -196,6 +211,7 @@ Environment Variable: WATCHTOWER_INCLUDE_STOPPED ``` ## Revive stopped + Start any stopped containers that have had their image updated. This argument is only usable with the `--include-stopped` argument. ```text @@ -206,6 +222,7 @@ Environment Variable: WATCHTOWER_REVIVE_STOPPED ``` ## Poll interval + Poll interval (in seconds). This value controls how frequently watchtower will poll for new images. Either `--schedule` or a poll interval can be defined, but not both. ```text @@ -216,6 +233,7 @@ Environment Variable: WATCHTOWER_POLL_INTERVAL ``` ## Filter by enable label + Monitor and update containers that have a `com.centurylinklabs.watchtower.enable` label set to true. ```text @@ -226,11 +244,13 @@ Environment Variable: WATCHTOWER_LABEL_ENABLE ``` ## Filter by disable label + __Do not__ Monitor and update containers that have `com.centurylinklabs.watchtower.enable` label set to false and no `--label-enable` argument is passed. Note that only one or the other (targeting by enable label) can be used at the same time to target containers. ## Filter by disabling specific container names + Monitor and update containers whose names are not in a given set of names. This can be used to exclude specific containers, when setting labels is not an option. @@ -244,6 +264,7 @@ Environment Variable: WATCHTOWER_DISABLE_CONTAINERS ``` ## Without updating containers + Will only monitor for new images, send notifications and invoke the [pre-check/post-check hooks](https://watchtower.devcdn.net/lifecycle-hooks/), but will __not__ update the containers. @@ -276,8 +297,10 @@ Environment Variable: WATCHTOWER_LABEL_TAKE_PRECEDENCE ``` ## Without restarting containers + Do not restart containers after updating. This option can be useful when the start of the containers is managed by an external system such as systemd. + ```text Argument: --no-restart Environment Variable: WATCHTOWER_NO_RESTART @@ -286,6 +309,7 @@ Environment Variable: WATCHTOWER_NO_RESTART ``` ## Without pulling new images + Do not pull new images. When this flag is specified, watchtower will not attempt to pull new images from the registry. Instead it will only monitor the local image cache for changes. Use this option if you are building new images directly on the Docker host without pushing @@ -304,6 +328,7 @@ Note that no-pull can also be specified on a per-container basis with the See [With label taking precedence over arguments](#With-label-taking-precedence-over-arguments) for behavior when both argument and label are set ## Without sending a startup message + Do not send a message after watchtower started. Otherwise there will be an info-level notification. ```text @@ -324,6 +349,7 @@ Environment Variable: WATCHTOWER_RUN_ONCE ``` ## HTTP API Mode + Runs Watchtower in HTTP API mode, only allowing image updates to be triggered by an HTTP request. For details see [HTTP API](https://watchtower.devcdn.net/http-api-mode). @@ -335,6 +361,7 @@ Environment Variable: WATCHTOWER_HTTP_API_UPDATE ``` ## HTTP API Token + Sets an authentication token to HTTP API requests. Can also reference a file, in which case the contents of the file are used. @@ -346,6 +373,7 @@ Environment Variable: WATCHTOWER_HTTP_API_TOKEN ``` ## HTTP API periodic polls + Keep running periodic updates if the HTTP API mode is enabled, otherwise the HTTP API would prevent periodic polls. ```text @@ -356,6 +384,7 @@ Environment Variable: WATCHTOWER_HTTP_API_PERIODIC_POLLS ``` ## Filter by scope + Update containers that have a `com.centurylinklabs.watchtower.scope` label set with the same value as the given argument. This enables [running multiple instances](https://watchtower.devcdn.net/running-multiple-instances). @@ -372,6 +401,7 @@ Environment Variable: WATCHTOWER_SCOPE ``` ## HTTP API Metrics + Enables a metrics endpoint, exposing prometheus metrics via HTTP. See [Metrics](metrics.md) for details. ```text @@ -382,6 +412,7 @@ Environment Variable: WATCHTOWER_HTTP_API_METRICS ``` ## Scheduling + [Cron expression](https://pkg.go.dev/github.com/robfig/cron@v1.2.0?tab=doc#hdr-CRON_Expression_Format) in 6 fields (rather than the traditional 5) which defines when and how often to check for new images. Either `--interval` or the schedule expression can be defined, but not both. An example: `--schedule "0 0 4 * * *"` @@ -393,6 +424,7 @@ Environment Variable: WATCHTOWER_SCHEDULE ``` ## Rolling restart + Restart one image at time instead of stopping and starting all at once. Useful in conjunction with lifecycle hooks to implement zero-downtime deploy. @@ -404,6 +436,7 @@ Environment Variable: WATCHTOWER_ROLLING_RESTART ``` ## Wait until timeout + Timeout before the container is forcefully stopped. When set, this option will change the default (`10s`) wait time to the given value. An example: `--stop-timeout 30s` will set the timeout to 30 seconds. ```text @@ -455,10 +488,10 @@ Writes the session results to STDOUT using a stable, machine-readable format (in Alias for: ```text - --notification-url logger:// - --notification-log-stdout - --notification-report - --notification-template porcelain.VERSION.summary-no-log +--notification-url logger:// +--notification-log-stdout +--notification-report +--notification-template porcelain.VERSION.summary-no-log Argument: --porcelain, -P Environment Variable: WATCHTOWER_PORCELAIN diff --git a/docs/container-selection.md b/docs/container-selection.md index 81d7971..2465443 100644 --- a/docs/container-selection.md +++ b/docs/container-selection.md @@ -1,11 +1,13 @@ +# Container Selection + By default, watchtower will watch all containers. However, sometimes only some containers should be updated. There are two options: -- **Fully exclude**: You can choose to exclude containers entirely from being watched by watchtower. -- **Monitor only**: In this mode, watchtower checks for container updates, sends notifications and invokes the [pre-check/post-check hooks](https://watchtower.devcdn.net/lifecycle-hooks/) on the containers but does **not** perform the update. +- **Fully exclude**: You can choose to exclude containers entirely from being watched by watchtower. +- **Monitor only**: In this mode, watchtower checks for container updates, sends notifications and invokes the [pre-check/post-check hooks](https://watchtower.devcdn.net/lifecycle-hooks/) on the containers but does **not** perform the update. -## Full Exclude +## Full Exclude If you need to exclude some containers, set the _com.centurylinklabs.watchtower.enable_ label to `false`. For clarity this should be set **on the container(s)** you wish to be ignored, this is not set on watchtower. @@ -23,7 +25,6 @@ If you need to exclude some containers, set the _com.centurylinklabs.watchtower. === "docker-compose" ``` yaml - version: "3" services: someimage: container_name: someimage @@ -47,7 +48,6 @@ If instead you want to [only include containers with the enable label](https://w === "docker-compose" ``` yaml - version: "3" services: someimage: container_name: someimage @@ -78,4 +78,4 @@ Or, it can be specified as part of the `docker run` command line: docker run -d --label=com.centurylinklabs.watchtower.monitor-only=true someimage ``` -When the label is specified on a container, watchtower treats that container exactly as if [`WATCHTOWER_MONITOR_ONLY`](https://watchtower.devcdn.net/arguments/#without_updating_containers) was set, but the effect is limited to the individual container. +When the label is specified on a container, watchtower treats that container exactly as if [`WATCHTOWER_MONITOR_ONLY`](https://watchtower.devcdn.net/arguments/#without_updating_containers) was set, but the effect is limited to the individual container. diff --git a/docs/http-api-mode.md b/docs/http-api-mode.md index 9702096..39fda1d 100644 --- a/docs/http-api-mode.md +++ b/docs/http-api-mode.md @@ -1,3 +1,5 @@ +# HTTP API Mode + Watchtower provides an HTTP API mode that enables an HTTP endpoint that can be requested to trigger container updating. The current available endpoint list is: - `/v1/update` - triggers an update for all of the containers monitored by this Watchtower instance. @@ -7,7 +9,7 @@ Watchtower provides an HTTP API mode that enables an HTTP endpoint that can be r To enable this mode, use the flag `--http-api-update`. For example, in a Docker Compose config file: ```yaml -version: '3' + services: app-monitored-by-watchtower: diff --git a/docs/index.md b/docs/index.md index 343d501..e7a8ee6 100644 --- a/docs/index.md +++ b/docs/index.md @@ -32,7 +32,7 @@ !!! note "Watchtower fork" This is a fork of the really nice project from [containrrr](https://github.com/containrrr) called [watchtower](https://github.com/containrrr/watchtower). - I am not the original author of this project. I just forked it to make some changes to it and keep it up-to-date as properly as I can. + I am not the original author of this project. I just forked it to make some changes to it and keep it up-to-date as properly as I can. Contributions, tips and hints are welcome. Just open an issue or a pull request. Please be aware that I am by no means a professional developer. I am just a Platform Engineer. ## Quick Start @@ -54,7 +54,6 @@ the following command: === "docker-compose.yml" ```yaml - version: "3" services: watchtower: image: beatkind/watchtower diff --git a/docs/introduction.md b/docs/introduction.md index 7158ecd..f2f131d 100644 --- a/docs/introduction.md +++ b/docs/introduction.md @@ -1,3 +1,5 @@ +# Introduction + Watchtower is an application that will monitor your running Docker containers and watch for changes to the images that those containers were originally started from. If watchtower detects that an image has changed, it will automatically restart the container using the new image. With watchtower you can update the running version of your containerized app simply by pushing a new image to the Docker Hub or your own image registry. Watchtower will pull down your new image, gracefully shut down your existing container and restart it with the same options that were used when it was deployed initially. @@ -12,4 +14,3 @@ CONTAINER ID IMAGE STATUS PORTS ``` Every day watchtower will pull the latest _centurylink/wetty-cli_ image and compare it to the one that was used to run the "wetty" container. If it sees that the image has changed it will stop/remove the "wetty" container and then restart it using the new image and the same `docker run` options that were used to start the container initially (in this case, that would include the `-p 8080:3000` port mapping). - diff --git a/docs/lifecycle-hooks.md b/docs/lifecycle-hooks.md index 0c1e4e0..a7d3b11 100644 --- a/docs/lifecycle-hooks.md +++ b/docs/lifecycle-hooks.md @@ -1,10 +1,10 @@ -## Executing commands before and after updating +# Executing commands before and after updating -!!! note +!!! note These are shell commands executed with `sh`, and therefore require the container to provide the `sh` executable. -> **DO NOTE**: If the container is not running then lifecycle hooks can not run and therefore +> **DO NOTE**: If the container is not running then lifecycle hooks can not run and therefore > the update is executed without running any lifecycle hooks. It is possible to execute _pre/post\-check_ and _pre/post\-update_ commands @@ -19,14 +19,14 @@ This feature is disabled by default. To enable it, you need to set the option `--enable-lifecycle-hooks` on the command line, or set the environment variable `WATCHTOWER_LIFECYCLE_HOOKS` to `true`. -### Specifying update commands +## Specifying update commands The commands are specified using docker container labels, the following are currently available: | Type | Docker Container Label | -| ----------- | ------------------------------------------------------ | +| ----------- | ------------------------------------------------------ | | Pre Check | `com.centurylinklabs.watchtower.lifecycle.pre-check` | -| Pre Update | `com.centurylinklabs.watchtower.lifecycle.pre-update` | +| Pre Update | `com.centurylinklabs.watchtower.lifecycle.pre-update` | | Post Update | `com.centurylinklabs.watchtower.lifecycle.post-update` | | Post Check | `com.centurylinklabs.watchtower.lifecycle.post-check` | @@ -34,7 +34,7 @@ These labels can be declared as instructions in a Dockerfile (with some example the `docker run` command line: === "Dockerfile" - ```docker + ```docker LABEL com.centurylinklabs.watchtower.lifecycle.pre-check="/sync.sh" LABEL com.centurylinklabs.watchtower.lifecycle.pre-update="/dump-data.sh" LABEL com.centurylinklabs.watchtower.lifecycle.post-update="/restore-data.sh" @@ -42,7 +42,7 @@ the `docker run` command line: ``` === "docker run" - ```bash + ```bash docker run -d \ --label=com.centurylinklabs.watchtower.lifecycle.pre-check="/sync.sh" \ --label=com.centurylinklabs.watchtower.lifecycle.pre-update="/dump-data.sh" \ @@ -50,20 +50,21 @@ the `docker run` command line: someimage --label=com.centurylinklabs.watchtower.lifecycle.post-check="/send-heartbeat.sh" \ ``` -### Timeouts +## Timeouts + The timeout for all lifecycle commands is 60 seconds. After that, a timeout will occur, forcing Watchtower to continue the update loop. -#### Pre- or Post-update timeouts +### Pre- or Post-update timeouts For the `pre-update` or `post-update` lifecycle command, it is possible to override this timeout to allow the script to finish before forcefully killing it. This is done by adding the label `com.centurylinklabs.watchtower.lifecycle.pre-update-timeout` or post-update-timeout respectively followed by the timeout expressed in minutes. -If the label value is explicitly set to `0`, the timeout will be disabled. +If the label value is explicitly set to `0`, the timeout will be disabled. -### Execution failure +## Execution failure The failure of a command to execute, identified by an exit code different than 0 or 75 (EX_TEMPFAIL), will not prevent watchtower from updating the container. Only an error diff --git a/docs/linked-containers.md b/docs/linked-containers.md index c7e9be8..b7e760c 100644 --- a/docs/linked-containers.md +++ b/docs/linked-containers.md @@ -1,3 +1,5 @@ +# Linked Containers + Watchtower will detect if there are links between any of the running containers and ensures that things are stopped/started in a way that won't break any of the links. If an update is detected for one of the dependencies in a group of linked containers, watchtower will stop and start all of the containers in the correct order so that the application comes back up correctly. For example, imagine you were running a _mysql_ container and a _wordpress_ container which had been linked to the _mysql_ container. If watchtower were to detect that the _mysql_ container required an update, it would first shut down the linked _wordpress_ container followed by the _mysql_ container. When restarting the containers it would handle _mysql_ first and then _wordpress_ to ensure that the link continued to work. diff --git a/docs/metrics.md b/docs/metrics.md index 480d7c6..237401b 100644 --- a/docs/metrics.md +++ b/docs/metrics.md @@ -1,3 +1,5 @@ +# Watchtower Metrics + !!! warning "Experimental feature" This feature was added in v1.0.4 and is still considered experimental. If you notice any strange behavior, please raise a ticket in the repository issues. @@ -9,7 +11,7 @@ as well as creating a port mapping for your container for port `8080`. The metrics API endpoint is `/v1/metrics`. -## Available Metrics +## Available Metrics | Name | Type | Description | | ------------------------------- | ------- | --------------------------------------------------------------------------- | diff --git a/docs/notifications.md b/docs/notifications.md index f4e0bf1..d197ccb 100644 --- a/docs/notifications.md +++ b/docs/notifications.md @@ -144,7 +144,7 @@ Example using a custom report template that always sends a session report after === "docker-compose" ``` yaml - version: "3" + services: watchtower: image: beatkind/watchtower @@ -206,7 +206,7 @@ If watchtower is started with `notify-upgrade` as it's first argument, it will g === "docker-compose.yml" ```yaml - version: "3" + services: watchtower: image: beatkind/watchtower @@ -234,7 +234,7 @@ You can then copy this file from the container (a message with the full command === "docker-compose.yml" ```yaml - version: "3" + services: watchtower: image: beatkind/watchtower @@ -283,7 +283,6 @@ The following example assumes, that your domain is called `your-domain.com` and Example including an SMTP relay: ```yaml -version: '3.8' services: watchtower: image: beatkind/watchtower:latest diff --git a/docs/private-registries.md b/docs/private-registries.md index 3a3ba43..d3e54a7 100644 --- a/docs/private-registries.md +++ b/docs/private-registries.md @@ -1,6 +1,8 @@ +# Private Registries + Watchtower supports private Docker image registries. In many cases, accessing a private registry requires a valid username and password (i.e., _credentials_). In order to operate in such an -environment, watchtower needs to know the credentials to access the registry. +environment, watchtower needs to know the credentials to access the registry. The credentials can be provided to watchtower in a configuration file called `config.json`. There are two ways to generate this configuration file: @@ -8,7 +10,8 @@ There are two ways to generate this configuration file: * The configuration file can be created manually. * Call `docker login ` and share the resulting configuration file. -### Create the configuration file manually +## Create the configuration file manually + Create a new configuration file with the following syntax and a base64 encoded username and password `auth` string: @@ -31,7 +34,7 @@ password `auth` string: In this special case, the registry domain does not have to be specified in `docker run` or `docker-compose`. Like Docker, Watchtower will use the Docker Hub registry and its credentials when no registry domain is specified. - + Watchtower will recognize credentials with `` `index.docker.io`, but the Docker CLI will not. @@ -40,7 +43,7 @@ password `auth` string: in both `config.json` and the `docker run` command or `docker-compose` file. Valid hosts are `localhost[:PORT]`, `HOST:PORT`, or any multi-part `domain.name` or IP-address with or without a port. - + Examples: * `localhost` -> `localhost/myimage` * `127.0.0.1` -> `127.0.0.1/myimage:mytag` @@ -66,7 +69,7 @@ When the watchtower Docker container is started, the created configuration file docker run [...] -v /config.json:/config.json beatkind/watchtower ``` -### Share the Docker configuration file +## Share the Docker configuration file To pull an image from a private registry, `docker login` needs to be called first, to get access to the registry. The provided credentials are stored in a configuration file called `/.docker/config.json`. @@ -92,14 +95,15 @@ services: ... ``` -#### Docker Config path +### Docker Config path + By default, watchtower will look for the `config.json` file in `/`, but this can be changed by setting the `DOCKER_CONFIG` environment variable to the directory path where your config is located. This is useful for setups where the config.json file is changed while the watchtower instance is running, as the changes will not be picked up for a mounted file if the inode changes. Example usage: ```yaml version: "3.4" -services: +services: watchtower: image: beatkind/watchtower environment: @@ -110,6 +114,7 @@ services: ``` ## Credential helpers + Some private Docker registries (the most prominent probably being AWS ECR) use non-standard ways of authentication. To be able to use this together with watchtower, we need to use a credential helper. @@ -117,6 +122,7 @@ To keep the image size small we've decided to not include any helpers in the wat helper in a separate container and mount it using volumes. ### Example + Example implementation for use with [amazon-ecr-credential-helper](https://github.com/awslabs/amazon-ecr-credential-helper): Use the dockerfile below to build the [amazon-ecr-credential-helper](https://github.com/awslabs/amazon-ecr-credential-helper), @@ -125,30 +131,30 @@ in a volume that may be mounted onto your watchtower container. 1. Create the Dockerfile (contents below): ```Dockerfile FROM golang:1.20 - + ENV GO111MODULE off ENV CGO_ENABLED 0 ENV REPO github.com/awslabs/amazon-ecr-credential-helper/ecr-login/cli/docker-credential-ecr-login - + RUN go get -u $REPO - + RUN rm /go/bin/docker-credential-ecr-login - + RUN go build \ -o /go/bin/docker-credential-ecr-login \ /go/src/$REPO - + WORKDIR /go/bin/ ``` 2. Use the following commands to build the aws-ecr-dock-cred-helper and store it's output in a volume: ```bash # Create a volume to store the command (once built) - docker volume create helper - + docker volume create helper + # Build the container docker build -t aws-ecr-dock-cred-helper . - + # Build the command and store it in the new volume in the /go/bin directory. docker run -d --rm --name aws-cred-helper \ --volume helper:/go/bin aws-ecr-dock-cred-helper @@ -188,20 +194,20 @@ in a volume that may be mounted onto your watchtower container. - PATH=$PATH:/go/bin - AWS_REGION=us-west-1 volumes: - helper: + helper: external: true ``` A few additional notes: -1. With docker-compose the volume (helper, in this case) MUST be set to `external: true`, otherwise docker-compose +1. With docker-compose the volume (helper, in this case) MUST be set to `external: true`, otherwise docker-compose will preface it with the directory name. -2. Note that "credsStore" : "ecr-login" is needed - and in theory if you have that you can remove the +2. Note that "credsStore" : "ecr-login" is needed - and in theory if you have that you can remove the credHelpers section -3. I have this running on an EC2 instance that has credentials assigned to it - so no keys are needed; however, +3. I have this running on an EC2 instance that has credentials assigned to it - so no keys are needed; however, you may need to include the `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` environment variables as well. -4. An alternative to adding the various variables is to create a ~/.aws/config and ~/.aws/credentials files and +4. An alternative to adding the various variables is to create a ~/.aws/config and ~/.aws/credentials files and place the settings there, then mount the ~/.aws directory to / in the container. diff --git a/docs/remote-hosts.md b/docs/remote-hosts.md index b1808d8..d6b4b95 100644 --- a/docs/remote-hosts.md +++ b/docs/remote-hosts.md @@ -1,3 +1,5 @@ +# Remote Docker Hosts + By default, watchtower is set-up to monitor the local Docker daemon (the same daemon running the watchtower container itself). However, it is possible to configure watchtower to monitor a remote Docker endpoint. When starting the watchtower container you can specify a remote Docker endpoint with either the `--host` flag or the `DOCKER_HOST` environment variable: ```bash diff --git a/docs/running-multiple-instances.md b/docs/running-multiple-instances.md index 470b9e1..fc1e6d6 100644 --- a/docs/running-multiple-instances.md +++ b/docs/running-multiple-instances.md @@ -1,4 +1,4 @@ -By default, Watchtower will clean up other instances and won't allow multiple instances running on the same Docker host or swarm. It is possible to override this behavior by defining a [scope](https://watchtower.devcdn.net/arguments/#filter_by_scope) to each running instance. +By default, Watchtower will clean up other instances and won't allow multiple instances running on the same Docker host or swarm. It is possible to override this behavior by defining a [scope](https://watchtower.devcdn.net/arguments/#filter_by_scope) to each running instance. !!! note - Multiple instances can't run with the same scope; @@ -10,7 +10,7 @@ To define an instance monitoring scope, use the `--scope` argument or the `WATCH For example, in a Docker Compose config file: ```yaml -version: '3' + services: app-with-scope: @@ -21,7 +21,7 @@ services: image: beatkind/watchtower volumes: [ "/var/run/docker.sock:/var/run/docker.sock" ] command: --interval 30 --scope myscope - labels: [ "com.centurylinklabs.watchtower.scope=myscope" ] + labels: [ "com.centurylinklabs.watchtower.scope=myscope" ] unscoped-app-a: image: myapps/app-a @@ -29,11 +29,11 @@ services: unscoped-app-b: image: myapps/app-b labels: [ "com.centurylinklabs.watchtower.scope=none" ] - + unscoped-app-c: image: myapps/app-b labels: [ "com.centurylinklabs.watchtower.scope=" ] - + unscoped-watchtower: image: beatkind/watchtower volumes: [ "/var/run/docker.sock:/var/run/docker.sock" ] diff --git a/docs/secure-connections.md b/docs/secure-connections.md index debb59e..4b73bd7 100644 --- a/docs/secure-connections.md +++ b/docs/secure-connections.md @@ -1,3 +1,5 @@ +# Secure Connections + Watchtower is also capable of connecting to Docker endpoints which are protected by SSL/TLS. If you've used _docker-machine_ to provision your remote Docker host, you simply need to volume mount the certificates generated by _docker-machine_ into the watchtower container and optionally specify `--tlsverify` flag. The _docker-machine_ certificates for a particular host can be located by executing the `docker-machine env` command for the desired host (note the values for the `DOCKER_HOST` and `DOCKER_CERT_PATH` environment variables that are returned from this command). The directory containing the certificates for the remote host needs to be mounted into the watchtower container at _/etc/ssl/docker_. diff --git a/docs/stop-signals.md b/docs/stop-signals.md index f4b4f1d..bf2706b 100644 --- a/docs/stop-signals.md +++ b/docs/stop-signals.md @@ -1,3 +1,5 @@ +# Stop signals + When watchtower detects that a running container needs to be updated it will stop the container by sending it a SIGTERM signal. If your container should be shutdown with a different signal you can communicate this to watchtower by setting a label named _com.centurylinklabs.watchtower.stop-signal_ with the value of the desired signal. diff --git a/docs/updating.md b/docs/updating.md index 4b95775..ded9bdd 100644 --- a/docs/updating.md +++ b/docs/updating.md @@ -1,6 +1,6 @@ -## Updating Watchtower +# Updating Watchtower -If watchtower is monitoring the same Docker daemon under which the watchtower container itself is running (i.e. if you -volume-mounted `/var/run/docker.sock` into the watchtower container) then it has the ability to update itself. -If a new version of the `beatkind/watchtower` image is pushed to the Docker Hub, your watchtower will pull down the +If watchtower is monitoring the same Docker daemon under which the watchtower container itself is running (i.e. if you +volume-mounted `/var/run/docker.sock` into the watchtower container) then it has the ability to update itself. +If a new version of the `beatkind/watchtower` image is pushed to the Docker Hub, your watchtower will pull down the new image and restart itself automatically. diff --git a/docs/usage-overview.md b/docs/usage-overview.md index a5e213c..1531ba4 100644 --- a/docs/usage-overview.md +++ b/docs/usage-overview.md @@ -1,3 +1,5 @@ +# Usage + Watchtower is itself packaged as a Docker container so installation is as simple as pulling the `beatkind/watchtower` image. If you are using ARM based architecture, pull the appropriate `beatkind/watchtower:armhf-` image from the [beatkind Docker Hub](https://hub.docker.com/r/beatkind/watchtower/tags/). Since the watchtower code needs to interact with the Docker API in order to monitor the running containers, you need to mount _/var/run/docker.sock_ into the container with the `-v` flag when you run it. @@ -41,8 +43,8 @@ docker run -d \ If you mount `config.json` in the manner above, changes from the host system will (generally) not be propagated to the running container. Mounting files into the Docker daemon uses bind mounts, which are based on inodes. Most applications (including `docker login` and `vim`) will not directly edit the file, but instead make a copy and replace - the original file, which results in a new inode which in turn _breaks_ the bind mount. - **As a workaround**, you can create a symlink to your `config.json` file and then mount the symlink in the container. + the original file, which results in a new inode which in turn _breaks_ the bind mount. + **As a workaround**, you can create a symlink to your `config.json` file and then mount the symlink in the container. The symlinked file will always have the same inode, which keeps the bind mount intact and will ensure changes to the original file are propagated to the running container (regardless of the inode of the source file!). @@ -52,7 +54,7 @@ from a private repo on the GitHub Registry and monitors it with watchtower. Note to 30s rather than the default 24 hours. ```yaml -version: "3" + services: cavo: image: ghcr.io//: diff --git a/mkdocs.yml b/mkdocs.yml index f6aa742..8c880d0 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,5 +1,5 @@ site_name: Watchtower -site_url: https://containrrr.dev/watchtower/ +site_url: https://watchtower.devcdn.net/ repo_url: https://github.com/beatkind/watchtower/ edit_uri: edit/main/docs/ theme: From b68b16fb2049c19a6fbf41cfd1adc9fb1d06c5b0 Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Sun, 30 Mar 2025 08:52:41 +0200 Subject: [PATCH 131/157] ci: enhance GitHub Actions workflow for Docker image publishing and add permissions --- .github/workflows/release-dev.yaml | 112 +++++++++++++++++++++++++++-- .gitignore | 1 + 2 files changed, 106 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml index ad7c718..17e9155 100644 --- a/.github/workflows/release-dev.yaml +++ b/.github/workflows/release-dev.yaml @@ -6,6 +6,12 @@ on: branches: - main +permissions: + contents: read + packages: write + attestations: write + id-token: write + jobs: build: runs-on: ubuntu-latest @@ -28,23 +34,115 @@ jobs: with: go-version: 1.24.x - name: Test - run: go test -v -coverprofile coverage.out -covermode atomic ./... + run: go test -v -coverprofile coverage.out -covermode atomic ./... - name: Publish coverage uses: codecov/codecov-action@v5 with: token: ${{ secrets.CODECOV_TOKEN }} - publish: + publish-docker-hub: needs: - build - test runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - name: Publish to Docker Hub - uses: jerray/publish-docker-action@87d84711629b0dc9f6bb127b568413cc92a2088e #master@2022-10-14 + # - uses: actions/checkout@v4 + # - name: Publish to Docker Hub + # uses: jerray/publish-docker-action@87d84711629b0dc9f6bb127b568413cc92a2088e #master@2022-10-14 + # with: + # username: ${{ secrets.DOCKERHUB_USERNAME }} + # password: ${{ secrets.DOCKERHUB_TOKEN }} + # file: dockerfiles/Dockerfile.self-contained + # repository: beatkind/watchtower + # tags: latest-dev + - name: Check out the repo + uses: actions/checkout@v4 + + - name: Log in to Docker Hub + uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 + with: + images: beatkind/watchtower + labels: | + org.opencontainers.image.created={{commit_date 'YYYY-MM-DDTHH:mm:ss.SSS[Z]'}} + org.opencontainers.image.authors={{github.actor}} + org.opencontainers.image.source={{repository}} + org.opencontainers.image.documentation=https://watchtower.devcdn.net + org.opencontainers.image.version=latest-dev + org.opencontainers.image.revision={{sha}} + org.opencontainers.image.vendor=beatkind + org.opencontainers.image.licenses=Apache-2.0 + tags: | + type=raw,value=latest-dev + type=raw,value=${{ github.sha }} + type=raw,value=${{ github.ref_name }} + + - name: Build and push Docker image + id: push + uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 + with: + context: . file: dockerfiles/Dockerfile.self-contained - repository: beatkind/watchtower - tags: latest-dev + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + + - name: Generate artifact attestation + uses: actions/attest-build-provenance@v2 + with: + subject-name: index.docker.io/beatkind/watchtower + subject-digest: ${{ steps.push.outputs.digest }} + push-to-registry: true + + publish-github: + env: + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository }} + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Log in to the Container registry + uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + labels: | + org.opencontainers.image.created={{commit_date 'YYYY-MM-DDTHH:mm:ss.SSS[Z]'}} + org.opencontainers.image.authors={{github.actor}} + org.opencontainers.image.source={{repository}} + org.opencontainers.image.documentation=https://watchtower.devcdn.net + org.opencontainers.image.version=latest-dev + org.opencontainers.image.revision={{sha}} + org.opencontainers.image.vendor=beatkind + org.opencontainers.image.licenses=Apache-2.0 + tags: | + type=raw,value=latest-dev + type=raw,value=${{ github.sha }} + type=raw,value=${{ github.ref_name }} + - name: Build and push Docker image + id: push + uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4 + with: + context: . + file: dockerfiles/Dockerfile.self-contained + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + - name: Generate artifact attestation + uses: actions/attest-build-provenance@v2 + with: + subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}} + subject-digest: ${{ steps.push.outputs.digest }} + push-to-registry: true diff --git a/.gitignore b/.gitignore index fd6098c..3609e99 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ docs/assets/*.wasm .vscode/settings.json .env +.venv From 062a0b09d5d1765094c5024922706584b26a4016 Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Sun, 30 Mar 2025 08:54:22 +0200 Subject: [PATCH 132/157] ci: update release workflow to ensure publish job depends on build and test --- .github/workflows/release-dev.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml index 17e9155..21af056 100644 --- a/.github/workflows/release-dev.yaml +++ b/.github/workflows/release-dev.yaml @@ -100,6 +100,9 @@ jobs: push-to-registry: true publish-github: + needs: + - build + - test env: REGISTRY: ghcr.io IMAGE_NAME: ${{ github.repository }} From 0c6463a6a10a69e9a83e4a8ae4e32d946996a110 Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Sun, 30 Mar 2025 09:00:00 +0200 Subject: [PATCH 133/157] fix: revert to old docker build pipeline --- .github/workflows/release-dev.yaml | 105 ++--------------------------- 1 file changed, 5 insertions(+), 100 deletions(-) diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml index 21af056..94098b9 100644 --- a/.github/workflows/release-dev.yaml +++ b/.github/workflows/release-dev.yaml @@ -45,107 +45,12 @@ jobs: - test runs-on: ubuntu-latest steps: - # - uses: actions/checkout@v4 - # - name: Publish to Docker Hub - # uses: jerray/publish-docker-action@87d84711629b0dc9f6bb127b568413cc92a2088e #master@2022-10-14 - # with: - # username: ${{ secrets.DOCKERHUB_USERNAME }} - # password: ${{ secrets.DOCKERHUB_TOKEN }} - # file: dockerfiles/Dockerfile.self-contained - # repository: beatkind/watchtower - # tags: latest-dev - - name: Check out the repo - uses: actions/checkout@v4 - - - name: Log in to Docker Hub - uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a + - uses: actions/checkout@v4 + - name: Publish to Docker Hub + uses: jerray/publish-docker-action@87d84711629b0dc9f6bb127b568413cc92a2088e #master@2022-10-14 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 - with: - images: beatkind/watchtower - labels: | - org.opencontainers.image.created={{commit_date 'YYYY-MM-DDTHH:mm:ss.SSS[Z]'}} - org.opencontainers.image.authors={{github.actor}} - org.opencontainers.image.source={{repository}} - org.opencontainers.image.documentation=https://watchtower.devcdn.net - org.opencontainers.image.version=latest-dev - org.opencontainers.image.revision={{sha}} - org.opencontainers.image.vendor=beatkind - org.opencontainers.image.licenses=Apache-2.0 - tags: | - type=raw,value=latest-dev - type=raw,value=${{ github.sha }} - type=raw,value=${{ github.ref_name }} - - - name: Build and push Docker image - id: push - uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 - with: - context: . file: dockerfiles/Dockerfile.self-contained - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - - - name: Generate artifact attestation - uses: actions/attest-build-provenance@v2 - with: - subject-name: index.docker.io/beatkind/watchtower - subject-digest: ${{ steps.push.outputs.digest }} - push-to-registry: true - - publish-github: - needs: - - build - - test - env: - REGISTRY: ghcr.io - IMAGE_NAME: ${{ github.repository }} - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - name: Log in to the Container registry - uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 - with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - labels: | - org.opencontainers.image.created={{commit_date 'YYYY-MM-DDTHH:mm:ss.SSS[Z]'}} - org.opencontainers.image.authors={{github.actor}} - org.opencontainers.image.source={{repository}} - org.opencontainers.image.documentation=https://watchtower.devcdn.net - org.opencontainers.image.version=latest-dev - org.opencontainers.image.revision={{sha}} - org.opencontainers.image.vendor=beatkind - org.opencontainers.image.licenses=Apache-2.0 - tags: | - type=raw,value=latest-dev - type=raw,value=${{ github.sha }} - type=raw,value=${{ github.ref_name }} - - name: Build and push Docker image - id: push - uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4 - with: - context: . - file: dockerfiles/Dockerfile.self-contained - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - - name: Generate artifact attestation - uses: actions/attest-build-provenance@v2 - with: - subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}} - subject-digest: ${{ steps.push.outputs.digest }} - push-to-registry: true + repository: beatkind/watchtower + tags: latest-dev From 62fc467b026a4b4de7ed4c9db3e94f4c08197e61 Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Sun, 30 Mar 2025 09:11:38 +0200 Subject: [PATCH 134/157] ci: enhance release workflow with Docker image metadata extraction and artifact attestation --- .github/workflows/release-dev.yaml | 103 +++++++++++++++++++++++++++-- 1 file changed, 98 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml index 94098b9..ef038d7 100644 --- a/.github/workflows/release-dev.yaml +++ b/.github/workflows/release-dev.yaml @@ -45,12 +45,105 @@ jobs: - test runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - name: Publish to Docker Hub - uses: jerray/publish-docker-action@87d84711629b0dc9f6bb127b568413cc92a2088e #master@2022-10-14 + # - uses: actions/checkout@v4 + # - name: Publish to Docker Hub + # uses: jerray/publish-docker-action@87d84711629b0dc9f6bb127b568413cc92a2088e #master@2022-10-14 + # with: + # username: ${{ secrets.DOCKERHUB_USERNAME }} + # password: ${{ secrets.DOCKERHUB_TOKEN }} + # file: dockerfiles/Dockerfile.self-contained + # repository: beatkind/watchtower + # tags: latest-dev + - name: Check out the repo + uses: actions/checkout@v4 + + - name: Log in to Docker Hub + uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 + with: + images: beatkind/watchtower + labels: | + org.opencontainers.image.created={{commit_date 'YYYY-MM-DDTHH:mm:ss.SSS[Z]'}} + org.opencontainers.image.authors=${{github.actor}} + org.opencontainers.image.source=${{github.repository}} + org.opencontainers.image.documentation=https://watchtower.devcdn.net + org.opencontainers.image.version=latest-dev + org.opencontainers.image.revision=${{github.sha}} + org.opencontainers.image.vendor=beatkind + org.opencontainers.image.licenses=Apache-2.0 + tags: | + type=raw,value=latest-dev + type=raw,value=latest-dev-${{ github.sha }} + + - name: Build and push Docker image + id: push + uses: docker/build-push-action@84ad562665bb303b549fec655d1b64f9945f3f91 + with: + context: . file: dockerfiles/Dockerfile.self-contained - repository: beatkind/watchtower - tags: latest-dev + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + + - name: Generate artifact attestation + uses: actions/attest-build-provenance@v2 + with: + subject-name: index.docker.io/beatkind/watchtower + subject-digest: ${{ steps.push.outputs.digest }} + push-to-registry: true + + publish-github: + needs: + - build + - test + env: + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository }} + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + - name: Log in to the Container registry + uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + labels: | + org.opencontainers.image.created={{commit_date 'YYYY-MM-DDTHH:mm:ss.SSS[Z]'}} + org.opencontainers.image.authors=${{github.actor}} + org.opencontainers.image.source=${{github.repository}} + org.opencontainers.image.documentation=https://watchtower.devcdn.net + org.opencontainers.image.version=latest-dev + org.opencontainers.image.revision=${{github.sha}} + org.opencontainers.image.vendor=beatkind + org.opencontainers.image.licenses=Apache-2.0 + tags: | + type=raw,value=latest-dev + type=raw,value=latest-dev-${{ github.sha }} + - name: Build and push Docker image + id: push + uses: docker/build-push-action@84ad562665bb303b549fec655d1b64f9945f3f91 + with: + context: . + file: dockerfiles/Dockerfile.self-contained + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + - name: Generate artifact attestation + uses: actions/attest-build-provenance@v2 + with: + subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}} + subject-digest: ${{ steps.push.outputs.digest }} + push-to-registry: true From fc75ade94f7e2d4254173a24c65db87bfe2ef5c6 Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Sun, 30 Mar 2025 09:17:42 +0200 Subject: [PATCH 135/157] ci: update release workflow to disable pushing Docker image and artifact attestation to registry --- .github/workflows/release-dev.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml index ef038d7..0154115 100644 --- a/.github/workflows/release-dev.yaml +++ b/.github/workflows/release-dev.yaml @@ -79,7 +79,6 @@ jobs: org.opencontainers.image.licenses=Apache-2.0 tags: | type=raw,value=latest-dev - type=raw,value=latest-dev-${{ github.sha }} - name: Build and push Docker image id: push @@ -96,7 +95,7 @@ jobs: with: subject-name: index.docker.io/beatkind/watchtower subject-digest: ${{ steps.push.outputs.digest }} - push-to-registry: true + push-to-registry: false publish-github: needs: @@ -131,7 +130,7 @@ jobs: org.opencontainers.image.licenses=Apache-2.0 tags: | type=raw,value=latest-dev - type=raw,value=latest-dev-${{ github.sha }} + - name: Build and push Docker image id: push uses: docker/build-push-action@84ad562665bb303b549fec655d1b64f9945f3f91 @@ -141,9 +140,10 @@ jobs: push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} + - name: Generate artifact attestation uses: actions/attest-build-provenance@v2 with: subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}} subject-digest: ${{ steps.push.outputs.digest }} - push-to-registry: true + push-to-registry: false From a4ff4cc291565067d1c80bf8d0dff54e3bfb7bc0 Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Sun, 30 Mar 2025 09:20:41 +0200 Subject: [PATCH 136/157] fix: update image creation date label syntax in release workflow --- .github/workflows/release-dev.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml index 0154115..16aaeb9 100644 --- a/.github/workflows/release-dev.yaml +++ b/.github/workflows/release-dev.yaml @@ -69,7 +69,7 @@ jobs: with: images: beatkind/watchtower labels: | - org.opencontainers.image.created={{commit_date 'YYYY-MM-DDTHH:mm:ss.SSS[Z]'}} + org.opencontainers.image.created={{date 'YYYY-MM-DDTHH:mm:ss.SSS[Z]'}} org.opencontainers.image.authors=${{github.actor}} org.opencontainers.image.source=${{github.repository}} org.opencontainers.image.documentation=https://watchtower.devcdn.net @@ -120,7 +120,7 @@ jobs: with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} labels: | - org.opencontainers.image.created={{commit_date 'YYYY-MM-DDTHH:mm:ss.SSS[Z]'}} + org.opencontainers.image.created={{date 'YYYY-MM-DDTHH:mm:ss.SSS[Z]'}} org.opencontainers.image.authors=${{github.actor}} org.opencontainers.image.source=${{github.repository}} org.opencontainers.image.documentation=https://watchtower.devcdn.net From 7843fa7a2f03e755709394538cec8846ea093e9e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 30 Mar 2025 07:12:10 +0000 Subject: [PATCH 137/157] chore(deps): update docker/metadata-action digest to 902fa8e --- .github/workflows/release-dev.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml index 16aaeb9..4ab115b 100644 --- a/.github/workflows/release-dev.yaml +++ b/.github/workflows/release-dev.yaml @@ -65,7 +65,7 @@ jobs: - name: Extract metadata (tags, labels) for Docker id: meta - uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 + uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 with: images: beatkind/watchtower labels: | @@ -116,7 +116,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Extract metadata (tags, labels) for Docker id: meta - uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7 + uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} labels: | From edcacc61dd550bd6952fbaa10ac233529fd7250e Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Sun, 30 Mar 2025 09:36:23 +0200 Subject: [PATCH 138/157] docs: add warning about minimum Docker API version and environment variable configuration --- docs/usage-overview.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/usage-overview.md b/docs/usage-overview.md index 1531ba4..1a8fc8c 100644 --- a/docs/usage-overview.md +++ b/docs/usage-overview.md @@ -4,6 +4,11 @@ Watchtower is itself packaged as a Docker container so installation is as simple Since the watchtower code needs to interact with the Docker API in order to monitor the running containers, you need to mount _/var/run/docker.sock_ into the container with the `-v` flag when you run it. +!!! warning "Minimum Docker API version" + Watchtower is by default supporting the last supported version of Docker, which can be found [here](https://endoflife.date/docker-engine). The maximum version number for the oldest supported version of Docker can be found inside the [Docker docs](https://docs.docker.com/reference/api/engine/#api-version-matrix). + + If you are using a version of Docker that is older than the minimum supported version, you will need to set the environment variable `DOCKER_API_VERSION` to the minimum supported version. For example, if you are using Docker 24.0, you would set `DOCKER_API_VERSION=1.43`. + Run the `watchtower` container with the following command: ```bash From 6d901a74424062a3ffe6da48f0c20fec06d2cae1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 28 Mar 2025 11:56:02 +0000 Subject: [PATCH 139/157] fix(deps): update module github.com/onsi/ginkgo to v2 --- go.mod | 1 + 1 file changed, 1 insertion(+) diff --git a/go.mod b/go.mod index 7318a01..75c72e6 100644 --- a/go.mod +++ b/go.mod @@ -9,6 +9,7 @@ require ( github.com/docker/docker v28.0.4+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo v1.16.5 + github.com/onsi/ginkgo/v2 v2.23.3 github.com/onsi/gomega v1.36.3 github.com/prometheus/client_golang v1.21.1 github.com/robfig/cron v1.2.0 From a9642a2dcc5f45c6500cb127a4d5eb19b359edeb Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Sun, 30 Mar 2025 10:02:16 +0200 Subject: [PATCH 140/157] fix(deps): update ginkgo import path to v2 in test files --- go.mod | 45 ++--- go.sum | 162 +++++++----------- internal/actions/actions_suite_test.go | 2 +- internal/actions/update_test.go | 2 +- pkg/api/api_test.go | 6 +- pkg/api/metrics/metrics_test.go | 2 +- pkg/container/cgroup_id_test.go | 2 +- pkg/container/client_test.go | 5 +- pkg/container/container_suite_test.go | 2 +- pkg/container/container_test.go | 2 +- pkg/container/mocks/ApiServer.go | 2 +- pkg/container/util_test.go | 2 +- pkg/notifications/json_test.go | 2 +- pkg/notifications/notifications_suite_test.go | 5 +- pkg/notifications/notifier_test.go | 2 +- pkg/notifications/shoutrrr_test.go | 2 +- pkg/registry/auth/auth_test.go | 2 +- pkg/registry/digest/digest_test.go | 13 +- pkg/registry/helpers/helpers_test.go | 2 +- pkg/registry/manifest/manifest_test.go | 2 +- pkg/registry/registry_suite_test.go | 5 +- pkg/registry/registry_test.go | 2 +- pkg/registry/trust_test.go | 2 +- 23 files changed, 116 insertions(+), 157 deletions(-) diff --git a/go.mod b/go.mod index 75c72e6..720953e 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,6 @@ require ( github.com/docker/cli v28.0.4+incompatible github.com/docker/docker v28.0.4+incompatible github.com/docker/go-connections v0.5.0 - github.com/onsi/ginkgo v1.16.5 github.com/onsi/ginkgo/v2 v2.23.3 github.com/onsi/gomega v1.36.3 github.com/prometheus/client_golang v1.21.1 @@ -18,7 +17,7 @@ require ( github.com/spf13/pflag v1.0.6 github.com/spf13/viper v1.20.1 github.com/stretchr/testify v1.10.0 - golang.org/x/net v0.37.0 + golang.org/x/net v0.38.0 ) require ( @@ -26,55 +25,57 @@ require ( github.com/felixge/httpsnoop v1.0.4 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect + github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/go-viper/mapstructure/v2 v2.2.1 // indirect - github.com/klauspost/compress v1.17.11 // indirect + github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e // indirect + github.com/klauspost/compress v1.18.0 // indirect github.com/moby/docker-image-spec v1.3.1 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect - go.opentelemetry.io/otel v1.29.0 // indirect + go.opentelemetry.io/auto/sdk v1.1.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect + go.opentelemetry.io/otel v1.35.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect - go.opentelemetry.io/otel/metric v1.29.0 // indirect - go.opentelemetry.io/otel/trace v1.29.0 // indirect + go.opentelemetry.io/otel/metric v1.35.0 // indirect + go.opentelemetry.io/otel/trace v1.35.0 // indirect + golang.org/x/tools v0.31.0 // indirect ) require ( - github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect + github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect github.com/Microsoft/go-winio v0.6.2 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/docker/docker-credential-helpers v0.8.2 // indirect + github.com/docker/docker-credential-helpers v0.9.3 // indirect github.com/docker/go-units v0.5.0 // indirect - github.com/fatih/color v1.17.0 // indirect + github.com/fatih/color v1.18.0 // indirect github.com/fsnotify/fsnotify v1.8.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/google/go-cmp v0.7.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-colorable v0.1.14 // indirect github.com/mattn/go-isatty v0.0.20 // indirect - github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect - github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c // indirect - github.com/nxadm/tail v1.4.8 // indirect + github.com/moby/term v0.5.2 // indirect + github.com/morikuni/aec v1.0.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect - github.com/opencontainers/image-spec v1.1.0 // indirect + github.com/opencontainers/image-spec v1.1.1 // indirect github.com/pelletier/go-toml/v2 v2.2.3 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.62.0 // indirect - github.com/prometheus/procfs v0.15.1 // indirect - github.com/sagikazarmark/locafero v0.7.0 // indirect + github.com/prometheus/common v0.63.0 // indirect + github.com/prometheus/procfs v0.16.0 // indirect + github.com/sagikazarmark/locafero v0.9.0 // indirect github.com/sourcegraph/conc v0.3.0 // indirect - github.com/spf13/afero v1.12.0 // indirect + github.com/spf13/afero v1.14.0 // indirect github.com/spf13/cast v1.7.1 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/subosito/gotenv v1.6.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/sys v0.31.0 // indirect golang.org/x/text v0.23.0 - golang.org/x/time v0.8.0 // indirect - google.golang.org/protobuf v1.36.5 // indirect - gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect + golang.org/x/time v0.11.0 // indirect + google.golang.org/protobuf v1.36.6 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gotest.tools/v3 v3.0.3 // indirect ) diff --git a/go.sum b/go.sum index 3638ccf..1b2f163 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= -github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= +github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg= +github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -13,8 +13,8 @@ github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3 github.com/containrrr/shoutrrr v0.8.0 h1:mfG2ATzIS7NR2Ec6XL+xyoHzN97H8WPjir8aYzJUSec= github.com/containrrr/shoutrrr v0.8.0/go.mod h1:ioyQAyu1LJY6sILuNyKaQaw+9Ttik5QePU8atnAdO2o= github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= -github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= -github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= +github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= @@ -25,20 +25,18 @@ github.com/docker/cli v28.0.4+incompatible h1:pBJSJeNd9QeIWPjRcV91RVJihd/TXB77q1 github.com/docker/cli v28.0.4+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/docker v28.0.4+incompatible h1:JNNkBctYKurkw6FrHfKqY0nKIDf5nrbxjVBtS+cdcok= github.com/docker/docker v28.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo= -github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M= +github.com/docker/docker-credential-helpers v0.9.3 h1:gAm/VtF9wgqJMoxzT3Gj5p4AqIjCBS4wrsOh9yRqcz8= +github.com/docker/docker-credential-helpers v0.9.3/go.mod h1:x+4Gbw9aGmChi3qTLZj8Dfn0TD20M/fuWy0E5+WDeCo= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4= -github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI= +github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= +github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M= github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -46,77 +44,55 @@ github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= -github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss= github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= -github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad h1:a6HEuzUHeKH6hwfN/ZoQgRgVIWFJljSWa/zetS2WTvg= -github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= +github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs= +github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jarcoal/httpmock v1.3.0 h1:2RJ8GP0IIaWwcC9Fp2BmVi8Kog3v2Hn7VXM3fTd+nuc= github.com/jarcoal/httpmock v1.3.0/go.mod h1:3yb8rc4BI7TCBhFY8ng0gjuLKJNquuDNiPaZjnENuYg= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= -github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= +github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo= +github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= -github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= +github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= -github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 h1:dcztxKSvZ4Id8iPpHERQBbIJfabdt4wUm5qy3wOL2Zc= -github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= -github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c h1:nXxl5PrvVm2L/wCy8dQu6DMTwH4oIuGN8GJDAlqDdVE= -github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= +github.com/moby/term v0.5.2 h1:6qk3FJAFDs6i/q3W/pQ97SX192qKfZgGjCQqfCJkgzQ= +github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFLc= +github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= +github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= -github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= -github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/ginkgo/v2 v2.23.3 h1:edHxnszytJ4lD9D5Jjc4tiDkPBZ3siDeJJkUZJJVkp0= github.com/onsi/ginkgo/v2 v2.23.3/go.mod h1:zXTP6xIp3U8aVuXN8ENK9IXRaTjFnpVB9mGmaSRvxnM= -github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.36.3 h1:hID7cr8t3Wp26+cYnfcjR6HpJ00fdogN6dqZ1t6IylU= github.com/onsi/gomega v1.36.3/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= -github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= -github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM= +github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040= +github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M= github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M= github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -129,23 +105,23 @@ github.com/prometheus/client_golang v1.21.1 h1:DOvXXTqVzvkIewV/CDPFdejpMCGeMcbGC github.com/prometheus/client_golang v1.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io= -github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= -github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= -github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= +github.com/prometheus/common v0.63.0 h1:YR/EIY1o3mEFP/kZCD7iDMnLPlGyuU2Gb3HIcXnA98k= +github.com/prometheus/common v0.63.0/go.mod h1:VVFF/fBIoToEnWRVkYoXEkq3R3paCoxG9PXP74SnV18= +github.com/prometheus/procfs v0.16.0 h1:xh6oHhKwnOJKMYiYBDWmkHqQPyiY40sny36Cmx2bbsM= +github.com/prometheus/procfs v0.16.0/go.mod h1:8veyXUu3nGP7oaCxhX6yeaM5u4stL2FeMXnCqhDthZg= github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ= github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k= -github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= +github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/sagikazarmark/locafero v0.7.0 h1:5MqpDsTGNDhY8sGp0Aowyf0qKsPrhewaLSsFaodPcyo= -github.com/sagikazarmark/locafero v0.7.0/go.mod h1:2za3Cg5rMaTMoG/2Ulr9AwtFaIppKXTRYnozin4aB5k= +github.com/sagikazarmark/locafero v0.9.0 h1:GbgQGNtTrEmddYDSAH9QLRyfAHY12md+8YFTqyMTC9k= +github.com/sagikazarmark/locafero v0.9.0/go.mod h1:UBUyz37V+EdMS3hDF3QWIiVr/2dPrx49OMO0Bn0hJqk= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= -github.com/spf13/afero v1.12.0 h1:UcOPyRBYczmFn6yvphxkn9ZEOY65cpwGKb5mL36mrqs= -github.com/spf13/afero v1.12.0/go.mod h1:ZTlWwG4/ahT8W7T0WQ5uYmjI9duaLQGy3Q2OAl4sk/4= +github.com/spf13/afero v1.14.0 h1:9tH6MapGnn/j0eb0yIXiLjERO8RB6xIVZRDCX7PtqWA= +github.com/spf13/afero v1.14.0/go.mod h1:acJQ8t0ohCGuMN3O+Pv0V0hgMxNYDlvdk+VTfyZmbYo= github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y= github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo= @@ -158,7 +134,6 @@ github.com/spf13/viper v1.20.1/go.mod h1:P9Mdzt1zoHIG8m2eZQinpiBjo6kCmZSKBClNNqj github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= @@ -166,20 +141,24 @@ github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 h1:TT4fX+nBOA/+LUkobKGW1ydGcn+G3vRw9+g5HwCphpk= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0/go.mod h1:L7UH0GbB0p47T4Rri3uHjbpCFYrVrwc1I25QhNPiGK8= -go.opentelemetry.io/otel v1.29.0 h1:PdomN/Al4q/lN6iBJEN3AwPvUiHPMlt93c8bqTG5Llw= -go.opentelemetry.io/otel v1.29.0/go.mod h1:N/WtXPs1CNCUEx+Agz5uouwCba+i+bJGFicT8SR4NP8= +go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= +go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 h1:sbiXRNDSWJOTobXh5HyQKjq6wUC5tNybqjIqDpAY4CU= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0/go.mod h1:69uWxva0WgAA/4bu2Yy70SLDBwZXuQ6PbBpbsa5iZrQ= +go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ= +go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 h1:j9+03ymgYhPKmeXGk5Zu+cIZOlVzd9Zv7QIiyItjFBU= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0/go.mod h1:Y5+XiUG4Emn1hTfciPzGPJaSI+RpDts6BnCIir0SLqk= -go.opentelemetry.io/otel/metric v1.29.0 h1:vPf/HFWTNkPu1aYeIsc98l4ktOQaL6LeSoeV2g+8YLc= -go.opentelemetry.io/otel/metric v1.29.0/go.mod h1:auu/QWieFVWx+DmQOUMgj0F8LHWdgalxXqvp7BII/W8= -go.opentelemetry.io/otel/sdk v1.29.0 h1:vkqKjk7gwhS8VaWb0POZKmIEDimRCMsopNYnriHyryo= -go.opentelemetry.io/otel/sdk v1.29.0/go.mod h1:pM8Dx5WKnvxLCb+8lG1PRNIDxu9g9b9g59Qr7hfAAok= -go.opentelemetry.io/otel/trace v1.29.0 h1:J/8ZNK4XgR7a21DZUAsbF8pZ5Jcw1VhACmnYt39JTi4= -go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+MMTlEh3nsQgWQ= +go.opentelemetry.io/otel/metric v1.35.0 h1:0znxYu2SNyuMSQT4Y9WDWej0VpcsxkuklLa4/siN90M= +go.opentelemetry.io/otel/metric v1.35.0/go.mod h1:nKVFgxBZ2fReX6IlyW28MgZojkoAkJGaE8CpgeAU3oE= +go.opentelemetry.io/otel/sdk v1.35.0 h1:iPctf8iprVySXSKJffSS79eOjl9pvxV9ZqOWT0QejKY= +go.opentelemetry.io/otel/sdk v1.35.0/go.mod h1:+ga1bZliga3DxJ3CQGg3updiaAJoNECOgJREo9KHGQg= +go.opentelemetry.io/otel/sdk/metric v1.35.0 h1:1RriWBmCKgkeHEhM7a2uMjMUfP7MsOF5JpUCaEqEI9o= +go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstFnhW0BidkR+gL+qN+w= +go.opentelemetry.io/otel/trace v1.35.0 h1:dPpEfJu1sDIqruz7BHFG3c7528f6ddfSWfFDVt/xgMs= +go.opentelemetry.io/otel/trace v1.35.0/go.mod h1:WUk7DtFp1Aw2MkvqGdwiXYDZZNvA/1J8o6xRXLrIkyc= go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= @@ -189,31 +168,21 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c= -golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= +golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= @@ -221,47 +190,32 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= -golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg= -golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= +golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY= -golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY= +golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU= +golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 h1:ToEetK57OidYuqD4Q5w+vfEnPvPpuTwedCNVohYJfNk= -google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 h1:CkkIfIt50+lT6NHAVoRYEyAvQGFM7xEwXUUywFvEb3Q= -google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576/go.mod h1:1R3kvZ1dtP3+4p4d3G8uJ8rFk/fWlScl38vanWACI08= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 h1:TqExAhdPaB60Ux47Cn0oLV07rGnxZzIsaRhQaqS666A= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8/go.mod h1:lcTa1sDdWEIHMWlITnIczmw5w60CF9ffkb8Z+DVmmjA= -google.golang.org/grpc v1.67.3 h1:OgPcDAFKHnH8X3O4WcO4XUc8GRDeKsKReqbQtiCj7N8= -google.golang.org/grpc v1.67.3/go.mod h1:YGaHCc6Oap+FzBJTZLBzkGSYt/cvGPFTPxkn7QfSU8s= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM= -google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 h1:0+ozOGcrp+Y8Aq8TLNN2Aliibms5LEzsq99ZZmAGYm0= +google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094/go.mod h1:fJ/e3If/Q67Mj99hin0hMhiNyCRmt6BQ2aWIJshUSJw= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY= +google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= +google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= +google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY= +google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0= gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= diff --git a/internal/actions/actions_suite_test.go b/internal/actions/actions_suite_test.go index e4c4a07..aa30769 100644 --- a/internal/actions/actions_suite_test.go +++ b/internal/actions/actions_suite_test.go @@ -10,7 +10,7 @@ import ( "github.com/beatkind/watchtower/pkg/types" . "github.com/beatkind/watchtower/internal/actions/mocks" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/internal/actions/update_test.go b/internal/actions/update_test.go index a9bcae2..2dbf111 100644 --- a/internal/actions/update_test.go +++ b/internal/actions/update_test.go @@ -10,7 +10,7 @@ import ( "github.com/docker/go-connections/nat" . "github.com/beatkind/watchtower/internal/actions/mocks" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/api/api_test.go b/pkg/api/api_test.go index 4e9110b..3851bf7 100644 --- a/pkg/api/api_test.go +++ b/pkg/api/api_test.go @@ -6,12 +6,12 @@ import ( "net/http/httptest" "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) const ( - token = "123123123" + token = "123123123" ) func TestAPI(t *testing.T) { @@ -51,7 +51,7 @@ var _ = Describe("API", func() { rec := httptest.NewRecorder() req := httptest.NewRequest("GET", "/hello", nil) - req.Header.Set("Authorization", "Bearer " + token) + req.Header.Set("Authorization", "Bearer "+token) handlerFunc(rec, req) diff --git a/pkg/api/metrics/metrics_test.go b/pkg/api/metrics/metrics_test.go index c82a33c..9c70608 100644 --- a/pkg/api/metrics/metrics_test.go +++ b/pkg/api/metrics/metrics_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/beatkind/watchtower/pkg/api" diff --git a/pkg/container/cgroup_id_test.go b/pkg/container/cgroup_id_test.go index 5f694e3..2b5de9c 100644 --- a/pkg/container/cgroup_id_test.go +++ b/pkg/container/cgroup_id_test.go @@ -1,7 +1,7 @@ package container import ( - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/container/client_test.go b/pkg/container/client_test.go index ba3f0dd..67a6ed9 100644 --- a/pkg/container/client_test.go +++ b/pkg/container/client_test.go @@ -1,9 +1,10 @@ package container import ( - "github.com/docker/docker/api/types/network" "time" + "github.com/docker/docker/api/types/network" + "github.com/beatkind/watchtower/internal/util" "github.com/beatkind/watchtower/pkg/container/mocks" "github.com/beatkind/watchtower/pkg/filters" @@ -17,7 +18,7 @@ import ( "github.com/onsi/gomega/ghttp" "github.com/sirupsen/logrus" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" gt "github.com/onsi/gomega/types" diff --git a/pkg/container/container_suite_test.go b/pkg/container/container_suite_test.go index 292a008..9f08f1f 100644 --- a/pkg/container/container_suite_test.go +++ b/pkg/container/container_suite_test.go @@ -3,7 +3,7 @@ package container_test import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/container/container_test.go b/pkg/container/container_test.go index d7721b3..489cd07 100644 --- a/pkg/container/container_test.go +++ b/pkg/container/container_test.go @@ -4,7 +4,7 @@ import ( "github.com/beatkind/watchtower/pkg/types" dockerContainer "github.com/docker/docker/api/types/container" "github.com/docker/go-connections/nat" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/container/mocks/ApiServer.go b/pkg/container/mocks/ApiServer.go index d9d321e..a6b4489 100644 --- a/pkg/container/mocks/ApiServer.go +++ b/pkg/container/mocks/ApiServer.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - "github.com/onsi/ginkgo" + "github.com/onsi/ginkgo/v2" t "github.com/beatkind/watchtower/pkg/types" diff --git a/pkg/container/util_test.go b/pkg/container/util_test.go index 2477e04..cc982c6 100644 --- a/pkg/container/util_test.go +++ b/pkg/container/util_test.go @@ -2,7 +2,7 @@ package container_test import ( wt "github.com/beatkind/watchtower/pkg/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/notifications/json_test.go b/pkg/notifications/json_test.go index bb5a060..a31dd5b 100644 --- a/pkg/notifications/json_test.go +++ b/pkg/notifications/json_test.go @@ -2,7 +2,7 @@ package notifications import ( s "github.com/beatkind/watchtower/pkg/session" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/notifications/notifications_suite_test.go b/pkg/notifications/notifications_suite_test.go index 19d286e..a38d62d 100644 --- a/pkg/notifications/notifications_suite_test.go +++ b/pkg/notifications/notifications_suite_test.go @@ -1,10 +1,11 @@ package notifications_test import ( - "github.com/onsi/gomega/format" "testing" - . "github.com/onsi/ginkgo" + "github.com/onsi/gomega/format" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/notifications/notifier_test.go b/pkg/notifications/notifier_test.go index 12a5894..929ea21 100644 --- a/pkg/notifications/notifier_test.go +++ b/pkg/notifications/notifier_test.go @@ -8,7 +8,7 @@ import ( "github.com/beatkind/watchtower/cmd" "github.com/beatkind/watchtower/internal/flags" "github.com/beatkind/watchtower/pkg/notifications" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/notifications/shoutrrr_test.go b/pkg/notifications/shoutrrr_test.go index 6f7980a..c279b37 100644 --- a/pkg/notifications/shoutrrr_test.go +++ b/pkg/notifications/shoutrrr_test.go @@ -7,7 +7,7 @@ import ( "github.com/beatkind/watchtower/internal/flags" s "github.com/beatkind/watchtower/pkg/session" "github.com/containrrr/shoutrrr/pkg/types" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" "github.com/sirupsen/logrus" diff --git a/pkg/registry/auth/auth_test.go b/pkg/registry/auth/auth_test.go index d26931b..50ca261 100644 --- a/pkg/registry/auth/auth_test.go +++ b/pkg/registry/auth/auth_test.go @@ -13,7 +13,7 @@ import ( wtTypes "github.com/beatkind/watchtower/pkg/types" ref "github.com/distribution/reference" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/registry/digest/digest_test.go b/pkg/registry/digest/digest_test.go index aa0d0f7..fb07e79 100644 --- a/pkg/registry/digest/digest_test.go +++ b/pkg/registry/digest/digest_test.go @@ -2,16 +2,17 @@ package digest_test import ( "fmt" - "github.com/beatkind/watchtower/internal/actions/mocks" - "github.com/beatkind/watchtower/pkg/registry/digest" - wtTypes "github.com/beatkind/watchtower/pkg/types" - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" - "github.com/onsi/gomega/ghttp" "net/http" "os" "testing" "time" + + "github.com/beatkind/watchtower/internal/actions/mocks" + "github.com/beatkind/watchtower/pkg/registry/digest" + wtTypes "github.com/beatkind/watchtower/pkg/types" + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + "github.com/onsi/gomega/ghttp" ) func TestDigest(t *testing.T) { diff --git a/pkg/registry/helpers/helpers_test.go b/pkg/registry/helpers/helpers_test.go index 7918de7..d39b2a1 100644 --- a/pkg/registry/helpers/helpers_test.go +++ b/pkg/registry/helpers/helpers_test.go @@ -3,7 +3,7 @@ package helpers import ( "testing" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/registry/manifest/manifest_test.go b/pkg/registry/manifest/manifest_test.go index fa918b8..82ece1d 100644 --- a/pkg/registry/manifest/manifest_test.go +++ b/pkg/registry/manifest/manifest_test.go @@ -7,7 +7,7 @@ import ( "github.com/beatkind/watchtower/internal/actions/mocks" "github.com/beatkind/watchtower/pkg/registry/manifest" "github.com/docker/docker/api/types/image" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/registry/registry_suite_test.go b/pkg/registry/registry_suite_test.go index 4dcbea6..f316b50 100644 --- a/pkg/registry/registry_suite_test.go +++ b/pkg/registry/registry_suite_test.go @@ -1,10 +1,11 @@ package registry_test import ( - "github.com/sirupsen/logrus" "testing" - . "github.com/onsi/ginkgo" + "github.com/sirupsen/logrus" + + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) diff --git a/pkg/registry/registry_test.go b/pkg/registry/registry_test.go index 79c94f4..1513e1e 100644 --- a/pkg/registry/registry_test.go +++ b/pkg/registry/registry_test.go @@ -3,7 +3,7 @@ package registry_test import ( "github.com/beatkind/watchtower/internal/actions/mocks" unit "github.com/beatkind/watchtower/pkg/registry" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "time" diff --git a/pkg/registry/trust_test.go b/pkg/registry/trust_test.go index 00fc8a7..87d05f9 100644 --- a/pkg/registry/trust_test.go +++ b/pkg/registry/trust_test.go @@ -3,7 +3,7 @@ package registry import ( "os" - . "github.com/onsi/ginkgo" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) From 5d5e090863c24332b4fd587ef905e15c61a192d4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 18 Apr 2025 14:13:34 +0000 Subject: [PATCH 141/157] fix(deps): update module github.com/docker/docker to v28.1.1+incompatible --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 720953e..5f13aff 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/containrrr/shoutrrr v0.8.0 github.com/distribution/reference v0.6.0 github.com/docker/cli v28.0.4+incompatible - github.com/docker/docker v28.0.4+incompatible + github.com/docker/docker v28.1.1+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo/v2 v2.23.3 github.com/onsi/gomega v1.36.3 diff --git a/go.sum b/go.sum index 1b2f163..f0ed8e0 100644 --- a/go.sum +++ b/go.sum @@ -25,6 +25,8 @@ github.com/docker/cli v28.0.4+incompatible h1:pBJSJeNd9QeIWPjRcV91RVJihd/TXB77q1 github.com/docker/cli v28.0.4+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/docker v28.0.4+incompatible h1:JNNkBctYKurkw6FrHfKqY0nKIDf5nrbxjVBtS+cdcok= github.com/docker/docker v28.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v28.1.1+incompatible h1:49M11BFLsVO1gxY9UX9p/zwkE/rswggs8AdFmXQw51I= +github.com/docker/docker v28.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.9.3 h1:gAm/VtF9wgqJMoxzT3Gj5p4AqIjCBS4wrsOh9yRqcz8= github.com/docker/docker-credential-helpers v0.9.3/go.mod h1:x+4Gbw9aGmChi3qTLZj8Dfn0TD20M/fuWy0E5+WDeCo= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= From 6e2c9cb8377e029a44e727bd0d347f624690b6f3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 6 May 2025 16:21:13 +0000 Subject: [PATCH 142/157] chore(deps): update docker/login-action digest to 6d4b68b --- .github/workflows/release-dev.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml index 4ab115b..6629816 100644 --- a/.github/workflows/release-dev.yaml +++ b/.github/workflows/release-dev.yaml @@ -58,7 +58,7 @@ jobs: uses: actions/checkout@v4 - name: Log in to Docker Hub - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 + uses: docker/login-action@6d4b68b490aef8836e8fb5e50ee7b3bdfa5894f0 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -109,7 +109,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - name: Log in to the Container registry - uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 + uses: docker/login-action@6d4b68b490aef8836e8fb5e50ee7b3bdfa5894f0 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} From 41c608433fa5d09f589984484402df934ba8715d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 6 May 2025 16:21:39 +0000 Subject: [PATCH 143/157] fix(deps): update module github.com/docker/cli to v28.1.1+incompatible --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 5f13aff..28286c8 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.24 require ( github.com/containrrr/shoutrrr v0.8.0 github.com/distribution/reference v0.6.0 - github.com/docker/cli v28.0.4+incompatible + github.com/docker/cli v28.1.1+incompatible github.com/docker/docker v28.1.1+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo/v2 v2.23.3 diff --git a/go.sum b/go.sum index f0ed8e0..81c9dee 100644 --- a/go.sum +++ b/go.sum @@ -23,6 +23,8 @@ github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5Qvfr github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/cli v28.0.4+incompatible h1:pBJSJeNd9QeIWPjRcV91RVJihd/TXB77q1ef64XEu4A= github.com/docker/cli v28.0.4+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v28.1.1+incompatible h1:eyUemzeI45DY7eDPuwUcmDyDj1pM98oD5MdSpiItp8k= +github.com/docker/cli v28.1.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/docker v28.0.4+incompatible h1:JNNkBctYKurkw6FrHfKqY0nKIDf5nrbxjVBtS+cdcok= github.com/docker/docker v28.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v28.1.1+incompatible h1:49M11BFLsVO1gxY9UX9p/zwkE/rswggs8AdFmXQw51I= From 46db980150f12be66b5ac85bc54b7e9e20ae03ee Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 6 May 2025 16:32:02 +0000 Subject: [PATCH 144/157] chore(deps): update docker/metadata-action digest to 418e4b9 --- .github/workflows/release-dev.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml index 6629816..9cfe992 100644 --- a/.github/workflows/release-dev.yaml +++ b/.github/workflows/release-dev.yaml @@ -65,7 +65,7 @@ jobs: - name: Extract metadata (tags, labels) for Docker id: meta - uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 + uses: docker/metadata-action@418e4b98bf2841bd337d0b24fe63cb36dc8afa55 with: images: beatkind/watchtower labels: | @@ -116,7 +116,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Extract metadata (tags, labels) for Docker id: meta - uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 + uses: docker/metadata-action@418e4b98bf2841bd337d0b24fe63cb36dc8afa55 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} labels: | From 9f0aed41fa6c99f5200a94725900ef0775b76549 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 23 Apr 2025 23:53:14 +0000 Subject: [PATCH 145/157] chore(deps): update nginx docker tag to v1.28.0 --- dockerfiles/container-networking/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/container-networking/docker-compose.yml b/dockerfiles/container-networking/docker-compose.yml index 2320348..3bdc21a 100644 --- a/dockerfiles/container-networking/docker-compose.yml +++ b/dockerfiles/container-networking/docker-compose.yml @@ -11,7 +11,7 @@ services: consumer: depends_on: - producer - image: nginx:1.27.4 + image: nginx:1.28.0 network_mode: "service:producer" labels: - "com.centurylinklabs.watchtower.depends-on=/wt-contnet-producer-1" From faf22cfce7754e46555da1d6ce2b30a51b7470f8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 8 Apr 2025 11:42:28 +0000 Subject: [PATCH 146/157] fix(deps): update module github.com/prometheus/client_golang to v1.22.0 --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 28286c8..e83d615 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo/v2 v2.23.3 github.com/onsi/gomega v1.36.3 - github.com/prometheus/client_golang v1.21.1 + github.com/prometheus/client_golang v1.22.0 github.com/robfig/cron v1.2.0 github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.9.1 diff --git a/go.sum b/go.sum index 81c9dee..d24cee0 100644 --- a/go.sum +++ b/go.sum @@ -107,6 +107,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v1.21.1 h1:DOvXXTqVzvkIewV/CDPFdejpMCGeMcbGCQ8YOmu+Ibk= github.com/prometheus/client_golang v1.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg= +github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q= +github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= github.com/prometheus/common v0.63.0 h1:YR/EIY1o3mEFP/kZCD7iDMnLPlGyuU2Gb3HIcXnA98k= From 8c77cb0e95eab55554de5453a94811d203788929 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 5 May 2025 23:21:26 +0000 Subject: [PATCH 147/157] fix(deps): update module golang.org/x/net to v0.40.0 --- go.mod | 6 +++--- go.sum | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index e83d615..b614be7 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/spf13/pflag v1.0.6 github.com/spf13/viper v1.20.1 github.com/stretchr/testify v1.10.0 - golang.org/x/net v0.38.0 + golang.org/x/net v0.40.0 ) require ( @@ -72,8 +72,8 @@ require ( github.com/stretchr/objx v0.5.2 // indirect github.com/subosito/gotenv v1.6.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/sys v0.31.0 // indirect - golang.org/x/text v0.23.0 + golang.org/x/sys v0.33.0 // indirect + golang.org/x/text v0.25.0 golang.org/x/time v0.11.0 // indirect google.golang.org/protobuf v1.36.6 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index d24cee0..802faf9 100644 --- a/go.sum +++ b/go.sum @@ -181,6 +181,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= +golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY= +golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -192,10 +194,14 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= +golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= +golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4= +golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA= golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= From 62dd9a2648724b315e6251d689475426570efc02 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 23 Apr 2025 18:56:21 +0000 Subject: [PATCH 148/157] chore(deps): update docker/build-push-action digest to 14487ce --- .github/workflows/release-dev.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml index 9cfe992..8d05a3a 100644 --- a/.github/workflows/release-dev.yaml +++ b/.github/workflows/release-dev.yaml @@ -82,7 +82,7 @@ jobs: - name: Build and push Docker image id: push - uses: docker/build-push-action@84ad562665bb303b549fec655d1b64f9945f3f91 + uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 with: context: . file: dockerfiles/Dockerfile.self-contained @@ -133,7 +133,7 @@ jobs: - name: Build and push Docker image id: push - uses: docker/build-push-action@84ad562665bb303b549fec655d1b64f9945f3f91 + uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 with: context: . file: dockerfiles/Dockerfile.self-contained From 70426e1838cf78416faaddae4c71dc420b82199e Mon Sep 17 00:00:00 2001 From: Jiahao Ji Zhou Date: Thu, 23 Jan 2025 11:51:53 +0100 Subject: [PATCH 149/157] feat: add flag to disable to the memory swappiness --- cmd/root.go | 12 +++++++----- docs/arguments.md | 12 ++++++++++++ internal/flags/flags.go | 7 +++++++ pkg/container/client.go | 16 +++++++++++----- 4 files changed, 37 insertions(+), 10 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index e0b9ee2..8ce538f 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -117,17 +117,19 @@ func PreRun(cmd *cobra.Command, _ []string) { reviveStopped, _ := f.GetBool("revive-stopped") removeVolumes, _ := f.GetBool("remove-volumes") warnOnHeadPullFailed, _ := f.GetString("warn-on-head-failure") + disableMemorySwappiness, _ := f.GetBool("disable-memory-swappiness") if monitorOnly && noPull { log.Warn("Using `WATCHTOWER_NO_PULL` and `WATCHTOWER_MONITOR_ONLY` simultaneously might lead to no action being taken at all. If this is intentional, you may safely ignore this message.") } client = container.NewClient(container.ClientOptions{ - IncludeStopped: includeStopped, - ReviveStopped: reviveStopped, - RemoveVolumes: removeVolumes, - IncludeRestarting: includeRestarting, - WarnOnHeadFailed: container.WarningStrategy(warnOnHeadPullFailed), + IncludeStopped: includeStopped, + ReviveStopped: reviveStopped, + RemoveVolumes: removeVolumes, + IncludeRestarting: includeRestarting, + DisableMemorySwappiness: disableMemorySwappiness, + WarnOnHeadFailed: container.WarningStrategy(warnOnHeadPullFailed), }) notifier = notifications.NewNotifier(cmd) diff --git a/docs/arguments.md b/docs/arguments.md index 4378b88..4a2ef93 100644 --- a/docs/arguments.md +++ b/docs/arguments.md @@ -498,3 +498,15 @@ Environment Variable: WATCHTOWER_PORCELAIN Possible values: v1 Default: - ``` + +## Compatibility with podman (Disable memory swappiness) + +Disable memory swappiness. By default, podman sets the memory-swappiness value to 0 when no memory-swappiness is defined +When this flag is specified, watchtower will set the memory-swappiness to nil, fixing a compatibility issue with podman running with crun and cgroupv2 + +```text + Argument: --disable-memory-swappiness +Environment Variable: WATCHTOWER_DISABLE_MEMORY_SWAPPINESS + Type: Boolean + Default: false +``` diff --git a/internal/flags/flags.go b/internal/flags/flags.go index e71d02c..9b722bb 100644 --- a/internal/flags/flags.go +++ b/internal/flags/flags.go @@ -211,6 +211,12 @@ func RegisterSystemFlags(rootCmd *cobra.Command) { "", envBool("WATCHTOWER_LABEL_TAKE_PRECEDENCE"), "Label applied to containers take precedence over arguments") + + flags.BoolP( + "disable-memory-swappiness", + "", + envBool("WATCHTOWER_DISABLE_MEMORY_SWAPPINESS"), + "Label used for setting memory swappiness as nil when recreating the container, used for compatibility with podman") } // RegisterNotificationFlags that are used by watchtower to send notifications @@ -437,6 +443,7 @@ func SetDefaults() { viper.SetDefault("WATCHTOWER_NOTIFICATION_SLACK_IDENTIFIER", "watchtower") viper.SetDefault("WATCHTOWER_LOG_LEVEL", "info") viper.SetDefault("WATCHTOWER_LOG_FORMAT", "auto") + viper.SetDefault("WATCHTOWER_DISABLE_MEMORY_SWAPPINESS", false) } // EnvConfig translates the command-line options into environment variables diff --git a/pkg/container/client.go b/pkg/container/client.go index 26e1595..defa488 100644 --- a/pkg/container/client.go +++ b/pkg/container/client.go @@ -57,11 +57,12 @@ func NewClient(opts ClientOptions) Client { // ClientOptions contains the options for how the docker client wrapper should behave type ClientOptions struct { - RemoveVolumes bool - IncludeStopped bool - ReviveStopped bool - IncludeRestarting bool - WarnOnHeadFailed WarningStrategy + RemoveVolumes bool + IncludeStopped bool + ReviveStopped bool + IncludeRestarting bool + DisableMemorySwappiness bool + WarnOnHeadFailed WarningStrategy } // WarningStrategy is a value determining when to show warnings @@ -251,6 +252,11 @@ func (client dockerClient) StartContainer(c t.Container) (t.ContainerID, error) hostConfig := c.GetCreateHostConfig() networkConfig := client.GetNetworkConfig(c) + // this is a flag set for podman compatibility + if client.DisableMemorySwappiness { + hostConfig.MemorySwappiness = nil + } + // simpleNetworkConfig is a networkConfig with only 1 network. // see: https://github.com/docker/docker/issues/29265 simpleNetworkConfig := func() *network.NetworkingConfig { From 6d22ff25bb20ff1bc82ea0c2c6356b35de253310 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 15 May 2025 17:09:36 +0000 Subject: [PATCH 150/157] chore(deps): update docker/build-push-action digest to 0788c44 --- .github/workflows/release-dev.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml index 8d05a3a..892a899 100644 --- a/.github/workflows/release-dev.yaml +++ b/.github/workflows/release-dev.yaml @@ -82,7 +82,7 @@ jobs: - name: Build and push Docker image id: push - uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 + uses: docker/build-push-action@0788c444d8b4d67580213712e34a148cae3a6c4e with: context: . file: dockerfiles/Dockerfile.self-contained @@ -133,7 +133,7 @@ jobs: - name: Build and push Docker image id: push - uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 + uses: docker/build-push-action@0788c444d8b4d67580213712e34a148cae3a6c4e with: context: . file: dockerfiles/Dockerfile.self-contained From edc0654f1ce96e66900336e1ebc259413d5bc3e1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 6 Jun 2025 21:24:10 +0000 Subject: [PATCH 151/157] fix(deps): update module golang.org/x/net to v0.41.0 --- go.mod | 6 +++--- go.sum | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index b614be7..93d8e98 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/spf13/pflag v1.0.6 github.com/spf13/viper v1.20.1 github.com/stretchr/testify v1.10.0 - golang.org/x/net v0.40.0 + golang.org/x/net v0.41.0 ) require ( @@ -37,7 +37,7 @@ require ( go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect go.opentelemetry.io/otel/metric v1.35.0 // indirect go.opentelemetry.io/otel/trace v1.35.0 // indirect - golang.org/x/tools v0.31.0 // indirect + golang.org/x/tools v0.33.0 // indirect ) require ( @@ -73,7 +73,7 @@ require ( github.com/subosito/gotenv v1.6.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/sys v0.33.0 // indirect - golang.org/x/text v0.25.0 + golang.org/x/text v0.26.0 golang.org/x/time v0.11.0 // indirect google.golang.org/protobuf v1.36.6 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 802faf9..7662757 100644 --- a/go.sum +++ b/go.sum @@ -183,6 +183,8 @@ golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY= golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds= +golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw= +golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -202,6 +204,8 @@ golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4= golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA= +golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M= +golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA= golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0= golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -211,6 +215,8 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU= golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ= +golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc= +golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From 9814cdc150a1b9eb4813852f261c0bd5a7458ebd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 27 May 2025 17:31:40 +0000 Subject: [PATCH 152/157] chore(deps): update docker/build-push-action digest to 2634353 --- .github/workflows/release-dev.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml index 892a899..15c7815 100644 --- a/.github/workflows/release-dev.yaml +++ b/.github/workflows/release-dev.yaml @@ -82,7 +82,7 @@ jobs: - name: Build and push Docker image id: push - uses: docker/build-push-action@0788c444d8b4d67580213712e34a148cae3a6c4e + uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 with: context: . file: dockerfiles/Dockerfile.self-contained @@ -133,7 +133,7 @@ jobs: - name: Build and push Docker image id: push - uses: docker/build-push-action@0788c444d8b4d67580213712e34a148cae3a6c4e + uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 with: context: . file: dockerfiles/Dockerfile.self-contained From 432e218bb11b6e7e591495f2631eb58ca9af1bb8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 30 May 2025 23:11:05 +0000 Subject: [PATCH 153/157] chore(deps): update alpine docker tag to v3.22.0 --- dockerfiles/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile index 3506149..6d4a3ee 100644 --- a/dockerfiles/Dockerfile +++ b/dockerfiles/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM alpine:3.21.3 as alpine +FROM --platform=$BUILDPLATFORM alpine:3.22.0 as alpine RUN apk add --no-cache \ ca-certificates \ From b4836dcfb6934a76429767abeb9b1ee3f8cad5bd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 30 May 2025 16:29:44 +0000 Subject: [PATCH 154/157] fix(deps): update module github.com/docker/cli to v28.2.2+incompatible --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 93d8e98..5d00dc8 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.24 require ( github.com/containrrr/shoutrrr v0.8.0 github.com/distribution/reference v0.6.0 - github.com/docker/cli v28.1.1+incompatible + github.com/docker/cli v28.2.2+incompatible github.com/docker/docker v28.1.1+incompatible github.com/docker/go-connections v0.5.0 github.com/onsi/ginkgo/v2 v2.23.3 diff --git a/go.sum b/go.sum index 7662757..15fca1f 100644 --- a/go.sum +++ b/go.sum @@ -25,6 +25,8 @@ github.com/docker/cli v28.0.4+incompatible h1:pBJSJeNd9QeIWPjRcV91RVJihd/TXB77q1 github.com/docker/cli v28.0.4+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli v28.1.1+incompatible h1:eyUemzeI45DY7eDPuwUcmDyDj1pM98oD5MdSpiItp8k= github.com/docker/cli v28.1.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v28.2.2+incompatible h1:qzx5BNUDFqlvyq4AHzdNB7gSyVTmU4cgsyN9SdInc1A= +github.com/docker/cli v28.2.2+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/docker v28.0.4+incompatible h1:JNNkBctYKurkw6FrHfKqY0nKIDf5nrbxjVBtS+cdcok= github.com/docker/docker v28.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v28.1.1+incompatible h1:49M11BFLsVO1gxY9UX9p/zwkE/rswggs8AdFmXQw51I= From 1f0b418e13b25b7a8f1123aac022f8f7fb298b02 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 13 Jun 2025 14:40:22 +0000 Subject: [PATCH 155/157] chore(deps): update docker/login-action digest to 3d10084 --- .github/workflows/release-dev.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml index 15c7815..c2c69db 100644 --- a/.github/workflows/release-dev.yaml +++ b/.github/workflows/release-dev.yaml @@ -58,7 +58,7 @@ jobs: uses: actions/checkout@v4 - name: Log in to Docker Hub - uses: docker/login-action@6d4b68b490aef8836e8fb5e50ee7b3bdfa5894f0 + uses: docker/login-action@3d100841f68d4548bf57e52eb27bd33ec5069f55 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -109,7 +109,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - name: Log in to the Container registry - uses: docker/login-action@6d4b68b490aef8836e8fb5e50ee7b3bdfa5894f0 + uses: docker/login-action@3d100841f68d4548bf57e52eb27bd33ec5069f55 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} From d6bb80a3a0f9de61d33644f56c2599b780c1710a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 22 Jun 2025 08:16:47 +0000 Subject: [PATCH 156/157] chore(deps): update docker/metadata-action digest to b798ed8 --- .github/workflows/release-dev.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-dev.yaml b/.github/workflows/release-dev.yaml index c2c69db..e0fee53 100644 --- a/.github/workflows/release-dev.yaml +++ b/.github/workflows/release-dev.yaml @@ -65,7 +65,7 @@ jobs: - name: Extract metadata (tags, labels) for Docker id: meta - uses: docker/metadata-action@418e4b98bf2841bd337d0b24fe63cb36dc8afa55 + uses: docker/metadata-action@b798ed8388581f6f002541048b6458ca2c4ba442 with: images: beatkind/watchtower labels: | @@ -116,7 +116,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Extract metadata (tags, labels) for Docker id: meta - uses: docker/metadata-action@418e4b98bf2841bd337d0b24fe63cb36dc8afa55 + uses: docker/metadata-action@b798ed8388581f6f002541048b6458ca2c4ba442 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} labels: | From d60d5bb7b4ca59f028004fe95da8e99e63743fcf Mon Sep 17 00:00:00 2001 From: Aaron U'Ren Date: Sat, 13 Jul 2024 19:28:29 -0500 Subject: [PATCH 157/157] feat: add open container version to log messages --- pkg/container/client.go | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkg/container/client.go b/pkg/container/client.go index defa488..fdb6787 100644 --- a/pkg/container/client.go +++ b/pkg/container/client.go @@ -20,7 +20,10 @@ import ( t "github.com/beatkind/watchtower/pkg/types" ) -const defaultStopSignal = "SIGTERM" +const ( + defaultStopSignal = "SIGTERM" + openContainerVersion = "org.opencontainers.image.version" +) // A Client is the interface through which watchtower interacts with the // Docker API. @@ -193,6 +196,10 @@ func (client dockerClient) StopContainer(c t.Container, timeout time.Duration) e shortID := c.ID().ShortID() if c.IsRunning() { + openVer, ok := c.ContainerInfo().Config.Labels[openContainerVersion] + if ok { + shortID = fmt.Sprintf("%s - %s", shortID, openVer) + } log.Infof("Stopping %s (%s) with %s", c.Name(), shortID, signal) if err := client.api.ContainerKill(bg, idStr, signal); err != nil { return err @@ -349,7 +356,13 @@ func (client dockerClient) HasNewImage(ctx context.Context, container t.Containe return false, currentImageID, nil } - log.Infof("Found new %s image (%s)", imageName, newImageID.ShortID()) + imageID := newImageID.ShortID() + openImageVer, ok := newImageInfo.Config.Labels[openContainerVersion] + if ok { + imageID = fmt.Sprintf("%s - %s", imageID, openImageVer) + } + + log.Infof("Found new %s image (%s)", imageName, imageID) return true, newImageID, nil }