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

Merge pull request #1309 from thaJeztah/bump_master_version 

Bump version to 19.03.0-dev
This commit is contained in:
Silvin Lubecki 2018-09-13 23:54:04 +02:00 committed by GitHub
parent 94efcf4886 7fa9b4babf
commit c3f2d78178
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
18.09.0-dev 19.03.0-dev

7
e2eengine/altroot/altroot_test.go
View File

@ -1,7 +1,6 @@
package check package check
import ( import (
"os"
"testing" "testing"
"github.com/docker/cli/e2eengine" "github.com/docker/cli/e2eengine"
@ -17,9 +16,12 @@ func TestDockerEngineOnContainerdAltRootConfig(t *testing.T) {
} }
}() }()
// Use a fixed version to prevent failures when development of the next version starts, and no image is available yet.
targetVersion := "18.09.0-dev"
t.Log("First engine init") t.Log("First engine init")
// First init // First init
result := icmd.RunCmd(icmd.Command("docker", "engine", "init", "--config-file", "/tmp/etc/docker/daemon.json"), result := icmd.RunCmd(icmd.Command("docker", "engine", "init", "--config-file", "/tmp/etc/docker/daemon.json", "--version", targetVersion),
func(c *icmd.Cmd) { func(c *icmd.Cmd) {
c.Env = append(c.Env, "DOCKER_CLI_EXPERIMENTAL=enabled") c.Env = append(c.Env, "DOCKER_CLI_EXPERIMENTAL=enabled")
}) })
@ -32,7 +34,6 @@ func TestDockerEngineOnContainerdAltRootConfig(t *testing.T) {
// Make sure update doesn't blow up with alternate config path // Make sure update doesn't blow up with alternate config path
t.Log("perform update") t.Log("perform update")
// Now update and succeed // Now update and succeed
targetVersion := os.Getenv("VERSION")
result = icmd.RunCmd(icmd.Command("docker", "engine", "update", "--version", targetVersion)) result = icmd.RunCmd(icmd.Command("docker", "engine", "update", "--version", targetVersion))
result.Assert(t, icmd.Expected{ result.Assert(t, icmd.Expected{
Out: "Success! The docker engine is now running.", Out: "Success! The docker engine is now running.",

9
e2eengine/multi/multi_test.go
View File

@ -1,7 +1,6 @@
package multi package multi
import ( import (
"os"
"testing" "testing"
"github.com/docker/cli/e2eengine" "github.com/docker/cli/e2eengine"
@ -17,9 +16,12 @@ func TestDockerEngineOnContainerdMultiTest(t *testing.T) {
} }
}() }()
// Use a fixed version to prevent failures when development of the next version starts, and no image is available yet.
targetVersion := "18.09.0-dev"
t.Log("Attempt engine init without experimental") t.Log("Attempt engine init without experimental")
// First init // First init
result := icmd.RunCmd(icmd.Command("docker", "engine", "init"), result := icmd.RunCmd(icmd.Command("docker", "engine", "init", "--version", targetVersion),
func(c *icmd.Cmd) { func(c *icmd.Cmd) {
c.Env = append(c.Env, "DOCKER_CLI_EXPERIMENTAL=disabled") c.Env = append(c.Env, "DOCKER_CLI_EXPERIMENTAL=disabled")
}) })
@ -31,7 +33,7 @@ func TestDockerEngineOnContainerdMultiTest(t *testing.T) {
t.Log("First engine init") t.Log("First engine init")
// First init // First init
result = icmd.RunCmd(icmd.Command("docker", "engine", "init"), result = icmd.RunCmd(icmd.Command("docker", "engine", "init", "--version", targetVersion),
func(c *icmd.Cmd) { func(c *icmd.Cmd) {
c.Env = append(c.Env, "DOCKER_CLI_EXPERIMENTAL=enabled") c.Env = append(c.Env, "DOCKER_CLI_EXPERIMENTAL=enabled")
}) })
@ -64,7 +66,6 @@ func TestDockerEngineOnContainerdMultiTest(t *testing.T) {
t.Log("perform update") t.Log("perform update")
// Now update and succeed // Now update and succeed
targetVersion := os.Getenv("VERSION")
result = icmd.RunCmd(icmd.Command("docker", "engine", "update", "--version", targetVersion)) result = icmd.RunCmd(icmd.Command("docker", "engine", "update", "--version", targetVersion))
result.Assert(t, icmd.Expected{ result.Assert(t, icmd.Expected{
Out: "Success! The docker engine is now running.", Out: "Success! The docker engine is now running.",