From 95cbb7ff4b1a84191c67c66f53e5d39871e86229 Mon Sep 17 00:00:00 2001 From: Jan Rundshagen Date: Mon, 8 Jul 2024 15:15:43 +0200 Subject: [PATCH] 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