GordonTheTurtle
2a42a9a588
Merge component 'cli' from git@github.com:docker/cli master
2018-06-08 16:41:22 +00:00
Vincent Demeester
5522fc00fc
Merge pull request #1119 from silvin-lubecki/fix-help-docker-client-initialization
...
Check errors when initializing the docker client in the help command
Upstream-commit: aac3124794
Component: cli
2018-06-08 17:05:21 +02:00
Silvin Lubecki
17705eb1b4
Fix #1113 "Segfault on --help with --tlsverify if no ca certificate is present"
...
Errors were not checked while initializing the docker client in the help command
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: f4b0780e20
Component: cli
2018-06-08 16:14:48 +02:00
Silvin
709a15352d
Merge pull request #1115 from vdemeester/o-rly
...
Mark @thajeztah as a MAINTAINER…
Upstream-commit: 001c8f2f7f
Component: cli
2018-06-07 20:55:40 +02:00
Vincent Demeester
5ea7988613
Mark @thajeztah as a MAINTAINER…
...
… discovered recently that our very own Sebastiaan was not even listed
in the maintainers, so fixing this mistake !
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 9fda91bed4
Component: cli
2018-06-07 19:52:40 +02:00
GordonTheTurtle
b41fea2d2c
Merge component 'engine' from git@github.com:docker/engine master
2018-06-07 17:07:30 +00:00
Sebastiaan van Stijn
025606b2a1
Merge pull request #36644 from jessfraz/rawaccess
...
api: add MaskedPaths and ReadonlyPaths options
Upstream-commit: 1fe0e49d2057d5ee1b12cc6f53e4c41a197e7fec
Component: engine
2018-06-06 18:16:16 -07:00
Sebastiaan van Stijn
bf25aa33ff
Merge pull request #37209 from thaJeztah/bump_libnetwork
...
bump libnetwork to 3931ba4d815e385ab97093c64477b82f14dadefb
Upstream-commit: 21291e5aefe1f13f3208d57bcc4183848c492bd1
Component: engine
2018-06-06 13:41:33 -07:00
Anusha Ragunathan
5028541e5c
Merge pull request #37192 from thaJeztah/update_miekd_dns
...
Update miekg/dns to v1.0.7
Upstream-commit: 9b0b9a0ece532caa806594b5fbc5eef2d6777b10
Component: engine
2018-06-06 11:24:54 -07:00
GordonTheTurtle
57b10679e6
Merge component 'engine' from git@github.com:docker/engine master
2018-06-06 17:06:45 +00:00
GordonTheTurtle
5f7ac51e1c
Merge component 'cli' from git@github.com:docker/cli master
2018-06-06 16:41:36 +00:00
Sebastiaan van Stijn
f6411898cc
Merge pull request #36895 from dmcgowan/vendor-containerd-master
...
Update containerd to 1.1
Upstream-commit: fd2f2a919e392b96de74795ae9af2dc5e510bc4c
Component: engine
2018-06-05 21:43:31 -07:00
Andrew Hsu
370137f15d
Merge pull request #531 from seemethere/engine
...
Change engine component to point to docker/engine
2018-06-05 14:52:24 -07:00
Sebastiaan van Stijn
8925778ea9
Merge pull request #37211 from vdemeester/fix-volume-unit-test
...
Fix wrong assertion in volume/service package
Upstream-commit: 340fd5e2370714f54ae99b8679a4311617848bc5
Component: engine
2018-06-05 13:14:13 -07:00
Eli Uriegas
6e77b5d7c2
Change to docker/engine
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2018-06-05 19:02:54 +00:00
Sebastiaan van Stijn
4cdb057509
bump libnetwork to 3931ba4d815e385ab97093c64477b82f14dadefb
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: fe02b187555b25cb1a92ecaaac2b8b9f5b6a293d
Component: engine
2018-06-05 11:29:23 -07:00
Vincent Demeester
50be59326e
Fix wrong assertion in volume/service package
...
This last assertion shouldn't be there, those cases should be handled
by the for/switch above.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 04207c2db9cd82e47aa82bc2834fe3820086a697
Component: engine
2018-06-05 18:51:17 +02:00
Jess Frazelle
67fe100ad5
api: add configurable MaskedPaths and ReadOnlyPaths to the API
...
This adds MaskedPaths and ReadOnlyPaths options to HostConfig for containers so
that a user can override the default values.
When the value sent through the API is nil the default is used.
Otherwise the default is overridden.
Adds integration tests for MaskedPaths and ReadonlyPaths.
Signed-off-by: Jess Frazelle <acidburn@microsoft.com >
Upstream-commit: 3694c1e34e40fa2e255a97b5541645cec9c8d1d5
Component: engine
2018-06-05 12:33:14 -04:00
Sebastiaan van Stijn
61e3e1ddea
Merge pull request #1104 from vdemeester/show-me-your-secret
...
Add more example to the full-example tests
Upstream-commit: 90f8ce8a5d
Component: cli
2018-06-05 16:44:06 +02:00
Sebastiaan van Stijn
2452577cb1
Merge pull request #37194 from AntaresS/fix-test-failure
...
fix a failed test
Upstream-commit: ca25df3b54300e897d96029dcc4f86b8c4215a27
Component: engine
2018-06-05 02:38:04 +02:00
Sebastiaan van Stijn
0e7017a3ae
Merge pull request #36688 from cpuguy83/volumes_service
...
Extract volume interaction to a volumes service
Upstream-commit: 5037c5a8ce762b46638378b7a7d1081572eadba1
Component: engine
2018-06-05 02:16:20 +02:00
Derek McGowan
77116c8094
Update containerd daemon
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net >
Upstream-commit: a0009345f51d7a58a2f188d7ffc7e0e837a5238d
Component: engine
2018-06-04 15:37:03 -07:00
Derek McGowan
60c800804e
Update containerd to 1.1
...
Updates swarmkit, grpc, and all related vendors
Signed-off-by: Derek McGowan <derek@mcgstyle.net >
Upstream-commit: 52ed3e0896c203013388a3eb603658f345a9d80a
Component: engine
2018-06-04 15:37:03 -07:00
Sebastiaan van Stijn
94cab3b97b
Merge pull request #37191 from adshmh/use-unique-names-for-integration-tests-secret
...
use unique names for resources in integration tests of secret package
Upstream-commit: d7e94d6ea7c1a76c79b6da722491c79118236999
Component: engine
2018-06-05 00:06:50 +02:00
Anda Xu
82d56e0c15
fix a failed test
...
Signed-off-by: Anda Xu <anda.xu@docker.com >
Upstream-commit: 1d9973c0d4c51362e8c5b38e585a025c90baf085
Component: engine
2018-06-04 14:29:00 -07:00
GordonTheTurtle
78419943dd
Merge component 'engine' from git@github.com:moby/moby master
2018-06-04 17:09:05 +00:00
GordonTheTurtle
389df6fca3
Merge component 'cli' from git@github.com:docker/cli master
2018-06-04 16:42:00 +00:00
Vincent Demeester
f5f666914b
Merge pull request #37197 from tonistiigi/vendor-buildkit
...
vendor: dockerfile parser from buildkit
Upstream-commit: e466f999aa9d2add9ccaca655f8d53c3112c121d
Component: engine
2018-06-04 14:53:22 +02:00
Vincent Demeester
9bf4d4a535
Merge pull request #948 from simonferquel/k8s-watch-stack-status
...
K8s: more robust stack error detection on deploy
Upstream-commit: eaa9149e29
Component: cli
2018-06-04 10:42:42 +02:00
GordonTheTurtle
1023e99d13
Merge component 'engine' from git@github.com:moby/moby master
2018-06-03 17:07:57 +00:00
Akihiro Suda
79ad4e84bf
Merge pull request #37190 from vdemeester/allow-make-run-with-args
...
Allow to add any args when doing a make run
Upstream-commit: 641e2c01cca0c9c66b173a52c1f1ef12a934dfa9
Component: engine
2018-06-03 03:42:02 +09:00
Tonis Tiigi
f01f23683f
vendor: add new opentracing deps for session tracing
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: ad77dee8baafc478baa18f65a4972ba19b6e973f
Component: engine
2018-06-02 11:10:38 -07:00
Tonis Tiigi
2f23577c7a
vendor: use dockerfile parser from buildkit
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: c9ebd2f13b3aab49c2d90cc38dcf2cd0d059697f
Component: engine
2018-06-02 11:10:34 -07:00
GordonTheTurtle
0132060680
Merge component 'cli' from git@github.com:docker/cli master
2018-06-02 16:41:34 +00:00
Sebastiaan van Stijn
d9ce9238d8
Merge pull request #1106 from silvin-lubecki/fix-orchestrator-flag-persistent
...
Add a "top-level" annotation to hide persistent flags
Upstream-commit: 2014e991ee
Component: cli
2018-06-01 23:32:40 +02:00
GordonTheTurtle
763340472e
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2018-06-01 21:14:02 +00:00
Vincent Demeester
0e64c4ed59
Merge pull request #1105 from vdemeester/1044-compress-stream-friend
...
Fix panics when --compress and --stream are used together
Upstream-commit: d1cc8c731e
Component: cli
2018-06-01 23:00:01 +02:00
Andrew Hsu
894a729113
Merge pull request #113 from seemethere/btrfs
...
Remove btrfs-progs in favor of libbtrfs-dev
Upstream-commit: f1e7523cee9a53295233ba3d0e1fc5cb07ed7913
Component: packaging
2018-06-01 13:44:44 -07:00
Eli Uriegas
46248afb01
Remove btrfs-progs in favor of libbtrfs-dev
...
`btrfs-progs` doesn't actually contain the files we need, since we only
need the headers for btrfs, which `libbtrfs-dev` now provides.
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 73678285d0671e1b67ec30d21e99cfe1580159fa
Component: packaging
2018-06-01 20:33:59 +00:00
Vincent Demeester
de438df3a8
Allow to add any args when doing a make run
...
`make DOCKERD_ARGS=--init binary run` should start the daemon with
`--init` as flags (with any other "automagically" added ones).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: d2af0d96e3fbdfec340cb707b795b863411b00e1
Component: engine
2018-06-01 19:19:20 +02:00
GordonTheTurtle
739469a67f
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2018-06-01 17:05:00 +00:00
GordonTheTurtle
a7f733dcd3
Merge component 'cli' from git@github.com:docker/cli master
2018-06-01 16:41:21 +00:00
Vincent Demeester
a87a3769f8
Fix panics when --compress and --stream are used together
...
Warns that `-compress` has no effect when used together with the
expremintal `--stream` flag.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 8b3dc39fce
Component: cli
2018-06-01 18:34:00 +02:00
Sebastiaan van Stijn
9d9413af9f
Update miekg/dns to v1.0.7
...
This dependency now uses SemVer, tagged releases.
Also updates dependencies
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 4acddf21b7c11c2c6a71f0f9ba1d329cfbb99e5f
Component: engine
2018-06-01 16:24:59 +02:00
Vincent Demeester
d1ccf01fd1
Merge pull request #1101 from silvin-lubecki/filter-stack-service
...
Fix service filtering by name on Kubernetes
Upstream-commit: 7db15a4553
Component: cli
2018-06-01 15:50:34 +02:00
Vincent Demeester
6f7cfb3c58
Merge pull request #1094 from thaJeztah/hide_checkpoint_on_windows
...
Hide experimental checkpoint features on Windows
Upstream-commit: 63ad0a0e88
Component: cli
2018-06-01 15:49:51 +02:00
Sebastiaan van Stijn
2d6b52f5ec
Merge pull request #1097 from vdemeester/x-objects
...
Allow `x-*` extension on 3rd level objects
Upstream-commit: eb54d3e5c0
Component: cli
2018-06-01 15:48:04 +02:00
Silvin Lubecki
14b4abdabd
Fix service filtering by name on Kubernetes to mimic Swarm filtering
...
* Kubernetes native filtering (server side) is an exact match, now filtering on name is made client-side to add prefix-matching
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: b1ff199167
Component: cli
2018-06-01 15:43:02 +02:00
Silvin Lubecki
cc8e8442e8
Added a "top-level" annotation to hide persistent flags in all sub-commands, excepting some specific commands, while printing help
...
Fixes issue #1099
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: c003ed1f35
Component: cli
2018-06-01 15:13:40 +02:00
Vincent Demeester
fd04115881
Add more example to the full-example tests
...
Configs and Secrets were note present, some labels on volumes and
networks too.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 55426d9396
Component: cli
2018-06-01 14:16:18 +02:00