toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,163 Commits 3 Branches 295 Tags
f21492c649f39a5d1adadd1dd5855c22a2b9efff
Commit Graph
16163 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vivek Goyal f21492c649 devicemapper: Compare uuid of base device on startup 
It is easy for one to use docker for a while, shut it down and restart
docker with different set of storage options for device mapper driver
which will effectively change the thin pool. That means any of the
metadata stored in /var/lib/docker/devicemapper/metadata/ is not valid
for the new pool and user will run into various kind of issues like
container not found in the pool etc.

Users think that their images or containers are lost but it might just
be the case of configuration issue. People might use wrong metadata
with wrong pool.

To detect such situations, save UUID of base image and once docker
starts later, query and compare the UUID of base image with the
stored one. If they don't match, fail the initialization with the
error that UUID failed to match.

That way user will be forced to cleanup /var/lib/docker/ directory
and start docker again.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: c06b05b11e6bbe48ae3ca140096d7862e5e312f8
Component: engine
 2015-06-16 21:12:27 -04:00
Arnaud Porterie b25a623fe3 Merge pull request #13722 from samuelkarp/CpuShareRemoteAPI 
Adjust disallowed CpuShares in /containers/create
Upstream-commit: 71ead0ef5ce1f4e7c38631b1fc62d88cf29dba3e
Component: engine
 2015-06-11 14:20:50 -07:00
Jessie Frazelle d86641ad8d Merge pull request #13801 from bexelbie/bex_manpage_indention 
Updates man page generation to use go-md2man v1.0.2
Upstream-commit: 0de7065897573551bb23ead8d1d21d22e7657f17
Component: engine
 2015-06-11 14:12:17 -07:00
Jessie Frazelle 00b1dbe10f Merge pull request #13890 from moxiegirl/vieux-fix 
Updating with fix for first line and the vieux/amy comment on website
Upstream-commit: 98391f0a39e5696df0f5e7fd59be0b7f158d0564
Component: engine
 2015-06-11 13:22:03 -07:00
Mary Anthony 239317c5c8 Updating with fix for first line and the vieux/amy comment on website 
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 566466e71402b1d75412061d6ee80b07bb8e37b1
Component: engine
 2015-06-11 12:48:01 -07:00
Jessie Frazelle f4886b8583 Merge pull request #13865 from Mic92/zfs-selinux 
zfs: correctly apply selinux context
Upstream-commit: cada9b54b52246fd284e3025da5ad936a7521c1c
Component: engine
 2015-06-11 12:42:06 -07:00
Jessie Frazelle 238420e186 Merge pull request #13783 from tianon/vendor-pruning 
Add intelligent vendor pruning (via "go list")
Upstream-commit: e3821feb137a81683f1763cc64b85d47ad4545bf
Component: engine
 2015-06-11 10:32:53 -07:00
Tianon Gravi 1e82333db2 Update "vendor/" 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: b0d748325f1eaae8d4f138b5785307cef2a784d3
Component: engine
 2015-06-11 09:59:12 -07:00
Tianon Gravi af029cbed5 Add intelligent vendor pruning (via "go list") 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 9e4ee3dea52ec0615f59c729ed972d08732a3edd
Component: engine
 2015-06-11 09:59:12 -07:00
Tianon Gravi 67781f5191 Adjust "Dockerfile" to build tools we need in isolated mktemp GOPATHs 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: f61d595b55b48428b7268b85a23b6e61b649f6d9
Component: engine
 2015-06-11 09:59:12 -07:00
Doug Davis 7f3cb67fc1 Merge pull request #13879 from eolamey/13878-nil-ip-opt-as-empty-string 
Display empty string instead of <nil> when IP opt is nil.
Upstream-commit: b27f9605043377b46ecd7b983bea0e46da78cab7
Component: engine
 2015-06-11 09:30:52 -07:00
moxiegirl 8634848db8 Merge pull request #13839 from eolamey/13838-fix-docs-url 
Fix docs URL not using https.
Upstream-commit: 9001c4bc486934f91d5809b335232875e639dafb
Component: engine
 2015-06-11 08:59:35 -07:00
Brian Goff 6bfaa80cf5 Merge pull request #13861 from mrjana/cnm_integ 
Vendoring libnetwork to fix stale arp cache issue
Upstream-commit: 4fc6449944901d0c696ddeb296434871d196ec20
Component: engine
 2015-06-11 09:12:34 -04:00
Eric-Olivier Lamey bdb3371188 Display empty string instead of <nil> when IP opt is nil. 
Fixes #13878.

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

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
Upstream-commit: 19c31a703fb84f1079cc2466d435cb4913a4bfd2
Component: engine
 2015-06-11 11:11:37 +02:00
Brian (bex) Exelbierd 06fed29156 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>
Upstream-commit: 5d51118c7c6399ed3002e6c19d860e89be79d160
Component: engine
 2015-06-11 08:36:21 +02:00
Antonio Murdaca 27623f4a6c Merge pull request #13862 from Microsoft/10662-fixelementsrestored 
Show actual number of elements restored
Upstream-commit: 2b27fe17a1b3fb8472fde96d768fa70996adf201
Component: engine
 2015-06-11 07:13:19 +02:00
Eric-Olivier Lamey 64aa4080a0 Fix docs URL not using https. 
Fixes #13838.

Signed-off-by: Eric-Olivier Lamey <eo@lamey.me>
Upstream-commit: 212dfb45dec64b470307aec22623f2d80be6695f
Component: engine
 2015-06-11 04:50:50 +00:00
Jana Radhakrishnan 54c658c51c Vendoring libnetwork to fix stale arp cache issue 
Vendoring in libnetwork 90638ec9cf7fa7b7f5d0e96b0854f136d66bff92

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 386ab251372a40e895115e7a927d349412cf9d89
Component: engine
 2015-06-10 19:29:10 -07:00
Arnaud Porterie 3ac639a43d Merge pull request #13867 from calavera/fix_daemon_cleanup_order 
Cleanup driver and graph db after stopping containers.
Upstream-commit: 883d661b693fceab343d764366731c165e360d50
Component: engine
 2015-06-10 17:05:41 -07:00
David Calavera 6dcb016943 Merge pull request #13868 from jfrazelle/update-gitignore-man 
update gitignore for new manpages
Upstream-commit: ad9080a87c847121897f4d00dcde4541d392dd7c
Component: engine
 2015-06-10 16:55:15 -07:00
David Calavera 5390ec6e1b Cleanup driver and graph db after stopping containers. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 0964a664e85c88568863df30f43b0e3974093348
Component: engine
 2015-06-10 16:11:50 -07:00
Jessica Frazelle 64af46488a update gitignore for new manpages 
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: f88e620359eaf986a843714126a9a7df5e25e115
Component: engine
 2015-06-10 16:11:15 -07:00
Doug Davis a487d04de7 Merge pull request #13863 from Microsoft/typoclientutils 
Typo fix in api\client\utils.go
Upstream-commit: 466efebf0e9c41740316ec66c63ec6c7d64f9f57
Component: engine
 2015-06-10 15:57:37 -07:00
John Howard c49e649bfd Typo fix in api\client\utils.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 84aec1e8e6e6b3e7ea2da31fcae5a80df026edc6
Component: engine
 2015-06-10 15:24:53 -07:00
John Howard 08db54d962 Show actual number of elements restored 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 141cd2a1f26f3455a1daf20420ca1efb5a9e1a16
Component: engine
 2015-06-10 15:18:51 -07:00
David Calavera 475879cb0c Merge pull request #13804 from moxiegirl/proposal-man-pages 
PROPOSAL: Moving man pages out of docs
Upstream-commit: b6049b5c4963bb1b82ba381cdce69d1083bcf59e
Component: engine
 2015-06-10 15:04:19 -07:00
Arnaud Porterie 5e66dbe684 Merge pull request #13854 from crosbymichael/revert-shared-root 
Revert shared container rootfs
Upstream-commit: 9da65ed84f9fc285fa2d122c8341a897e5d0eb29
Component: engine
 2015-06-10 14:12:14 -07:00
Mary Anthony 84b8fc6fe1 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>
Upstream-commit: eacae64bd89ccc95a6db7bda76d36014e71e70ac
Component: engine
 2015-06-10 13:43:35 -07:00
Tibor Vass 6c4935d15a Merge pull request #13832 from mapk0y/fix-error-msg 
fix typo.
Upstream-commit: add64dc297a4549e1abe0e0c5176eeabd198fb47
Component: engine
 2015-06-10 16:38:07 -04:00
Brian Goff b4e364cf05 Merge pull request #13272 from Microsoft/10662-daemonrefactorv2 
Windows: Refactor daemon
Upstream-commit: 05644ccea9910179274ffc9e587a8787fe9cceae
Component: engine
 2015-06-10 16:28:56 -04:00
David Calavera 0c9254be37 Merge pull request #13015 from mariussturm/master 
Add logging driver for GELF via UDP
Upstream-commit: 17324c91e33d43472f94188b25ee4bed49630e39
Component: engine
 2015-06-10 12:45:12 -07:00
John Howard a180cd8538 Windows: Refactor daemon 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 8fb0ca2c35c0df38a79c4eac62fd7d04e3688240
Component: engine
 2015-06-10 12:42:43 -07:00
Jessie Frazelle 962cbe284b Merge pull request #13853 from jfrazelle/fix-hack-make 
ugh typo in hack scripts fix, introduced by 2b4facdf
Upstream-commit: 65d0670d65ecd79984a51ceeef3e25dd67bafa1c
Component: engine
 2015-06-10 11:53:47 -07:00
Michael Crosby ebc23891b1 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>
Upstream-commit: c9d71317be5fd13ba544a2699442a40ccf2cc3cc
Component: engine
 2015-06-10 11:29:27 -07:00
Marius Sturm 0c0594818f add UDP GELF logging-driver 
allows to send container logs to Graylog or Logstash.

Signed-off-by: Marius Sturm <marius@graylog.com>
Upstream-commit: 96d06e106fb9e35e5a526054d3aa0152152a9cc4
Component: engine
 2015-06-10 20:21:50 +02:00
Jessica Frazelle 9a7bae36c0 ugh typo in hack scripts fix, introduced by 2b4facdf 
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: c5f49886fa1a7ce67ab020a19c4aea65225c3658
Component: engine
 2015-06-10 11:00:59 -07:00
Jessie Frazelle 52e2bdb4c8 Merge pull request #13754 from cpuguy83/13753_fix_events_64 
Default events since to current time
Upstream-commit: 12149e829369e879a1978420b6ec2100a4b4fadd
Component: engine
 2015-06-10 10:34:13 -07:00
Brian Goff 5a71e1d7b0 Default events since to current time 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 74c12aa42918e3f349afcb46e6e54b724ef789a9
Component: engine
 2015-06-10 12:37:40 -04:00
James Turnbull e359817c8d Merge pull request #13844 from ponsfrilus/master 
Typo psuedo - pseudo
Upstream-commit: 5821f13b8c8222ca75f5909236036222d175a25e
Component: engine
 2015-06-10 11:41:44 -04:00
Doug Davis 85a6cd6efb Merge pull request #12371 from rhatdan/kill 
docker kill should return error if container is not running.
Upstream-commit: 46af724e81fe6890dc2709101e3c3f680db77631
Component: engine
 2015-06-10 08:32:57 -07:00
Tibor Vass 5ff5529252 Merge pull request #12813 from Microsoft/10662-nolinuxgraph 
Windows: Don't build Linux graph drivers
Upstream-commit: de90aef4115c5a183e4d9406842562933aa93cf4
Component: engine
 2015-06-10 10:01:50 -04:00
Shijiang Wei 63bef25f34 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>
Upstream-commit: e2c6a8be7c03d3c8405421c07ec6fb1c5c3a6200
Component: engine
 2015-06-10 20:29:29 +08:00
Nicolas Borboën 7b52c53f62 Typo psuedo - pseudo 
Signed-off-by: ponsfrilus <ponsfrilus@gmail.com>
Upstream-commit: e12839fa5a1c1051a06d96a8b2f72c4e4625aa8d
Component: engine
 2015-06-10 13:27:55 +02:00
Arnaud Porterie 438dab23c9 Merge pull request #13699 from calavera/volume_backwards 
Allow to downgrade local volumes from > 1.7 to 1.6.
Upstream-commit: 55bdb51659b3982ae78cd24ed0823f6b8d0bb9b2
Component: engine
 2015-06-09 19:51:06 -07:00
David Calavera 416f8a0f5b Allow to downgrade local volumes from > 1.7 to 1.6. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: bd9814f0db9c8a087e42b66eabb8413bf1b2ab66
Component: engine
 2015-06-09 18:04:59 -07:00
Michael Crosby 0ae1820eeb Merge pull request #13784 from mrjana/cnm_integ 
libnetwork: Add garbage collection trigger
Upstream-commit: 4750e1f77ef1f42f8b826f7314ec4c2b3f7a4f34
Component: engine
 2015-06-09 17:24:30 -07:00
Arnaud Porterie a53114bcd1 Merge pull request #13831 from LK4D4/update_libcontainer 
Update libcontainer to v2.1.1
Upstream-commit: c3b962d327d161171157b95d587946ebe5a5cfba
Component: engine
 2015-06-09 17:12:20 -07:00
Arnaud Porterie f40bfd3ca4 Merge pull request #13815 from tiborvass/do-not-send-basic-auth-on-302 
Do not set auth headers for registry v1 if 302
Upstream-commit: 13baeb3b70c5f145614cbbd582daa8a6fcbd2b79
Component: engine
 2015-06-09 15:34:53 -07:00