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

registry: fix mtls config dir passing #40967

Merged
merged 1 commit into from
May 19, 2020
Merged

registry: fix mtls config dir passing #40967

merged 1 commit into from
May 19, 2020

Conversation

tonistiigi
Copy link
Member

#40814 doesn't pass mtls config dirs for registries that are not mentioned in main config json. A better approach would be to use a callback so adding new directories would not require a restart but that requires changes to buildkit.

Signed-off-by: Tonis Tiigi tonistiigi@gmail.com

@tonistiigi tonistiigi mentioned this pull request May 13, 2020
Closed
@thaJeztah thaJeztah added this to the 20.03.0 milestone May 13, 2020
@thaJeztah thaJeztah added this to In progress in 20.10 planning via automation May 13, 2020
thaJeztah
thaJeztah reviewed May 13, 2020
View reviewed changes
daemon/daemon.go Outdated Show resolved Hide resolved
@thaJeztah
Copy link
Member

Hm... never seen this one (probably not related);

[2020-05-13T22:44:08.947Z] === Failed
[2020-05-13T22:44:08.947Z] === FAIL: daemon/logger/loggerutils TestCheckCapacityAndRotate (0.00s)
[2020-05-13T22:44:08.947Z]     logfile_test.go:270: assertion failed: error is not nil: stat /tmp/TestCheckCapacityAndRotate758257781/log777351504.1: no such file or directory: 
[2020-05-13T22:44:08.947Z]         log777351504
[2020-05-13T22:44:08.947Z]         log777351504.1.gz

thaJeztah
thaJeztah approved these changes May 14, 2020
View reviewed changes
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM (left one suggestion)

20.10 planning automation moved this from In progress to Reviewer approved May 14, 2020
@tonistiigi
registry: fix mtls config dir passing
fdb71e4 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
thaJeztah
thaJeztah approved these changes May 14, 2020
View reviewed changes
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

@tonistiigi tonistiigi mentioned this pull request May 15, 2020
Closed
chris-crone
chris-crone approved these changes May 19, 2020
View reviewed changes
Copy link
Contributor

@chris-crone chris-crone left a comment

Choose a reason for hiding this comment

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

LGTM

@AkihiroSuda AkihiroSuda merged commit 5086779 into moby:master May 19, 2020
20.10 planning automation moved this from Reviewer approved to Done May 19, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

@chris-crone chris-crone chris-crone approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

Assignees
No one assigned
Labels
area/builder kind/bugfix PR's that fix bugs status/2-code-review
Projects
No open projects
20.10 planning
  
Done
Milestone
20.10.0
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@tonistiigi @thaJeztah @chris-crone @AkihiroSuda