p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 626 Packages Projects Releases Wiki Activity

Merge component 'cli' from git@github.com:docker/cli 18.09

Browse Source
This commit is contained in:
GordonTheTurtle
2019-08-14 21:00:45 +00:00
parent 673a03c73a d5def67d68
commit 9e36dcdcdf
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/cli/appveyor.yml
View File

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

2
components/cli/dockerfiles/Dockerfile.binary-native
View File

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

2
components/cli/dockerfiles/Dockerfile.cross
View File

@ -1,4 +1,4 @@
FROM dockercore/golang-cross:1.11.12
FROM dockercore/golang-cross:1.11.13
ENV DISABLE_WARN_OUTSIDE_CONTAINER=1
WORKDIR /go/src/github.com/docker/cli
COPY . .

2
components/cli/dockerfiles/Dockerfile.dev
View File

@ -1,4 +1,4 @@
FROM golang:1.11.12-alpine
FROM golang:1.11.13-alpine
RUN apk add -U git make bash coreutils ca-certificates curl

2
components/cli/dockerfiles/Dockerfile.e2e
View File

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

2
components/cli/dockerfiles/Dockerfile.lint
View File

@ -1,4 +1,4 @@
FROM golang:1.11.12-alpine
FROM golang:1.11.13-alpine
RUN apk add -U git

12
components/cli/opts/hosts_test.go
View File

@ -53,8 +53,8 @@ func TestParseHost(t *testing.T) {
func TestParseDockerDaemonHost(t *testing.T) {
invalids := map[string]string{
"tcp:a.b.c.d": "Invalid bind address format: tcp:a.b.c.d",
"tcp:a.b.c.d/path": "Invalid bind address format: tcp:a.b.c.d/path",
"tcp:a.b.c.d": "",
"tcp:a.b.c.d/path": "",
"udp://127.0.0.1": "Invalid bind address format: udp://127.0.0.1",
"udp://127.0.0.1:2375": "Invalid bind address format: udp://127.0.0.1:2375",
"tcp://unix:///run/docker.sock": "Invalid proto, expected tcp: unix:///run/docker.sock",
@ -83,7 +83,7 @@ func TestParseDockerDaemonHost(t *testing.T) {
"localhost:5555/path": "tcp://localhost:5555/path",
}
for invalidAddr, expectedError := range invalids {
if addr, err := parseDockerDaemonHost(invalidAddr); err == nil || err.Error() != expectedError {
if addr, err := parseDockerDaemonHost(invalidAddr); err == nil || expectedError != "" && err.Error() != expectedError {
t.Errorf("tcp %v address expected error %q return, got %q and addr %v", invalidAddr, expectedError, err, addr)
}
}
@ -99,8 +99,8 @@ func TestParseTCP(t *testing.T) {
defaultHTTPHost = "tcp://127.0.0.1:2376"
)
invalids := map[string]string{
"tcp:a.b.c.d": "Invalid bind address format: tcp:a.b.c.d",
"tcp:a.b.c.d/path": "Invalid bind address format: tcp:a.b.c.d/path",
"tcp:a.b.c.d": "",
"tcp:a.b.c.d/path": "",
"udp://127.0.0.1": "Invalid proto, expected tcp: udp://127.0.0.1",
"udp://127.0.0.1:2375": "Invalid proto, expected tcp: udp://127.0.0.1:2375",
}
@ -125,7 +125,7 @@ func TestParseTCP(t *testing.T) {
"localhost:5555/path": "tcp://localhost:5555/path",
}
for invalidAddr, expectedError := range invalids {
if addr, err := ParseTCPAddr(invalidAddr, defaultHTTPHost); err == nil || err.Error() != expectedError {
if addr, err := ParseTCPAddr(invalidAddr, defaultHTTPHost); err == nil || expectedError != "" && err.Error() != expectedError {
t.Errorf("tcp %v address expected error %v return, got %s and addr %v", invalidAddr, expectedError, err, addr)
}
}