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.

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

docker: replace 127.0.0.1 with host gateway ip in docker daemon.json proxy settings #1145

Merged
merged 5 commits into from
Sep 30, 2024

Conversation

rteeling-evernorth
Copy link
Contributor

  • Automatically replace 127.0.0.1 with host gateway ip in docker daemon.json proxy settings
  • Refactored daemon.json to move fetching of gateway ip to a function for DRY

Fixes #1144

Related to #956, #1040

@abiosoft abiosoft changed the title Automatically replace 127.0.0.1 with host gateway ip in docker daemon.json proxy settings docker: replace 127.0.0.1 with host gateway ip in docker daemon.json proxy settings Sep 28, 2024
abiosoft
abiosoft previously approved these changes Sep 28, 2024
@abiosoft
Copy link
Owner

abiosoft commented Sep 30, 2024

I am not sure what is preventing the github actions from successfully running the virtual machines and starting Colima.

@rteeling-evernorth
Copy link
Contributor Author

rteeling-evernorth commented Sep 30, 2024

I am not sure what is preventing the github actions from successfully running the virtual machines and starting Colima.

@abiosoft I've updated the failing jobs to verbose logging, hopefully that might reveal the issue

@rteeling-evernorth
Copy link
Contributor Author

@abiosoft updated to very verbose - last ci run seems to have skipped integration, but i dont see anything on the workflow file that would cause that. do you need me do to anything specific on my end?

@abiosoft
Copy link
Owner

@rteeling-evernorth it has nothing to do with your contributions. It's just Github actions acting up.
I may merge this and troubleshoot that differently.

@abiosoft
Copy link
Owner

@rteeling-evernorth kindly remove the verbose flags and let's get this over the line.

Thanks :)

@rteeling-evernorth
Copy link
Contributor Author

@abiosoft Done. Thanks for the speedy approval! Looking forward to bringing this to my org without having to explain how to handle the proxy stuff.

@abiosoft abiosoft merged commit 2fc61da into abiosoft:main Sep 30, 2024
7 of 11 checks passed
@rteeling-evernorth rteeling-evernorth deleted the rt/translate-docker-daemon-proxy branch September 30, 2024 18:21
@rteeling-evernorth
Copy link
Contributor Author

@abiosoft Thanks for moving so quickly on this. Do you have an idea of when this will be tagged/released to homebrew?

@abiosoft
Copy link
Owner

@abiosoft Thanks for moving so quickly on this. Do you have an idea of when this will be tagged/released to homebrew?

You can already test it with brew install --head colima.

I would like to figure what's going on with Github actions and get that resolved before pushing a release. In the next few days hopefully.

@rteeling-evernorth
Copy link
Contributor Author

Excellent! Thank you!

tmeijn pushed a commit to tmeijn/dotfiles that referenced this pull request Nov 20, 2024
This MR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [abiosoft/colima](https://github.com/abiosoft/colima) | minor | `v0.7.5` -> `v0.8.0` |

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>abiosoft/colima (abiosoft/colima)</summary>

### [`v0.8.0`](https://github.com/abiosoft/colima/releases/tag/v0.8.0)

[Compare Source](abiosoft/colima@v0.7.6...v0.8.0)

#### Highlights

This is a new release to address compatibility issues with [Lima v1.0.0](https://github.com/lima-vm/lima/releases/tag/v1.0.0).

-   Colima now utilises virtualization.framework on macOS when Qemu is not available. Fixes [#&#8203;1188](abiosoft/colima#1188).
-   SSH port-forwarding is retained for Lima v1.0.0. Fixes [#&#8203;1181](abiosoft/colima#1181), [#&#8203;1184](abiosoft/colima#1184), [#&#8203;1185](abiosoft/colima#1185).

#### Other Updates

-   Nested Virtualization is now supported with the `--nested-virtualization` flag or `nestedVirtualization` config for m3 devices.
-   The default disk size is now 100GiB.

#### Commits

-   core: retain SSH port forwarder by [@&#8203;abiosoft](https://github.com/abiosoft) in abiosoft/colima#1182
-   core: make qemu an optional dependency by [@&#8203;abiosoft](https://github.com/abiosoft) in abiosoft/colima#1187

**Full Changelog**: abiosoft/colima@v0.7.6...v0.8.0

### [`v0.7.6`](https://github.com/abiosoft/colima/releases/tag/v0.7.6)

[Compare Source](abiosoft/colima@v0.7.5...v0.7.6)

#### Highlights

This release introduces the `colima update` command to update the container runtime version (e.g. Docker version) without needing to upgrade Colima or wait for the next release.

#### Other Fixes

-   Avoid error when docker-certs directory does not exist. Fixes [#&#8203;1128](abiosoft/colima#1128).
-   Update host-gateway-ip in proxy settings for docker daemon. Fixes [#&#8203;956](abiosoft/colima#956), [#&#8203;1040](abiosoft/colima#1040).

#### Commits

-   docker: avoid error where the cache docker-certs directory does not exist by [@&#8203;AlexanderOMara](https://github.com/AlexanderOMara) in abiosoft/colima#1129
-   build(deps): bump golang.org/x/term from 0.23.0 to 0.24.0 by [@&#8203;dependabot](https://github.com/dependabot) in abiosoft/colima#1133
-   docs: fixed typo on Apple Silicon in README by [@&#8203;analogsignals](https://github.com/analogsignals) in abiosoft/colima#1137
-   docker: replace 127.0.0.1 with host gateway ip in docker daemon.json proxy settings by [@&#8203;rteeling-evernorth](https://github.com/rteeling-evernorth) in abiosoft/colima#1145
-   ci: bump Go version by [@&#8203;abiosoft](https://github.com/abiosoft) in abiosoft/colima#1148
-   net: update vmnet by [@&#8203;abiosoft](https://github.com/abiosoft) in abiosoft/colima#1152
-   build(deps): bump golang.org/x/term from 0.24.0 to 0.25.0 by [@&#8203;dependabot](https://github.com/dependabot) in abiosoft/colima#1154
-   Minor updates by [@&#8203;abiosoft](https://github.com/abiosoft) in abiosoft/colima#1156
-   ci: use older qemu version by [@&#8203;abiosoft](https://github.com/abiosoft) in abiosoft/colima#1160
-   build(deps): bump github.com/fatih/color from 1.17.0 to 1.18.0 by [@&#8203;dependabot](https://github.com/dependabot) in abiosoft/colima#1171
-   cli: add update command by [@&#8203;abiosoft](https://github.com/abiosoft) in abiosoft/colima#1178
-   core: update disk images by [@&#8203;abiosoft](https://github.com/abiosoft) in abiosoft/colima#1179

#### New Contributors

-   [@&#8203;AlexanderOMara](https://github.com/AlexanderOMara) made their first contribution in abiosoft/colima#1129
-   [@&#8203;analogsignals](https://github.com/analogsignals) made their first contribution in abiosoft/colima#1137
-   [@&#8203;rteeling-evernorth](https://github.com/rteeling-evernorth) made their first contribution in abiosoft/colima#1145

**Full Changelog**: abiosoft/colima@v0.7.5...v0.7.6

</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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Colima does not auto-replace gateway address for proxy variables in docker daemon.json
2 participants