Alexander Morozov
7f718199ae
Merge pull request #23256 from vdemeester/migrate-pull-push-to-cobra
...
Use spf13/cobra for docker push and docker pull
Upstream-commit: f0193e278c31fb568c4cbbdc046e84a0d1a3390b
Component: engine
2016-06-13 14:16:42 -07:00
Alexander Morozov
b87258cf19
Merge pull request #23265 from vdemeester/migrate-login-logout-to-cobra
...
Use spf13/cobra for docker login and docker logout
Upstream-commit: a502158d8a9b3a3949eb0bc0b087138ef65efabb
Component: engine
2016-06-13 14:15:46 -07:00
Alexander Morozov
8b68fb04f6
Merge pull request #23309 from yongtang/23211-spf13-cobra-commit
...
Use spf13/cobra for docker commit
Upstream-commit: e6c49bf71b44a2513c37c08f488bf05089ac1f76
Component: engine
2016-06-13 14:13:37 -07:00
Michael Crosby
7bec8a2e7d
Merge pull request #22126 from dmcgowan/overlay-native-diff
...
Overlay multiple lower directory support
Upstream-commit: 8a2f9a249c28c0a80bac4b41eb318dfe68f63f0d
Component: engine
2016-06-13 13:15:39 -07:00
Sebastiaan van Stijn
2fe8f9bbb3
Merge pull request #23195 from cyli/update-content-trust-docs
...
Update content trust docs to reflect latest notary compose file changes
Upstream-commit: 1842077541d1679c20932ed66c07081759c36c7f
Component: engine
2016-06-13 22:11:32 +02:00
cyli
b0a6df1b32
Update content trust docs to reflect latest notary compose file changes, and to simplify
...
the instructions by providing a single compose file that runs the notary server, registry,
and a docker-in-docker trust sandbox.
Signed-off-by: cyli <cyli@twistedmatrix.com >
Upstream-commit: ba115b0a91970f434e41e9f72caccc01493a9729
Component: engine
2016-06-13 12:57:06 -07:00
Sebastiaan van Stijn
711259e403
Merge pull request #23261 from dimrozakis/23260
...
Escape brackets in hack/install.sh
Upstream-commit: f7600fc6413cc7dcc5a243c174ecb086870fb16f
Component: engine
2016-06-13 20:19:26 +02:00
Vincent Demeester
5751f65265
Merge pull request #23473 from coolljt0725/fix_stop_crash
...
Fix shutdown daemon during daemon staring casue crash
Upstream-commit: d169f057d9007580aa7ddb3ca7fca8de1e481081
Component: engine
2016-06-13 20:08:12 +02:00
Sebastiaan van Stijn
f38c785cc7
Merge pull request #23485 from sbose78/22514-run-image-using-digest
...
Fixes #22514 - Added example for using image digest in the docker run command
Upstream-commit: 3bb42723acf4a6ade3f9f1a1819ca6ef530c2032
Component: engine
2016-06-13 20:07:17 +02:00
Derek McGowan
f7c1d79a55
Add documentation for using overlay2
...
Add mention in dockerd command line and storage driver selection documentation.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: a546042b91f655c7cf53484cdb0c5c8b3cf12d33
Component: engine
2016-06-13 11:06:47 -07:00
Shoubhik Bose
a8d0a6bea4
Added example for using image digest in the docker run command
...
Signed-off-by: Shoubhik Bose <sbose78@gmail.com >
Added explanation for the example with image's digest ( as per @thaJeztah 's comment
Signed-off-by: Shoubhik Bose <sbose78@gmail.com >
Wrapped to ~80 chars
Signed-off-by: Shoubhik Bose <sbose78@gmail.com >
Upstream-commit: e6e8c4d700c4510e463eb16fedba51b6e8a3ccd6
Component: engine
2016-06-13 18:00:41 +00:00
Sebastiaan van Stijn
0a17038359
Merge pull request #23443 from swernli/servicing-async
...
Updating call sequence for servicing Windows containers
Upstream-commit: 50c7bcac1e22a6a3dd39bec4136aa96136f56eb2
Component: engine
2016-06-13 19:49:23 +02:00
Alexander Morozov
9f139dff3a
Merge pull request #22631 from runcom/fix-leak-mount
...
pkg: chrootarchive: chroot_linux: fix mount leak
Upstream-commit: 8eb1d89c1755150fef42799f284866ebe604b7dc
Component: engine
2016-06-13 09:29:46 -07:00
Vincent Demeester
1770a37dc6
Merge pull request #23416 from dnephin/fix-daemon-help
...
Support running 'docker help daemon' with split binaries
Upstream-commit: 0b879b993df3332814da3c2ae3ba470df84226d2
Component: engine
2016-06-13 15:46:12 +02:00
Sebastiaan van Stijn
8058305668
Merge pull request #22575 from mountkin/fix-22536
...
fix LogConfig for containers created before docker 1.12 on daemon start
Upstream-commit: 6ba3d63a8ccd58423495c52b003cd01c7b0c7e10
Component: engine
2016-06-13 15:11:01 +02:00
Lei Jitang
5fe11026e0
Fix shutdown daemon during starting causes daemon crash
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 3c25656efa812a4c969c833623f3b96f86116e77
Component: engine
2016-06-13 02:10:37 -04:00
Sven Dowideit
4f9252d408
Merge pull request #23478 from cpuguy83/22833_optional_mountpoint_docs
...
Clarify volume plugin `Mountpoint` is optional
Upstream-commit: 9a8affb0ffdf6010fca6a1c8fb00c9e0a38845d6
Component: engine
2016-06-13 14:22:48 +10:00
Vincent Demeester
5fb049a186
Merge pull request #23479 from thaJeztah/fix-typo
...
Fix typo in error message
Upstream-commit: 0d744de9abc868ae79d813a93ed571670dd97bd6
Component: engine
2016-06-13 00:49:44 +02:00
Sebastiaan van Stijn
8478f2a319
Merge pull request #23444 from Microsoft/RevendorHcsshim
...
Update vendored hcsshim to v0.3.4
Upstream-commit: bf0e2cb1b632b46a070fd6141d8abf5de5f69231
Component: engine
2016-06-13 00:41:09 +02:00
Sebastiaan van Stijn
4484af9ebf
Fix typo in error message
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 4ace1811b4a0c0a48f1aeeba996b8096a3a4bb2d
Component: engine
2016-06-12 23:22:26 +02:00
Brian Goff
6103097f27
Note about mountpoint being optional
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: edd80498d5b1b7686f2179dc5c6602093295a21e
Component: engine
2016-06-12 16:34:09 -04:00
Brian Goff
df899a58be
Merge pull request #22152 from flixr/armhf-ubuntu-trusty-deb
...
build armhf deb for ubuntu-trusty
Upstream-commit: aaef5297bfb2a410bdaea2bf6a4fa17951796daf
Component: engine
2016-06-12 16:27:54 -04:00
Sebastiaan van Stijn
17bcf1c226
Merge pull request #23472 from sdurrheimer/zsh-completion-run-healthcheck
...
Add zsh completion for 'docker run' healthcheck options
Upstream-commit: 0f7c5f92c5c64f1844f402da507d061e2189f036
Component: engine
2016-06-12 16:21:41 +02:00
Vincent Demeester
b9624c9967
Merge pull request #22777 from WeiZhang555/wait-restarting
...
Bug fix: `docker run -i --restart always` hangs
Upstream-commit: 4dafd107ad0cb89e1a7f9e3bcc66fb6a5a5c99c5
Component: engine
2016-06-12 13:01:20 +02:00
Steve Durrheimer
e720f00dbd
Add zsh completion for 'docker run' healthcheck options
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 734260886c9281f98c109e78b8f28a7d4d8fec78
Component: engine
2016-06-12 13:00:05 +02:00
Vincent Demeester
eada6b2246
Merge pull request #23466 from yongtang/23459-logrus-formatting-2
...
Fix incorrect usage of logrus when formatting string is present
Upstream-commit: 434a46e6522b6fd143eb6842f57d126f772ff045
Component: engine
2016-06-12 10:21:04 +02:00
Alexander Morozov
f5b3d9e5ad
Merge pull request #23442 from thaJeztah/remove-defaultExitOnUnhealthy
...
remove unused defaultExitOnUnhealthy constant
Upstream-commit: 576c9fa2007cfb5f379f67b11cd852800f9175c6
Component: engine
2016-06-11 16:37:39 -07:00
Yong Tang
1328a5b68c
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 >
Upstream-commit: d917723331c090d5003b70decda7f80bf123f966
Component: engine
2016-06-11 15:37:36 -07:00
Vincent Demeester
79a01437ed
Merge pull request #23461 from yongtang/23459-logrus-formatting
...
Fix logrus formatting
Upstream-commit: 96110f3cd2229eb0f1e45c924da69badaeca4afb
Component: engine
2016-06-12 00:19:05 +02:00
Vincent Demeester
5dc0a90f39
Merge pull request #23464 from charleswhchan/update-pull-commandline-doc
...
Add link to Docker Hub.
Upstream-commit: c9b1ec542448ea5dea741d9830cc3309c623d80d
Component: engine
2016-06-12 00:18:44 +02:00
Charles Chan
517b0cb220
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 >
Upstream-commit: 0c3a4a1fcdbb4b7e14292a871dec4bf6828ae57c
Component: engine
2016-06-11 14:31:53 -07:00
Yong Tang
04ae4edf2f
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 >
Upstream-commit: a72b45dbec3caeb3237d1af5aedd04adeb083571
Component: engine
2016-06-11 13:16:55 -07:00
Vincent Demeester
b3cd08e4c9
Merge pull request #23458 from runcom/warnf
...
*: fix logrus.Warn[f]
Upstream-commit: ec1790d7f110366a438202c61985d377c4e2b43a
Component: engine
2016-06-11 21:42:12 +02:00
Vincent Demeester
8a0b6c5bca
Merge pull request #23460 from kevinburke/fix-typo
...
typo in builder.md: its => it's
Upstream-commit: dcc65376bac8e73bb5930fce4cddc2350bb7baa2
Component: engine
2016-06-11 21:41:33 +02:00
Kevin Burke
82e00cd535
typo in builder.md: its => it's
...
Signed-off-by: Kevin Burke <kev@inburke.com >
Upstream-commit: c9a68ffb2ae7b2ac13a2febab82b3d7a824eb97f
Component: engine
2016-06-11 12:33:58 -07:00
Antonio Murdaca
763e6c326e
*: fix logrus.Warn[f]
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 44ccbb317c2ca67fd8a88147b1ff80ce83d453cc
Component: engine
2016-06-11 19:42:38 +02:00
Vincent Demeester
fef383557c
Merge pull request #23456 from sdurrheimer/zsh-completion-ps-filter-network
...
Add zsh completion for 'docker ps --filter=network'
Upstream-commit: a29376dfd0be8157c2251ee2317648a29a5057b9
Component: engine
2016-06-11 18:52:48 +02:00
Sebastiaan van Stijn
2eb8ff6a97
Merge pull request #23453 from runcom/fix-typo-pkg-proxy
...
pkg: proxy: fix TCPEchoServer.Close() in unit test
Upstream-commit: befada2ca7064997c3b1f3d65999ffa323dcba73
Component: engine
2016-06-11 18:32:22 +02:00
Sebastiaan van Stijn
2ba62d3f58
Merge pull request #23455 from sdurrheimer/zsh-completion-events-filter-values
...
Add zsh completion for 'docker events --filter' values
Upstream-commit: b133737cb765d7b70874d9b4d6d6d0ab0328ea26
Component: engine
2016-06-11 18:29:17 +02:00
Sebastiaan van Stijn
56b73a36ba
Merge pull request #23454 from sdurrheimer/zsh-completion-create-run-pid-values
...
Add zsh completion for 'docker {create,run} --pid' values
Upstream-commit: b3ce5327622f07b675f5ec7d69cd58f5f1d7656f
Component: engine
2016-06-11 18:28:01 +02:00
Steve Durrheimer
419dbccd3a
Add zsh completion for 'docker events --filter' values
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: b5498a8b0b6d836b42381bbdd272670ad3219bd2
Component: engine
2016-06-11 17:02:26 +02:00
Steve Durrheimer
3a227e412a
Add zsh completion for 'docker ps --filter=network'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 60c435e7d0f79f530606dd49440fbdef6d83edd2
Component: engine
2016-06-11 16:53:26 +02:00
Steve Durrheimer
68b8d0d9c0
Add zsh completion for 'docker {create,run} --pid' values
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 654aaa055e3bc56048996f46e4e4b6d0afe42dac
Component: engine
2016-06-11 15:30:27 +02:00
Antonio Murdaca
2454579907
pkg: proxy: fix TCPEchoServer.Close() in unit test
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 809207fc7432b59257d4026b98467ba7414014be
Component: engine
2016-06-11 15:27:56 +02:00
Sebastiaan van Stijn
1f06ec7001
Merge pull request #23441 from thaJeztah/update-packagers
...
Update Golang requirements in PACKAGERS.md
Upstream-commit: 2a6abf101173ca5212f56c647c2f5d51bf24ff7b
Component: engine
2016-06-11 15:26:45 +02:00
Sebastiaan van Stijn
90b4d1f145
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 >
Upstream-commit: edadc2f4d737bf4f7aa3c477f2021aae2e551cc2
Component: engine
2016-06-11 01:47:51 +02:00
Alexander Morozov
ad3cf97c76
Merge pull request #23403 from WeiZhang555/split-utils
...
Move GetExitCode to package container and unexport it
Upstream-commit: ee8c512dc32117fbd327b4a19da0ffefe47abfcd
Component: engine
2016-06-10 15:38:06 -07:00
Darren Stahl
96c1665876
Update vendored hcsshim to v0.3.4
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: d4d8cc9c0a94840a2d45b549925301daa3bfcad3
Component: engine
2016-06-10 15:27:05 -07:00
Stefan J. Wernli
28d7534bc7
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 >
Upstream-commit: f2ad7be2c4aa13413d539887e8c13fb47bea7254
Component: engine
2016-06-10 15:19:10 -07:00
Antonio Murdaca
6a3cd56f2e
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 >
Upstream-commit: 7d22887b2c8f4de99c3da7c3a0394ca53fb1c4eb
Component: engine
2016-06-11 00:07:41 +02:00