Commit Graph
41735 Commits
Author SHA1 Message Date
GordonTheTurtle 9ec201f089 Merge component 'cli' from git@github.com:docker/cli master 2018-07-13 16:41:28 +00:00
Sebastiaan van Stijn d1e4c2c766 Fix golint warning on generated "volume" types
Should fix

```
api/types/volume/volume_create.go
Line 10: warning: comment on exported type VolumeCreateBody should be of the form "VolumeCreateBody ..." (with optional leading article) (golint)

api/types/volume/volume_list.go
Line 12: warning: comment on exported type VolumeListOKBody should be of the form "VolumeListOKBody ..." (with optional leading article) (golint)
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: bd06a5ea4df919ff323510fba10801b5673a3af6
Component: engine
2018-07-13 16:58:59 +02:00
Silvin 95d9ce4032 Merge pull request #1212 from thaJeztah/bump_circleci_docker
Update CircleCI Docker version to 18.03
Upstream-commit: b395d2d6f5
Component: cli
2018-07-13 15:13:40 +02:00
Vimal Raghubir de770aa887 Fix: Warning Message
Signed-off-by: Vimal-Raghubir <vraghubir0418@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ce3d069936
Component: cli
2018-07-13 13:39:24 +02:00
Sebastiaan van Stijn c1dba76a94 Unexport daemon.FillPlatformInfo
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c03d3a416b24c18dfbb938397052eebd8b67d1a3
Component: engine
2018-07-13 13:16:34 +02:00
Sebastiaan van Stijn 91b7b13fc2 Refactor daemon.info to reduce cyclomatic complexity
Before this change;

    gocyclo daemon/info.go
    17 daemon (*Daemon).SystemInfo daemon/info.go:27:1
    2 daemon (*Daemon).SystemVersion daemon/info.go:150:1
    1 daemon (*Daemon).showPluginsInfo daemon/info.go:195:1

After this change;

    gocyclo daemon/info.go
    8 daemon (*Daemon).fillSecurityOptions daemon/info.go:150:1
    5 daemon operatingSystem daemon/info.go:201:1
    3 daemon (*Daemon).fillDriverInfo daemon/info.go:121:1
    2 daemon hostName daemon/info.go:172:1
    2 daemon memInfo daemon/info.go:192:1
    2 daemon kernelVersion daemon/info.go:182:1
    1 daemon (*Daemon).SystemVersion daemon/info.go:81:1
    1 daemon (*Daemon).SystemInfo daemon/info.go:27:1
    1 daemon (*Daemon).fillPluginsInfo daemon/info.go:138:1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 50eaed4d0c1492479ed4d83eb97424d21a3e458d
Component: engine
2018-07-13 13:10:05 +02:00
Sebastiaan van Stijn bd3a5eca16 Merge pull request #37445 from kolyshkin/continuity
vendor: update continuity to 0377f7d767206
Upstream-commit: 23f4a3d5091b878b252bef73ce6ab10a54641eb4
Component: engine
2018-07-13 12:12:09 +02:00
Sebastiaan van Stijn 4dc1b1b81b Merge pull request #37446 from kolyshkin/lcow
lcow: fix debug in startServiceVMIfNotRunning()
Upstream-commit: bd0a4ac1c5bbf6a613c39be9cc2b74f1a1cc73ca
Component: engine
2018-07-13 12:10:26 +02:00
Sebastiaan van Stijn 3980327921 Configure CircleCI remote daemon to use version 18.03.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 13eb2aa125
Component: cli
2018-07-13 11:51:41 +02:00
Vincent Demeester 15f7e30815 Merge pull request #1208 from thaJeztah/update-linting
Update gometalinter to v2.0.6, remove nakedret
Upstream-commit: d57cc1782e
Component: cli
2018-07-13 11:41:59 +02:00
Sebastiaan van Stijn 92fa05c733 Update CircleCI Docker version to 18.03
17.06 has reached EOL a long time ago; let's use a current
version in CI as well :D

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e2a56c47da
Component: cli
2018-07-13 11:26:07 +02:00
Sebastiaan van Stijn ca353ee7ae Update hints for linting
- remove some hints that are no longer needed
- added a nolint: unparam for removeSingleSigner() (return bool is only used in tests)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9847e96765
Component: cli
2018-07-13 11:18:50 +02:00
Sebastiaan van Stijn 71a73ab18c Update gometalinter to v2.0.6 and remove alexkohler/nakedret
alexkohler/nakedret is now installed by default with gometalinter,
so it's no longer needed to install this manually

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f3811e865e
Component: cli
2018-07-13 11:17:43 +02:00
Sebastiaan van Stijn 8ce22ea6b6 Fix API template to not use "golang.org/x/net/context"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a8b4e04e2f6ae95a5146c4c4d794cda1a725c634
Component: engine
2018-07-13 09:54:24 +02:00
Sebastiaan van Stijn bcde4812db Remove stray uses of "golang.org/x/net/context"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4c0a050ee24beb399b11c48829522e48f8d0b98a
Component: engine
2018-07-13 09:53:36 +02:00
Sebastiaan van Stijn 0388cb645f Merge pull request #1210 from albers/completion-service-create--init
Add bash completion for `service create|update --init`
Upstream-commit: d97f378009
Component: cli
2018-07-13 09:44:11 +02:00
Harald Albers 526010074d Add bash completion for service create|update --init
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 97d312e02a
Component: cli
2018-07-13 09:05:29 +02:00
Kir Kolyshkin 1efda2126e vendor: update continuity to 0377f7d767206
This is to include the Go 1.11 fix
(https://github.com/containerd/continuity/pull/120).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: c64a2448d1f2b7ba680dcb017cd46dcb8ac359c4
Component: engine
2018-07-12 16:38:05 -07:00
GordonTheTurtle 810635b34f Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2018-07-12 23:01:55 +00:00
Sebastiaan van Stijn 882263fbf1 Merge pull request #37422 from thaJeztah/fix-linting-errors
Fix some golint and ineffassign issues
Upstream-commit: f9470d8189e25c297c6c7bd9ac592b6e5acd951e
Component: engine
2018-07-13 00:25:46 +02:00
Kir Kolyshkin 8a9efc106f lcow: fix debug in startServiceVMIfNotRunning()
When go-1.11beta1 is used for building, the following error is
reported:

> 14:56:20 daemon\graphdriver\lcow\lcow.go:236: Debugf format %s reads
> arg #2, but call has 1 arg

While fixing this, let's also fix a few other things in this
very function (startServiceVMIfNotRunning):

1. Do not use fmt.Printf when not required.
2. Use `title` whenever possible.
3. Don't add `id` to messages as `title` already has it.
4. Remove duplicated colons.
5. Try to unify style of messages.
6. s/startservicevmifnotrunning/startServiceVMIfNotRunning/
...

In general, logging/debugging here is a mess and requires much more
love than I can give it at the moment. Areas for improvement:

1. Add a global var logger = logrus.WithField("storage-driver", "lcow")
and use it everywhere else in the code.
2. Use logger.WithField("id", id) whenever possible (same for "context"
and other similar fields).
3. Revise all the errors returned to be uniform.
4. Make use of errors.Wrap[f] whenever possible.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: b7a95a3ce4c731c0fca204435be758ea89d6050f
Component: engine
2018-07-12 13:42:23 -07:00
docker-unir[bot] 1ea5cae6b3 Merge pull request #123 from dhiltgen/image_build
Merged with https://github.com/seemethere/unir
Upstream-commit: 648a878d637a51826d3d7d17efe8f2f58383daa2
Component: packaging
2018-07-12 17:59:57 +00:00
Daniel Hiltgen 78ba8bbfa1 Add support for image build
This adds a new packaging variant for engine with an image
Upstream-commit: 27766ed0f4576ced4026adc60359ad63a977008e
Component: packaging
2018-07-12 10:41:52 -07:00
GordonTheTurtle ca6e81b42a Merge component 'engine' from git@github.com:docker/engine master 2018-07-12 17:07:16 +00:00
GordonTheTurtle dcf499c9e9 Merge component 'cli' from git@github.com:docker/cli master 2018-07-12 16:41:44 +00:00
Sebastiaan van Stijn cb708746f4 Merge pull request #37440 from msabansal/errorfix
Fix error string in docker CLI test
Upstream-commit: 460297b5fb6bf091bc91b6f8cfbe396c6a483826
Component: engine
2018-07-12 13:47:47 +02:00
Silvin 370f51742e Merge pull request #1204 from thaJeztah/improve-version-align
Improve version output alignment
Upstream-commit: ee8cdb3850
Component: cli
2018-07-12 10:53:50 +02:00
Sandeep Bansal dc41641256 Fix error string in docker CLI test
Signed-off-by: Sandeep Bansal <sabansal@microsoft.com>
Upstream-commit: 76ace9bb5e2c5ecdd02046956ab00f76c3b25a3a
Component: engine
2018-07-11 23:02:44 -07:00
GordonTheTurtle 747f6b750f Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2018-07-12 02:00:27 +00:00
GordonTheTurtle 78b4a1b16e Merge component 'engine' from git@github.com:docker/engine master 2018-07-12 02:00:19 +00:00
Sebastiaan van Stijn 508c160462 Adapt min-column width to component information
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0f7ae34ea9
Component: cli
2018-07-12 01:34:34 +02:00
Sebastiaan van Stijn bc8e259b12 Extend version-align test with components
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 55ff66d967
Component: cli
2018-07-12 01:31:23 +02:00
Yong Tang 6de0e3f629 Merge pull request #37436 from thaJeztah/bump_metalinter
Bump gometalinter to v2.0.6
Upstream-commit: 705774aa7683892fc214d2b028d226f24ad20f1c
Component: engine
2018-07-11 15:44:45 -07:00
Sebastiaan van Stijn c5fdcd4c55 Merge pull request #37437 from thaJeztah/format_fixes
Various formatting fixes / compilation issues caught by Go 1.11
Upstream-commit: 5fc12449d830ae9005138fb3d3782728fa8d137a
Component: engine
2018-07-11 23:14:19 +02:00
docker-unir[bot] a5afbc072c Merge pull request #124 from seemethere/tilder
Merged with https://github.com/seemethere/unir
Upstream-commit: 8c000e19fc52ce65f008b0a7ff81871be9367915
Component: packaging
2018-07-11 21:13:35 +00:00
Sebastiaan van Stijn d799a9b46d Fix golint issues
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 35f7e7c50a131494c9d530800e80bf2da42fb89c
Component: engine
2018-07-11 22:19:03 +02:00
Sebastiaan van Stijn a174fffcfe Fix ineffassign linting
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ddd8a6572d36a6d0db2aa21d697018f419a7b424
Component: engine
2018-07-11 22:18:45 +02:00
Sebastiaan van Stijn 6029eff9d1 Merge pull request #37413 from yui-knk/do_not_Healthcheck_RUN_command
Ensure RUN instruction to run without Healthcheck
Upstream-commit: f0585d04d079d289b7b9cb572f8ee509f6768402
Component: engine
2018-07-11 20:38:03 +02:00
GordonTheTurtle e408ff8937 Merge component 'engine' from git@github.com:docker/engine master 2018-07-11 18:35:11 +00:00
Kir Kolyshkin 99d1e1cf76 loggerutils: build fixes, improve errors
There are two build errors when using go-1.11beta1:

> daemon/logger/loggerutils/logfile.go:367: Warningf format %q arg f.Name is a func value, not called
> daemon/logger/loggerutils/logfile.go:564: Debug call has possible formatting directive %v

In the first place, the file name is actually not required as error
message already includes it.

While at it, fix a couple of other places for more correct messages, and
make sure to not add a file name if an error already has it.

Fixes: f69f09f44c
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 09ad434f10cff48741322854a3003686b28295b5
Component: engine
2018-07-11 15:52:25 +02:00
Kir Kolyshkin d01a9704de aufs: fix Wrapf args
Fix the following go-1.11beta1 build error:

> daemon/graphdriver/aufs/aufs.go:376: Wrapf format %s reads arg #1, but call has 0 args

While at it, change '%s' to %q.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2e30e9e6db42043cb2bd67d25a7152488c834f9f
Component: engine
2018-07-11 15:52:22 +02:00
Kir Kolyshkin 14a71772f5 Compile fix
Go 1.11beta1 (rightfully) complains:

> 15:38:37 daemon/cluster/controllers/plugin/controller.go:183:
> Entry.Debugf format %#T has unrecognized flag #

This debug print was added by commit 72c3bcf2a5.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a9a136572dc2a2c2ec5da320c4d0a32b5a15c550
Component: engine
2018-07-11 15:52:19 +02:00
Sebastiaan van Stijn 2a7994f372 daemon/*.go: fix some Wrap[f]/Warn[f] errors
In particular, these two:
> daemon/daemon_unix.go:1129: Wrapf format %v reads arg #1, but call has 0 args
> daemon/kill.go:111: Warn call has possible formatting directive %s

and a few more.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 3737194b9f2875c10f3f2117c1816054ba0ff262
Component: engine
2018-07-11 15:51:51 +02:00
Kir Kolyshkin c5b67f5adc Bump gometalinter to v2.0.6
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: bda793d1d4b4000154d057afb9621f5123bb0dac
Component: engine
2018-07-11 15:41:15 +02:00
Justin Cormack 9ef9ed7750 Merge pull request #37424 from thaJeztah/bump_libnetwork
Bump libnetwork to d00ceed44cc447c77f25cdf5d59e83163bdcb4c9
Upstream-commit: 94a8f4d0d4af128d656fa571fff2dd2b59278717
Component: engine
2018-07-11 12:04:41 +01:00
Yong Tang 2a39d8293c Merge pull request #37431 from tonistiigi/mountable-fix
builder: fix duplicate calls to mountable
Upstream-commit: e6aa71b190a87406e327ca08680e691d6f1fcfe5
Component: engine
2018-07-10 18:26:57 -07:00
Eli Uriegas f481ae9371 ~ -> - for dev versions
tilde doesn't play nice with docker images so to be uniform let's
replace the tilde with a dash

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: ad988a9a4020eaf44245659a8fe7053a2e9b874b
Component: packaging
2018-07-11 00:27:21 +00:00
Tonis Tiigi 4c7a4e64a3 builder: fix duplicate calls to mountable
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: ffa7233d1538363fe12ad609e720b8d75e8768de
Component: engine
2018-07-10 15:21:29 -07:00
GordonTheTurtle 4fdca264ef Merge component 'engine' from git@github.com:docker/engine master 2018-07-10 17:07:24 +00:00
GordonTheTurtle 8e212141ba Merge component 'cli' from git@github.com:docker/cli master 2018-07-10 16:41:45 +00:00