From e6281b1b3f2234bc14d5b5185f8a7c849fc25acf Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 25 Feb 2020 11:47:58 +0100 Subject: [PATCH] Revert "Don't die when daemon cannot read certs.d" This reverts commit 2808762b27b9e4e94a705193c8554184f6beb151. This exception was added for rootless mode, but superseded by the follow-up commit f4fa98f583a64d736eea1bb3a8fab755e159fdf4, which uses a different path to look for the certs when running in rootless mode Signed-off-by: Sebastiaan van Stijn --- registry/registry.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/registry/registry.go b/registry/registry.go index 7c24e4a9b1..4c82a61cb3 100644 --- a/registry/registry.go +++ b/registry/registry.go @@ -69,7 +69,7 @@ func hasFile(files []os.FileInfo, name string) bool { // provided TLS configuration. func ReadCertsDirectory(tlsConfig *tls.Config, directory string) error { fs, err := ioutil.ReadDir(directory) - if err != nil && !os.IsNotExist(err) && !os.IsPermission(err) { + if err != nil && !os.IsNotExist(err) { return err }