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

24830 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian Goff
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
Sebastiaan van Stijn
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
Vincent Demeester
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
Steve Durrheimer
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
Vincent Demeester
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
Alexander Morozov
576c9fa200 Merge pull request #23442 from thaJeztah/remove-defaultExitOnUnhealthy 
remove unused defaultExitOnUnhealthy constant
 2016-06-11 16:37:39 -07:00
Yong Tang
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
Vincent Demeester
96110f3cd2 Merge pull request #23461 from yongtang/23459-logrus-formatting 
Fix logrus formatting
 2016-06-12 00:19:05 +02:00
Vincent Demeester
c9b1ec5424 Merge pull request #23464 from charleswhchan/update-pull-commandline-doc 
Add link to Docker Hub.
 2016-06-12 00:18:44 +02:00
Charles Chan
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
Yong Tang
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
Vincent Demeester
ec1790d7f1 Merge pull request #23458 from runcom/warnf 
*: fix logrus.Warn[f]
 2016-06-11 21:42:12 +02:00
Vincent Demeester
dcc65376ba Merge pull request #23460 from kevinburke/fix-typo 
typo in builder.md: its => it's
 2016-06-11 21:41:33 +02:00
Kevin Burke
c9a68ffb2a typo in builder.md: its => it's 
Signed-off-by: Kevin Burke <kev@inburke.com>
 2016-06-11 12:33:58 -07:00
Antonio Murdaca
44ccbb317c *: fix logrus.Warn[f] 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-06-11 19:42:38 +02:00
Vincent Demeester
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Steve Durrheimer
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
Steve Durrheimer
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
Steve Durrheimer
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
Antonio Murdaca
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
Sebastiaan van Stijn
2a6abf1011 Merge pull request #23441 from thaJeztah/update-packagers 
Update Golang requirements in PACKAGERS.md
 2016-06-11 15:26:45 +02:00
Sebastiaan van Stijn
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
Alexander Morozov
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
Sebastiaan van Stijn
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
Michael Crosby
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
Sebastiaan van Stijn
29283143be Merge pull request #23435 from thaJeztah/carry-23352-peaceful-zen 
[carry 23352] update peaceful zen
 2016-06-10 23:23:16 +02:00
Sebastiaan van Stijn
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
Michael Holzheu
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 ("Enable seccomp for s390x")
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
 2016-06-10 15:18:58 -04:00
Alexander Morozov
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
fortinux
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
Vincent Demeester
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
Kenfe-Mickael Laventure
64a91ee74e Increase containerd start-timeout to 2 minutes 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit 4251e1e99e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-06-10 16:22:19 +02:00
Kenfe-Mickael Laventure
302a1e6101
Update CHANGELOG for 1.11.2 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
(cherry picked from commit c9dd46ca5c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-06-10 16:16:10 +02:00
Sebastiaan van Stijn
4a3b9a606b Merge pull request #23410 from cyphar/fix-xattr-ignore 
pkg: archive: only ignore ENOTSUP when xattr fails
 2016-06-10 15:58:25 +02:00
Antonio Murdaca
a05536ff42 Merge pull request #23412 from vdemeester/migrate-load-and-save-to-cobra 
Use spf13/cobra for docker load and save
 2016-06-10 12:02:18 +02:00
Vincent Demeester
51f0def774 Merge pull request #23400 from runcom/fix-digest-test 
integration-cli: use distribution/reference.DigestRegexp
 2016-06-10 11:56:14 +02:00
Sebastiaan van Stijn
04f5ce5152 Merge pull request #23421 from tiffanyfj/typos 
Fixed spelling error in builder/dockerfile/parser/parser.go
 2016-06-10 08:31:19 +02:00
Sebastiaan van Stijn
949f8d0d11 Merge pull request #23419 from ahmetalpbalkan/docs/azure-vol-plugin 
docs: Add Azure File Storage Volume Driver plugin
 2016-06-10 00:36:13 +02:00
Ahmet Alp Balkan
b91269c5ed
docs: Add Azure File Storage Volume Driver plugin 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2016-06-09 15:28:38 -07:00
Sebastiaan van Stijn
a4ff707e99 Merge pull request #23406 from thaJeztah/update-deb-script 
release-deb: create "dists" directory if missing
 2016-06-10 00:05:43 +02:00
Sebastiaan van Stijn
1164f917fa Merge pull request #23359 from londoncalling/docker-engine-overview 
re-doing Docker Engine overview topics for v.1.12
 2016-06-10 00:02:56 +02:00
Tiffany Jernigan
a07c57f656 Fixed spelling error in builder/dockerfile/parser/parser.go 
Signed-off-by: Tiffany Jernigan <tiffany.f.j@gmail.com>
 2016-06-09 14:49:59 -07:00
John Howard
30bbf184e9 Merge pull request #23392 from Microsoft/RevendorHcsshim 
Revendor hcsshim to v0.3.2
 2016-06-09 11:39:39 -07:00
Alexander Morozov
5bdc833e44 Merge pull request #23413 from vdemeester/client-fix-context-sharing 
Fix some api/client context sharing/plumbing
 2016-06-09 10:15:10 -07:00
Vincent Demeester
075b75fa14
Fix some context sharing/plumbing 
With cobra switch (and maybe before), some context weren't *plumbed* the
right way, fixing that.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-06-09 17:58:10 +02:00
Vincent Demeester
6632fd2788
Migrate save command to cobra 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-06-09 17:38:20 +02:00
Vincent Demeester
8b1d40271f
Migrate load command to cobra 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-06-09 17:28:33 +02:00