a4438ca606
API docs cleanup
...
fix some formatting issues and consistency;
- Change capitalization (Query Parameters -> Query parameters, Json -> JSON)
- Make Query/JSON parameters and Status codes headings bold
- Fix indentation of some code blocks
- Fix headings (H2 -> H1), although all headings should be shifted the other way
round ;-)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-13 16:37:24 +02:00
0b879b993d
Merge pull request #23416 from dnephin/fix-daemon-help
...
Support running 'docker help daemon' with split binaries
2016-06-13 15:46:12 +02:00
6ba3d63a8c
Merge pull request #22575 from mountkin/fix-22536
...
fix LogConfig for containers created before docker 1.12 on daemon start
2016-06-13 15:11:01 +02:00
546594eaaa
Fix syntax errors in bash-completion ( Closes : #23483 )
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-06-13 19:12:31 +10:00
3c25656efa
Fix shutdown daemon during starting causes daemon crash
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-06-13 02:10:37 -04:00
9a8affb0ff
Merge pull request #23478 from cpuguy83/22833_optional_mountpoint_docs
...
Clarify volume plugin `Mountpoint` is optional
2016-06-13 14:22:48 +10:00
0d744de9ab
Merge pull request #23479 from thaJeztah/fix-typo
...
Fix typo in error message
2016-06-13 00:49:44 +02:00
bf0e2cb1b6
Merge pull request #23444 from Microsoft/RevendorHcsshim
...
Update vendored hcsshim to v0.3.4
2016-06-13 00:41:09 +02:00
4ace1811b4
Fix typo in error message
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-12 23:22:26 +02:00
edd80498d5
Note about mountpoint being optional
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-06-12 16:34:09 -04:00
aaef5297bf
Merge pull request #22152 from flixr/armhf-ubuntu-trusty-deb
...
build armhf deb for ubuntu-trusty
2016-06-12 16:27:54 -04:00
d1b7e8373b
authz: cleanups
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-06-12 17:23:19 +02:00
ceb9c5a88b
pkg: authorization: lock when lazy loading
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-06-12 17:19:43 +02:00
0f7c5f92c5
Merge pull request #23472 from sdurrheimer/zsh-completion-run-healthcheck
...
Add zsh completion for 'docker run' healthcheck options
2016-06-12 16:21:41 +02:00
4dafd107ad
Merge pull request #22777 from WeiZhang555/wait-restarting
...
Bug fix: `docker run -i --restart always` hangs
2016-06-12 13:01:20 +02:00
734260886c
Add zsh completion for 'docker run' healthcheck options
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-06-12 13:00:05 +02:00
434a46e652
Merge pull request #23466 from yongtang/23459-logrus-formatting-2
...
Fix incorrect usage of logrus when formatting string is present
2016-06-12 10:21:04 +02:00
576c9fa200
Merge pull request #23442 from thaJeztah/remove-defaultExitOnUnhealthy
...
remove unused defaultExitOnUnhealthy constant
2016-06-11 16:37:39 -07:00
d917723331
Fix incorrect usage of logrus when formatting string is present
...
This fix tries to fix logrus formatting by adding `f` to the end of
`logrus.[Error|Warn|Debug|Fatal|Panic|Info](` when formatting string
is present but the function `logrus.[Error|Warn|Debug|Fatal|Panic|Info](`
is used (incorrectly).
This fix is related to #23459 , and is a follow up of #23461 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-06-11 15:37:36 -07:00
96110f3cd2
Merge pull request #23461 from yongtang/23459-logrus-formatting
...
Fix logrus formatting
2016-06-12 00:19:05 +02:00
c9b1ec5424
Merge pull request #23464 from charleswhchan/update-pull-commandline-doc
...
Add link to Docker Hub.
2016-06-12 00:18:44 +02:00
0c3a4a1fcd
Add link to Docker Hub.
...
* To make it consistent with similar references in other parts of document.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2016-06-11 14:31:53 -07:00
a72b45dbec
Fix logrus formatting
...
This fix tries to fix logrus formatting by removing `f` from
`logrus.[Error|Warn|Debug|Fatal|Panic|Info]f` when formatting string
is not present.
This fix fixes #23459 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-06-11 13:16:55 -07:00
ec1790d7f1
Merge pull request #23458 from runcom/warnf
...
*: fix logrus.Warn[f]
2016-06-11 21:42:12 +02:00
dcc65376ba
Merge pull request #23460 from kevinburke/fix-typo
...
typo in builder.md: its => it's
2016-06-11 21:41:33 +02:00
c9a68ffb2a
typo in builder.md: its => it's
...
Signed-off-by: Kevin Burke <kev@inburke.com>
2016-06-11 12:33:58 -07:00
44ccbb317c
*: fix logrus.Warn[f]
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-06-11 19:42:38 +02:00
a29376dfd0
Merge pull request #23456 from sdurrheimer/zsh-completion-ps-filter-network
...
Add zsh completion for 'docker ps --filter=network'
2016-06-11 18:52:48 +02:00
befada2ca7
Merge pull request #23453 from runcom/fix-typo-pkg-proxy
...
pkg: proxy: fix TCPEchoServer.Close() in unit test
2016-06-11 18:32:22 +02:00
b133737cb7
Merge pull request #23455 from sdurrheimer/zsh-completion-events-filter-values
...
Add zsh completion for 'docker events --filter' values
2016-06-11 18:29:17 +02:00
b3ce532762
Merge pull request #23454 from sdurrheimer/zsh-completion-create-run-pid-values
...
Add zsh completion for 'docker {create,run} --pid' values
2016-06-11 18:28:01 +02:00
b5498a8b0b
Add zsh completion for 'docker events --filter' values
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-06-11 17:02:26 +02:00
60c435e7d0
Add zsh completion for 'docker ps --filter=network'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-06-11 16:53:26 +02:00
654aaa055e
Add zsh completion for 'docker {create,run} --pid' values
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-06-11 15:30:27 +02:00
809207fc74
pkg: proxy: fix TCPEchoServer.Close() in unit test
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-06-11 15:27:56 +02:00
2a6abf1011
Merge pull request #23441 from thaJeztah/update-packagers
...
Update Golang requirements in PACKAGERS.md
2016-06-11 15:26:45 +02:00
edadc2f4d7
Update Golang requirements in PACKAGERS.md
...
Docker 1.12 now requires Go 1.6, so update
the packagers.md accordingly
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-11 01:47:51 +02:00
ea3a7899f5
Removed QoS validation on Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-06-10 16:30:54 -07:00
ee8c512dc3
Merge pull request #23403 from WeiZhang555/split-utils
...
Move GetExitCode to package container and unexport it
2016-06-10 15:38:06 -07:00
d4d8cc9c0a
Update vendored hcsshim to v0.3.4
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-06-10 15:27:05 -07:00
f2ad7be2c4
Updating call sequence for servicing Windows containers
...
This change adjusts the calling pattern for servcing containers to use waiting on the process instead of expecting start to block. This is safer, as it avoids timeouts in the start code path for the potentially expensive update operation.
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
2016-06-10 15:19:10 -07:00
7d22887b2c
pkg: chrootarchive: chroot_linux: fix mount leak
...
When pivot_root fails we need to unmount the bind mounted path we
previously mounted in preparation for pivot_root.
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-06-11 00:07:41 +02:00
1dd28788f1
remove unused defaultExitOnUnhealthy constant
...
the '--exit-on-unhealty' option was removed,
but we forgot to remove this constant.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-11 00:04:05 +02:00
3d0595f1d5
Merge pull request #23439 from michael-holzheu/PR-s390x-seccomp-remove-again
...
Dockerfile.s390x: Remove 'seccomp' again from DOCKER_BUILDTAGS
2016-06-10 14:45:44 -07:00
29283143be
Merge pull request #23435 from thaJeztah/carry-23352-peaceful-zen
...
[carry 23352] update peaceful zen
2016-06-10 23:23:16 +02:00
a1f60b9db3
Merge pull request #23434 from thaJeztah/cherry-pick-increase-containerd-start-timeout
...
(cherry-pick) Increase containerd start-timeout to 2 minutes on master
2016-06-10 23:21:52 +02:00
e6e51d37f7
Dockerfile.s390x: Remove 'seccomp' again from DOCKER_BUILDTAGS
...
We have to wait until runc version (RUNC_COMMIT) is bumped.
Otherwise we get the following error:
oci runtime error: string SCMP_ARCH_S390 is not a valid
arch for seccomp
Fixes: bf2a577c13
2016-06-10 15:18:58 -04:00
12970bef34
Merge pull request #23351 from thaJeztah/remove-go-1.4-fix
...
remove fallback for Go 1.4
2016-06-10 09:16:46 -07:00
cd7ca2a1c7
update peaceful zen
...
Signed-off-by: fortinux <info@fortinux.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-06-10 16:39:05 +02:00
73169da9db
Merge pull request #23433 from thaJeztah/changelog-cherry-pick
...
Cherry-pick 1.11.2 CHANGELOG into master
2016-06-10 16:28:19 +02:00
Sebastiaan van Stijn
Vincent Demeester
Sebastiaan van Stijn
Dmitry Smirnov
Lei Jitang
Sven Dowideit
Brian Goff
Antonio Murdaca
Steve Durrheimer
Alexander Morozov
Yong Tang
Charles Chan
Kevin Burke
Darren Stahl
Stefan J. Wernli
Michael Crosby
Michael Holzheu
fortinux