From 80a3b961a423cf2cc3273d907525145ca89de55e Mon Sep 17 00:00:00 2001 From: CF Buildpacks Team CI Server Date: Tue, 10 Sep 2019 21:11:51 +0000 Subject: [PATCH] Update go module github.com/cloudfoundry/dagger --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/cloudfoundry/dagger/app.go | 10 +++++++++- vendor/github.com/cloudfoundry/dagger/go.mod | 2 ++ vendor/github.com/cloudfoundry/dagger/pack.go | 2 +- vendor/modules.txt | 2 +- 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 846171a..9f4cec2 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.12 require ( github.com/buildpack/libbuildpack v1.23.0 - github.com/cloudfoundry/dagger v0.0.0-20190904150052-ccbcb1be08ca + github.com/cloudfoundry/dagger v0.0.0-20190910211006-e7385ebe12c4 github.com/cloudfoundry/libcfbuildpack v1.85.0 github.com/golang/mock v1.3.1 github.com/google/go-cmp v0.3.1 diff --git a/go.sum b/go.sum index f4d4fe4..814d9ed 100644 --- a/go.sum +++ b/go.sum @@ -7,8 +7,8 @@ github.com/buildpack/libbuildpack v1.19.0 h1:HUkaIwuGmPbQhujBjYNpd+E4f0NdAgAgHq7 github.com/buildpack/libbuildpack v1.19.0/go.mod h1:oxgSTzPbWscHs27iuYrctEZpSak2m/qPThA+9JM0Boo= github.com/buildpack/libbuildpack v1.23.0 h1:J1Bz62zQUeQW/vVzLQrW0DdKgU2P1Aa99nBAigKG11g= github.com/buildpack/libbuildpack v1.23.0/go.mod h1:Amg0Ygeo8V7Lqr5hJ6TtDG7d2FwY2ZUptLpEnOvyfL4= -github.com/cloudfoundry/dagger v0.0.0-20190904150052-ccbcb1be08ca h1:fiwxfQhQ0z7koDbbjiufwh5igq8zM0VOTfAsEBsfkBo= -github.com/cloudfoundry/dagger v0.0.0-20190904150052-ccbcb1be08ca/go.mod h1:PXeUHc4d2vAVO/31jFE6uD09w/yFfzs4kcayAVEvnEI= +github.com/cloudfoundry/dagger v0.0.0-20190910211006-e7385ebe12c4 h1:YntXPlrEIZ9/glePgiY0HTecy1EsNhdDz8zFa79tQ6o= +github.com/cloudfoundry/dagger v0.0.0-20190910211006-e7385ebe12c4/go.mod h1:vbeid+MuoJPZXM8fGvJy87lDLvu/q0Rs1NN4M6lFFg4= github.com/cloudfoundry/libcfbuildpack v1.76.0 h1:oMTv35mjk5Jogzy2sshVXHyolDWnWHMfANQ0UooXJq0= github.com/cloudfoundry/libcfbuildpack v1.76.0/go.mod h1:QGm+nzixn579dvQNlS7ZQET541y2hEpZ0/5uNxkQ04Y= github.com/cloudfoundry/libcfbuildpack v1.85.0 h1:7ncRWtaz2zltkaKx4lrzj1xZihEu6UM7uven/Ip1wAo= diff --git a/vendor/github.com/cloudfoundry/dagger/app.go b/vendor/github.com/cloudfoundry/dagger/app.go index 33e6377..6179d83 100644 --- a/vendor/github.com/cloudfoundry/dagger/app.go +++ b/vendor/github.com/cloudfoundry/dagger/app.go @@ -117,7 +117,15 @@ docker: if err := cmd.Run(); err != nil { return errors.Wrap(err, fmt.Sprintf("docker error: failed to get port from container: %s", a.ContainerID)) } - a.port = strings.TrimSpace(strings.Split(buf.String(), ":")[1]) + + ports := strings.Split(buf.String(), ":") + + if len(ports) > 1 { + a.port = strings.TrimSpace(ports[1]) + } else { + return fmt.Errorf("unable to get well formed port map from docker") + } + return nil } diff --git a/vendor/github.com/cloudfoundry/dagger/go.mod b/vendor/github.com/cloudfoundry/dagger/go.mod index e51ffd9..a6d1dfe 100644 --- a/vendor/github.com/cloudfoundry/dagger/go.mod +++ b/vendor/github.com/cloudfoundry/dagger/go.mod @@ -8,3 +8,5 @@ require ( golang.org/x/net v0.0.0-20190628185345-da137c7871d7 // indirect golang.org/x/oauth2 v0.0.0-20190319182350-c85d3e98c914 ) + +go 1.13 diff --git a/vendor/github.com/cloudfoundry/dagger/pack.go b/vendor/github.com/cloudfoundry/dagger/pack.go index f313391..0bb9882 100644 --- a/vendor/github.com/cloudfoundry/dagger/pack.go +++ b/vendor/github.com/cloudfoundry/dagger/pack.go @@ -18,7 +18,7 @@ const ( Bionic = "io.buildpacks.stacks.bionic" DefaultBuildImage = "cloudfoundry/build:full-cnb" DefaultRunImage = "cloudfoundry/run:full-cnb" - TestBuilderImage = "cfbuildpacks/spec-change-builder" + TestBuilderImage = "cloudfoundry/cnb:cflinuxfs3" logBufferSize = 1024 ) diff --git a/vendor/modules.txt b/vendor/modules.txt index 0367901..b26ef09 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -15,7 +15,7 @@ github.com/buildpack/libbuildpack/buildpack github.com/buildpack/libbuildpack/platform github.com/buildpack/libbuildpack/services github.com/buildpack/libbuildpack/stack -# github.com/cloudfoundry/dagger v0.0.0-20190904150052-ccbcb1be08ca +# github.com/cloudfoundry/dagger v0.0.0-20190910211006-e7385ebe12c4 github.com/cloudfoundry/dagger # github.com/cloudfoundry/libcfbuildpack v1.85.0 github.com/cloudfoundry/libcfbuildpack/build