starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-08-28 10:05:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
GordonTheTurtle
2019-08-14 21:23:52 +00:00
parent 9e36dcdcdf d0f7c1a7ee
commit fb5f4260fc
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/Dockerfile
+1 -1
View File
@@ -24,7 +24,7 @@
# the case. Therefore, you don't have to disable it anymore.
#
ARG GO_VERSION=1.11.12
ARG GO_VERSION=1.11.13
FROM golang:${GO_VERSION}-stretch AS base
ARG APT_MIRROR
components/engine/Dockerfile.e2e
+1 -1
View File
@@ -1,4 +1,4 @@
ARG GO_VERSION=1.11.12
ARG GO_VERSION=1.11.13
FROM golang:${GO_VERSION}-alpine3.9 AS builder
components/engine/Dockerfile.simple
+1 -1
View File
@@ -5,7 +5,7 @@
# This represents the bare minimum required to build and test Docker.
ARG GO_VERSION=1.11.12
ARG GO_VERSION=1.11.13
FROM golang:${GO_VERSION}-stretch
components/engine/Dockerfile.windows
+1 -1
View File
@@ -158,7 +158,7 @@ FROM microsoft/windowsservercore
# Use PowerShell as the default shell
SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
ARG GO_VERSION=1.11.12
ARG GO_VERSION=1.11.13
# Environment variable notes:
# - GO_VERSION must be consistent with 'Dockerfile' used by Linux.
components/engine/opts/hosts_test.go
+6 -6
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 := parseDaemonHost(invalidAddr); err == nil || err.Error() != expectedError {
if addr, err := parseDaemonHost(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)
}
}