docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-23 15:21:32 +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
Alexander Larsson
1357281d03 devmapper: Fix major/minor extraction 
The way devices are mapped is a bit more complex than before.
This implements the method from new_decode_dev in:
https://github.com/mirrors/linux-2.6/blob/master/include/linux/kdev_t.h

Which is what is needed on kernels > 2.6
Upstream-commit: 572b1fd9be69c20a98d885e18b327031ef4f4b51
Component: engine
 2013-10-18 11:38:21 +02:00
Solomon Hykes
5be5b89b7a devmapper: use major,minor of underlying device in devmapper device name, for readability. 
Upstream-commit: 4756ad248a6b8c70a7f4d6cb1aacd6e60e27b1e6
Component: engine
 2013-10-18 08:30:53 +00:00
Solomon Hykes
e658fc1a1d devmapper: clearer make the 'unknown base hash' error message more understandable 
Upstream-commit: dfb77274cef85c0561d98de2eee8b2562c329d1f
Component: engine
 2013-10-18 08:22:42 +00:00
Roger Peppe
f793996ad4 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	commands.go
Upstream-commit: 43fd85eb8f1a3eb8f6dcf9dba818fdcc4602e47e
Component: engine
 2013-10-18 09:22:20 +01:00
Solomon Hykes
d53bf7553c hack: encode the name of the current test in temporary directories, for easier tracking 
Conflicts:
	utils_test.go
Upstream-commit: b629810fe08dc864674a6e64a7f1b418096bc448
Component: engine
 2013-10-18 07:29:07 +00:00
Solomon Hykes
21aae43f3a Increase readbility of unit tests by using mkRuntime everywhere 
Upstream-commit: 07d9e4353bc199db7abb52b4b4bba1c2feb75c1a
Component: engine
 2013-10-18 07:20:39 +00:00
Solomon Hykes
89f16d267d Merge remote-tracking branch 'alexlarsson/dm-status' into dm 
Conflicts:
	devmapper/deviceset.go
Upstream-commit: 73545199a8e84ebc7e44bf2595c7f7b0e20f04a1
Component: engine
 2013-10-18 07:17:13 +00:00
Solomon Hykes
c588125712 devmapper: cleanup error reporting 
Upstream-commit: 0ad35c67462ce3343b99d40ea78755d2ad92a754
Component: engine
 2013-10-18 07:09:13 +00:00
Solomon Hykes
8069d98b90 Merge branch 'dm' of ssh://github.com/dotcloud/docker into dm 
Upstream-commit: 5e363072f54ec1cf0fdb7feb70cdce38622dcbe0
Component: engine
 2013-10-18 06:51:50 +00:00
Solomon Hykes
b73358fb51 devmapper: the tests are fast enough that we no longer need a workaround to avoid timeouts 
Upstream-commit: cad913c57bbd1d9f9b3b2284ee9e2c262734047b
Component: engine
 2013-10-18 06:48:20 +00:00
Solomon Hykes
cc3628cab5 hack: encode the name of the current test in temporary directories, for easier tracking 
Upstream-commit: 5f58a1fbe4733c1415046d6e16afd17a41b595a8
Component: engine
 2013-10-18 06:47:08 +00:00
Solomon Hykes
e20e669277 Increase readbility of unit tests by using mkRuntime everywhere 
Upstream-commit: 07e09d57af29bf9b59945ab2f31c4dc5ab52bb5b
Component: engine
 2013-10-18 06:44:30 +00:00
Tianon Gravi
d1f6497ecd Merge pull request #1 from jpetazzo/cherry-on-top-of-hack-release 
Cherry on top of hack release
Upstream-commit: ac5bc867718b3ea8da1cb13831592094f3d21076
Component: engine
 2013-10-17 23:21:41 -07:00
Jérôme Petazzoni
b75aa9ace9 Change bundle order, and fix shell array expansion. 
I believe that it is helpful to build the binary first. That way,
if you interrupt the tests, you still get a binary to play with.
If you run the tests first and interrupt them, no binary for you!

Also, the second part of this commit is an undeniable proof that
Bash array syntax is nothing else than an elaborate troll by Bash
authors.
Upstream-commit: 85956c70b5613439d9f239550c5c4ec360339cb6
Component: engine
 2013-10-17 23:20:18 -07:00
Jérôme Petazzoni
70d38dc0d4 Remove spurious messages, and use proper args expansion. 
Also, display some (hopefully helpful) message when no command was given.
Upstream-commit: 8c38c309851c2a44b9c12bac8f29bc011ea4040f
Component: engine
 2013-10-17 23:19:36 -07:00
Tianon Gravi
54f8255e5f Merge pull request #2283 from tmc/master 
Make mkimage-arch.sh a little more clear
Upstream-commit: 89a2c8e2cd2ddfe6f7874a1c7f063fdda208c580
Component: engine
 2013-10-17 23:05:01 -07:00
Solomon Hykes
c3b863ceed Merge pull request #2269 from alexlarsson/dm-blocksize 
devmapper: Use a smaller blocksize for the thin-pool
Upstream-commit: 9f85a967bb121a5102f2244611a6aa9cf3abb2b3
Component: engine
 2013-10-17 22:50:33 -07:00
Travis Cline
b7d138e4ad Use heredoc to make expect script more clear 
Upstream-commit: f34a62ea19b477bbaa74a09c04d5e8faf67c44a2
Component: engine
 2013-10-18 00:35:12 -05:00
Solomon Hykes
66093eff84 devmapper: rename deviceset_devmapper.go to deviceset.go 
Upstream-commit: 85a36b3b53f39e13bba9d69a486758b68301d503
Component: engine
 2013-10-18 05:19:22 +00:00
Jérôme Petazzoni
40ae0bfbb2 Work around an exotic bug affecting Docker-in-Docker + systemd. 
Upstream-commit: 255b6aadfacfd346ef413a1ffd945360276cbcf6
Component: engine
 2013-10-17 20:42:11 -07:00
Solomon Hykes
19207ea5e6 Merge remote-tracking branch 'alexlarsson/dm-readonly-images' into dm 
Conflicts:
	devmapper/deviceset_devmapper.go
Upstream-commit: d3505d836ac98a95b2129206844b6e4d6ad24927
Component: engine
 2013-10-18 03:40:46 +00:00
Solomon Hykes
f6aee57647 Merge remote-tracking branch 'alexlarsson/fix-tar-leak' into dm-correct 
Upstream-commit: c47e93fcbeda6c1c29a95b6d0deb23f5d03a07ed
Component: engine
 2013-10-18 03:32:47 +00:00
Solomon Hykes
4e4f3e50fd hack: fail tests if there are leftover temp files before or after 
Upstream-commit: 5cd7de5de8fddd5868c6b85ed1e4f46228c82672
Component: engine
 2013-10-18 03:31:21 +00:00
Solomon Hykes
c53c4a96f0 Hack: fix tests which didn't cleanup properly 
Upstream-commit: 5c175357aaa7e011e3535eeb1ee162450f390b9e
Component: engine
 2013-10-18 02:13:36 +00:00
Solomon Hykes
06ac81c4b1 Hack: don't run integration tests in /var/lib/docker/unit-tests; add missing cleanups in a few tests 
Upstream-commit: 240d5b3fa1b66f099b71c20ff8dc4ed1ecffc1d3
Component: engine
 2013-10-18 02:13:36 +00:00
Solomon Hykes
1f33220276 devicemapper: Add fixme 
Upstream-commit: d034aafac7a9db601b8affd61a28c762be6b6c31
Component: engine
 2013-10-18 00:58:20 +00:00
Andy Rothfusz
ce87496ba9 Clean up build warnings. Remove redundant files. 
Upstream-commit: 689bcd1dc3afdcae5bd45e32541b464fcf3ecbd0
Component: engine
 2013-10-17 17:57:01 -07:00
Solomon Hykes
d24b97a314 devmapper: Rename DeviceSetDM to DeviceSet 
Upstream-commit: 4bd6021806985b48b872aa9dbe2d0183675eac1d
Component: engine
 2013-10-18 00:07:56 +00:00
Solomon Hykes
27c3cb7365 Don't add /.docker-id to the container filesystem 
Upstream-commit: ed03dbfe82f4481ea3845071606ef25c7ea2ec3e
Component: engine
 2013-10-18 00:07:46 +00:00
Solomon Hykes
8e5b6c7d93 Remove race condition caused by double-destroy in 2 tests 
Upstream-commit: 330062ef723f66ed8a640627f983e586f46df03a
Component: engine
 2013-10-17 23:59:59 +00:00
Victor Vieux
0a62aaa3b1 clean split between errors and output. JSON output always valid 
Upstream-commit: 8bce284496e60231ac2e82fc023ff1faadff6aa5
Component: engine
 2013-10-17 23:40:43 +00:00
Jérôme Petazzoni
efb1162110 Merge pull request #2253 from jpetazzo/infrastructure-docs 
Try a different presentation of infrastructure documentation.
Upstream-commit: 95ccb78aa79bb1d8704fe65b09803167b36cd074
Component: engine
 2013-10-17 16:17:32 -07:00
Tianon Gravi
b73b1d5688 Update hack/release.sh process to automatically invoke hack/make.sh and bail on building/testing issues 
Upstream-commit: 83a2e92d47bc1d78a44b9508656725a043f08b6b
Component: engine
 2013-10-17 16:49:35 -06:00
Guillaume J. Charmes
5c8226fc06 Add error checking and error messages 
Upstream-commit: 31b883b07641bfab721a05f0a68629c79b74a058
Component: engine
 2013-10-17 15:04:14 -07:00
Jérôme Petazzoni
427dad8458 Add Stackbrew. 
Upstream-commit: d401e9d3ace06d3291ddd96a8ab8aa690d5935dc
Component: engine
 2013-10-17 14:11:10 -07:00
Peter Braden
71320cc1e8 Re #2137 Note about vagrant dns in the test documentation 
Upstream-commit: 3db381bf086215ff9d29cf55cb55d7fa086f990d
Component: engine
 2013-10-17 13:38:39 -07:00
Guillaume J. Charmes
cdce39d789 Merge pull request #2262 from alexlarsson/dm-dind-use-root-dir 
devicemapper: Use device/inode of the root dir, not the image
Upstream-commit: bdb3b2a88c0379942e3e10f4e44b7d69a96b49d2
Component: engine
 2013-10-17 11:54:40 -07:00
Victor Vieux
1e82bca350 Update CHANGELOG.md 
Upstream-commit: f248a8e13cbde9498a79a902c3d326bf2021e181
Component: engine
 2013-10-17 11:27:44 -07:00
Victor Vieux
fe7c7ab666 Update CHANGELOG.md 
Upstream-commit: 47cc6c808161057f3a04f090dc01f32da2132b47
Component: engine
 2013-10-17 11:26:17 -07:00
Tianon Gravi
82851ecb8f Add initial init scripts library, including systemd, sysvinit, upstart, and openrc 
Upstream-commit: c405d53b6e6658b1cbe9ad7ba52ea6dc9330f546
Component: engine
 2013-10-17 12:03:49 -06:00
Alexander Larsson
efce3d8602 Devmapper: Mount images readonly when calculating changes 
There is no need to have this be writable, and there is a chance
that e.g. atime updates will cause writes to the image which is
bad for disk use wrt sharing between all containers.
Upstream-commit: a14496ce891f1f09b10f0459550e8fe095b477b5
Component: engine
 2013-10-17 16:14:53 +02:00
Alexander Larsson
17a97293a6 devmapper: Use a smaller blocksize for the thin-pool 
As per the thin provisioning docs for creating the pool:

   $data_block_size gives the smallest unit of disk space that can be
   allocated at a time expressed in units of 512-byte sectors.
   $data_block_size must be between 128 (64KB) and 2097152 (1GB) and a
   multiple of 128 (64KB). $data_block_size cannot be changed after the
   thin-pool is created. People primarily interested in thin provisioning
   may want to use a value such as 1024 (512KB). People doing lots of
   snapshotting may want a smaller value such as 128 (64KB).

The switch from 512 (which we used before) to 128 (recommended above
for lots of snapshoting) means a simple container creation (based on the
mattdm/fedora:f19 image) adds 1 MB of diskspace rather than 3.6.
This seems more in tune with how docker is typically used.
Upstream-commit: 8abcc8e713fdf6229d65dec23e6e104f8040d704
Component: engine
 2013-10-17 15:33:00 +02:00
Alexander Larsson
3972ff1232 Show devicemapper status in "docker info" 
This shows the current global diskspace use in "docker info"
Upstream-commit: d733cdcebbcb6bc8573e1869b11f0d9116a92892
Component: engine
 2013-10-17 15:32:07 +02:00
Alexander Larsson
79b5685703 TarFilter: Fix leak of tmpfiles 
We were leaking the temporary directory that we create in TarFilter,
because the "tmpDir, err := ioutil.TempDir()" call overrides the
tmpDir in the outer scope with a new locally scoped variable.
This means tmpDir is always "" when the cleanup function is called.

Also, we did not call the atExit() function if CmdStream had an
error early on.

On errors in CmdStream(),
Upstream-commit: 0aee096fd73676e2548e3bf132770f1692ac47dd
Component: engine
 2013-10-17 14:46:58 +02:00
Edmund Wagner
438bef9430 c&p improvement for 13.04 
first line killed sources list
Upstream-commit: bc39ac71e66327aa73c44633b374ef75630909dc
Component: engine
 2013-10-17 10:07:12 +02:00
Alexander Larsson
9f21580deb devicemapper: Use device/inode of the root dir, not the image 
This way the devicemapper prefix stays stable even if we're not
using loopback mounted devices.
Upstream-commit: e6a73e65a23163273fa63d54b8f12530f7eef104
Component: engine
 2013-10-17 09:53:09 +02:00
Edmund Wagner
e2a6017ff6 make copy paste user friendly 
copying only the first line killed my sources.list file
Upstream-commit: 2110b3cca80da253d2fd7443480509a3b58a19e2
Component: engine
 2013-10-17 09:31:35 +02:00
Solomon Hykes
d2fc2c3021 devmapper: error reporting workaround in waitRemove() 
Upstream-commit: ad2fbd9e873915d9d09685887eb0afe16b9559a4
Component: engine
 2013-10-17 01:49:51 +00:00
Solomon Hykes
cff980c7fc devmapper: small fixes in error reporting 
Upstream-commit: e5d7472a0d0268957eebbc385005d6b69c442270
Component: engine
 2013-10-17 01:49:27 +00:00
Solomon Hykes
379a09a137 devmapper: debug messages 
Upstream-commit: 7d3c7e2b297badc152213cae1e6a11f64a7691b4
Component: engine
 2013-10-17 01:47:03 +00:00