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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
9befd43508
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 >
Upstream-commit: 1dd28788f14d19ac5d9a1248769c689d9398236d
Component: engine
2016-06-11 00:04:05 +02:00
2e143d4c3a
Merge pull request #23439 from michael-holzheu/PR-s390x-seccomp-remove-again
...
Dockerfile.s390x: Remove 'seccomp' again from DOCKER_BUILDTAGS
Upstream-commit: 3d0595f1d5aaa52b82a9bdfe7104735c09667860
Component: engine
2016-06-10 14:45:44 -07:00
7e10f5f788
Merge pull request #23435 from thaJeztah/carry-23352-peaceful-zen
...
[carry 23352] update peaceful zen
Upstream-commit: 29283143be0c2d31775dd540433d5a09fc3d1ffc
Component: engine
2016-06-10 23:23:16 +02:00
3c63c67eb1
Merge pull request #23434 from thaJeztah/cherry-pick-increase-containerd-start-timeout
...
(cherry-pick) Increase containerd start-timeout to 2 minutes on master
Upstream-commit: a1f60b9db3edc06f66d8977ebcf66f8ae606baec
Component: engine
2016-06-10 23:21:52 +02:00
13193b473d
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: bf2a577c131d899 ("Enable seccomp for s390x")
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com >
Upstream-commit: e6e51d37f7b6509f6422ad97533e9bb581042461
Component: engine
2016-06-10 15:18:58 -04:00
8900670b4f
Merge pull request #23351 from thaJeztah/remove-go-1.4-fix
...
remove fallback for Go 1.4
Upstream-commit: 12970bef34dbad39beb87a87d553020750347ec4
Component: engine
2016-06-10 09:16:46 -07:00
df727cdb81
update peaceful zen
...
Signed-off-by: fortinux <info@fortinux.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: cd7ca2a1c761886ba937efef2ea5fbd90d371c1b
Component: engine
2016-06-10 16:39:05 +02:00
9268d1b03c
Merge pull request #23433 from thaJeztah/changelog-cherry-pick
...
Cherry-pick 1.11.2 CHANGELOG into master
Upstream-commit: 73169da9db9ee12b421060eae14377cb6ca372d7
Component: engine
2016-06-10 16:28:19 +02:00
743a9e8b07
Increase containerd start-timeout to 2 minutes
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
(cherry picked from commit 4251e1e99e16ff7ff5557ee16e5bef26a14cd127)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 64a91ee74e73c956e92801447ae73ba82d168ed5
Component: engine
2016-06-10 16:22:19 +02:00
5203492492
Update CHANGELOG for 1.11.2
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
(cherry picked from commit c9dd46ca5c4d559e079962fe583755828f4b1a03)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 302a1e61013a2c90ae94a4e7d3e49b9c8ed9d768
Component: engine
2016-06-10 16:16:10 +02:00
35f940a3e5
Merge pull request #23410 from cyphar/fix-xattr-ignore
...
pkg: archive: only ignore ENOTSUP when xattr fails
Upstream-commit: 4a3b9a606b0a33de8148a1fd438bd2166fa77945
Component: engine
2016-06-10 15:58:25 +02:00
6975ac43d7
Merge pull request #23412 from vdemeester/migrate-load-and-save-to-cobra
...
Use spf13/cobra for docker load and save
Upstream-commit: a05536ff42d8a59d72cd95dfc38dc848e736420c
Component: engine
2016-06-10 12:02:18 +02:00
40058a9c4e
Merge pull request #23400 from runcom/fix-digest-test
...
integration-cli: use distribution/reference.DigestRegexp
Upstream-commit: 51f0def774fc8e526adce73bb4465577ebebfe27
Component: engine
2016-06-10 11:56:14 +02:00
95e43c122a
Merge pull request #23421 from tiffanyfj/typos
...
Fixed spelling error in builder/dockerfile/parser/parser.go
Upstream-commit: 04f5ce5152dbbe303e95216fb5a2a420656c3297
Component: engine
2016-06-10 08:31:19 +02:00
