GitList

Browse code

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 <github@gone.nl>

Sebastiaan van Stijn authored on 2020/02/25 19:47:58
Showing 1 changed files

registry/registry.go index 7c24e4a..4c82a61 100644

registry/registry.go

History View file @ e6281b1

@@ -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
+                     	}