docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-22 03:22:01 +03:00
Code Activity
5,871 Commits 12 Branches 297 Tags
efeecbbbfbefb3285c1903ade7ff702ca858d73e
Commit Graph

5871 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
6d014fee93 Merge pull request #40 from shykes/creack-0.6.5-dm-plugin 
Rename gograph and move drivers to sub pkg
Upstream-commit: 427649eee12c253ad24ec694353aea148e24eb08
Component: engine
 2013-11-15 17:31:50 -08:00
Guillaume J. Charmes
9d193b1c00 WIP 
Upstream-commit: a518b847511f034d9bfd4166e17f8f0eac61d021
Component: engine
 2013-11-15 17:16:30 -08:00
Victor Vieux
10d4ab171f Fix tmp dir never cleanup 
Upstream-commit: 926169059374fb7a7a7035dde4e78f3418778a80
Component: engine
 2013-11-15 16:23:55 -08:00
Guillaume J. Charmes
73e6c3f45e rename gograph in graphdb 
Upstream-commit: cbd1281ec998e017b579c13ee6262aa21c96c38a
Component: engine
 2013-11-15 15:55:45 -08:00
Guillaume J. Charmes
052ebaaf52 Move all drivers to the same subdir graphdriver 
Upstream-commit: 035c1442424ee502118cdbf2ee2dddafcc0f01cd
Component: engine
 2013-11-15 15:48:24 -08:00
Guillaume J. Charmes
bf47a58ff7 Merge pull request #38 from crosbymichael/add-container-driver 
Save driver to container and skip incompat containers
Upstream-commit: fb245f79038294a1a3ea51f47ce2e62ffad6b5d1
Component: engine
 2013-11-15 14:20:19 -08:00
Guillaume J. Charmes
d49c3e47d7 Merge pull request #36 from crosbymichael/unlink-init-files 
Unlink docker init files
Upstream-commit: dc5b7b32c3ad42a6414a2c6bb0e1be6743c746fc
Component: engine
 2013-11-15 14:09:51 -08:00
Andy Rothfusz
c2f970187c Merge pull request #2709 from eugenkrizo/patch-1 
path needs to be specified to 'docker build' command
Upstream-commit: e12bba66ea784e0c7859b5679d6a55d639889508
Component: engine
 2013-11-15 13:34:08 -08:00
Andy Rothfusz
4f21d884c5 Merge pull request #2713 from eugenkrizo/patch-2 
port published explicitly (for docker 0.6.6)
Upstream-commit: 92c3a319fba58132bfc918a3bde8dcc64e00304c
Component: engine
 2013-11-15 13:32:18 -08:00
Andy Rothfusz
f5175fa4bb Merge pull request #2685 from Painted-Fox/patch-1 
Add more depth to the upstart example in host_integration.rst
Upstream-commit: 323e86032db8941135bea418cfbddc8d20739c0e
Component: engine
 2013-11-15 12:28:07 -08:00
Victor Vieux
d46ca98228 bring back tests about LXCConfig 
Upstream-commit: c06d903edd7b16588e68680a989b73e27d990871
Component: engine
 2013-11-15 11:48:18 -08:00
Andy Rothfusz
da637b552f Fix typos, add links, streamline content of #2592 
Upstream-commit: 9a9d3239e10b55cc15bb38788a411d9a16c477fc
Component: engine
 2013-11-15 11:38:03 -08:00
Andy Rothfusz
dc84120dc9 Merge branch 'fix_examples_use_docs' of git://github.com/rogaha/docker into test-2592 
Upstream-commit: 33110ddc3fbb457d071fa9a53f9bb76e52dd724b
Component: engine
 2013-11-15 11:15:14 -08:00
Andy Rothfusz
07dd17035d Merge pull request #2689 from metalivedev/fix-syntax 
Clean up sphinx syntax
Upstream-commit: 6341768393a8b48cc37e29f43efdffd3fa4caf33
Component: engine
 2013-11-15 11:09:51 -08:00
Victor Vieux
b2bdca3ec2 Merge pull request #2712 from makinacorpus/master 
Do not drop sys_boot
Upstream-commit: ad96d5ff04dd9b8284bad4f86ed285f905723951
Component: engine
 2013-11-15 10:33:41 -08:00
Michael Crosby
c579e87812 Merge pull request #33 from alexlarsson/dm-plugin-status 
Add driver plugin status
Upstream-commit: 7cad77b1e2d0b8af5dcadce0599fc83cbe1970f4
Component: engine
 2013-11-15 10:15:59 -08:00
Guillaume J. Charmes
b0ad480645 Merge pull request #34 from alexlarsson/dm-plugin-dummy-volumes 
Use dummy driver for volumes
Upstream-commit: 2b23da1d2ff14c3f62a4c4b1ea78084598a58ca6
Component: engine
 2013-11-15 09:41:16 -08:00
Guillaume J. Charmes
d77afe3b14 Merge pull request #30 from alexlarsson/dm-plugins-archive-tests 
Dm plugins archive tests
Upstream-commit: bcf96d95bce927b23b03703f27965019e727313c
Component: engine
 2013-11-15 09:38:17 -08:00
eugenkrizo
3c67b07093 port published explicitly (for docker 0.6.6) 
port 5984 to couchdb needs to be published explicitly in docker version 0.6.6
Upstream-commit: 492ce4c665b7d55d1496fb7e822a49ff0d44809d
Component: engine
 2013-11-15 17:12:48 +01:00
Mathieu Le Marec - Pasquet
61d22b0c3d Merge pull request #1 from jpetazzo/2392-add-kernel-docs 
Add warning about SYS_BOOT capability with pre-3.4 kernels and pre-0.8 LXC.
Upstream-commit: 76ab8fa00ffca136c50b58b4215eb063458f4a5b
Component: engine
 2013-11-15 07:58:54 -08:00
eugenkrizo
bc283849de path needs to be specified to 'docker build' command 
current folder '.' appended as a path
Upstream-commit: 007964793dd619279bfb48c3fa84ada65aa599bd
Component: engine
 2013-11-15 16:16:59 +01:00
Alexander Larsson
faff941ade Use dummy driver for volumes 
It makes no sense to use the aufs or devicemapper drivers for volumes.
The aufs one is perhaps not a big problem, but the devicemapper one
certainly is. It will be unnecessarily using a dm
blockdevice-over-loopback with a limited size base FS.

This just hardcodes the driver to be the dummy, perhaps in the future
we can have other drivers that make sense for the volumes.
Upstream-commit: 10f23a94f6daaf03c684937daea67d10205b4b89
Component: engine
 2013-11-15 11:30:28 +01:00
Alexander Larsson
fa730d3073 Print devicemapper status details in docker info 
This adds a generic Status call in the Driver api and
implements if for the devicemapper backend.

The status is an array of key/value strings rather than a map so that
we can guarantee some static order of the docker info output.
Upstream-commit: 243843c0787ce2b56c8bbf72a2d4bd7604e84b2e
Component: engine
 2013-11-15 11:04:02 +01:00
Alexander Larsson
fb91dc2f0c Show active driver in docker info output 
Upstream-commit: 062810caedba973e76a3dd7eb9e45b56511eefc6
Component: engine
 2013-11-15 10:24:48 +01:00
Alexander Larsson
d9b9f3ddbd Add tests for the changes detection code 
This adds 3 tests:

Verify that ChangesDirs() returns nothing when run on a copy of the
same directory.

Verify that various mutations of a directory get reported with the
right changes.

Verify that ExportChanges() + ApplyLayer() of the above mutation gets
an identical directory.

Unfortunately the last test is disabled because it fails in multiple
ways atm. But I want to get it in so that we can fix it.
Upstream-commit: f7238f94e8b5b31e78360c342676ca84b5984806
Component: engine
 2013-11-15 09:49:46 +01:00
Alexander Larsson
b091059403 Use ExportChanges() in runtime.Diff() 
This code was duplicated in two places, one which was unused. This
syncs the code and removes the unused version.
Upstream-commit: d69a6a20f0b6657821638ee591920d071a784b0e
Component: engine
 2013-11-15 09:49:42 +01:00
Michael Crosby
b264af0c15 Save driver to container and skip incompat containers 
For people who toggle drivers we want to save the driver used
to create a container so that if the driver changes we can skip
loading the container and it should not show up in docker ps
Upstream-commit: 4908d7f81db91f4a28be152ec0cacb0cf711b403
Component: engine
 2013-11-14 22:53:59 -08:00
Michael Crosby
ea7ee7989a Unlink docker init files 
Upstream-commit: 29fa1b6666f28e7f42e92a10d195823fa84b7622
Component: engine
 2013-11-14 21:23:23 -08:00
Andy Rothfusz
a9461ab782 Merge pull request #2690 from codevin/master 
Improvise documentation for builder.rst / VOLUME command
Upstream-commit: bed87ea1038321d4c58d379040acdbd824cb8b7c
Component: engine
 2013-11-14 19:23:18 -08:00
Solomon Hykes
3372c0c790 Move iptables test to integration tests 
Upstream-commit: 823674816e59e1e8c3f768a97585c69e1d86ead8
Component: engine
 2013-11-15 01:15:39 +00:00
Solomon Hykes
2a4f3940f0 Split auth tests between unit tests and integration tests 
Upstream-commit: 8d3e35cd8d92d184dc66041c235163cab4953842
Component: engine
 2013-11-15 01:13:20 +00:00
Michael Crosby
d3e492dda3 Merge pull request #32 from shykes/shykes-0.6.5-dm-plugin 
Merge bug fix from dotcloud/docker master
Upstream-commit: 0c38f86e5e799e71866a3ee2f876c170e71c68d0
Component: engine
 2013-11-14 16:21:19 -08:00
Guillaume J. Charmes
7ac1f80c52 Merge branch 'master' into shykes-0.6.5-dm-plugin 
Upstream-commit: 8a358e88339c7ba8606bab2c2f8877175bf55598
Component: engine
 2013-11-14 16:18:33 -08:00
Guillaume J. Charmes
0f14533ff9 Merge pull request #2704 from shykes/fix-auto-pull 
Fix the brittle errorstring-to-httperror recognition code
Upstream-commit: 84ed18827a5903c7df61146a8fd716e8245830e7
Component: engine
 2013-11-14 16:15:46 -08:00
Solomon Hykes
d641b4b09e Fix the brittle errorstring-to-httperror recognition code which in turn is required by autopull (the client issues a pull if container creation returns 404) 
Upstream-commit: 693ff4d2ae5f0d723469340f67bb55f7aa3e824b
Component: engine
 2013-11-14 23:54:28 +00:00
Victor Vieux
26146eb208 move TestMount to integration 
Upstream-commit: 596810d8db17c246c9c5107e7ecc6eb781454f36
Component: engine
 2013-11-14 15:17:31 -08:00
Victor Vieux
7456f6a466 fix Integration tests 
Upstream-commit: 661a8a0e0ce95d9bcb222184c14373fb1dbb1aec
Component: engine
 2013-11-14 14:46:13 -08:00
Michael Crosby
e63f1ff2a2 Merge pull request #31 from shykes/shykes-0.6.5-dm-plugin 
Merge from dotcloud/docker master 
Upstream-commit: eb06a7b8f87e14891b38f650e13e23760cf7a051
Component: engine
 2013-11-14 14:14:13 -08:00
Guillaume J. Charmes
7686e1f389 Merge branch 'master' into shykes-0.6.5-dm-plugin 
Conflicts:
	utils.go
	utils_test.go
Upstream-commit: 7cf60da38880534d76d031c4646fbd469d922385
Component: engine
 2013-11-14 14:02:44 -08:00
Alexander Larsson
39e4a0bc9e ApplyLayer() use RemoveAll to handle removing directories 
rmTargetPath can be a directory, so we have to use RemoveAll() or we
will fail to whiteout non-empty directories.
Upstream-commit: 006e2a600ce689770ba2c49805bc4f634976f365
Component: engine
 2013-11-14 22:56:18 +01:00
Michael Crosby
5f7a312280 Merge branch 'dm-plugin-new-ChangesDirs' of https://github.com/alexlarsson/docker into alexlarsson-dm-plugin-new-ChangesDirs 
Conflicts:
	archive/changes.go
Upstream-commit: eace2dbe1d49ad6a990f5b42f092d3f4d77bf225
Component: engine
 2013-11-14 12:23:01 -08:00
Michael Crosby
bf15883f56 Merge pull request #2445 from alexlarsson/fix-shared-root-from-dm 
Fix lxc start for shared root filesystems 
Upstream-commit: 629c6e36492336f01fd4e25426a5c875f52628e2
Component: engine
 2013-11-14 11:20:53 -08:00
Andy Rothfusz
43fe95ed51 Merge pull request #2691 from SvenDowideit/add-instruction-path-limitations 
except URL-based ADDs
Upstream-commit: c7aaf831d7ae6ddd0a897c6f687d479904536107
Component: engine
 2013-11-14 11:12:08 -08:00
Solomon Hykes
54481185b5 Remove deprecated tags_test.go 
Upstream-commit: e9624bf715134294a7fac1ab8a43508139000253
Component: engine
 2013-11-14 10:50:43 -08:00
Solomon Hykes
13d08cbd03 gofmt 
Upstream-commit: 2a209afe5fe0f27296e3e06a199bb5305910e1cf
Component: engine
 2013-11-14 10:50:43 -08:00
Victor Vieux
1880f01ff8 Integration tests: remove dependency on private APIs 
Upstream-commit: c001a5af67b7b811a8fc69011fcffc2656b8fd99
Component: engine
 2013-11-14 10:50:43 -08:00
Solomon Hykes
6c1679864e Move integration tests to integration/, expose missing public methods in the core 
Upstream-commit: 359a6f49b9ec704686d0cb0df7cb0d7c8d5f55a7
Component: engine
 2013-11-14 10:50:00 -08:00
Solomon Hykes
1ac8c4289f Merge pull request #29 from crosbymichael/try-load-aufs 
Try to load aufs first then check in filesystems for aufs support
Upstream-commit: 099c53b28ef361c236b0c2b22dbf6a43bb647af2
Component: engine
 2013-11-14 10:11:19 -08:00
Michael Crosby
93ce091ee1 Try to load aufs first then check in filesystems for aufs support 
Upstream-commit: 7b2d59b91e64e72e346747cf2e561be8afc87fa7
Component: engine
 2013-11-14 09:42:12 -08:00
Guillaume J. Charmes
ce293b5a8b Merge pull request #28 from crosbymichael/close-sparse-files 
Close sparse files when done
Upstream-commit: 529c30261efeede3a101fc62a0f72cbf992b3b02
Component: engine
 2013-11-14 07:02:47 -08:00