Merge pull request #538 from silvin-lubecki/bump

Bumping vendoring and image dependencies

Dockerfile

@@ -1,4 +1,4 @@
-FROM dockercore/golang-cross:1.12.4@sha256:7ccd2d90d99974c7aad84660638590547495cfd3b1c78e6b5971fe944bf1ca51 AS build
+FROM dockercore/golang-cross:1.12.5@sha256:15b5f9805c0395d3ad80f9354ee358312e1abe3a683ce80371ad0551199ff253 AS build
 ENV     DISABLE_WARN_OUTSIDE_CONTAINER=1
 
 RUN apt-get install -y -q --no-install-recommends \

Dockerfile.invocation-image

@@ -1,6 +1,6 @@
-ARG ALPINE_VERSION=3.9.3
+ARG ALPINE_VERSION=3.9.4
 
-FROM dockercore/golang-cross:1.12.4@sha256:7ccd2d90d99974c7aad84660638590547495cfd3b1c78e6b5971fe944bf1ca51 AS build
+FROM dockercore/golang-cross:1.12.5@sha256:15b5f9805c0395d3ad80f9354ee358312e1abe3a683ce80371ad0551199ff253 AS build
 
 RUN apt-get install -y -q --no-install-recommends \
     coreutils \

Dockerfile.lint

@@ -1,5 +1,5 @@
 ARG ALPINE_VERSION=3.9
-ARG GO_VERSION=1.12.4
+ARG GO_VERSION=1.12.5
 
 FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION}
 RUN apk add --no-cache \

internal/commands/cnab.go

@@ -296,7 +296,7 @@ func requiredBindMount(targetContextName string, targetOrchestrator string, s st
 	// in case of docker desktop, we want to rewrite the context in cases where it targets the local swarm or Kubernetes
 	s = &dockerDesktopAwareStore{Store: s}
 
-	ctxMeta, err := s.GetContextMetadata(targetContextName)
+	ctxMeta, err := s.GetMetadata(targetContextName)
 	if err != nil {
 		return bindMount{}, err
 	}

internal/commands/dockerdesktop.go

@@ -74,6 +74,7 @@ func (r *dockerDesktopKubernetesEndpointRewriter) rewrite(ep *kubernetes.Endpoin
 	ep.Host = fmt.Sprintf("https://%s:6443", ip)
 }
 
+// nolint:interfacer
 func makeLinuxkitIPProvider(contextName string, s store.Store) dockerDesktopLinuxKitIPProvider {
 	return func() (string, error) {
 		clientCfg, err := kubernetes.ConfigFromContext(contextName, s)
@@ -104,7 +105,7 @@ func makeLinuxkitIPProvider(contextName string, s store.Store) dockerDesktopLinu
 	}
 }
 
-func rewriteContextIfDockerDesktop(meta *store.ContextMetadata, s store.Store) {
+func rewriteContextIfDockerDesktop(meta *store.Metadata, s store.Store) {
 	// errors are treated as "don't rewrite"
 	rewriter := dockerDesktopDockerEndpointRewriter{
 		defaultHostProvider: defaultDockerDesktopHostProvider,
@@ -131,8 +132,8 @@ type dockerDesktopAwareStore struct {
 	store.Store
 }
 
-func (s dockerDesktopAwareStore) ListContexts() ([]store.ContextMetadata, error) {
-	contexts, err := s.Store.ListContexts()
+func (s dockerDesktopAwareStore) List() ([]store.Metadata, error) {
+	contexts, err := s.Store.List()
 	if err != nil {
 		return nil, err
 	}
@@ -143,10 +144,10 @@ func (s dockerDesktopAwareStore) ListContexts() ([]store.ContextMetadata, error)
 	return contexts, nil
 }
 
-func (s dockerDesktopAwareStore) GetContextMetadata(name string) (store.ContextMetadata, error) {
-	context, err := s.Store.GetContextMetadata(name)
+func (s dockerDesktopAwareStore) GetMetadata(name string) (store.Metadata, error) {
+	context, err := s.Store.GetMetadata(name)
 	if err != nil {
-		return store.ContextMetadata{}, err
+		return store.Metadata{}, err
 	}
 	rewriteContextIfDockerDesktop(&context, s.Store)
 	return context, nil

vars.mk

@@ -6,7 +6,7 @@ E2E_NAME := $(BIN_NAME)-e2e
 # Enable experimental features. "on" or "off"
 EXPERIMENTAL := off
 
-ALPINE_VERSION=3.9.3
+ALPINE_VERSION=3.9.4
 
 # Failing to resolve sh.exe to a full path denotes a windows vanilla shell.
 # Although 'simple' commands are still exec'ed, 'complex' ones are batch'ed instead of sh'ed.