Commit Graph

37421 Commits

Author SHA1 Message Date
bab96155c7 Merge component 'engine' from git@github.com:moby/moby master 2017-07-14 21:15:01 +00:00
1a59a831b3 Merge component 'cli' from git@github.com:docker/cli master 2017-07-14 20:04:39 +00:00
c2eba39c13 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2017-07-14 20:03:09 +00:00
a50b8e5956 Merge pull request #335 from coolljt0725/add_env
Add DOCKER_BUILD_ARGS to support build with proxy
Upstream-commit: 0c8d401cd8
Component: cli
2017-07-14 11:41:44 -04:00
19bca77267 Merge pull request #34077 from justincormack/mount_remount_opts
In the case of remounting with changed data, need to call mount
Upstream-commit: f7ce35f47b1b8e029d7e572ef333cabba1b08e5b
Component: engine
2017-07-14 09:58:30 -04:00
0667ef33f8 Add DOCKER_BUILD_ARGS to support build with proxy
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 7d8681fadb
Component: cli
2017-07-14 05:20:18 -04:00
c8dfc96c37 Merge pull request #324 from cyphar/libdm-debug-flag-docs
docs: add documentation for dm.libdm_log_level
Upstream-commit: de4c546b7e
Component: cli
2017-07-14 00:58:38 -07:00
240df15e94 Merge pull request #34076 from yastij/33679-renaming-id-meth
renaming id() to state clearly that it's related to the networkAttachment
Upstream-commit: ce0ef9568d945b3d16442906a428b6f80fedc4dd
Component: engine
2017-07-14 00:29:09 -07:00
becbfbd6d3 docs: add documentation for dm.libdm_log_level
This is a new option added specifically to allow for debugging of bugs
in Docker's storage drivers or libdm itself.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
Upstream-commit: c7710819a5
Component: cli
2017-07-14 16:52:33 +10:00
fd5e2f635f Merge pull request #34089 from tonistiigi/builder-report-2017-07-10
Add builder dev report for 2017-07-10
Upstream-commit: 93494237df7ddcd78738b68d5c48ed08e3755423
Component: engine
2017-07-13 23:25:57 -07:00
0393b35079 Merge pull request #34 from andrewhsu/check-clean
check if build dir exists before chown
Upstream-commit: 6829cb8fdb1ffad738d9742329bf83de1b2aad8b
Component: packaging
2017-07-13 21:50:19 -07:00
16b3113441 check if build dir exists before chown
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 46dd23f1fc2863741783f0584dad1a42815e5438
Component: packaging
2017-07-14 04:35:47 +00:00
80e097613a Merge pull request #34063 from dnephin/fix-builder-no-such-layer
Fix multiple `COPY --from` in multistage builds
Upstream-commit: 1daa10301acfe0742dd852dfb8603c48afdaa1ee
Component: engine
2017-07-14 12:19:19 +09:00
b9deee44fd Merge pull request #33969 from Microsoft/jjh/lifetime
LCOW: Service VM lifetime changes
Upstream-commit: f22cecf9297a467f20bf49bc1c7aef5d2ee3a59c
Component: engine
2017-07-13 15:51:21 -07:00
6da354bd2c Merge pull request #10 from seemethere/reflective_alpine_images
Add reflective alpine images to other components
Upstream-commit: f373edf0ac49203be0b8dd66f75237e18927c553
Component: packaging
2017-07-13 15:29:20 -07:00
480f1b0a2a ALPINE -> ALPINE_IMG
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: ee25bc2379126a75116ce66daffda6c7d3f41d42
Component: packaging
2017-07-13 15:19:22 -07:00
fa401fa1b5 Add reflective alpine images to other components
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 0435cef6a945dc1c57b51cb24b36aaf66be8d8cc
Component: packaging
2017-07-13 15:16:51 -07:00
9ed5ded98d LCOW: Service VM lifetime changes
Signed-off-by: John Howard <jhoward@microsoft.com>

This changes the LCOW driver to support both global SVM lifetime and
per-instance lifetime. It also corrects the scratch implementation.
Upstream-commit: 76b0d4819a50c50edd79890db0b92eb96c8d46e6
Component: engine
2017-07-13 11:09:43 -07:00
a100224db8 Add builder dev report for 2017-07-10
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 2689f9cc0b45dfbacf52f8f08a7b5f4abb286427
Component: engine
2017-07-13 09:30:13 -07:00
d4d72fe32c In the case of remounting with changed data, need to call mount
The case where we are trying to do a remount with changed filesystem specific options was missing,
we need to call `mount` as well here to change those options.

See #33844 for where we need this, as we change `tmpfs` options.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 3a1ab5b479ce843648cf676fbaaf2bec9e040dce
Component: engine
2017-07-13 15:48:58 +01:00
3c42375fa5 Merge pull request #206 from dnephin/why-cross-so-slow
Faster CI
Upstream-commit: e3746d388e
Component: cli
2017-07-13 09:36:18 +02:00
f68d310a1b Merge pull request #32881 from coolljt0725/fix_exec_faild
Enable inspect exec if container is pause/restarting/non-running
Upstream-commit: 53a75ee05072cf5e59e9fb5b9e5cc5fb91fdb5be
Component: engine
2017-07-12 19:29:27 -07:00
2015772003 Merge pull request #34027 from cpuguy83/15853_allow_stopping_paused_container
Allow stopping of paused container
Upstream-commit: 6fdb2fb069b985f244eb227828b00a940ee9de84
Component: engine
2017-07-13 10:16:46 +08:00
0e754d487a Merge pull request #33539 from tklauser/x-sys-unix-symlink-xattrs
Use symlink xattr functions from x/sys/unix
Upstream-commit: 96bf279c7d03bc20dd2626535ff77d7efd66dd07
Component: engine
2017-07-12 18:04:33 -07:00
a6bf694e20 Merge pull request #33845 from cyphar/devicemapper-show-me-your-logs
devicemapper: rework logging and add --storage-opt dm.libdm_log_level
Upstream-commit: 00b218216d8a2075bf7200df74aa07b749f72f34
Component: engine
2017-07-12 17:46:14 -07:00
8e0ce0ecdb Merge pull request #33877 from rhvgoyal/sync-removal
devicemapper: Wait for device removal if deferredRemoval=true and deferredDeletion=…
Upstream-commit: e04dbe5ac287c2a856b7c96972d931ee5f0e288f
Component: engine
2017-07-12 17:35:45 -07:00
38d61f1225 Merge pull request #271 from tych0/password-stdin
Password stdin
Upstream-commit: ae38f202bb
Component: cli
2017-07-12 17:08:11 -07:00
e7e9eef224 Merge pull request #328 from cyli/de-duplicate-CAcert-flag
Fix warning in docker CLI when `swarm ca` is called with flags other than `--rotate`
Upstream-commit: dcd788b100
Component: cli
2017-07-12 16:45:50 -07:00
ac7952530f Fix warning in docker CLI when swarm ca --ca-cert, etc. flags are passed,
and add a test.

Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: 4615c92f66
Component: cli
2017-07-12 14:56:28 -07:00
34e1a128cc Merge pull request #329 from dnephin/fix-linter-master
Update gometalinter
Upstream-commit: 6d74d8c13c
Component: cli
2017-07-12 13:21:24 -07:00
5f448ae97b Update gometalinter
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 7a8f75a25a
Component: cli
2017-07-12 15:21:41 -04:00
b492ded3c0 Fix multiple copy from
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b50ade0bfb67dae7867f4f5c3da12c1f778b6c7e
Component: engine
2017-07-12 12:36:03 -04:00
0ca3fff735 Merge pull request #326 from dnephin/fix-merged-pr-conflicts
Fix test and lint failures on master
Upstream-commit: 25d9594f0b
Component: cli
2017-07-12 09:34:14 -07:00
cdbad2a1c4 Fix test and lint failures
Split test cases.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f27934376d
Component: cli
2017-07-12 11:37:35 -04:00
7aed75f09c Allow stopping of paused container
When a container is paused, signals are sent once the container has been
unpaused.
Instead of forcing the user to unpause a container before they can ever
send a signal, allow the user to send the signals, and in the case of a
stop signal, automatically unpause the container afterwards.

This is much safer than unpausing the container first then sending a
signal (what a user is currently forced to do), as the container may be
paused for very good reasons and should not be unpaused except for
stopping.
Note that not even SIGKILL is possible while a process is paused,
but it is killed the instant it is unpaused.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: c3feb046b9b1eb606cc7e853d020799eb3800e0e
Component: engine
2017-07-12 10:35:48 -04:00
165659798d renaming id() to state clearly that it's related to the networkAttachement container target
Signed-off-by: Yassine TIJANI <yasstij11@gmail.com>
Upstream-commit: 27c0131a43b1f4956446467273e82826264d6c35
Component: engine
2017-07-12 15:58:31 +02:00
5eaf5cc8fa Merge pull request #33887 from thaJeztah/update-version-error
Fix NewVersionError() for clients using default version
Upstream-commit: 45cad73ea8abc5e87d5db1a4a47c8565531d769f
Component: engine
2017-07-12 15:24:00 +02:00
6ef5605557 system: Use symlink xattr functions from x/sys/unix
Use the symlink xattr syscall wrappers Lgetxattr and Lsetxattr from
x/sys/unix (introduced in golang/sys@b90f89a) instead of providing own
wrappers. Leave the functionality of system.Lgetxattr intact with
respect to the retry with a larger buffer, but switch it to use
unix.Lgetxattr. Also leave system.Lsetxattr intact (even though it's
just a wrapper around the corresponding function from unix) in order to
keep moby building for !linux.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Upstream-commit: 4d966409bc7033e3bebe7deb921d8be8249f8d18
Component: engine
2017-07-12 14:52:42 +02:00
ea0a9a0e13 [pkg/term] temporarily use STD_*_HANDLE from syscall again
Due to the CL https://go-review.googlesource.com/c/39608/ in
x/sys/windows which changed the definitions of STD_INPUT_HANDLE,
STD_OUTPUT_HANDLE and STD_ERROR_HANDLE, we get the following failure
after re-vendoring x/sys/windows:

  07:47:01 # github.com/docker/docker/pkg/term
  07:47:01 pkg/term/term_windows.go:82: constant 4294967286 overflows int
  07:47:01 pkg/term/term_windows.go:88: constant 4294967285 overflows int
  07:47:01 pkg/term/term_windows.go:94: constant 4294967284 overflows int
  07:47:12 Build step 'Execute shell' marked build as failure

Temporarily switch back pkg/term to use these constants from the syscall
package and add a comment about it.

To really fix this, go-ansiterm should probably be switched to use
x/sys/windows.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Upstream-commit: ef5252fc5dcd83d1b8dfe173a68691c8a63e7e4a
Component: engine
2017-07-12 14:52:42 +02:00
520019f676 Windows: fix build after re-vendoring golang.org/x/sys
Due to the CL https://go-review.googlesource.com/c/39608/ in
x/sys/windows which changed the definitions of STD_INPUT_HANDLE,
STD_OUTPUT_HANDLE and STD_ERROR_HANDLE, we get the following failure
in cmd/dockerd/service_windows.go after re-vendoring x/sys/windows:

  06:29:57 # github.com/docker/docker/cmd/dockerd
  06:29:57 .\service_windows.go:400: cannot use sh (type int) as type uint32 in argument to windows.GetStdHandle

Fix it by adding an explicit type conversion when calling
windows.GetStdHandle.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Upstream-commit: e769da88e6c6e94a397822dd8962cbcb83a402a0
Component: engine
2017-07-12 14:52:42 +02:00
8658bf36a0 Merge pull request #323 from dnephin/add-code-owners
Add a new CODEOWNERS file, and add a few owners
Upstream-commit: bb795aa7af
Component: cli
2017-07-12 13:28:24 +02:00
27200496d4 Merge pull request #34067 from thaJeztah/bump-image-spec
bump image-spec to 372ad780f63454fbbbbcc7cf80e5b90245c13e13
Upstream-commit: 94260ccb1dad0b49c7642db07aece5112b316ba0
Component: engine
2017-07-12 12:19:39 +02:00
e4f148de96 Merge pull request #277 from thaJeztah/dont-remove-what-isnt-there
Don't attempt to remove unsupported resources on older daemon
Upstream-commit: 87345ed117
Component: cli
2017-07-12 10:43:54 +02:00
316c35cc99 Merge pull request #299 from dnephin/less-verbose-fake-cli
Less verbose fake cli
Upstream-commit: fa7687a362
Component: cli
2017-07-12 09:56:43 +02:00
a05235a1e0 Merge pull request #322 from dnephin/pin-tools
Pin all tools used in the Dockerfiles
Upstream-commit: 8b451c598f
Component: cli
2017-07-12 08:58:33 +02:00
9083f94772 vendor: re-vendor golang.org/x/sys
Update golang.org/x/sys to 739734461d1c916b6c72a63d7efda2b27edb369f in
order to get the Lgetxattr, Llistxattr, Lremovexattr and Lsetxattr
syscall wrappers. These will be used in a successive commit to replace
the wrappers in libcontainer/system/xattr_linux.go.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Upstream-commit: bd13a5a9e0e3bfad8bdc533cac45ec4bd17c1c33
Component: engine
2017-07-12 08:26:51 +02:00
4f75fb4d4c bump image-spec to 372ad780f63454fbbbbcc7cf80e5b90245c13e13
this commit matches what's used in SwarmKit

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9fc66ec869ecd963d7a30b96f5c0b1de69cf5090
Component: engine
2017-07-11 20:52:17 -07:00
bd835f3c9e Merge pull request #34061 from cyli/re-vendor-swarmkit
Re-vendor swarmkit. 
Upstream-commit: c0e6da7637491886904725c2fcec9db6ec261af4
Component: engine
2017-07-11 20:30:56 -07:00
322987e0f5 Merge pull request #34065 from allencloud/add-cluster-events-change
add cluster events change in version_history.md
Upstream-commit: e5862d42b372110c4530ba7afb579801ddafd553
Component: engine
2017-07-11 20:28:05 -07:00
c30b5760e3 Merge pull request #34032 from allencloud/support-config-event-in-cluster
make engine support cluster config event
Upstream-commit: 334702ab1fa8d3d6c64f3c41d80752c7b4196357
Component: engine
2017-07-11 20:25:19 -07:00