From 56f13f778897a51888d02edde9f3b80e3e586115 Mon Sep 17 00:00:00 2001 From: droctothorpe Date: Thu, 17 Nov 2022 14:53:15 -0500 Subject: [PATCH] vm: add /etc/ssl/certs as certs copy target --- environment/vm/lima/certs.go | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/environment/vm/lima/certs.go b/environment/vm/lima/certs.go index 2a2dc60c4..e887ad1e3 100644 --- a/environment/vm/lima/certs.go +++ b/environment/vm/lima/certs.go @@ -13,7 +13,7 @@ func (l limaVM) copyCerts() error { log := l.Logger(context.Background()) err := func() error { dockerCertsDirHost := filepath.Join(util.HomeDir(), ".docker", "certs.d") - dockerCertsDirGuest := "/etc/docker/certs.d" + dockerCertsDirsGuest := []string{"/etc/docker/certs.d", "/etc/ssl/certs"} if _, err := l.host.Stat(dockerCertsDirHost); err != nil { // no certs found return nil @@ -31,10 +31,17 @@ func (l limaVM) copyCerts() error { } // copy from cache to vm - if err := l.RunQuiet("sudo", "mkdir", "-p", dockerCertsDirGuest); err != nil { - return err + for _, dir := range dockerCertsDirsGuest { + // copy from cache to vm + if err := l.RunQuiet("sudo", "mkdir", "-p", dir); err != nil { + return err + } + if err := l.RunQuiet("sudo", "cp", "-R", dockerCertsCacheDir+"/.", dir); err != nil { + return err + } } - return l.RunQuiet("sudo", "cp", "-R", dockerCertsCacheDir+"/.", dockerCertsDirGuest) + + return nil }() // not a fatal error, a warning suffices.