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

16169 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian Goff
855a056af7 Fixes content-type/length for stats stream=false 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-06-12 13:06:06 -04:00
Brian Goff
e70d680d72 Merge pull request #13903 from dqminh/fix-cli-exec-output 
TestExecStopNotHanging: log output as string
 2015-06-12 09:23:45 -04:00
Daniel, Dao Quang Minh
d898372568 TestExecStopNotHanging: log output as string 
When cmd failed, log its ouput as string instead of byte array to prevent test
log like: [49 53 ....] exit status 1

Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
 2015-06-11 22:53:55 -04:00
Arnaud Porterie
00b8fec75f Merge pull request #13773 from dmcgowan/refactor-1-image-graph-separation 
refactor: separate graph from image
 2015-06-11 17:44:37 -07:00
Arnaud Porterie
71ead0ef5c Merge pull request #13722 from samuelkarp/CpuShareRemoteAPI 
Adjust disallowed CpuShares in /containers/create
 2015-06-11 14:20:50 -07:00
Jessie Frazelle
0de7065897 Merge pull request #13801 from bexelbie/bex_manpage_indention 
Updates man page generation to use go-md2man v1.0.2
 2015-06-11 14:12:17 -07:00
Jessie Frazelle
98391f0a39 Merge pull request #13890 from moxiegirl/vieux-fix 
Updating with fix for first line and the vieux/amy comment on website
 2015-06-11 13:22:03 -07:00
Mary Anthony
566466e714 Updating with fix for first line and the vieux/amy comment on website 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-11 12:48:01 -07:00
Jessie Frazelle
cada9b54b5 Merge pull request #13865 from Mic92/zfs-selinux 
zfs: correctly apply selinux context
 2015-06-11 12:42:06 -07:00
Jessie Frazelle
e3821feb13 Merge pull request #13783 from tianon/vendor-pruning 
Add intelligent vendor pruning (via "go list")
 2015-06-11 10:32:53 -07:00
Tianon Gravi
b0d748325f Update "vendor/" 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-06-11 09:59:12 -07:00
Tianon Gravi
9e4ee3dea5 Add intelligent vendor pruning (via "go list") 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-06-11 09:59:12 -07:00
Tianon Gravi
f61d595b55 Adjust "Dockerfile" to build tools we need in isolated mktemp GOPATHs 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-06-11 09:59:12 -07:00
Doug Davis
b27f960504 Merge pull request #13879 from eolamey/13878-nil-ip-opt-as-empty-string 
Display empty string instead of <nil> when IP opt is nil.
 2015-06-11 09:30:52 -07:00
moxiegirl
9001c4bc48 Merge pull request #13839 from eolamey/13838-fix-docs-url 
Fix docs URL not using https.
 2015-06-11 08:59:35 -07:00
Brian Goff
4fc6449944 Merge pull request #13861 from mrjana/cnm_integ 
Vendoring libnetwork to fix stale arp cache issue
 2015-06-11 09:12:34 -04:00
Eric-Olivier Lamey
9ad89281ae Display empty string instead of <nil> when IP opt is nil. 
Fixes #13878.

Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>
 2015-06-11 11:14:28 +00:00
Vincent Batts
ef171afdbb Merge pull request #13590 from mountkin/fix-archive-tests 
Add the parent directory to changes set if new files are generated
 2015-06-11 05:12:45 -04:00
Jörg Thalheim
19c31a703f zfs: correctly apply selinux context 
fixes #13858

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
 2015-06-11 11:11:37 +02:00
Brian (bex) Exelbierd
5d51118c7c Update man page Dockerfile to use go-md2man v1.0.1 and go-lang 1.4 
The main Dockerfile to was updated - this update brings the
sub-directory specific file inline with it.

Fixes #12866

Signed-off-by: Brian Exelbierd <bex@pobox.com>
 2015-06-11 08:36:21 +02:00
Antonio Murdaca
2b27fe17a1 Merge pull request #13862 from Microsoft/10662-fixelementsrestored 
Show actual number of elements restored
 2015-06-11 07:13:19 +02:00
Eric-Olivier Lamey
212dfb45de Fix docs URL not using https. 
Fixes #13838.

Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>
 2015-06-11 04:50:50 +00:00
Jana Radhakrishnan
386ab25137 Vendoring libnetwork to fix stale arp cache issue 
Vendoring in libnetwork 90638ec9cf7fa7b7f5d0e96b0854f136d66bff92

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-06-10 19:29:10 -07:00
Arnaud Porterie
883d661b69 Merge pull request #13867 from calavera/fix_daemon_cleanup_order 
Cleanup driver and graph db after stopping containers.
 2015-06-10 17:05:41 -07:00
David Calavera
ad9080a87c Merge pull request #13868 from jfrazelle/update-gitignore-man 
update gitignore for new manpages
 2015-06-10 16:55:15 -07:00
David Calavera
0964a664e8 Cleanup driver and graph db after stopping containers. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-06-10 16:11:50 -07:00
Jessica Frazelle
f88e620359 update gitignore for new manpages 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-06-10 16:11:15 -07:00
Doug Davis
466efebf0e Merge pull request #13863 from Microsoft/typoclientutils 
Typo fix in api\client\utils.go
 2015-06-10 15:57:37 -07:00
John Howard
84aec1e8e6 Typo fix in api\client\utils.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-10 15:24:53 -07:00
John Howard
141cd2a1f2 Show actual number of elements restored 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-10 15:18:51 -07:00
David Calavera
b6049b5c49 Merge pull request #13804 from moxiegirl/proposal-man-pages 
PROPOSAL: Moving man pages out of docs
 2015-06-10 15:04:19 -07:00
Arnaud Porterie
9da65ed84f Merge pull request #13854 from crosbymichael/revert-shared-root 
Revert shared container rootfs
 2015-06-10 14:12:14 -07:00
Mary Anthony
eacae64bd8 Moving man pages out of docs 
Adding in other areas per comments
Updating with comments; equalizing generating man page info
Updating with duglin's comments
Doug is right here again;fixing.

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-10 13:43:35 -07:00
Tibor Vass
add64dc297 Merge pull request #13832 from mapk0y/fix-error-msg 
fix typo.
 2015-06-10 16:38:07 -04:00
Brian Goff
05644ccea9 Merge pull request #13272 from Microsoft/10662-daemonrefactorv2 
Windows: Refactor daemon
 2015-06-10 16:28:56 -04:00
David Calavera
17324c91e3 Merge pull request #13015 from mariussturm/master 
Add logging driver for GELF via UDP
 2015-06-10 12:45:12 -07:00
John Howard
8fb0ca2c35 Windows: Refactor daemon 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-10 12:42:43 -07:00
Jessie Frazelle
65d0670d65 Merge pull request #13853 from jfrazelle/fix-hack-make 
ugh typo in hack scripts fix, introduced by 2b4facdf
 2015-06-10 11:53:47 -07:00
Michael Crosby
c9d71317be Revert shared container rootfs 
This is breaking various setups where the host's rootfs is mount shared
correctly and breaks live migration with bind mounts.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-06-10 11:29:27 -07:00
Marius Sturm
96d06e106f add UDP GELF logging-driver 
allows to send container logs to Graylog or Logstash.

Signed-off-by: Marius Sturm <marius@graylog.com>
 2015-06-10 20:21:50 +02:00
Jessica Frazelle
c5f49886fa ugh typo in hack scripts fix, introduced by 2b4facdf 
Signed-off-by: Jessica Frazelle <princess@docker.com>
 2015-06-10 11:00:59 -07:00
Jessie Frazelle
12149e8293 Merge pull request #13754 from cpuguy83/13753_fix_events_64 
Default events since to current time
 2015-06-10 10:34:13 -07:00
Brian Goff
74c12aa429 Default events since to current time 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-06-10 12:37:40 -04:00
James Turnbull
5821f13b8c Merge pull request #13844 from ponsfrilus/master 
Typo psuedo - pseudo
 2015-06-10 11:41:44 -04:00
Doug Davis
46af724e81 Merge pull request #12371 from rhatdan/kill 
docker kill should return error if container is not running.
 2015-06-10 08:32:57 -07:00
Tibor Vass
de90aef411 Merge pull request #12813 from Microsoft/10662-nolinuxgraph 
Windows: Don't build Linux graph drivers
 2015-06-10 10:01:50 -04:00
Shijiang Wei
e2c6a8be7c Add the parent directory to changes set if new files are generated 
The "TestChangesWithChanges" case randomlly fails on my development
VM with the following errors:
```
--- FAIL: TestChangesWithChanges (0.00s)
        changes_test.go:201: no change for expected change C /dir1/subfolder != A /dir1/subfolder/newFile
```

If I apply the following patch to changes_test.go, the test passes.

```diff
diff --git a/pkg/archive/changes_test.go b/pkg/archive/changes_test.go
index 290b2dd..ba1aca0 100644
--- a/pkg/archive/changes_test.go
+++ b/pkg/archive/changes_test.go
@@ -156,6 +156,7 @@ func TestChangesWithChanges(t *testing.T) {
        }
        defer os.RemoveAll(layer)
        createSampleDir(t, layer)
+       time.Sleep(5 * time.Millisecond)
        os.MkdirAll(path.Join(layer, "dir1/subfolder"), 0740)

        // Let's modify modtime for dir1 to be sure it's the same for the two layer (to not having false positive)
```

It seems that if a file is created immediately after the directory is created,
the `archive.Changes` function could't recognize that the parent directory of
the new file is modified.

Perhaps the problem may reproduce on machines with low time precision?
I had successfully reproduced the failure on my development VM as well as
a VM on DigitalOcean.

Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2015-06-10 20:29:29 +08:00
Nicolas Borboën
e12839fa5a Typo psuedo - pseudo 
Signed-off-by: ponsfrilus <ponsfrilus@gmail.com>
 2015-06-10 13:27:55 +02:00
Arnaud Porterie
55bdb51659 Merge pull request #13699 from calavera/volume_backwards 
Allow to downgrade local volumes from > 1.7 to 1.6.
 2015-06-09 19:51:06 -07:00
David Calavera
bd9814f0db Allow to downgrade local volumes from > 1.7 to 1.6. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-06-09 18:04:59 -07:00