GordonTheTurtle
ed8df8d90f
Merge component 'cli' from git@github.com:docker/cli master
2017-12-22 16:41:11 +00:00
Sebastiaan van Stijn
2ac4f6cd3a
Merge pull request #758 from vdemeester/experimental-cli
...
Add support for experimental Cli configuration
Upstream-commit: 70db7cc0fc
Component: cli
2017-12-22 14:56:40 +01:00
Vincent Demeester
2a46f74679
Add support for experimental Cli configuration
...
Allow to mark some commands and flags experimental on cli (i.e. not
depending to the state of the daemon). This will allow more flexibility
on experimentation with the cli.
Marking `docker trust` as cli experimental as it is documented so.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 84fe1a1b5b
Component: cli
2017-12-22 14:48:47 +01:00
GordonTheTurtle
b1a25d1e15
Merge component 'engine' from git@github.com:moby/moby master
2017-12-21 17:03:54 +00:00
GordonTheTurtle
3e15d0b417
Merge component 'cli' from git@github.com:docker/cli master
2017-12-21 16:41:00 +00:00
Sebastiaan van Stijn
618f1e2388
Merge pull request #761 from sourabhtk37/patch-1
...
Corrected descriptions for MAC_ADMIN and MAC_OVERRIDE
Upstream-commit: ebb8927a2a
Component: cli
2017-12-21 11:43:21 +01:00
T K Sourabh
7fa76a7822
Corrected descriptions for MAC_ADMIN and MAC_OVERRIDE
...
The description for capabilities are mismatched for MAC_ADMIN and MAC_OVERRIDE.
Signed-off-by: T K Sourabh <sourabhtk37@gmail.com >
Upstream-commit: afcc78aae3
Component: cli
2017-12-21 16:06:32 +05:30
Sebastiaan van Stijn
87487ae8dd
Merge pull request #759 from mistyhacks/link-to-attack-surface
...
Fix typo in link
Upstream-commit: 2f3b13742f
Component: cli
2017-12-21 08:33:16 +01:00
Tõnis Tiigi
b8be0fb3b8
Merge pull request #35582 from asottile/use_base_containers_config
...
Fix environ substitutions in `docker commit --change ...`
Upstream-commit: a5de79b435735f8027ffc98072a33a83fc8dea28
Component: engine
2017-12-20 21:01:53 -08:00
Akihiro Suda
aa8a79c526
Merge pull request #35845 from ndeloof/FIX35843
...
fix #35843 regression on health check workingdir
Upstream-commit: c36d6f5ab10d0dd4e5216fa3b8e2613de38c3ba2
Component: engine
2017-12-21 10:55:15 +09:00
Misty Stanley-Jones
1f700eda21
Fix typo in link
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 946cb0d4fd
Component: cli
2017-12-20 15:35:22 -08:00
Sebastiaan van Stijn
02056dd212
Merge pull request #35838 from marcusmartins/marcus_swarmkit
...
Vendor docker/swarmkit to 713d79d
Upstream-commit: 9646d07d753b9d92678c625b6f43ed76a71fe83e
Component: engine
2017-12-20 23:47:10 +01:00
Anthony Sottile
2af5d43021
Fix environ substitutions in docker commit --change ...
...
The building machinery was being handed an uninitialized container
Config. This changes it to use the target container's Config.
Resolves #30538
Signed-off-by: Anthony Sottile <asottile@umich.edu >
Upstream-commit: 0785836c4b440a8d4a5dfdb8df82e50f9f4d23a1
Component: engine
2017-12-20 11:03:38 -08:00
Sebastiaan van Stijn
e0ed436e6c
Add integration test for healthcheck workdir
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 5be2f2be243a52eb1b051c981bac5442b6e85606
Component: engine
2017-12-20 18:48:36 +01:00
GordonTheTurtle
e190404195
Merge component 'engine' from git@github.com:moby/moby master
2017-12-20 17:04:25 +00:00
Nicolas De Loof
2a820c0f5f
fix #35843 regression on health check workingdir
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com >
Upstream-commit: 852a943c773382df09cdda4f29f9e93807523178
Component: engine
2017-12-20 14:04:51 +01:00
Vincent Demeester
847487f5da
Merge pull request #35778 from estesp/moby-governance
...
Add Moby TSC references/governance details
Upstream-commit: 267847712e720d624f78ef5364f474ff6635b725
Component: engine
2017-12-20 10:50:47 +01:00
Victor Vieux
50de5d926a
Merge pull request #35812 from stevvooe/follow-conventions
...
daemon, plugin: follow containerd namespace conventions
Upstream-commit: 745278d24280614145819838b763c3a2d5349b7e
Component: engine
2017-12-19 15:55:39 -08:00
Marcus Martins
3f7322c602
Vendor docker/swarmkit to 713d79d
...
Revendor swarmkit to 713d79dc8799b33465c58ed120b870c52eb5eb4f to include
https://github.com/docker/swarmkit/pull/2473 .
Signed-off-by: Marcus Martins <marcus@docker.com >
Upstream-commit: af73d31e60fd5c26d58bb8275785e628c3febdc0
Component: engine
2017-12-19 13:23:21 -08:00
Anusha Ragunathan
760baaebbb
Merge pull request #35805 from cpuguy83/fix_kill_containers_on_restart
...
Ensure containers are stopped on daemon startup
Upstream-commit: c3a9f5d00f48a1487ab005693e23bbaba04a0523
Component: engine
2017-12-19 12:19:47 -08:00
Sebastiaan van Stijn
b225d1b061
Merge pull request #35726 from jahkeup/awslogs-batching
...
Fix awslogs batch size calculation
Upstream-commit: c8f7f4489ebac5b5dbf2d4e2b4fc1dd3f2d744dc
Component: engine
2017-12-19 20:44:33 +01:00
GordonTheTurtle
0acf31e126
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-12-19 17:04:12 +00:00
GordonTheTurtle
92961327ba
Merge component 'engine' from git@github.com:moby/moby master
2017-12-19 17:04:06 +00:00
GordonTheTurtle
f1ba211fd1
Merge component 'cli' from git@github.com:docker/cli master
2017-12-19 16:41:15 +00:00
Daniel Nephin
822fd111b3
Merge pull request #35808 from thaJeztah/prevent-panic-in-test
...
Prevent potential panic in TestLogsAPIUntil
Upstream-commit: 602bce175b40d77abf671b35afa9bf81c96b2b72
Component: engine
2017-12-19 11:16:00 -05:00
Vincent Demeester
04606e240e
Merge pull request #757 from pszczekutowicz/master
...
Return errors from client in stack deploy configs
Upstream-commit: 2b8eb23b8c
Component: cli
2017-12-19 11:05:49 +01:00
Yong Tang
7a36094339
Merge pull request #35823 from thaJeztah/remove-dead-code
...
Remove dead code and redundant build tags
Upstream-commit: c492e76d13a61b13815475d1a6393ab1da1db5c8
Component: engine
2017-12-18 18:05:05 -06:00
Paweł Szczekutowicz
3e7449957b
Return errors from client in stack deploy configs
...
Signed-off-by: Paweł Szczekutowicz <pszczekutowicz@gmail.com >
Upstream-commit: a30dd1b6f3
Component: cli
2017-12-18 21:34:04 +01:00
Brian Goff
048a0b941a
Ensure containers are stopped on daemon startup
...
When the containerd 1.0 runtime changes were made, we inadvertantly
removed the functionality where any running containers are killed on
startup when not using live-restore.
This change restores that behavior.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: e69127bd5ba4dcf8ae1f248db93a95795eb75b93
Component: engine
2017-12-18 14:33:45 -05:00
Eli Uriegas
df88bdc9c9
Merge pull request #69 from BSWANG/master
...
replace all '-' in version when generate rpm version
Upstream-commit: abc7613e1b7399b3a8012c00a8a3aaa01e1251fa
Component: packaging
2017-12-18 10:08:29 -08:00
Sebastiaan van Stijn
fd08bae89c
Remove redundant build-tags
...
Files that are suffixed with `_linux.go` or `_windows.go` are
already only built on Linux / Windows, so these build-tags
were redundant.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 6ed1163c98703f8dd0693cecbadc84d2cda811c3
Component: engine
2017-12-18 17:41:53 +01:00
Sebastiaan van Stijn
ef4dfd2f67
Remove Solaris files
...
Solaris is no longer being worked on, so these files
are now just dead code.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 1589cc0a85396e2768bfe9e558c7c2100dc3bc87
Component: engine
2017-12-18 17:22:25 +01:00
Sebastiaan van Stijn
7e2ee76b7e
Remove unused experimental code
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 16fe5a12891984ae5d0b28e737958566a13958ae
Component: engine
2017-12-18 17:07:48 +01:00
GordonTheTurtle
15c0c88784
Merge component 'engine' from git@github.com:moby/moby master
2017-12-16 17:04:05 +00:00
GordonTheTurtle
f3becf1d35
Merge component 'cli' from git@github.com:docker/cli master
2017-12-16 16:41:09 +00:00
Yong Tang
343f73cf3d
Merge pull request #35811 from abhi/vendor
...
Vendoring swarmkit a6519e28ff2a558f5d32b2dab9fcb0882879b398
Upstream-commit: 26bc976ac9e379b4432f71394f069dfb1e4d7baf
Component: engine
2017-12-16 10:40:29 -06:00
Sebastiaan van Stijn
435d4943db
Merge pull request #35809 from cpuguy83/fix_container_zombies
...
Fix race conditions in libcontainerd process handling
Upstream-commit: 52656da9500eefedd69361849954e7d44b9a1513
Component: engine
2017-12-16 01:16:50 -08:00
Sebastiaan van Stijn
ef43ef8bc9
Merge pull request #35794 from estesp/fix-overlay2-untarinuserns
...
Fix overlay2 storage driver inside a user namespace
Upstream-commit: 0862014431d40174a7b4e614ddcc0ee6e13ad570
Component: engine
2017-12-15 23:25:15 -08:00
Stephen J Day
ebbba75d0a
daemon, plugin: follow containerd namespace conventions
...
Follow the conventions for namespace naming set out by other projects,
such as linuxkit and cri-containerd. Typically, they are some sort of
host name, with a subdomain describing functionality of the namespace.
In the case of linuxkit, services are launched in `services.linuxkit`.
In cri-containerd, pods are launched in `k8s.io`, making it clear that
these are from kubernetes.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: 521e7eba86df25857647b93f13e5366c554e9d63
Component: engine
2017-12-15 17:20:42 -08:00
Daniel Nephin
a67c7bc0ee
Merge pull request #713 from albers/completion-512
...
Fix #512 Bash autocompletion works incorrect with inspect
Upstream-commit: 718a245b6e
Component: cli
2017-12-15 16:33:41 -05:00
abhi
e1fb11f9ea
Vendoring swarmkit a6519e28ff2a558f5d32b2dab9fcb0882879b398
...
Signed-off-by: abhi <abhi@docker.com >
Upstream-commit: efae8db785189dc1fe9ce880d190beb2e26cb0fd
Component: engine
2017-12-15 11:37:17 -08:00
Brian Goff
fbc087df98
Fix some missing synchronization in libcontainerd
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 647cec4324186faa3183bd6a7bc72a032a86c8c9
Component: engine
2017-12-15 12:54:38 -05:00
GordonTheTurtle
b16d6e9f15
Merge component 'engine' from git@github.com:moby/moby master
2017-12-15 17:04:20 +00:00
GordonTheTurtle
c687cf1b38
Merge component 'cli' from git@github.com:docker/cli master
2017-12-15 16:41:16 +00:00
Brian Goff
72249a1f2e
Fix error handling for kill/process not found
...
With the contianerd 1.0 migration we now have strongly typed errors that
we can check for process not found.
We also had some bad error checks looking for `ESRCH` which would only
be returned from `unix.Kill` and never from containerd even though we
were checking containerd responses for it.
Fixes some race conditions around process handling and our error checks
that could lead to errors that propagate up to the user that should not.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: e55bead518e4c72cdecf7de2e49db6c477cb58eb
Component: engine
2017-12-15 10:09:55 -05:00
Sebastiaan van Stijn
5e5a802f6b
Merge pull request #753 from thaJeztah/image-shortid
...
Updated deprecation status for "repository:shortid"
Upstream-commit: 69b11daa77
Component: cli
2017-12-15 01:35:11 -08:00
Sebastiaan van Stijn
7ad7bb59be
Merge pull request #35790 from thaJeztah/image-shortid
...
Remove support for referencing images by 'repository:shortid'
Upstream-commit: 6796e740fdcb8f446747a6b7890e71d4057b1082
Component: engine
2017-12-15 01:33:49 -08:00
Sebastiaan van Stijn
ba6f88e84d
Merge pull request #749 from albers/completion--generic-resource
...
Add support for generic resources to bash completion
Upstream-commit: 8684b99923
Component: cli
2017-12-15 01:08:42 -08:00
Harald Albers
edf70bdb82
Add support for generic resources to bash completion
...
Adds bash completion for
- `service create --generic-resource`
- `service update --generic-resource-(add|rm)`
- `dockerd --node-generic-resource`
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 8ec80eec67
Component: cli
2017-12-15 08:56:14 +01:00
Sebastiaan van Stijn
58f0e7706b
Merge pull request #35793 from Microsoft/33107
...
Windows: Case-insensitive filename matching against builder cache
Upstream-commit: a59061da5f6d02f16563efc5ec7c561373d1c4e2
Component: engine
2017-12-14 23:48:47 -08:00