Add containerd, runc, and docker-init versions to /version by thaJeztah · Pull Request #37974 · moby/moby

thaJeztah · 2018-10-05T10:33:01Z

This patch adds version information about the containerd,
runc, and docker-init components to the /version endpoint.

With this patch applied, running:

curl --unix-socket /var/run/docker.sock http://localhost/version | jq .

Will produce this response:

{
  "Platform": {
    "Name": ""
  },
  "Components": [
    {
      "Name": "Engine",
      "Version": "dev",
      "Details": {
        "ApiVersion": "1.40",
        "Arch": "amd64",
        "BuildTime": "2018-11-08T10:23:42.000000000+00:00",
        "Experimental": "false",
        "GitCommit": "7d02782d2f",
        "GoVersion": "go1.11.2",
        "KernelVersion": "4.9.93-linuxkit-aufs",
        "MinAPIVersion": "1.12",
        "Os": "linux"
      }
    },
    {
      "Name": "containerd",
      "Version": "v1.1.4",
      "Details": {
        "GitCommit": "9f2e07b1fc1342d1c48fe4d7bbb94cb6d1bf278b"
      }
    },
    {
      "Name": "runc",
      "Version": "1.0.0-rc5+dev",
      "Details": {
        "GitCommit": "a00bf0190895aa465a5fbed0268888e2c8ddfe85"
      }
    },
    {
      "Name": "docker-init",
      "Version": "0.18.0",
      "Details": {
        "GitCommit": "fec3683"
      }
    }
  ],
  "Version": "dev",
  "ApiVersion": "1.40",
  "MinAPIVersion": "1.12",
  "GitCommit": "7d02782d2f",
  "GoVersion": "go1.11.2",
  "Os": "linux",
  "Arch": "amd64",
  "KernelVersion": "4.9.93-linuxkit-aufs",
  "BuildTime": "2018-11-08T10:23:42.000000000+00:00"
}

When using a recent version of the CLI, that information is included in the
output of docker version:

Client:
 Version:           18.09.1
 API version:       1.39
 Go version:        go1.10.6
 Git commit:        4c52b90
 Built:             Wed Jan  9 19:35:59 2019
 OS/Arch:           linux/amd64
 Experimental:      false

Server:
 Engine:
  Version:          dev
  API version:      1.40 (minimum version 1.12)
  Go version:       go1.11.4
  Git commit:       56f9283133
  Built:            Mon Jan 14 22:12:18 2019
  OS/Arch:          linux/amd64
  Experimental:     false
 containerd:
  Version:          v1.2.2
  GitCommit:        9754871865f7fe2f4e74d43e2fc7ccd237edcbce
 runc:
  Version:          1.0.0-rc6+dev
  GitCommit:        96ec2177ae841256168fcf76954f7177af9446eb
 docker-init:
  Version:          0.18.0
  GitCommit:        fec3683

- How to verify it

make TESTDIRS='github.com/docker/docker/daemon' TESTFLAGS='-test.run ^TestParse' test-unit

- Description for the changelog

* Add containerd, runc, and docker-init versions to `/version` [moby/moby#37974](https://github.com/moby/moby/pull/37974)

- A picture of a cute animal (not mandatory but encouraged)

thaJeztah · 2018-10-05T10:34:06Z

Follow-up to #37968, but I'm still tweaking some things, and need to update the API changelog; just pushing as a WIP, so that we can discuss already

/cc @vdemeester @tiborvass

AkihiroSuda · 2018-10-29T03:24:35Z

ping^^ @thaJeztah

thaJeztah · 2018-11-07T01:05:56Z

@AkihiroSuda updated

vdemeester

LGTM 🐯

thaJeztah · 2018-11-08T09:49:01Z

Ah, boo; linting error;

09:07:13 daemon/info_unix.go:218:49:warning: unnecessary conversion (unconvert)

@vdemeester @AkihiroSuda wondering; should I truncate the git-commit to a shorter value, or leave it as-is, and leave it to the packaging of containerd/runc to decide if they show a short or long commit-sha? (not sure what length is "safe" to truncate to);

Client:
 Version:           18.09.1
 API version:       1.39
 Go version:        go1.10.6
 Git commit:        4c52b90
 Built:             Wed Jan  9 19:35:59 2019
 OS/Arch:           linux/amd64
 Experimental:      false

Server:
 Engine:
  Version:          dev
  API version:      1.40 (minimum version 1.12)
  Go version:       go1.11.4
  Git commit:       56f9283133
  Built:            Mon Jan 14 22:12:18 2019
  OS/Arch:          linux/amd64
  Experimental:     false
 containerd:
  Version:          v1.2.2
  GitCommit:        9754871865f7fe2f4e74d43e2fc7ccd237edcbce
 runc:
  Version:          1.0.0-rc6+dev
  GitCommit:        96ec2177ae841256168fcf76954f7177af9446eb
 docker-init:
  Version:          0.18.0
  GitCommit:        fec3683

thaJeztah · 2018-11-08T09:53:46Z

Actually, let me update the parseInitVersion() (or write a different function for this), so that we can show the version as well, not just the commit;

./docker-init --version tini version 0.18.0 - git.fec3683

AkihiroSuda · 2018-11-08T10:05:34Z

I think it is safe to keep full comnit

thaJeztah · 2018-11-08T10:34:34Z

OK, I'll leave the commits as-is, but working on the tini/docker-init version to show both version and commit (as it's a bit more user friendly to show that)

codecov · 2018-11-08T10:44:21Z

Codecov Report

❗ No coverage uploaded for pull request base (master@beef00c). Click here to learn what that means.
The diff coverage is 27.53%.

@@            Coverage Diff            @@
##             master   #37974   +/-   ##
=========================================
  Coverage          ?    36.6%           
=========================================
  Files             ?      608           
  Lines             ?    45221           
  Branches          ?        0           
=========================================
  Hits              ?    16552           
  Misses            ?    26382           
  Partials          ?     2287

thaJeztah · 2018-11-08T10:46:44Z

Updated; output now shows version and git commit for docker-init;

Client:
 Version:           18.09.1
 API version:       1.39
 Go version:        go1.10.6
 Git commit:        4c52b90
 Built:             Wed Jan  9 19:35:59 2019
 OS/Arch:           linux/amd64
 Experimental:      false

Server:
 Engine:
  Version:          dev
  API version:      1.40 (minimum version 1.12)
  Go version:       go1.11.4
  Git commit:       56f9283133
  Built:            Mon Jan 14 22:12:18 2019
  OS/Arch:          linux/amd64
  Experimental:     false
 containerd:
  Version:          v1.2.2
  GitCommit:        9754871865f7fe2f4e74d43e2fc7ccd237edcbce
 runc:
  Version:          1.0.0-rc6+dev
  GitCommit:        96ec2177ae841256168fcf76954f7177af9446eb
 docker-init:
  Version:          0.18.0
  GitCommit:        fec3683

thaJeztah · 2018-11-08T12:22:23Z

I dropped the v prefix. Looking at this again, I don't think we should modify versions that are returned by an external binary, and just return it as-is

vdemeester

Still LGTM 👼

kolyshkin · 2018-11-08T19:27:59Z

SGTM

thaJeztah · 2019-01-14T22:10:48Z

rebased to get a fresh CI run

This patch adds version information about the containerd, runc, and docker-init components to the /version endpoint. With this patch applied, running: ``` curl --unix-socket /var/run/docker.sock http://localhost/version | jq . ``` Will produce this response: ```json { "Platform": { "Name": "" }, "Components": [ { "Name": "Engine", "Version": "dev", "Details": { "ApiVersion": "1.40", "Arch": "amd64", "BuildTime": "2018-11-08T10:23:42.000000000+00:00", "Experimental": "false", "GitCommit": "7d02782d2f", "GoVersion": "go1.11.2", "KernelVersion": "4.9.93-linuxkit-aufs", "MinAPIVersion": "1.12", "Os": "linux" } }, { "Name": "containerd", "Version": "v1.1.4", "Details": { "GitCommit": "9f2e07b1fc1342d1c48fe4d7bbb94cb6d1bf278b" } }, { "Name": "runc", "Version": "1.0.0-rc5+dev", "Details": { "GitCommit": "a00bf0190895aa465a5fbed0268888e2c8ddfe85" } }, { "Name": "docker-init", "Version": "0.18.0", "Details": { "GitCommit": "fec3683" } } ], "Version": "dev", "ApiVersion": "1.40", "MinAPIVersion": "1.12", "GitCommit": "7d02782d2f", "GoVersion": "go1.11.2", "Os": "linux", "Arch": "amd64", "KernelVersion": "4.9.93-linuxkit-aufs", "BuildTime": "2018-11-08T10:23:42.000000000+00:00" } ``` When using a recent version of the CLI, that information is included in the output of `docker version`: ``` Client: Docker Engine - Community Version: 18.09.0 API version: 1.39 Go version: go1.10.4 Git commit: 4d60db4 Built: Wed Nov 7 00:46:51 2018 OS/Arch: linux/amd64 Experimental: false Server: Engine: Version: dev API version: 1.40 (minimum version 1.12) Go version: go1.11.2 Git commit: 7d02782d2f Built: Thu Nov 8 10:23:42 2018 OS/Arch: linux/amd64 Experimental: false containerd: Version: v1.1.4 GitCommit: 9f2e07b1fc1342d1c48fe4d7bbb94cb6d1bf278b runc: Version: 1.0.0-rc5+dev GitCommit: a00bf0190895aa465a5fbed0268888e2c8ddfe85 docker-init: Version: 0.18.0 GitCommit: fec3683 ``` Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

GordonTheTurtle added the status/0-triage label Oct 5, 2018

thaJeztah added status/1-design-review impact/api impact/changelog and removed status/0-triage labels Oct 5, 2018

AkihiroSuda reviewed Oct 5, 2018

View reviewed changes

Comment thread daemon/info_unix.go Outdated

GordonTheTurtle assigned cpuguy83 Oct 20, 2018

thaJeztah force-pushed the add_more_component_versions branch 2 times, most recently from 556785b to c88553e Compare November 7, 2018 01:05

thaJeztah changed the title ~~[WIP] Add containerd, runc, and docker-init versions to /version~~ Add containerd, runc, and docker-init versions to /version Nov 7, 2018

thaJeztah force-pushed the add_more_component_versions branch from c88553e to d200086 Compare November 7, 2018 01:31

AkihiroSuda approved these changes Nov 7, 2018

View reviewed changes

vdemeester approved these changes Nov 8, 2018

View reviewed changes

vdemeester added rebuild/janky labels Nov 8, 2018

GordonTheTurtle removed the rebuild/janky label Nov 8, 2018

thaJeztah removed the rebuild/windowsRS5-process label Nov 8, 2018

thaJeztah force-pushed the add_more_component_versions branch from d200086 to 7d02782 Compare November 8, 2018 09:51

thaJeztah commented Nov 8, 2018

View reviewed changes

thaJeztah force-pushed the add_more_component_versions branch from 7d02782 to e7ee176 Compare November 8, 2018 10:44

thaJeztah force-pushed the add_more_component_versions branch from e7ee176 to 6df6924 Compare November 8, 2018 12:20

thaJeztah commented Nov 8, 2018

View reviewed changes

vdemeester approved these changes Nov 8, 2018

View reviewed changes

vdemeester requested a review from cpuguy83 November 8, 2018 14:04

thaJeztah added rebuild/powerpc labels Nov 8, 2018

GordonTheTurtle removed rebuild/powerpc labels Nov 8, 2018

thaJeztah added status/2-code-review and removed status/1-design-review labels Nov 8, 2018

derek bot added the rebuild/* label Dec 21, 2018

GordonTheTurtle removed the rebuild/* label Dec 21, 2018

derek bot added the rebuild/powerpc label Dec 22, 2018

GordonTheTurtle removed the rebuild/powerpc label Dec 22, 2018

thaJeztah force-pushed the add_more_component_versions branch from 6df6924 to 56f9283 Compare January 14, 2019 22:10

tiborvass reviewed Jan 14, 2019

View reviewed changes

Comment thread daemon/info_unix.go Outdated

tiborvass reviewed Jan 14, 2019

View reviewed changes

Comment thread daemon/info_unix.go Outdated

thaJeztah force-pushed the add_more_component_versions branch from 56f9283 to 2137b8c Compare January 14, 2019 22:27

tiborvass approved these changes Jan 14, 2019

View reviewed changes

thaJeztah added status/4-merge rebuild/* and removed status/2-code-review labels Jan 14, 2019

GordonTheTurtle removed the rebuild/* label Jan 15, 2019

thaJeztah added the rebuild/experimental label Jan 15, 2019

GordonTheTurtle removed the rebuild/experimental label Jan 15, 2019

yongtang merged commit 508e5f7 into moby:master Jan 15, 2019

thaJeztah deleted the add_more_component_versions branch January 15, 2019 08:58

thaJeztah mentioned this pull request Feb 6, 2019

Feature/38518 Add builder info docker/cli#1660

Closed

Conversation

thaJeztah commented Oct 5, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

thaJeztah commented Oct 5, 2018

Uh oh!

Uh oh!

AkihiroSuda commented Oct 29, 2018

Uh oh!

thaJeztah commented Nov 7, 2018

Uh oh!

vdemeester left a comment

Choose a reason for hiding this comment

Uh oh!

thaJeztah commented Nov 8, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

thaJeztah Nov 8, 2018

Choose a reason for hiding this comment

Uh oh!

AkihiroSuda commented Nov 8, 2018

Uh oh!

thaJeztah commented Nov 8, 2018

Uh oh!

codecov bot commented Nov 8, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

thaJeztah commented Nov 8, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

thaJeztah Nov 8, 2018

Choose a reason for hiding this comment

Uh oh!

vdemeester left a comment

Choose a reason for hiding this comment

Uh oh!

kolyshkin commented Nov 8, 2018

Uh oh!

thaJeztah commented Jan 14, 2019

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

thaJeztah commented Oct 5, 2018 •

edited

Loading

thaJeztah commented Nov 8, 2018 •

edited

Loading

codecov bot commented Nov 8, 2018 •

edited

Loading

thaJeztah commented Nov 8, 2018 •

edited

Loading