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: remove cert cache directory before copying host certs #1112

Merged
merged 1 commit into from
Aug 16, 2024

Conversation

soedar
Copy link
Contributor

@soedar soedar commented Aug 16, 2024

Currently, colima would copy self-signed root CA certs from the ~/.docker.certs.d/ directory to the VM. This allows docker daemon in the VM to pull from registries that are signed with a self-signed cert.

However, when removing certs from the ~/.docker/certs.d directory, they would not be removed from the VM. More confusingly, even after running colima delete && colima start, the same custom certs are still present in the newly created VM.

This PR would first delete the intermediate cache directory prior to copying the certs from ~/.docker/certs.d, which should resolve the certs persistence across colima deletion/creation.

Note that certs will still be persisted across colima restart, since they are still present in the VM. While we can simply remove all certs from /etc/docker/certs.d, it would be trickier to selectively remove the added certs in /etc/ssl/certs, and we can probably tackle that in a subsequent PR.

Signed-off-by: Soedarsono <soedarsono@tech.gov.sg>
Copy link
Owner

@abiosoft abiosoft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks :)

@abiosoft abiosoft changed the title fix: remove cert cache directory before copying host certs docker: remove cert cache directory before copying host certs Aug 16, 2024
@abiosoft abiosoft merged commit 4816fd1 into abiosoft:main Aug 16, 2024
11 checks passed
tmeijn pushed a commit to tmeijn/dotfiles that referenced this pull request Aug 28, 2024
This MR contains the following updates:

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

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.7.5`](https://github.com/abiosoft/colima/releases/tag/v0.7.5)

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

#### Highlights

This is an hotfix release to address a regression in networking for Incus runtime.

#### Commits

-   incus: utilise macvlan network for multiple IP addresses by [@&#8203;abiosoft](https://github.com/abiosoft) in abiosoft/colima#1124

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

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

[Compare Source](abiosoft/colima@v0.7.3...v0.7.4)

#### Highlights

This is an incremental update with bug fixes.

#### Updates

-   Colima can now be prevented from overwriting config file on startup by specifying `--save-config=false` or setting `COLIMA_SAVE_CONFIG=0`.
-   Warning error would no longer be displayed on startup for users that install Colima with [aqua](https://aquaproj.github.io/).
-   An extra warning is now displayed on `colima delete` to further ascertain the user's intended action.

#### Commits

-   docker: remove cert cache directory before copying host certs by [@&#8203;soedar](https://github.com/soedar) in abiosoft/colima#1112
-   chore: add second confirmation for container data loss by [@&#8203;jramosf](https://github.com/jramosf) in abiosoft/colima#1113
-   chore: multiple updates by [@&#8203;abiosoft](https://github.com/abiosoft) in abiosoft/colima#1122
-   config: make persistence optional with --save-config flag by [@&#8203;abiosoft](https://github.com/abiosoft) in abiosoft/colima#1123

#### New Contributors

-   [@&#8203;soedar](https://github.com/soedar) made their first contribution in abiosoft/colima#1112

**Full Changelog**: abiosoft/colima@v0.7.3...v0.7.4

</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.

2 participants