Charles Smith
e69bb29b78
Merge pull request #2292 from SvenDowideit/fix-link
...
fix link
2016-05-31 15:52:08 -07:00
Sebastiaan van Stijn
3c55f11704
Add docker-credential-helpers and update libcompose maintainers
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2016-06-01 00:46:18 +02:00
Daniel Nephin
9b2bb64a38
Make the -h flag deprecated.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2016-05-31 15:43:16 -07:00
Daniel Nephin
fc5a4514fb
Use Args in cobra.Command to validate args.
...
Also re-use context.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2016-05-31 15:43:16 -07:00
Daniel Nephin
54b5cce7e4
Support usage messages on bad flags.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2016-05-31 15:43:16 -07:00
Daniel Nephin
3d624ed5d6
Update cobra vendor
...
- adds support for usage strings on flag errors
- adds support for arg validation
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2016-05-31 15:43:13 -07:00
Dongluo Chen
1ad2e1d65b
Merge pull request #2297 from allencloud/return-VolumesListResponse-in-volumes-API
...
return VolumesListResponse in /volumes API
2016-05-31 15:22:37 -07:00
Darren Stahl
d96e36cbbf
Revendor hcsshim
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
2016-05-31 14:42:01 -07:00
Daniel Nephin
667dcb0e8e
Update usage and help to (almost) match the existing docker behaviour
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2016-05-31 14:41:37 -07:00
Daniel Nephin
69264beb40
Migrate volume commands to cobra.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2016-05-31 14:41:37 -07:00
Daniel Nephin
6bc3e23f65
Refactor cli inspector to support new inspects.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2016-05-31 14:41:37 -07:00
Daniel Nephin
8c77c73e7b
Vendor spf13/cobra and spf13/pflag
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2016-05-31 14:41:37 -07:00
Sven Dowideit
bf4eb92f56
Add topics to the menu
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2016-05-31 21:31:25 +00:00
Sven Dowideit
9044c5177c
fix link
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2016-05-31 21:25:09 +00:00
Sven Dowideit
dd3590180d
more fixes
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2016-05-31 21:18:42 +00:00
Tristan Keen
73e8b0de2b
Merge branch 'master' into upgrade-govmomi-netip
2016-05-31 22:11:18 +01:00
Nalin Dahyabhai
7772d270c0
Remove the logger.Message ContainerID field
...
Log drivers are instantiated on a per-container basis, and passed the
container ID (along with other information) when they're initialized.
Drivers that care about that value are caching the value that they're
passed when they're initialized and using it in favor of the value
contained in Message structures that are passed to them, so the field in
Messages is unused, so we remove it.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com >
2016-05-31 16:41:29 -04:00
Vincent Demeester
4a7715c978
Merge pull request #23130 from justincormack/seccomperror
...
Error out if user tries to specify a custom seccomp profile on system that does not support it
2016-05-31 22:40:58 +02:00
Daniel Nephin
8b5e5c6195
Set --state-dir on containerd.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2016-05-31 11:48:05 -07:00
Derek McGowan
d9c4f03bcc
Merge pull request #1760 from RichardScothern/revert-config
...
Revert inadvertant filepath change
2016-05-31 11:16:19 -07:00
Richard Scothern
d153bfffbd
Revert inadvertant filepath change
...
Signed-off-by: Richard Scothern <richard.scothern@docker.com >
2016-05-31 11:14:25 -07:00
Antonio Murdaca
b18062122d
graphtest: fix cleanup logic
...
device Base should not exists on failure:
--- FAIL: TestDevmapperCreateBase (0.06s)
graphtest_unix.go:122: stat
/tmp/docker-graphtest-079240530/devicemapper/mnt/Base/rootfs/a subdir:
no such file or directory
--- FAIL: TestDevmapperCreateSnap (0.00s)
graphtest_unix.go:219: devmapper: device Base already
exists.
it should be:
--- FAIL: TestDevmapperCreateBase (0.25s)
graphtest_unix.go:122: stat
/tmp/docker-graphtest-828994195/devicemapper/mnt/Base/rootfs/a subdir:
no such file or directory
--- FAIL: TestDevmapperCreateSnap (0.13s)
graphtest_unix.go:122: stat
/tmp/docker-graphtest-828994195/devicemapper/mnt/Snap/rootfs/a subdir:
no such file or directory
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
2016-05-31 20:08:57 +02:00
Darren Stahl
c8454394f7
Windows: Remove a double free on hcs container handle
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
2016-05-31 10:25:38 -07:00
Darren Stahl
054992e291
Windows: Adding missing cleanup call when container start fails
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
2016-05-31 10:19:05 -07:00
Joao Fernandes
1f57f4a25a
Adds DTR upgrade docs
...
Adds instructions on how to upgrade DTR from
2.0.0 to 2.0.1.
2016-05-31 10:14:44 -07:00
Justin Cormack
6bd797b43f
Error out if user tries to specify a custom seccomp profile on system that does not support it
...
Fixes #23031
If a profile is explicitly passed but the system is not built with seccomp support,
error out rather than just running without a profile at all as we would previously.
Behaviour is unchanged if no profile is specified or unconfined is specified.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
2016-05-31 17:52:40 +01:00
Andrew Hsu
3d66418f30
remove hostname resolution problem workaround
...
Signed-off-by: Andrew Hsu <andrewhsu@acm.org >
2016-05-31 16:41:12 +00:00
Alexander Morozov
0b5e84cc8d
Merge pull request #23046 from mountkin/fix-23045
...
fix flaky test TestImportFileWithMessage
2016-05-31 09:39:38 -07:00
French Ben
3533e06bd2
Merge pull request #1723 from bdharris08/electron-os-optionaldependencies
...
Move deb rhel electron to optionalDependencies
2016-05-31 09:37:32 -07:00
Sven Dowideit
1b9ab303a4
Merge pull request #1735 from SvenDowideit/move-menu-page
...
Make the index.html files the visible overview menu entry
2016-05-31 09:32:53 -07:00
Allen Sun
aaa4d87a4e
Merge pull request #2308 from NanXiao/issue-9999
...
Edited CONTRIBUTING
2016-06-01 00:23:27 +08:00
Allen Sun
2721be2548
Merge pull request #2311 from bedeabza/docs-typos
...
typo: 'loadblancer' in Swarm at scale docs
2016-06-01 00:21:21 +08:00
Alexander Morozov
d1e9e86122
Merge pull request #23108 from michael-holzheu/s390x-dockerfile-gcc-6.1
...
Dockerfile.s390x: Move to gcc 6.1 (go 1.6.1)
2016-05-31 09:14:41 -07:00
Richard Scothern
641f102967
Merge pull request #1687 from RichardScothern/signature-store
...
Remove signature store from registry.
2016-05-31 09:09:39 -07:00
Clement Ho
458c3d687b
Add container ID and copy functionality
...
Signed-off-by: Clement Ho <ClemMakesApps@gmail.com >
2016-05-31 09:49:26 -05:00
Dragos Badea
4b1e08fd9d
typo: 'loadblancer' in Swarm at scale docs
...
Signed-off-by: Dragos Badea <bedeabza@gmail.com >
2016-05-31 16:55:52 +03:00
Ken Cochrane
dcc407a820
Fix issues with get.docker.com install script with redhat fixes #23101
...
Signed-off-by: Ken Cochrane <kencochrane@gmail.com >
2016-05-31 08:44:40 -04:00
Nan Xiao
e85792cfdd
Edited CONTRIBUTING
...
Signed-off-by: Nan Xiao <nan@chinadtrace.org >
2016-05-31 19:30:30 +08:00
Akihiro Suda
da7edb5f3c
Fix pkg/streamformatter.TestJSONFormatProgress
...
The test was failing if the terminal column width is <= 110.
Addendum to #23113
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
2016-05-31 09:09:06 +00:00
Michael Holzheu
b5490d4897
Dockerfile.s390x: Move to gcc 6.1 (go 1.6.1)
...
Pull request #22840 and commit 40b21745cc ("Upgrade to golang 1.6.2")
introduces gcc 6.1 for Dockerfile.gccgo and Dockerfile.ppc64le.
So do this also for s390x and use "s390x/gcc:6.1" as base image.
In addition to this use "GO15VENDOREXPERIMENT=0" for notary build
as a workaround for:
* golang/go#15814
* golang/go#15628
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com >
2016-05-31 04:39:20 -04:00
Lei Jitang
ba372df79c
Merge pull request #23113 from AkihiroSuda/fixTIOCGWINSZ23112
...
Fix pkg/jsonmessage.TestProgress panic
2016-05-31 14:58:55 +08:00
Alexander Morozov
a1f1e9c6d9
Merge pull request #23038 from AkihiroSuda/fixPkgDirectoryFilepathWalk
...
Fix filepath.Walk misusage in pkg/directory
2016-05-30 22:18:56 -07:00
Akihiro Suda
709478c8a3
Fix pkg/jsonmessage.TestProgress panic
...
Fix #23112
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
2016-05-31 04:19:00 +00:00
xianlubird
c4886bd006
Fix network uniq method concurrent map writes problem
...
Signed-off-by: Xianlu <xianlu.cxl@alibaba-inc.com >
2016-05-31 11:10:45 +08:00
Phil Estes
8e4a451448
Optimize docker ps when name/id filters in use
...
When a partial ID or name is used in `docker ps` filters, today the
entire list of containers is walked even though there are shorter paths
to acquiring the subset of containers that match the ID or name. Also,
container's locks are used during this walk, causing increased lock
contention on a busy daemon.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com >
2016-05-30 17:43:55 -04:00
Ben Harris
b514738283
Move deb rhel electron to optionalDependencies
...
grunt-electron-installer modules for debian and redhat will not install
on windows unless we move them to optional. Grunt file will error on
those platforms if the modules fail to install for some other reason.
2016-05-30 14:11:09 -05:00
Vincent Demeester
ef42e2f214
Merge pull request #23106 from LINBIT/master
...
Add the DRBD Docker Volume Plugin to the documentation
2016-05-30 18:21:26 +02:00
Roland Kammerer
ef238db508
Add the DRBD Docker Volume Plugin to the documentation
...
Signed-off-by: Roland Kammerer <roland.kammerer@linbit.com >
2016-05-30 17:46:53 +02:00
Vincent Demeester
edcc9577bf
Merge pull request #22103 from coolljt0725/fix_22093
...
Fix docker create with duplicate volume failed to remove
2016-05-30 15:57:13 +02:00
Sebastiaan van Stijn
f3a7abee81
Merge pull request #22384 from yongtang/22358-log-tag-prefix
...
Remove `docker/` prefix from log messages tag.
2016-05-30 14:48:31 +02:00