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

Make experimental a runtime flag

Browse Source 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 7781a1bf0fef748877326632b88e92fbf3c90daa
Component: engine
This commit is contained in:
Kenfe-Mickael Laventure
2016-10-06 07:09:54 -07:00
parent c42c998198
commit 9a299b360f
112 changed files with 782 additions and 979 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/cmd/docker/docker.go
View File

@ -91,11 +91,7 @@ func main() {
}
func showVersion() {
if utils.ExperimentalBuild() {
fmt.Printf("Docker version %s, build %s, experimental\n", dockerversion.Version, dockerversion.GitCommit)
} else {
fmt.Printf("Docker version %s, build %s\n", dockerversion.Version, dockerversion.GitCommit)
}
fmt.Printf("Docker version %s, build %s\n", dockerversion.Version, dockerversion.GitCommit)
}
func dockerPreRun(opts *cliflags.ClientOptions) {

5
components/engine/cmd/dockerd/daemon.go
View File

@ -129,7 +129,7 @@ func (cli *DaemonCli) start(opts daemonOptions) (err error) {
utils.EnableDebug()
}
if utils.ExperimentalBuild() {
if cli.Config.Experimental {
logrus.Warn("Running experimental build")
}
@ -435,6 +435,9 @@ func initRouter(s *apiserver.Server, d *daemon.Daemon, c *cluster.Cluster) {
func (cli *DaemonCli) initMiddlewares(s *apiserver.Server, cfg *apiserver.Config) {
v := cfg.Version
exp := middleware.NewExperimentalMiddleware(cli.d.HasExperimental())
s.UseMiddleware(exp)
vm := middleware.NewVersionMiddleware(v, api.DefaultVersion, api.MinVersion)
s.UseMiddleware(vm)

7
components/engine/cmd/dockerd/docker.go
View File

@ -13,7 +13,6 @@ import (
"github.com/docker/docker/dockerversion"
"github.com/docker/docker/pkg/reexec"
"github.com/docker/docker/pkg/term"
"github.com/docker/docker/utils"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
)
@ -85,11 +84,7 @@ func runDaemon(opts daemonOptions) error {
}
func showVersion() {
if utils.ExperimentalBuild() {
fmt.Printf("Docker version %s, build %s, experimental\n", dockerversion.Version, dockerversion.GitCommit)
} else {
fmt.Printf("Docker version %s, build %s\n", dockerversion.Version, dockerversion.GitCommit)
}
fmt.Printf("Docker version %s, build %s\n", dockerversion.Version, dockerversion.GitCommit)
}
func main() {

13
components/engine/cmd/dockerd/routes.go
View File

@ -1,13 +0,0 @@
// +build !experimental
package main
import (
"github.com/docker/docker/api/server/httputils"
"github.com/docker/docker/api/server/router"
"github.com/docker/docker/daemon"
)
func addExperimentalRouters(routers []router.Router, d *daemon.Daemon, decoder httputils.ContainerDecoder) []router.Router {
return routers
}

5
components/engine/cmd/dockerd/routes_experimental.go
View File

@ -1,5 +1,3 @@
// +build experimental
package main
import (
@ -12,5 +10,8 @@ import (
)
func addExperimentalRouters(routers []router.Router, d *daemon.Daemon, decoder httputils.ContainerDecoder) []router.Router {
if !d.HasExperimental() {
return []router.Router{}
}
return append(routers, checkpointrouter.NewRouter(d, decoder), pluginrouter.NewRouter(plugin.GetManager()))
}