Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1426 from kolyshkin/go111-pr1316 

Bump Go to 1.11.1
This commit is contained in:
Sebastiaan van Stijn 2018-10-11 20:19:20 +02:00 committed by GitHub
parent 6153a0967b 906c2d161a
commit b9a1a21fe2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appveyor.yml
View File

@ -4,7 +4,7 @@ clone_folder: c:\gopath\src\github.com\docker\cli
environment: environment:
GOPATH: c:\gopath GOPATH: c:\gopath
GOVERSION: 1.10.4 GOVERSION: 1.11.1
DEPVERSION: v0.4.1 DEPVERSION: v0.4.1
install: install:

4
cli/command/stack/swarm/deploy_test.go
View File

@ -71,14 +71,14 @@ func TestServiceUpdateResolveImageChanged(t *testing.T) {
}{ }{
// Image not changed // Image not changed
{ {
image: "foobar:1.2.3", image: "foobar:1.2.3",
expectedQueryRegistry: false, expectedQueryRegistry: false,
expectedImage: "foobar:1.2.3@sha256:deadbeef", expectedImage: "foobar:1.2.3@sha256:deadbeef",
expectedForceUpdate: 123, expectedForceUpdate: 123,
}, },
// Image changed // Image changed
{ {
image: "foobar:1.2.4", image: "foobar:1.2.4",
expectedQueryRegistry: true, expectedQueryRegistry: true,
expectedImage: "foobar:1.2.4", expectedImage: "foobar:1.2.4",
expectedForceUpdate: 123, expectedForceUpdate: 123,

2
cli/registry/client/fetcher.go
View File

@ -231,7 +231,7 @@ func (c *client) iterateEndpoints(ctx context.Context, namedRef reference.Named,
repoEndpoint := repositoryEndpoint{endpoint: endpoint, info: repoInfo} repoEndpoint := repositoryEndpoint{endpoint: endpoint, info: repoInfo}
repo, err := c.getRepositoryForReference(ctx, namedRef, repoEndpoint) repo, err := c.getRepositoryForReference(ctx, namedRef, repoEndpoint)
if err != nil { if err != nil {
logrus.Debugf("error with repo endpoint %s: %s", repoEndpoint, err) logrus.Debugf("error %s with repo endpoint %+v", err, repoEndpoint)
if _, ok := err.(ErrHTTPProto); ok { if _, ok := err.(ErrHTTPProto); ok {
continue continue
} }

2
dockerfiles/Dockerfile.binary-native
View File

@ -1,4 +1,4 @@
FROM golang:1.10.4-alpine FROM golang:1.11.1-alpine
RUN apk add -U git bash coreutils gcc musl-dev RUN apk add -U git bash coreutils gcc musl-dev

2
dockerfiles/Dockerfile.cross
View File

@ -1,3 +1,3 @@
FROM dockercore/golang-cross:1.10.4@sha256:55c7b933ac944f4922b673b4d4340d1a0404f3c324bd0b3f13a4326c427b1f2a FROM dockercore/golang-cross:1.11.1@sha256:57ce59bec5445d27cc00f9e27fc171bea44eed7a9890df6eea6540f214300a01
ENV DISABLE_WARN_OUTSIDE_CONTAINER=1 ENV DISABLE_WARN_OUTSIDE_CONTAINER=1
WORKDIR /go/src/github.com/docker/cli WORKDIR /go/src/github.com/docker/cli

2
dockerfiles/Dockerfile.dev
View File

@ -1,5 +1,5 @@
FROM golang:1.10.4-alpine FROM golang:1.11.1-alpine
RUN apk add -U git make bash coreutils ca-certificates curl RUN apk add -U git make bash coreutils ca-certificates curl

2
dockerfiles/Dockerfile.e2e
View File

@ -1,4 +1,4 @@
ARG GO_VERSION=1.10.4 ARG GO_VERSION=1.11.1
FROM docker/containerd-shim-process:a4d1531 AS containerd-shim-process FROM docker/containerd-shim-process:a4d1531 AS containerd-shim-process

2
dockerfiles/Dockerfile.lint
View File

@ -1,4 +1,4 @@
FROM golang:1.10.4-alpine FROM golang:1.11.1-alpine
RUN apk add -U git RUN apk add -U git

24
opts/hosts_test.go
View File

@ -69,18 +69,18 @@ func TestParseDockerDaemonHost(t *testing.T) {
"[::1]:5555/path": "tcp://[::1]:5555/path", "[::1]:5555/path": "tcp://[::1]:5555/path",
"[0:0:0:0:0:0:0:1]:": "tcp://[0:0:0:0:0:0:0:1]:2375", "[0:0:0:0:0:0:0:1]:": "tcp://[0:0:0:0:0:0:0:1]:2375",
"[0:0:0:0:0:0:0:1]:5555/path": "tcp://[0:0:0:0:0:0:0:1]:5555/path", "[0:0:0:0:0:0:0:1]:5555/path": "tcp://[0:0:0:0:0:0:0:1]:5555/path",
":6666": fmt.Sprintf("tcp://%s:6666", DefaultHTTPHost), ":6666": fmt.Sprintf("tcp://%s:6666", DefaultHTTPHost),
":6666/path": fmt.Sprintf("tcp://%s:6666/path", DefaultHTTPHost), ":6666/path": fmt.Sprintf("tcp://%s:6666/path", DefaultHTTPHost),
"tcp://": DefaultTCPHost, "tcp://": DefaultTCPHost,
"tcp://:7777": fmt.Sprintf("tcp://%s:7777", DefaultHTTPHost), "tcp://:7777": fmt.Sprintf("tcp://%s:7777", DefaultHTTPHost),
"tcp://:7777/path": fmt.Sprintf("tcp://%s:7777/path", DefaultHTTPHost), "tcp://:7777/path": fmt.Sprintf("tcp://%s:7777/path", DefaultHTTPHost),
"unix:///run/docker.sock": "unix:///run/docker.sock", "unix:///run/docker.sock": "unix:///run/docker.sock",
"unix://": "unix://" + DefaultUnixSocket, "unix://": "unix://" + DefaultUnixSocket,
"fd://": "fd://", "fd://": "fd://",
"fd://something": "fd://something", "fd://something": "fd://something",
"localhost:": "tcp://localhost:2375", "localhost:": "tcp://localhost:2375",
"localhost:5555": "tcp://localhost:5555", "localhost:5555": "tcp://localhost:5555",
"localhost:5555/path": "tcp://localhost:5555/path", "localhost:5555/path": "tcp://localhost:5555/path",
} }
for invalidAddr, expectedError := range invalids { for invalidAddr, expectedError := range invalids {
if addr, err := parseDockerDaemonHost(invalidAddr); err == nil || err.Error() != expectedError { if addr, err := parseDockerDaemonHost(invalidAddr); err == nil || err.Error() != expectedError {

1
scripts/build/osx
View File

@ -11,6 +11,7 @@ export CGO_ENABLED=1
export GOOS=darwin export GOOS=darwin
export GOARCH=amd64 export GOARCH=amd64
export CC=o64-clang export CC=o64-clang
export CXX=o64-clang++
export LDFLAGS="$LDFLAGS -linkmode external -s" export LDFLAGS="$LDFLAGS -linkmode external -s"
export LDFLAGS_STATIC_DOCKER='-extld='${CC} export LDFLAGS_STATIC_DOCKER='-extld='${CC}