beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
31747 commits 14 branches 412 tags 338 MiB
Commit graph

31747 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Demeester
b0235fd515 Merge pull request #31827 from erikstmartin/master 
Add mount point to cgroup root when initializing cgroup paths for cpu.rt_runtime
 2017-04-03 22:39:49 +02:00
Vincent Demeester
3fb84ca2f5 Merge pull request #32076 from tmp6154/master 
Bump up nproc in TestExecUlimits
 2017-04-03 22:30:28 +02:00
Brian Goff
9518a71cef Merge pull request #32072 from coolljt0725/fix_log_dead 
Fix docker logs a dead container
 2017-04-03 10:42:32 -04:00
Vincent Demeester
d9c3c1928d Merge pull request #31989 from aaronlehmann/node-ps-outside-swarm-mode 
cli: Wrong error message from "node ps" outside swarm mode
 2017-04-03 16:15:24 +02:00
Vincent Demeester
9f17b97820 Merge pull request #30907 from Hyzhou/master 
Add Aliyun mirror support to hack/install.sh
 2017-04-03 16:13:59 +02:00
Vincent Demeester
7f90590841 Merge pull request #32307 from jlhawn/update_TestRmRestartingContainer 
Fix Flakiness in TestRmRestartingContainer
 2017-04-03 15:48:19 +02:00
Sebastiaan van Stijn
93955bd215 Merge pull request #32305 from albers/completion-secret-ls--format 
Add bash completion for `secret ls --format`
 2017-04-03 15:43:12 +02:00
Antonio Murdaca
2c68e026da Merge pull request #32012 from cpuguy83/remove_uneeded_relabel 
Remove undeeded and broken selinux relabel call
 2017-04-03 15:25:23 +02:00
Vincent Demeester
022552ac87 Merge pull request #31889 from cpuguy83/all_the_pprof 
Use generic handler for pprof profile lookups
 2017-04-03 15:14:12 +02:00
Vitaly Ostrosablin
d4e132f84d Change TestExecUlimits to use nofile instead of nproc 
Test used to check whether ulimits applied by docker are in effect by
setting up nproc. However, in some environments (e.g. inside Virtuozzo
Containers), number of processes is higher and testcase fails. Hence, we
instead change testcase to check ulimits by setting nofile limit instead
of nproc.

Signed-off-by: Vitaly Ostrosablin <vostrosablin@virtuozzo.com>
 2017-04-03 10:43:43 +03:00
Josh Hawn
e979cf7464 Fix Flakiness in TestRmRestartingContainer 
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2017-04-02 17:45:30 -07:00
Harald Albers
f844e57315 Add bash completion for secret ls --format 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-04-02 15:32:33 -07:00
Sebastiaan van Stijn
6311e9fc9d Merge pull request #32027 from sdurrheimer/zsh-completion-ps-format 
Add zsh completion for 'docker {node,service,stack} ps --format'
 2017-04-02 23:38:22 +02:00
Vincent Demeester
33aae7c5cc Merge pull request #28723 from dattatrayakumbhar/filter-on-network-id 
28722: List of containers with networkID filter is not working
 2017-04-02 21:06:09 +02:00
Justin Cormack
c526588c79 Merge pull request #32279 from darrenstahlmsft/WindowsRestore 
Windows: Wait to delete container when restoring
 2017-04-02 18:38:12 +01:00
Sebastiaan van Stijn
2347020706 Merge pull request #32304 from thaJeztah/master-cherry-pick-32265 
[master] cherry-pick Updated legacy_plugins.md to include BeeGFS plugin
 2017-04-02 12:31:47 +02:00
Sebastiaan van Stijn
5df76be508
Merge pull request #32265 from breuner/patch-1 
Updated legacy_plugins.md to include BeeGFS plugin
(cherry picked from commit d0057bd12d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-04-02 12:27:54 +02:00
Vincent Demeester
16be072793 Merge pull request #32271 from krasi-georgiev/update-containerd-9048e5e50717ea4497b757314bad98ea3763c145 
update containerd to 9048e5e50717ea4497b757314bad98ea3763c145
 2017-04-02 11:02:08 +02:00
Sebastiaan van Stijn
75a7eca958 Merge pull request #32286 from vieux/add_ehazlett_and_johnstep_random_assign 
add ehazlett and johnstep to random_assign
 2017-04-02 01:16:57 +02:00
Victor Vieux
4fe11d49ca add ehazlett and johnstep to random_assign 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2017-04-02 01:15:19 +02:00
Sebastiaan van Stijn
571e403168 Merge pull request #32282 from mstanleyjones/improve-attach-desc 
Clarify meaning of docker attach
 2017-04-01 20:52:26 +02:00
Sebastiaan van Stijn
a96de091d6 Merge pull request #32244 from Microsoft/jjh/panicfix 
Windows - fix panic and stderr output when service
 2017-04-01 20:00:59 +02:00
Victor Vieux
3dfce9fbb8 Merge pull request #31022 from jmzwcn/issue30994 
docker version output is not consistent when there are downgrades or incompatibilities #30994
 2017-03-31 15:55:03 -07:00
Victor Vieux
e45483964f Merge pull request #31800 from ripcurld0/checkpoint_ls 
Use formatter in docker checkpoint ls
 2017-03-31 15:54:22 -07:00
Krasi Georgiev
d1a0afacc2 update criu to 2.12.1 
Signed-off-by: Krasi Georgiev <krasi@vip-consult.solutions>
 2017-04-01 00:54:28 +03:00
Misty Stanley-Jones
1922eac4cc Clarify meaning of docker attach 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2017-03-31 13:22:21 -07:00
Kenfe-Mickaël Laventure
3d31198cda Merge pull request #31599 from ripcurld0/diff_cmd_format 
Use formatter in docker diff
 2017-03-31 11:19:41 -07:00
Darren Stahl
dbdc8bbee4 Wait to delete container when restoring on Windows 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2017-03-31 10:59:00 -07:00
Vincent Demeester
d57825cb1e Merge pull request #31183 from thaJeztah/log-upgrade-rollback-error 
log error if restoring plugin fails
 2017-03-31 19:44:31 +02:00
John Howard
141a83b820 Windows - fix panic and stderr 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-03-31 09:51:50 -07:00
Krasi Georgiev
a3c2ccacd0 update containerd to 9048e5e50717ea4497b757314bad98ea3763c145 
Signed-off-by: Krasi Georgiev <krasi@vip-consult.solutions>
 2017-03-31 19:47:05 +03:00
Vincent Demeester
9f9cc221bd Merge pull request #31634 from AkihiroSuda/clarify-env-without-value 
api: clarify that Env var without `=` is removed from the environment
 2017-03-31 17:34:32 +02:00
Brian Goff
1325f667ee Merge pull request #27565 from rothrock/env-by-regex 
[splunk] Use a regex to match environment variables
 2017-03-31 10:46:48 -04:00
Sebastiaan van Stijn
5d25195f29
fix cleanup logic if restoring plugin fails 
The "err" output variable was masked by the "if" statement,
so the error was never updated.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-03-31 16:42:30 +02:00
dattatrayakumbhar04
59b70cdabe 28722: List of containers with networkID filter is not working 
Signed-off-by: dattatrayakumbhar04 <dattatraya.kumbhar@gslab.com>
 2017-03-31 08:57:09 +00:00
Vincent Demeester
1ecaed0a99 Merge pull request #28696 from jlhawn/deprecate_graph_flag 
Deprecate --graph flag; Replace with --data-root
 2017-03-31 10:51:15 +02:00
Vincent Demeester
2a40b35629 Merge pull request #32246 from aboch/vnd 
Vendoring swarmkit @b74ec2b
 2017-03-31 10:33:57 +02:00
Sebastiaan van Stijn
05cd8bec32 Merge pull request #32236 from tonistiigi/fix-cmd-shell 
builder: Fix setting command with custom shell
 2017-03-31 03:26:28 +02:00
Alessandro Boch
4777fb6c6b Add ingress nw Test around consition which was panicing 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-03-30 16:12:48 -07:00
Alessandro Boch
747f0b4ba5 Vendoring swarmkit @b74ec2b 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-03-30 16:12:33 -07:00
Tonis Tiigi
a1fa59ea12 builder: Fix setting command with custom shell 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-03-30 13:29:21 -07:00
Sebastiaan van Stijn
9c0473fa65 Merge pull request #32222 from unclejack/small_cleanup 
Small cleanup
 2017-03-30 21:09:39 +02:00
Steve Durrheimer
07908f456a
Add zsh completion for 'docker {node,service,stack} ps --format' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2017-03-30 21:07:03 +02:00
Sebastiaan van Stijn
2ce39de0c8 Merge pull request #32010 from dongluochen/swarmkit_vendor 
vendor swarmkit 970b45afa1c9da9ed4b9c793669cedbb05ad3833
 2017-03-30 17:24:33 +02:00
Evan Hazlett
59aed5ab36 Merge pull request #32174 from KarthikNayak/32113 
Dockerd: enable CORS when only `--api-cors-header` is used
 2017-03-30 11:13:52 -04:00
Vincent Demeester
ee61f28cc3 Merge pull request #32124 from vdemeester/system-inspect-secret 
Add support for `--type=secret` in `docker inspect`
 2017-03-30 17:01:57 +02:00
Brian Goff
c94e0f5d02 Merge pull request #32225 from thaJeztah/remove-flag-constant 
Remove constant for "config-file" flag
 2017-03-30 10:05:07 -04:00
unclejack
a23c456e5a pkg/*: clean up a few issues 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2017-03-30 16:50:46 +03:00
unclejack
90a44b875c pkg/urlutil: don't compare to bool 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2017-03-30 16:38:01 +03:00
unclejack
20d6f5c2a9 pkg/file{utils,notify}: don't compare to bool 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2017-03-30 16:38:01 +03:00