Merge pull request #38875 from thaJeztah/revert_38518-docker_info_builder_version

Revert "Adding builder version"
This commit is contained in:
Tibor Vass 2019-03-14 10:55:44 -07:00 committed by GitHub
commit 5b6771345a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 5 deletions

View File

@ -52,8 +52,6 @@ func (s *systemRouter) getInfo(ctx context.Context, w http.ResponseWriter, r *ht
info.Swarm = s.cluster.Info()
}
info.Builder = build.BuilderVersion(*s.features)
if versions.LessThan(httputils.VersionFromContext(ctx), "1.25") {
// TODO: handle this conversion in engine-api
type oldInfo struct {

View File

@ -146,7 +146,6 @@ type Commit struct {
// GET "/info"
type Info struct {
ID string
Builder BuilderVersion
Containers int
ContainersRunning int
ContainersPaused int

View File

@ -35,8 +35,7 @@ func TestInfoAPI(t *testing.T) {
"KernelVersion",
"Driver",
"ServerVersion",
"SecurityOptions",
"Builder"}
"SecurityOptions"}
out := fmt.Sprintf("%+v", info)
for _, linePrefix := range stringsToCheck {