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

Fix dfinit issue when containerd config_path have multiple paths #895

Merged
merged 2 commits into from
Dec 17, 2024

Conversation

aliazlan-t
Copy link
Contributor

@aliazlan-t aliazlan-t commented Dec 14, 2024

Fix dfinit issue when updating registry config when multiple paths are present in config_path.

Description

Sometimes config_path have multiple paths separated by colon e.g

[plugins."io.containerd.grpc.v1.cri".registry]
config_path = "/etc/containerd/certs.d:/etc/docker/certs.d"

In this case dfinit is creating folder at path /etc/containerd/certs.d\:/etc/docker/certs.d/. It can be fixed by picking up the first path if multiple paths are added.

Related Issue

Motivation and Context

Screenshots (if appropriate)

@aliazlan-t aliazlan-t requested a review from a team as a code owner December 14, 2024 00:45
Copy link
Member

@gaius-qi gaius-qi left a comment

Choose a reason for hiding this comment

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

Please fix lint

Copy link

codecov bot commented Dec 14, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 33.88%. Comparing base (eb66100) to head (c19cc6c).
Report is 6 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##             main     #895   +/-   ##
=======================================
  Coverage   33.88%   33.88%           
=======================================
  Files          60       60           
  Lines        9040     9040           
=======================================
  Hits         3063     3063           
  Misses       5977     5977           
Files with missing lines Coverage Δ
...ly-client-init/src/container_runtime/containerd.rs 97.14% <ø> (ø)

@aliazlan-t
Copy link
Contributor Author

Please fix lint

fixed

Copy link
Member

@gaius-qi gaius-qi left a comment

Choose a reason for hiding this comment

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

LGTM

@gaius-qi gaius-qi merged commit d6b613e into dragonflyoss:main Dec 17, 2024
6 checks passed
@aliazlan-t
Copy link
Contributor Author

@gaius-qi thanks. It seems like dginit docker pipeline is not working. Last few builds timed out after many hours as well. Can you look into it?

https://github.com/dragonflyoss/client/actions/runs/12365531271

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