1
0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Commit Graph

17398 Commits

Author SHA1 Message Date
Steve Durrheimer
29630cd41d Add zsh completion for 'docker daemon --no-legacy-registry'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 883fe220ec0016922cf769f6ff8b7f85d9994d82
Component: engine
2015-10-05 08:31:00 +02:00
Sebastiaan van Stijn
72f4bc7137 Merge pull request #16744 from runcom/fix-mam-commandline
Fix man and commandline docs
Upstream-commit: 67eb810a604905df0a33ce20085c8aeddfb0171a
Component: engine
2015-10-04 22:28:19 +02:00
Vincent Demeester
356a51b97e Merge pull request #16751 from albers/completion--no-legacy-registry
Add bash completion for `docker daemon --no-legacy-registry`
Upstream-commit: 4843323a46dc5aa101a111a35fcce6eacfad5bd0
Component: engine
2015-10-04 22:13:51 +02:00
Antonio Murdaca
b51b5af287 Fix man and commandline docs
- missing help option in `docs/reference/commandline/*.md` (some files
  have it, the other I fixed didn't)
- missing `[OPTIONS]` in Usage description
- missing options
- formatting
- start/stop idempotence

Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
Upstream-commit: 14e8898648909379f37049828e103ba1c97f253b
Component: engine
2015-10-04 21:22:27 +02:00
Antonio Murdaca
e846ce8223 Merge pull request #16530 from dnephin/filter_events_by_label
Filter events by labels
Upstream-commit: e86291edd88641cc866c842d0f4a8f8296820aeb
Component: engine
2015-10-04 20:36:42 +02:00
Tianon Gravi
373a4e79bb Merge pull request #16561 from ai-traders/restart_on_debian
#16560 Add timeout to `sudo service docker stop` on sysvinit
Upstream-commit: e6ca006d8634a0fa9c6eb655aa9c872b84c5e438
Component: engine
2015-10-04 11:25:59 -07:00
Vincent Demeester
a3a78e3ce4 Merge pull request #16509 from HuKeping/search-problem
Fix docker search problem
Upstream-commit: b78f66c472399bf56bd5110dbdaac5e5676396c8
Component: engine
2015-10-04 18:21:32 +02:00
Hu Keping
a66830822a Fix docker search problem
Search terms shouldn't be restricted to only full valid repository
names. It should be perfectly valid to search using a part of a name,
even if it ends with a period, dash or underscore.

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: f04e8fdb9bbcdad28de5c328b7de3f3abdae0b5a
Component: engine
2015-10-04 23:23:43 +08:00
Harald Albers
e3177a2c43 Add bash completion for --no-legacy-registry
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 3f04ab2fc773a89f2ff465d995d10793a67f23a2
Component: engine
2015-10-04 06:49:42 -07:00
Sebastiaan van Stijn
781198dc30 Merge pull request #16739 from dgageot/contribution_fix
Fix hidden link in contribution guide
Upstream-commit: 2fcacf8ea3898b731828866f09df3ccd8bfb8f9b
Component: engine
2015-10-03 10:38:12 +02:00
Sebastiaan van Stijn
acc6593d19 Merge pull request #16726 from sallyom/man-search
typo man/search
Upstream-commit: a6cef38936d8ba448d9f2e5b7778ae648ac4a519
Component: engine
2015-10-03 10:26:18 +02:00
David Gageot
5ec5ed45a2 Fix hidden link in contribution guide
Signed-off-by: David Gageot <david@gageot.net>
Upstream-commit: 545ab6bf48a5a092e0f1ef79485ac5ee38de8525
Component: engine
2015-10-03 10:16:34 +02:00
Doug Davis
b1b064f9e8 Merge pull request #16582 from vdemeester/16360-dockerCmd-raceytests
Fix TestDockerCmd*Timeout racey tests
Upstream-commit: 49066f621e9cfd3e83a3a6e12ca254a68f4c41bb
Component: engine
2015-10-02 20:45:41 -04:00
Jess Frazelle
5d9a13c069 Merge pull request #16736 from cpuguy83/16706_let_the_undead_keep_names
Don't let `Names` be null on GET /containers/JSON
Upstream-commit: da0cf691471dc80cdf5bf4b9e7b60297b6d54edf
Component: engine
2015-10-02 16:55:21 -07:00
Jess Frazelle
f767f0010d Merge pull request #16733 from MHBauer/perjury
remove testify asserts from pkg/discovery
Upstream-commit: 24e7907bb15c7aa32a04310cd8604636a8b80586
Component: engine
2015-10-02 16:04:56 -07:00
Antonio Murdaca
45e90797a0 Merge pull request #16735 from LK4D4/style_fix
Fix some style issues
Upstream-commit: 0e17547af2a8bd13dd8d7aa68d01c7ce02566340
Component: engine
2015-10-03 01:03:44 +02:00
Brian Goff
5fa21cf8ee Don't let Names be null on GET /containers/JSON
Fixes an issue where a `Dead` container has no names so the API returns
`null` instead of an empty array.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 59b8a0f697355f1d404121f0c3e96c4957ac4608
Component: engine
2015-10-02 17:09:14 -04:00
Daniel Nephin
883f553c16 Documentation for filtering events by label
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c1713e7c5a8f2eee7d78b17eef81b0d4203aabdd
Component: engine
2015-10-02 16:45:08 -04:00
Alexander Morozov
e3ead3ca7f Fix some style issues
Just read code and saw inconsistencies in variable decls and stuff.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 01112989b71523df006b00f66b8585a18f634add
Component: engine
2015-10-02 13:39:33 -07:00
Daniel Nephin
1dfde818a2 Resolves #16458 - filter events by labels.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 08b117517d6d6b5daebe4c056c135e1598f44385
Component: engine
2015-10-02 16:33:20 -04:00
Morgan Bauer
f447a82451 remove testify asserts from pkg/discovery
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: eb13311129c75a11c05ec8c50f6f4c33951a07b9
Component: engine
2015-10-02 13:05:15 -07:00
Jess Frazelle
3b057aaeb2 Merge pull request #16250 from cpuguy83/15487_exec_error_codes
Make exec start return proper error codes
Upstream-commit: 5a43beda91efd9a53c798082abbc5b287167aa0c
Component: engine
2015-10-02 12:55:17 -07:00
Brian Goff
56b56acf38 Merge pull request #16708 from jfrazelle/fix-shm-mqueue-when-mounted-from-host
do not mount /dev/shm or /dev/mqueue if we are mounting from the host
Upstream-commit: 662f55d11d2f278daf5b9be215608540af35be4d
Component: engine
2015-10-02 15:13:59 -04:00
Jess Frazelle
d911d85df7 Merge pull request #16490 from Microsoft/10662-mtimefix
Fixed file modified time not changing on windows
Upstream-commit: 134fefbaa2b63e337a5ef247111bb5a2733809be
Component: engine
2015-10-02 12:06:03 -07:00
Brian Goff
a9fcaeb043 Make exec start return proper error codes
Exec start was sending HTTP 500 for every error.

Fixed an error where pausing a container and then calling exec start
caused the daemon to freeze.

Updated API docs which incorrectly showed that a successful exec start
was an HTTP 201, in reality it is HTTP 200.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 2d43d93410c29cec87deb9cd940c3b2a8af5fbbb
Component: engine
2015-10-02 14:40:22 -04:00
Jess Frazelle
f14e695085 Merge pull request #16159 from runcom/validate-cpuset-cpus
Validate --cpuset-cpus, --cpuset-mems
Upstream-commit: 698e14902a06af0613b697d88935ae0200659bff
Component: engine
2015-10-02 11:30:46 -07:00
Jess Frazelle
f12a07a163 Merge pull request #16367 from Morgy93/names-generator
Added some adjectives and names
Upstream-commit: bbac09a0976b946724d5fc0ac17eddf9ee8e9a61
Component: engine
2015-10-02 11:29:09 -07:00
Jess Frazelle
7d8a56e425 Merge pull request #16470 from tonistiigi/fix-aufs-opq
Add basic support for .wh..wh..opq
Upstream-commit: aa2e3247cb87a7a55fa0258b4ae92c026512ed2a
Component: engine
2015-10-02 11:28:33 -07:00
Jess Frazelle
15faad6822 Merge pull request #16594 from Microsoft/sjw/unc-build-fix
Windows: Fixing longpath hanlding of UNC paths.
Upstream-commit: d04fd5e0dc4d84c5b7ab6e78d58a6d71ed739fef
Component: engine
2015-10-02 11:24:27 -07:00
Jess Frazelle
f5fe88af39 Merge pull request #16680 from dnephin/update_list_image_api_docs
Update api docs for /images/json
Upstream-commit: d6f83652588fa39753a92fd046e8b837c0ac6cd4
Component: engine
2015-10-02 11:23:49 -07:00
Jessica Frazelle
0cd51b7f83 add regression test for mounting /dev/shm from host
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 934d9d632313acd338608ca1ad25c5270463e9c0
Component: engine
2015-10-02 11:14:08 -07:00
Jessica Frazelle
c09d7183ed do not mount /dev/shm or /dev/mqueue if we are mounting from the host
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: b8605a11070af73713f2127d9e9d3e35bb78e1ab
Component: engine
2015-10-02 11:14:04 -07:00
Vincent Demeester
8abb43049d Merge pull request #15472 from coolljt0725/fix_docker_ps_trucate_id
Fix docker ps truncate long image name
Upstream-commit: 830729bb94e8af8e6d9967da77673c13119cc00a
Component: engine
2015-10-02 18:56:55 +01:00
Tianon Gravi
2a71b21783 Merge pull request #16707 from jfrazelle/fix-release
fix release script gpg key id
Upstream-commit: 970bc4b5c118f10754432d472e405457483a21dd
Component: engine
2015-10-02 10:13:51 -07:00
Sally O'Malley
76767dc67b typo man/search
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: 435e30e42f794143ed90ca5a3777f63a1c61ce83
Component: engine
2015-10-02 11:24:31 -04:00
Lei Jitang
6f5edad812 Fix docker ps truncate long image name by default
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 3fcf481361400acd5e56da2a8c76cf888092b2e4
Component: engine
2015-10-02 22:56:42 +08:00
Vincent Demeester
b8616b16f4 Merge pull request #16076 from vbatts/export_image_times
graph: exported images times matching creation
Upstream-commit: 77da5d8feb5cf88446df0045240b4943ce4fc206
Component: engine
2015-10-01 21:50:43 +01:00
Jessica Frazelle
aae4517a8e fix release script gpg key id
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: cb0ce5bb76aa57383760e9e6ac211a5a042ab89a
Component: engine
2015-10-01 13:22:33 -07:00
Vincent Batts
90b9ae3169 save: integration test for timestamp matching
The `docker save`ed output ought to have matching timestamp to the layer
creation.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: e4478caddf78700bd42f94eb382ae1805a443618
Component: engine
2015-10-01 14:38:55 -04:00
Alexander Morozov
f0e2172183 Merge pull request #16698 from rhvgoyal/drop-redundant-lock
devmapper: Drop redundant lock and redundant function
Upstream-commit: 99d13e7e148eb046479531c89040bd29cff5b7ac
Component: engine
2015-10-01 10:48:03 -07:00
Darren Stahl
5b5431a0c1 Fixed file modified time not changing on Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 40b77af234319f02029368732249c2de0babb380
Component: engine
2015-10-01 10:45:32 -07:00
Jess Frazelle
93ac7b58ff Merge pull request #16687 from jfrazelle/update-man8
ignore man8
Upstream-commit: b26bcfe9beb332a7937d3e96aa7094b10ab8e9fd
Component: engine
2015-10-01 10:23:56 -07:00
Jessica Frazelle
dd16e8281b ignore man8
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: cf8688c235d1edc70fcb4f97c0c3a3843c95a77a
Component: engine
2015-10-01 10:05:51 -07:00
Vivek Goyal
42e7721be4 devmapper: Get rid of metaData.devicesLock
Right now we seem to have 3 locks. 

- devinfo.lock
  This is a per device lock

- metaData.devicesLock

  This is supposedely protecting map of devices.

- Global DeviceSet lock

  This is protecting map of devices as well as serializing calls to libdevmapper.

Semantics of per devices lock and global deviceset lock seem to be very clear.
Even ordering between these two locks has been defined properly.

What is not clear is the need and ordering of metaData.devicesLock. Looks like
this lock is not necessary and global DeviceSet lock should be used to
protect map of devices as it is part of DeviceSet.

This patchset gets rid of metaData.devicesLock and instead uses DeviceSet
lock to protect map of devices.

Also at couple of places during initialization takes devices.Lock(). That
is not strictly necessary as there is supposed to be one thread of execution
during initializaiton. Still it makes the code clearer.

I think this makes code more clear and easier to understand and easier to
make further changes.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 289145ecc6c016b8bb6797cc50905e34da911e84
Component: engine
2015-10-01 13:02:55 -04:00
Vivek Goyal
644e005e90 devmapper: Get rid of unused function HasActivatedDevice()
Looks like nobody is calling HasActivatedDevice(). Get rid of it.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 73f8b46d84e73929eacafe4c2f9676469f862c49
Component: engine
2015-10-01 07:59:12 -04:00
Stefan J. Wernli
8bb7196f95 Windows: Fixing longpath hanlding of UNC paths.
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
Upstream-commit: 6d223febda5fd3f27824d9dda7de1b18e50d0be5
Component: engine
2015-09-30 19:36:08 -07:00
Vivek Goyal
6479d844f2 devmapper: Move maxDeviceID check in loadMetadata
maxDeviceID is upper limit on device Id thin pool can support. Right now
we have this check only during startup. It is a good idea to move this
check in loadMetadata so that any time a device file is loaded and if it
is corrupted and device Id is more than maxDevieceID, it will be detected
right then and there.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 94caae2477f42b55adeab22f14bcef22b90373d6
Component: engine
2015-09-30 18:54:06 -04:00
Vivek Goyal
67663efaad devmapper: Use deactivateDevice() instead of removeDevice() in deleteDevice()
Use deactivateDevice() instead of removeDevice() directly. This will make
sure for device deletion, deferred removal is used if user has configured
it in. Also this makes reading code litle easier as there is single function
to remove a device and that is deactivateDevice().

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 39081eb3aa8f715c1da6f798c6531efd7a8a494c
Component: engine
2015-09-30 18:54:06 -04:00
David Calavera
e4c6aa28bc Merge pull request #16683 from rhvgoyal/fix-couple-of-bugs
devmapper: Fix a bug and fix a comment and add one reliability check
Upstream-commit: 8ebd0c972aaa9c24058ace74b72d10d4c1ef0613
Component: engine
2015-09-30 15:17:29 -07:00
Antonio Murdaca
b4ca40211f Merge pull request #16564 from calavera/versioned_types
Extract api types to version packages.
Upstream-commit: 0e9b0806f5b4b882550efdda3587abaabaa1a4c8
Component: engine
2015-09-30 23:28:10 +02:00