toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,217 Commits 3 Branches 295 Tags
1544c3baed37a80c7d2c06bf322b6cb23aed065a
Commit Graph
7217 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Michael Crosby d0b2920666 Don't send prctl to be consistent with other drivers 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 283daced0c919be760947d44d7e46c80e1054d64
Component: engine
 2014-04-01 07:12:50 +00:00
Michael Crosby 5f13c09028 Ensure a reliable way to kill ghost containers on reboot 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 5bb82f6313d7f789783ffac854be85a44a56617e
Component: engine
 2014-04-01 07:11:41 +00:00
Michael Crosby b36db3b674 Add kill for other drivers on restart 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 5b9069bd990dca0a35d8e490c6f6b56d27163bb8
Component: engine
 2014-04-01 07:11:41 +00:00
Michael Crosby 357e0a3599 Ensure that all containers are stopped cleanly at shutdown 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: f067e263677fc86f9610ca61fbe42f63efad91f2
Component: engine
 2014-04-01 07:11:41 +00:00
Michael Crosby 0595bffeac Update imports to be consistent 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 40c6d00c97c737d9d3827f159518007803affcc7
Component: engine
 2014-04-01 07:07:42 +00:00
tjmehta 69f1eddd56 make findNextPort circular, add all-ports-allocated error 
Docker-DCO-1.1-Signed-off-by: Tejesh Mehta <tejesh.mehta@gmail.com> (github: tjmehta)
Upstream-commit: 739d1244807bc3522a0af4dc3490305d6f037601
Component: engine
 2014-03-31 22:21:52 -07:00
Guillaume J. Charmes 9ef93e6d75 Allow push of a single tag 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: e648a186d68dcb3ee0d6123b041c5aa66438cc89
Component: engine
 2014-03-31 18:50:10 -07:00
Sam Alba 72f522b288 Payload checksum now match the checksum simple 
Backported for backward compatibility.

Docker-DCO-1.1-Signed-off-by: Sam Alba <sam.alba@gmail.com> (github: samalba)
Upstream-commit: de9fba71721f71f86d53cf94504b10dcea80a5bd
Component: engine
 2014-03-31 18:31:15 -07:00
Sam Alba 9681336973 Inverted layer checksum and tarsum. 
The checksum of the payload has to be computed on the Gzip'ed content.

Docker-DCO-1.1-Signed-off-by: Sam Alba <sam.alba@gmail.com> (github: samalba)
Upstream-commit: 3f0886c8c3084341e9ef454bf41445cfc22efca2
Component: engine
 2014-03-31 17:56:25 -07:00
Victor Vieux 5505d168ef remove setupDev from libcontainer 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: d52d24dd801f3ffe1b894226b8dba613de59bd87
Component: engine
 2014-04-01 00:28:44 +00:00
Michael Crosby 3edb80395b Ensure secound part of the key is provided 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 7a7f59210d5eb7a38a5fac8889010bd54576ea01
Component: engine
 2014-03-31 23:12:08 +00:00