toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,230 Commits 3 Branches 295 Tags
e8ca8d4bc2721e62e5a0b115becb00fbc9e4aaf6
Commit Graph
7230 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby e8ca8d4bc2 Merge pull request #3971 from creack/fix_add_ownership 
Change ownership to root for ADD file/directory
Upstream-commit: 9cc7eb4ab37504477b2e56219cab95e65a3fbf40
Component: engine
 2014-04-02 12:22:09 -07:00
Tianon Gravi fd7060d282 Merge pull request #4965 from tianon/update-makefile 
Update Makefile with several improvements
Upstream-commit: 8aa3dc681dcc1fbbfcb71ba52661f551004d1b51
Component: engine
 2014-04-02 12:03:12 -06:00
unclejack 0636b8d97e Merge pull request #4951 from alexlarsson/dm-fix-deadlock 
Fix AB-BA deadlock in devicemapper backend
Upstream-commit: 3e68d36485a15f1688601a88440af6df59a8cea7
Component: engine
 2014-04-02 20:58:09 +03:00
unclejack 036c540e6a Merge pull request #4779 from vieux/symlink_mtab 
symlink /etc/mtab and /proc/mounts
Upstream-commit: b5caa5053a561b02e14dd26395e08351e519dae1
Component: engine
 2014-04-02 20:57:04 +03:00
James Turnbull 81aaabc5f1 Merge pull request #4966 from SvenDowideit/add-kernel-version-info 
add RHEL6 kernel version, and a 3.8 hint to the binaries doc
Upstream-commit: 440562511ee1c21548c7388b9c19fdf82c6e93a7
Component: engine
 2014-04-02 08:56:17 -04:00
Tianon Gravi a12a41609d Merge pull request #4853 from pjz/bash_completion 
Include completion scripts in ubuntu/debian package
Upstream-commit: 506055d973ec3a393fa5f8438b41b2318e95b21c
Component: engine
 2014-04-02 01:40:24 -06:00
Alexander Larsson 98d864eefe devmapper: Avoid AB-BA deadlock 
We currently drop the global lock while holding a per-device lock when
waiting for device removal, and then we re-aquire it when the sleep is done.
This is causing a AB-BA deadlock if anyone at the same time tries to do any
operation on that device like this:

thread A:             thread B
grabs global lock
grabs device lock
releases global lock
sleeps
                      grabs global lock
                      blocks on device lock
wakes up
blocks on global lock

To trigger this you can for instance do:

ID=`docker run -d fedora sleep 5`
cd /var/lib/docker/devicemapper/mnt/$ID
docker wait $ID
docker rm $ID &
docker rm $ID

The unmount will fail due to the mount being busy thus causing the
timeout and the second rm will then trigger the deadlock.

We fix this by adding a lock ordering such that the device locks
are always grabbed before the global lock. This is safe since the
device lookups now have a separate lock.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 2ffef1b7eb618162673c6ffabccb9ca57c7dfce3
Component: engine
 2014-04-02 09:05:00 +02:00
Alexander Larsson bd0bcefa7f devmapper: Add lock to protext Devices map 
Currently access to the Devices map is serialized by the main
DeviceSet lock, but we need to access it outside that lock, so we
add a separate lock for this and grab that everywhere we modify
or read the map.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 70826e8b3fee27b971852aad89053507c6866d3e
Component: engine
 2014-04-02 09:05:00 +02:00
Alexander Larsson 1544c3baed devmapper: Add lookupDevice() helper 
This centralizes the lookup of devices so it is only done in one place.
This will be needed later when we change the locking for it.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: e01b71cebeb96755641a18762dea5b843f107bee
Component: engine
 2014-04-02 09:05:00 +02:00
Alexander Larsson be8cb2a3bc devmapper: Pass info rather than hash to setInitialized 
We already have this at the caller, no need to look up again.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 74edcaf1e84aa8bf35e496b2bead833172a79fca
Component: engine
 2014-04-02 09:05:00 +02:00
Alexander Larsson 3fc0d17ed6 devmapper: Pass info rather than hash to deactivateDevice() 
We already have the info in most cases, no need to look this up multiple times.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 5955846774c9b43291d6de0584fa8c3f62414c43
Component: engine
 2014-04-02 09:05:00 +02:00
Alexander Larsson cca3f27ce9 devmapper: Pass info rather than hash to deleteDevice 
All the callers already have the info, no need for an extra lookup.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 8e39b35c7cd02bbb644b7faf2a434de0098e6dea
Component: engine
 2014-04-02 09:05:00 +02:00
Alexander Larsson d51d0846f3 devmapper: Pass info rather than hash to activateDeviceIfNeeded 
There is no need to look this up again, we have it already in all callers.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: e5394e35c7a8f730ac76d24dee74d769049a0428
Component: engine
 2014-04-02 09:05:00 +02:00
Sven Dowideit 7635abc6de add RHEL6 kernel version, and a 3.8 hint to the binaries doc 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 2b64453adbfdf715542b0b4274ed13e6f2a444da
Component: engine
 2014-04-02 16:52:07 +10:00
Tianon Gravi 5daacf2dcb Update Makefile with several improvements 
Especially but not limited to:
- make BINDDIR= ... - for when you don't want a bind mount at all
- make DOCSPORT=9000 docs - for when you want a not-8000 docs port
- when we can't determine a branch name, we don't try to "docker build -t docker: ." anymore - we just "docker build -t docker ." (thus allowing Docker to assume ":latest")

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: b51fe1783347c1bf679870925a271531a925b7e9
Component: engine
 2014-04-01 22:43:38 -06:00
Victor Vieux 228e989bbd Merge pull request #4961 from creack/update_version_pkg 
Update Version to not use string anymore
Upstream-commit: 93bb20816418f68d8a47f8252e664856f7b554b1
Component: engine
 2014-04-01 18:37:25 -07:00
Michael Crosby 6b558492ee Merge pull request #4964 from creack/add_api_version 
Add API version to `docker version`
Upstream-commit: b4c8232b9516802f8eb575827d75465a07d47fcf
Component: engine
 2014-04-01 18:36:18 -07:00
Victor Vieux b3b5319e85 <3 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: d7ec39a4cfbee7b68e0c7973fb629da6f54d873c
Component: engine
 2014-04-02 01:19:26 +00:00
Guillaume J. Charmes 0423604572 Add API version to docker version 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: b246fc33ae4f05b5084fed8fc9f1034e36d87d78
Component: engine
 2014-04-01 17:30:19 -07:00
Guillaume J. Charmes f47a46d075 Merge pull request #4963 from tianon/check-config 
Add basic initial "check-config" script to contrib
Upstream-commit: 8ff02d58d99c547d59daa9e7bb3a8d4a1fe85121
Component: engine
 2014-04-01 16:51:32 -07:00
Victor Vieux 44b80d9793 Merge pull request #4902 from shykes/wozniak_is_not_boring 
Steve Wozniak is not boring.
Upstream-commit: 431046e0f5ccf2a16c4530b996e035447ce37b63
Component: engine
 2014-04-01 16:49:56 -07:00
unclejack d7e849e505 Merge pull request #4931 from crosbymichael/gen-mac-addr-for-bridge 
Set bridge mac addr on supported kernels
Upstream-commit: ceed9382d0b361018a57ec96e163c3c30198cbd0
Component: engine
 2014-04-02 02:47:56 +03:00
Tianon Gravi 91e0f424cb Add basic initial "check-config" script to contrib 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 9c0c4aeda47fcebc4470f7ba786749af2999ec78
Component: engine
 2014-04-01 17:42:54 -06:00
Sven Dowideit 63bbec4039 Merge pull request #4938 from jlhawn/master 
No longer expose gravatar_email in docker.io api
Upstream-commit: 8cc8b1dd9989ede140c59ed40582c93552a5cd87
Component: engine
 2014-04-02 09:13:33 +10:00
unclejack 4675670b52 Merge pull request #4867 from crosbymichael/clean-shutdown 
Cleanly shutdown docker
Upstream-commit: 30ff3fa954676bfc8f48b73093f3afa1473d146e
Component: engine
 2014-04-02 01:48:03 +03:00
Guillaume J. Charmes d9e5457b6e Update Version to not use string anymore 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 3ee37f547f4685ab88bfc39517cc18c1911451e5
Component: engine
 2014-04-01 15:46:52 -07:00
Michael Crosby 55905d7fbc Merge pull request #4942 from vieux/cleanup_dev_libcontainer 
remove setupDev from libcontainer
Upstream-commit: 9cf89f854256eace2b8f446b16c4fbe22ffa61b1
Component: engine
 2014-04-01 14:28:17 -07:00
Guillaume J. Charmes 9cddc561e1 Change ownership to root for ADD file/directory 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 026aebdebbaa05eab25134949ed5d5bda655ba67
Component: engine
 2014-04-01 14:17:31 -07:00
Victor Vieux 8aafbed56c Merge pull request #4958 from crosbymichael/update-port-tests 
Update test to reallocate port
Upstream-commit: 79c0ca81fcb4f946c5aa3ca5936d9fc6e093ffef
Component: engine
 2014-04-01 14:15:36 -07:00
Victor Vieux 25fa65216f add test 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: dcf2b72f5b6732a4b9b1897cb2b3f7019e3d547e
Component: engine
 2014-04-01 21:07:40 +00:00
Guillaume J. Charmes f2838447fa Merge pull request #4949 from tjmehta/4908-fix_dynamic_port_allocation_limit 
Fix dynamic port allocation limit
Upstream-commit: 7462cc6479c3a5c2f572bf9fe2bfc60a4f1e2506
Component: engine
 2014-04-01 13:49:21 -07:00
Guillaume J. Charmes b924033920 Merge pull request #4833 from crosbymichael/pluginflag 
Add opts flag for fine grained control over drivers
Upstream-commit: b4b87413d8d3fd20073975bcc84603fa7853d316
Component: engine
 2014-04-01 13:34:08 -07:00
Michael Crosby 9d14eab3c2 Merge pull request #4956 from tianon/sig 
Simplify the kill "SIG" prefix stripping code
Upstream-commit: 31787233411ee1af9b396f72f0e4b41af6421690
Component: engine
 2014-04-01 13:10:16 -07:00
Victor Vieux 91f0b97e4d Merge pull request #4948 from creack/push_single_tag 
Allow push of a single tag
Upstream-commit: e175a55eb9f0fe78d42559a716c7f69c707d7f87
Component: engine
 2014-04-01 12:54:15 -07:00
Tianon Gravi d6578971c5 Simplify the kill "SIG" prefix stripping code 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 4bf70317ed3c2467f444eac9b7865b170da6366c
Component: engine
 2014-04-01 13:33:46 -06:00
Michael Crosby bf0258224f Merge pull request #4947 from tianon/sig 
Allow "SIG" prefix on signal names in `docker kill` ("SIGKILL", etc)
Upstream-commit: 7ab66fa694c4be384588cfc2e6c975d325977024
Component: engine
 2014-04-01 11:59:44 -07:00
Victor Vieux 50a11c7c6a Merge pull request #4945 from samalba/fix-checksum-layer 
Fix checksum layer
Upstream-commit: b01c3a8b6c0ad61c6dcd962b7a703b30f3498c28
Component: engine
 2014-04-01 11:31:59 -07:00
Guillaume J. Charmes 99eaa02040 Update docs. Make PULL up to date, remove deprecated falg and update PUSH 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: b8d660d946c5f0be3a4f01867b11f26a4f303293
Component: engine
 2014-04-01 11:17:54 -07:00
Victor Vieux 8ea420dc44 Merge pull request #4920 from discordianfish/we-need-more-women 
Improve gender equality
Upstream-commit: 1aa976aca9c795408591e59e2832a27a61af108f
Component: engine
 2014-04-01 11:15:34 -07:00
Michael Crosby 4c0f7fbffc Merge pull request #4916 from creack/no_error_start_twice 
Don't error when trying to start a running container
Upstream-commit: 249a5ddfebfb877a88f6b7b9838f6b3e2d88f724
Component: engine
 2014-04-01 10:45:31 -07:00
Guillaume J. Charmes a2ee3725a5 Update test to be consistent 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 7a50f03fa69fb81c27d361333fadbc9cccdd8948
Component: engine
 2014-04-01 10:27:10 -07:00
Guillaume J. Charmes 9f401b129b Minor cleanup 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: cff5f0357ea35245ac906a0326863ac1f8c47c61
Component: engine
 2014-04-01 10:27:05 -07:00
Guillaume J. Charmes e4f0a4813f Do not error when trying to start a started container 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: a03f83e3370f3859ebff172d504cc29817863b17
Component: engine
 2014-04-01 10:26:53 -07:00
Tianon Gravi e80bf0c7c4 Allow "SIG" prefix on signal names in docker kill ("SIGKILL", etc) 
This way, we can use both `docker kill -s INT some_container` and `docker kill -s SIGINT some_container` and both will do nice things for us. :)

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 4cb602afa0a905ceb0cccf49fe142c1c7b62087b
Component: engine
 2014-04-01 11:01:07 -06:00
Tianon Gravi 55841b2181 Merge pull request #4904 from creack/make_dev 
Add "BINDDIR" variable to facilitate having a shell with the full source tree bind-mounted
Upstream-commit: 527bb5e9602fdcd78e4bad99d9a56300d830e6af
Component: engine
 2014-04-01 10:19:56 -06:00
Guillaume J. Charmes d65f1f9f12 Add $BINDIR to allow mounting the whole sources if needed (for development) 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: bd24eb07b6c3a9448d8b4a8b3ab0d9cd60995aaa
Component: engine
 2014-04-01 09:01:27 -07:00
Michael Crosby 2f00c385f1 Update sig message 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: ac9b06ae95f1da8407934036ab1e4019a96a6b21
Component: engine
 2014-04-01 08:18:52 +00:00
Michael Crosby 45bf7e9540 Update test to reallocate port 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 6b7cfc9e95af8510abc801a02cda7879e4f82518
Component: engine
 2014-04-01 07:27:34 +00:00
Michael Crosby 2ec7753394 Send sigterm and wait forever 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 93779cc7fee4ee0690d9dd28eed478a418e79577
Component: engine
 2014-04-01 07:12:50 +00:00
Michael Crosby 8169d6ecd6 Ensure state is saved to disk after we kill the ghost 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: e36d89b0f9c8ba5b071374310ca632f6b2fdb7a1
Component: engine
 2014-04-01 07:12:50 +00:00