-
Notifications
You must be signed in to change notification settings - Fork 5.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Bump engine cli v27.2.1 #12115
Bump engine cli v27.2.1 #12115
Conversation
containerd v1.7.22 buildx v0.17.0 buildkit v0.16.0 Signed-off-by: Guillaume Lours <[email protected]>
18576de
to
9ff971b
Compare
go.mod
Outdated
go 1.21.0 | ||
go 1.22.0 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did it automatically update this one, or did it still allow go 1.21.0 here?
I generally try to treat this one the same as other dependencies; list the minimum required version, and only update if it's impossible to use with older versions; see containerd/containerd#10596 (comment)
go.mod
Outdated
toolchain go1.22.2 | ||
toolchain go1.22.7 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
mostly curious; have you tried if it allows removing this one? I know it's sometimes added automatically, but if you remove it, it doesn't add it back
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Wonder go version bump won't bring issue to release Linux system packages and need to align with engine
Engine moved to go1.22 as well, so no problem there; but left the two comments above to not aggressively enforce (if possible) (LGTM otherwise) |
9ff971b
to
f2e29db
Compare
Dockerfile
Outdated
@@ -15,7 +15,7 @@ | |||
# See the License for the specific language governing permissions and | |||
# limitations under the License. | |||
|
|||
ARG GO_VERSION=1.21.12 | |||
ARG GO_VERSION=1.22.7 | |||
ARG XX_VERSION=1.2.1 | |||
ARG GOLANGCI_LINT_VERSION=v1.55.2 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh! You probably want to update GOLANGCI_LINT_VERSION as well for compatibility with newer go versions (CI still seemed happy, so maybe it still works); I think 1.60.2 is the current version, but you may run into linters complaining, so if it works, you could do it separately; see moby/moby#48359
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tried locally;
pkg/watch/watcher_darwin.go:96:16: Error return value of `d.stream.Start` is not checked (errcheck)
d.stream.Start()
^
pkg/prompt/prompt.go:97:12: Error return value of `fmt.Fprint` is not checked (errcheck)
fmt.Fprint(u.stdout, message)
^
pkg/prompt/prompt.go:99:12: Error return value of `fmt.Scanln` is not checked (errcheck)
fmt.Scanln(&answer)
^
cmd/formatter/logs.go:118:15: Error return value of `fmt.Fprintf` is not checked (errcheck)
fmt.Fprintf(w, "%s%s%s\n", p.prefix, timestamp, line)
^
cmd/formatter/logs.go:120:15: Error return value of `fmt.Fprintf` is not checked (errcheck)
fmt.Fprintf(w, "%s%s\n", p.prefix, line)
^
pkg/progress/json.go:67:15: Error return value of `fmt.Fprintln` is not checked (errcheck)
fmt.Fprintln(p.out, string(marshal))
^
pkg/progress/json.go:87:15: Error return value of `fmt.Fprintln` is not checked (errcheck)
fmt.Fprintln(p.out, string(marshal))
^
pkg/progress/plain.go:47:14: Error return value of `fmt.Fprintln` is not checked (errcheck)
fmt.Fprintln(p.out, prefix, e.ID, e.Text, e.StatusText)
^
pkg/progress/tty.go:162:12: Error return value of `fmt.Fprint` is not checked (errcheck)
fmt.Fprint(w.out, b.Column(0).ANSI)
^
pkg/progress/tty.go:165:12: Error return value of `fmt.Fprint` is not checked (errcheck)
fmt.Fprint(w.out, aec.Hide)
^
pkg/compose/attach.go:53:13: Error return value of `fmt.Fprintf` is not checked (errcheck)
fmt.Fprintf(s.stdout(), "Attaching to %s\n", strings.Join(names, ", "))
^
pkg/compose/compose.go:194:6: emptyStringTest: replace `len(dependencies) > 0` with `dependencies != ""` (gocritic)
if len(dependencies) > 0 {
^
pkg/compose/convergence.go:461:2: builtinShadow: shadowing of predeclared identifier: max (gocritic)
max := 0
^
pkg/compose/run.go:127:5: emptyStringTest: replace `len(opts.User) > 0` with `opts.User != ""` (gocritic)
if len(opts.User) > 0 {
^
pkg/compose/run.go:139:5: emptyStringTest: replace `len(opts.WorkingDir) > 0` with `opts.WorkingDir != ""` (gocritic)
if len(opts.WorkingDir) > 0 {
^
pkg/compose/viz.go:91:8: emptyStringTest: replace `len(portConfig.HostIP) > 0` with `portConfig.HostIP != ""` (gocritic)
if len(portConfig.HostIP) > 0 {
^
cmd/compatibility/convert.go:66:6: emptyStringTest: replace `len(arg) > 0` with `arg != ""` (gocritic)
if len(arg) > 0 && arg[0] != '-' {
^
pkg/e2e/watch_test.go:208:25: printf: non-constant format string in call to gotest.tools/v3/poll.Continue (govet)
return poll.Continue(res.Combined())
^
pkg/e2e/watch_test.go:290:25: printf: non-constant format string in call to gotest.tools/v3/poll.Continue (govet)
return poll.Continue(r.Combined())
^
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The poll.Continue(r.Combined())
ones will be addressed by gotestyourself/gotest.tools#279, but in the meantime you can use;
poll.Continue("%v", r.Combined())
Signed-off-by: Guillaume Lours <[email protected]>
f2e29db
to
b298172
Compare
If cli/engine moved to 1.22 then I'd prefer we do the same, even code technically would be happy with 1.21 |
We still keep the version in go.mod / vendor.mod at go1.21.0; https:/moby/moby/blob/34a2f953b13dd06cf09a457980f58fc30976e0ba/vendor.mod#L8 Same for BuildKit and Buildx; |
pkg/watch/watcher_darwin.go:96:16: Error return value of `d.stream.Start` is not checked (errcheck) d.stream.Start() ^ pkg/prompt/prompt.go:97:12: Error return value of `fmt.Fprint` is not checked (errcheck) fmt.Fprint(u.stdout, message) ^ pkg/prompt/prompt.go:99:12: Error return value of `fmt.Scanln` is not checked (errcheck) fmt.Scanln(&answer) ^ cmd/formatter/logs.go:118:15: Error return value of `fmt.Fprintf` is not checked (errcheck) fmt.Fprintf(w, "%s%s%s\n", p.prefix, timestamp, line) ^ cmd/formatter/logs.go:120:15: Error return value of `fmt.Fprintf` is not checked (errcheck) fmt.Fprintf(w, "%s%s\n", p.prefix, line) ^ pkg/progress/json.go:67:15: Error return value of `fmt.Fprintln` is not checked (errcheck) fmt.Fprintln(p.out, string(marshal)) ^ pkg/progress/json.go:87:15: Error return value of `fmt.Fprintln` is not checked (errcheck) fmt.Fprintln(p.out, string(marshal)) ^ pkg/progress/plain.go:47:14: Error return value of `fmt.Fprintln` is not checked (errcheck) fmt.Fprintln(p.out, prefix, e.ID, e.Text, e.StatusText) ^ pkg/progress/tty.go:162:12: Error return value of `fmt.Fprint` is not checked (errcheck) fmt.Fprint(w.out, b.Column(0).ANSI) ^ pkg/progress/tty.go:165:12: Error return value of `fmt.Fprint` is not checked (errcheck) fmt.Fprint(w.out, aec.Hide) ^ pkg/compose/attach.go:53:13: Error return value of `fmt.Fprintf` is not checked (errcheck) fmt.Fprintf(s.stdout(), "Attaching to %s\n", strings.Join(names, ", ")) ^ pkg/compose/compose.go:194:6: emptyStringTest: replace `len(dependencies) > 0` with `dependencies != ""` (gocritic) if len(dependencies) > 0 { ^ pkg/compose/convergence.go:461:2: builtinShadow: shadowing of predeclared identifier: max (gocritic) max := 0 ^ pkg/compose/run.go:127:5: emptyStringTest: replace `len(opts.User) > 0` with `opts.User != ""` (gocritic) if len(opts.User) > 0 { ^ pkg/compose/run.go:139:5: emptyStringTest: replace `len(opts.WorkingDir) > 0` with `opts.WorkingDir != ""` (gocritic) if len(opts.WorkingDir) > 0 { ^ pkg/compose/viz.go:91:8: emptyStringTest: replace `len(portConfig.HostIP) > 0` with `portConfig.HostIP != ""` (gocritic) if len(portConfig.HostIP) > 0 { ^ cmd/compatibility/convert.go:66:6: emptyStringTest: replace `len(arg) > 0` with `arg != ""` (gocritic) if len(arg) > 0 && arg[0] != '-' { ^ pkg/e2e/watch_test.go:208:25: printf: non-constant format string in call to gotest.tools/v3/poll.Continue (govet) return poll.Continue(res.Combined()) ^ pkg/e2e/watch_test.go:290:25: printf: non-constant format string in call to gotest.tools/v3/poll.Continue (govet) return poll.Continue(r.Combined()) ^ Signed-off-by: Sebastiaan van Stijn <[email protected]>
ef7de93
to
eaecc7a
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM (if CI is happy)
This MR contains the following updates: | Package | Update | Change | |---|---|---| | [docker/compose](https:/docker/compose) | patch | `v2.29.2` -> `v2.29.6` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>docker/compose (docker/compose)</summary> ### [`v2.29.6`](https:/docker/compose/releases/tag/v2.29.6) [Compare Source](docker/compose@v2.29.5...v2.29.6) #### What's Changed ##### 🐛 Fixes - Don't set propagation if target engine isn't linux by [@​ndeloof](https:/ndeloof) [(12138)](docker/compose#12138) ##### ⚙️ Dependencies - build(deps): bump docker, docker/cli to v27.3.0-rc.2 by [@​thaJeztah](https:/thaJeztah) [(12136)](docker/compose#12136) **Full Changelog**: docker/compose@v2.29.5...v2.29.6 ### [`v2.29.5`](https:/docker/compose/releases/tag/v2.29.5) [Compare Source](docker/compose@v2.29.4...v2.29.5) #### What's Changed This release fix an issue with bind mounts on WSL2 when using Docker Desktop ##### 🐛 Fixes - Set propagation default by [@​ndeloof](https:/ndeloof) [(12133)](docker/compose#12133) ##### 🔧 Internal - Remove custom codeql workflow in favor of default setup by [@​temenuzhka-thede](https:/temenuzhka-thede) [(12131)](docker/compose#12131) **Full Changelog**: docker/compose@v2.29.4...v2.29.5 ### [`v2.29.4`](https:/docker/compose/releases/tag/v2.29.4) [Compare Source](docker/compose@v2.29.3...v2.29.4) #### What's Changed ##### 🐛 Fixes - Fixed possible `nil` pointer dereference by [@​disc](https:/disc) [(12127)](docker/compose#12127) - Stop dependent containers before recreating diverged service by [@​ndeloof](https:/ndeloof) [(12122)](docker/compose#12122) ##### 🔧 Internal - GHA: test against docker engine v27.3.0 by [@​thaJeztah](https:/thaJeztah) [(12126)](docker/compose#12126) - Chore(watch): Add debug log when skipping service without build context by [@​idsulik](https:/idsulik) [(12067)](docker/compose#12067) ##### ⚙️ Dependencies - Build(deps): bump docker, docker/cli to v27.3.0-rc.1, buildx v0.17.1 by [@​thaJeztah](https:/thaJeztah) [(12125)](docker/compose#12125) #### New Contributors - [@​disc](https:/disc) made their first contribution in docker/compose#12127 **Full Changelog**: docker/compose@v2.29.3...v2.29.4 ### [`v2.29.3`](https:/docker/compose/releases/tag/v2.29.3) [Compare Source](docker/compose@v2.29.2...v2.29.3) #### What's Changed ##### ✨ Improvements - Allow combination of bind mounts and 'rebuild' watches by [@​remcokranenburg](https:/remcokranenburg) [(12089)](docker/compose#12089) ##### 🐛 Fixes - Fix(wait): Wait only until first container exit by [@​idsulik](https:/idsulik) [(12064)](docker/compose#12064) - Prefer mount API over bind by [@​ndeloof](https:/ndeloof) [(12078)](docker/compose#12078) - Service hash must exclude depends_on by [@​ndeloof](https:/ndeloof) [(12072)](docker/compose#12072) - Attach: close streams when done by [@​laurazard](https:/laurazard) [(12112)](docker/compose#12112) - Restore compose v1 behavior to recreate containers when ran with `-V` by [@​ndeloof](https:/ndeloof) [(12116)](docker/compose#12116) ##### 🔧 Internal - Allow to add empty line in the logs when nav menu activated by [@​glours](https:/glours) [(12062)](docker/compose#12062) - Docs: duplicate documentation for root cmd by [@​dvdksn](https:/dvdksn) [(12076)](docker/compose#12076) - Fix typo in pull.go by [@​jonathan-dev](https:/jonathan-dev) [(12108)](docker/compose#12108) - Use logrus instead of direct output to stderr by [@​felixfontein](https:/felixfontein) [(11996)](docker/compose#11996) - Fix minor typos by [@​NathanBaulch](https:/NathanBaulch) [(12104)](docker/compose#12104) - Chore(watch): Add changed file paths/count to log by [@​idsulik](https:/idsulik) [(12118)](docker/compose#12118) ##### ⚙️ Dependencies - Build(deps): bump golang.org/x/sys from 0.22.0 to 0.25.0 by [@​dependabot](https:/dependabot) [(12101)](docker/compose#12101) - Bump engine cli v27.2.1 by [@​glours](https:/glours) [(12115)](docker/compose#12115) - Bump compose-go to version `v2.2.0` by [@​glours](https:/glours) [(12117)](docker/compose#12117) - Build(deps): bump golang.org/x/sync from `0.7.0` to `0.8.0` by [@​dependabot](https:/dependabot) [(12043)](docker/compose#12043) #### New Contributors - [@​remcokranenburg](https:/remcokranenburg) made their first contribution in [(12089)](docker/compose#12089) - [@​jonathan-dev](https:/jonathan-dev) made their first contribution in [(12108)](docker/compose#12108) - [@​NathanBaulch](https:/NathanBaulch) made their first contribution in [(12104)](docker/compose#12104) **Full Changelog**: docker/compose@v2.29.2...v2.29.3 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https:/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40NDAuNyIsInVwZGF0ZWRJblZlciI6IjM3LjQ0MC43IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiXX0=-->
What I did
Bump dependency versions:
Related issue
(not mandatory) A picture of a cute animal, if possible in relation to what you did