Skip to content
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.

Sign up for GitHub

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

Jump to bottom

go.mod: github.com/docker/docker, docker/cli v27.0.3 #561

Merged
merged 17 commits into from
Jul 21, 2024
Merged

go.mod: github.com/docker/docker, docker/cli v27.0.3 #561

merged 17 commits into from
Jul 21, 2024

Conversation

thaJeztah
Copy link
Contributor

Dockerfile: fix alpine version

The go1.20 image is not published with alpine 3.15; updating the version.

test.sh: fix file not being executable

go.mod: github.com/sirupsen/logrus v1.9.3

update to the current version, which addresses some issues with current
Go versions, and removes the legacy konsorten/go-windows-terminal-sequences
dependency.

go.mod: github.com/imdario/mergo v0.3.16

update to the last version of the module under the old name, before v1.0.0
renames the module.

go.mod: github.com/morikuni/aec v1.0.0

no changes, but using the tagged version

go.mod: github.com/moby/term v0.5.0

no changes, but using the tagged version

go.mod: github.com/docker/go-units v0.5.0

removes uses of regular expressions

go.mod: golang.org/x/time v0.5.0

no changes, but using the tagged version

go.mod: github.com/Microsoft/go-winio v0.5.3

update to a version compatible with go1.22 and up

go.mod: github.com/docker/docker, docker/cli v23.0.6

Update to v23.0, and remove uses of deprecated types.

go.mod: github.com/docker/docker, docker/cli v24.0.7

Update to v24.0, and remove uses of deprecated types.

go.mod: github.com/docker/go-connections v0.5.0

drops support for legacy Go versions, add support for TLS 1.3

go.mod: github.com/stretchr/testify v1.9.0

go.mod: github.com/docker/docker, docker/cli v25.0.5

Update to v25.0, and remove uses of deprecated types.

go.mod: github.com/docker/docker, docker/cli v26.1.4

Update to v26.1, and remove uses of deprecated types.

go.mod: github.com/docker/docker, docker/cli v27.0.3

Update to v27.0, and remove uses of deprecated types.

@thaJeztah
Dockerfile: fix alpine version
ed600c7 
The go1.20 image is not published with alpine 3.15; updating the version.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
test.sh: fix file not being executable
b010ea4 
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
go.mod: github.com/sirupsen/logrus v1.9.3
6217ba0 
update to the current version, which addresses some issues with current
Go versions, and removes the legacy konsorten/go-windows-terminal-sequences
dependency.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
go.mod: github.com/imdario/mergo v0.3.16
8ca3166 
update to the last version of the module under the old name, before v1.0.0
renames the module.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
go.mod: github.com/morikuni/aec v1.0.0
61cd92b 
no changes, but using the tagged version

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
go.mod: github.com/moby/term v0.5.0
e27d487 
no changes, but using the tagged version

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
go.mod: github.com/docker/go-units v0.5.0
3daea1e 
removes uses of regular expressions

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
go.mod: golang.org/x/time v0.5.0
bb5d70f 
no changes, but using the tagged version

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
go.mod: github.com/Microsoft/go-winio v0.5.3
8fe9083 
update to a version compatible with go1.22 and up

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
go.mod: github.com/docker/docker, docker/cli v23.0.10
966ad05 
Update to v23.0, and remove uses of deprecated types.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
go.mod: github.com/docker/docker, docker/cli v24.0.7
6f85b65 
Update to v24.0, and remove uses of deprecated types.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
go.mod: github.com/docker/go-connections v0.5.0
463ddfd 
drops support for legacy Go versions, add support for TLS 1.3

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
go.mod: github.com/stretchr/testify v1.9.0
ff579d8 
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
update to go1.21
c84bb88 
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
go.mod: github.com/docker/docker, docker/cli v25.0.5
0232610 
Update to v25.0, and remove uses of deprecated types.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
go.mod: github.com/docker/docker, docker/cli v26.1.4
2d16389 
Update to v26.1, and remove uses of deprecated types.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
go.mod: github.com/docker/docker, docker/cli v27.0.3
77a4de4 
Update to v27.0, and remove uses of deprecated types.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah mentioned this pull request Jul 15, 2024
Merged
@thaJeztah thaJeztah marked this pull request as ready for review July 15, 2024 09:53
@thaJeztah
Copy link
Contributor Author

/cc @jesseduffield ptal - I noticed that the docker dependency was on a version that's no longer maintained; I updated in a couple of steps to make sure I didn't miss any of the deprecated types still being used (so probably easiest to review per-commit).

@jesseduffield jesseduffield merged commit 0849b80 into jesseduffield:master Jul 21, 2024
5 checks passed
@jesseduffield
Copy link
Owner

I've just given this a test and it worked fine. Thanks for putting the effort into this @thaJeztah .

Also, I'd like to commend you on your maintainership of docker (and related repos): whenever I read your comments on issues you're always being thoughtful and reasonable, so kudos.

This was referenced Jul 21, 2024
Closed
Closed
Closed
Closed
Closed
@thaJeztah
Copy link
Contributor Author

Sorry for the late reply (busy week); Thank you! And thanks for reviewing!

I'm not a Lazydocker user myself, but I frequently hear about people who are. I arrived here following basecamp/omakub#83 (comment), which made me curious if I could see something obvious what could cause issues. I didn't see anything that stood out immediately, but saw the version of the dependencies were somewhat behind, and knew we had a couple of types being moved to different locations, so thought; let me give that a try 😄)

@thaJeztah thaJeztah mentioned this pull request Jul 31, 2024
Merged
@thaJeztah thaJeztah deleted the update_docker branch July 31, 2024 07:37
@thaJeztah
Copy link
Contributor Author

Actually; I saw this was not released yet; let me update this to v27.1.1; shouldn't really affect this codebase, but we issued a CVE that may cause it to be flagged by scanners;

tmeijn pushed a commit to tmeijn/dotfiles that referenced this pull request Nov 25, 2024
@tmeijn
build(deps): update jesseduffield/lazydocker to v0.24.1
36502d4 
This MR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [jesseduffield/lazydocker](https://github.com/jesseduffield/lazydocker) | minor | `v0.23.3` -> `v0.24.1` |

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>jesseduffield/lazydocker (jesseduffield/lazydocker)</summary>

### [`v0.24.1`](https://github.com/jesseduffield/lazydocker/releases/tag/v0.24.1)

[Compare Source](jesseduffield/lazydocker@v0.24.0...v0.24.1)

Thanks to everybody who contributed in this release!

#### What's Changed

-   fix: Properly support remote docker daemon over ssh by [@&#8203;rajiv-k](https://github.com/rajiv-k) in jesseduffield/lazydocker#511
-   fix lazydocker breaking when having default context in config by [@&#8203;peauc](https://github.com/peauc) in jesseduffield/lazydocker#552
-   Bump lots of dependencies for various improvements by [@&#8203;thaJeztah](https://github.com/thaJeztah) in jesseduffield/lazydocker#561
    -   This fixed a bug I had where sometimes lazydocker didn't realise it was in a folder with a docker compose file.
-   Add hint to what .DockerCompose is in documentation by [@&#8203;hauskens](https://github.com/hauskens) in jesseduffield/lazydocker#554
-   Use 'docker compose' by default by [@&#8203;jesseduffield](https://github.com/jesseduffield) in jesseduffield/lazydocker#563
-   go.mod: github.com/docker/docker, docker/cli v27.1.1 by [@&#8203;thaJeztah](https://github.com/thaJeztah) in jesseduffield/lazydocker#568

#### New Contributors

-   [@&#8203;github-actions](https://github.com/github-actions) made their first contribution in jesseduffield/lazydocker#536
-   [@&#8203;peauc](https://github.com/peauc) made their first contribution in jesseduffield/lazydocker#552
-   [@&#8203;thaJeztah](https://github.com/thaJeztah) made their first contribution in jesseduffield/lazydocker#561
-   [@&#8203;hauskens](https://github.com/hauskens) made their first contribution in jesseduffield/lazydocker#554

**Full Changelog**: jesseduffield/lazydocker@v0.23.3...v0.24.1

### [`v0.24.0`](https://github.com/jesseduffield/lazydocker/releases/tag/v0.24.0)

[Compare Source](jesseduffield/lazydocker@v0.23.3...v0.24.0)

#### Changelog

-   [`015a108`](jesseduffield/lazydocker@015a108) Add hint to .DockerCompose in documentation
-   [`ed600c7`](jesseduffield/lazydocker@ed600c7) Dockerfile: fix alpine version
-   [`06ab7b7`](jesseduffield/lazydocker@06ab7b7) Merge pull request [#&#8203;511](jesseduffield/lazydocker#511) from rajiv-k/docker-host-ssh
-   [`1cf2e02`](jesseduffield/lazydocker@1cf2e02) Merge pull request [#&#8203;536](jesseduffield/lazydocker#536) from jesseduffield/create-pull-request/patch
-   [`c73b3f7`](jesseduffield/lazydocker@c73b3f7) Merge pull request [#&#8203;552](jesseduffield/lazydocker#552) from peauc/feature/issue-493
-   [`4f375bb`](jesseduffield/lazydocker@4f375bb) Merge pull request [#&#8203;554](jesseduffield/lazydocker#554) from hauskens/patch-1
-   [`0849b80`](jesseduffield/lazydocker@0849b80) Merge pull request [#&#8203;561](jesseduffield/lazydocker#561) from thaJeztah/update_docker
-   [`de40167`](jesseduffield/lazydocker@de40167) Merge pull request [#&#8203;563](jesseduffield/lazydocker#563) from jesseduffield/docker-compose-command-update
-   [`58d5a18`](jesseduffield/lazydocker@58d5a18) README.md: Update Sponsors
-   [`1e34a9b`](jesseduffield/lazydocker@1e34a9b) Remove homebrew bump action
-   [`89020d6`](jesseduffield/lazydocker@89020d6) Update readme
-   [`df6c8c1`](jesseduffield/lazydocker@df6c8c1) Use 'docker compose' by default
-   [`f6c044d`](jesseduffield/lazydocker@f6c044d) fix lazydocker breaking when having default docker explicitly mentioned in docker config
-   [`42b7ba1`](jesseduffield/lazydocker@42b7ba1) fix: Properly support remote docker daemon over ssh
-   [`8fe9083`](jesseduffield/lazydocker@8fe9083) go.mod: github.com/Microsoft/go-winio v0.5.3
-   [`966ad05`](jesseduffield/lazydocker@966ad05) go.mod: github.com/docker/docker, docker/cli v23.0.10
-   [`6f85b65`](jesseduffield/lazydocker@6f85b65) go.mod: github.com/docker/docker, docker/cli v24.0.7
-   [`0232610`](jesseduffield/lazydocker@0232610) go.mod: github.com/docker/docker, docker/cli v25.0.5
-   [`2d16389`](jesseduffield/lazydocker@2d16389) go.mod: github.com/docker/docker, docker/cli v26.1.4
-   [`77a4de4`](jesseduffield/lazydocker@77a4de4) go.mod: github.com/docker/docker, docker/cli v27.0.3
-   [`463ddfd`](jesseduffield/lazydocker@463ddfd) go.mod: github.com/docker/go-connections v0.5.0
-   [`3daea1e`](jesseduffield/lazydocker@3daea1e) go.mod: github.com/docker/go-units v0.5.0
-   [`8ca3166`](jesseduffield/lazydocker@8ca3166) go.mod: github.com/imdario/mergo v0.3.16
-   [`e27d487`](jesseduffield/lazydocker@e27d487) go.mod: github.com/moby/term v0.5.0
-   [`61cd92b`](jesseduffield/lazydocker@61cd92b) go.mod: github.com/morikuni/aec v1.0.0
-   [`6217ba0`](jesseduffield/lazydocker@6217ba0) go.mod: github.com/sirupsen/logrus v1.9.3
-   [`ff579d8`](jesseduffield/lazydocker@ff579d8) go.mod: github.com/stretchr/testify v1.9.0
-   [`bb5d70f`](jesseduffield/lazydocker@bb5d70f) go.mod: golang.org/x/time v0.5.0
-   [`b010ea4`](jesseduffield/lazydocker@b010ea4) test.sh: fix file not being executable
-   [`c84bb88`](jesseduffield/lazydocker@c84bb88) update to go1.21

</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://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40NDAuNyIsInVwZGF0ZWRJblZlciI6IjM3LjQ0MC43IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiXX0=-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@thaJeztah @jesseduffield