Commit Graph

20890 Commits

Author SHA1 Message Date
Jess Frazelle e07769bc5a Merge pull request #18351 from LK4D4/fix_rm_race
Fix race between two ContainerRm
2015-12-02 08:13:52 -08:00
David Calavera 93d1dd8036 Make filtering a linear operation.
Improves the current filtering implementation complixity.
Currently, the best case is O(N) and worst case O(N^2) for key-value filtering.
In the new implementation, the best case is O(1) and worst case O(N), again for key-value filtering.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-02 11:12:42 -05:00
Sebastiaan van Stijn 920a261839 update order and address review notes
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-02 16:38:51 +01:00
gwx296173 42d4eabeb2 add examples in search.md
Signed-off-by: gwx296173 <gaojing3@huawei.com>
2015-12-02 16:38:51 +01:00
Nalin Dahyabhai 800505729b Use -z,muldefs on arm,x86
Assume that the linker can make sense of us passing in the -z,muldefs
option to tell it to ignore symbol-multiply-defined errors triggered by
https://github.com/golang/go/issues/9510.  We should be able to stop
doing this once we move to Go 1.6.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> (github: nalind)
2015-12-02 10:30:13 -05:00
Nalin Dahyabhai 0ca6d77e6e Revert "prevent journald from being built on ARM"
This reverts commit 6f6f10a75f, so that we
can apply a different workaround.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> (github: nalind)
2015-12-02 10:30:13 -05:00
Phil Estes 3241b564a5 Differentiate integration test error messages
Makes it easier to debug in the future given three different docker run
executions were all outputting the same error string.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-12-02 10:25:00 -05:00
Sebastiaan van Stijn 8a350c5c7b Merge pull request #17822 from WeiZhang555/docs-isolation
Add docs for option `--isolation`
2015-12-02 16:18:15 +01:00
Dan Walsh b3e527dfd2 This patch adds --tmpfs as a option for mounting tmpfs on directories
It will Tar up contents of child directory onto tmpfs if mounted over

This patch will use the new PreMount and PostMount hooks to "tar"
up the contents of the base image on top of tmpfs mount points.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2015-12-02 10:06:59 -05:00
Wen Cheng Ma 08328cb703 Add NETWORK_NAME_or_ID value for --net= option
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2015-12-02 22:49:35 +08:00
Zhang Wei 9daca1222a Consolidate time format for API
Consolidate all the API to same time format: RFC3339, and it will be
client's responsibility to present it in more user friendly way.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-12-02 22:40:18 +08:00
Zhang Wei 38ec5d86a3 Add docs for option `--isolation`
Add docs for `run`/`create`/`build` command option `isolation`

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-12-02 22:24:33 +08:00
Phil Estes db6c4c99d8 Merge pull request #18340 from runcom/move-defshmsize-to-daemon
Move defaultSHMSize in daemon pkg
2015-12-02 09:18:21 -05:00
mqliang 519236b478 rename req to resp
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2015-12-02 20:38:54 +08:00
Antonio Murdaca 2969abc6c5 Move defaultSHMSize in daemon pkg
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-02 10:28:10 +01:00
Alexander Morozov 4d1007d75c Fix race between two ContainerRm
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-12-01 20:13:18 -08:00
Doug Davis 8d4fe141c4 Deprecate -f flag from docker tag
Closes #9798

@maintainers please note that this is a change to the UX. We no longer
require the -f flag on `docker tag` to move a tag from an existing image.
However, this does make us more consistent across our commands,
see https://github.com/docker/docker/issues/9798 for the history.

Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-12-01 19:53:49 -08:00
Qiang Huang 4089b4e440 Set default MemorySwappiness when adapt
It makes the inspect result consistent between cli and REST api
when MemorySwappiness is not set.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-12-02 10:53:52 +08:00
Qiang Huang 1415f55cc0 Move security opt adaption to adapt function
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-12-02 08:26:11 +08:00
Alexander Morozov e75da4b6ff Merge pull request #18352 from jfrazelle/update-go-md2man
update go-md2man because code.google.com needs to go away
2015-12-01 16:04:24 -08:00
Jessica Frazelle 6842c906c4
update go-md2man because code.google.com needs to go away
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-01 16:02:40 -08:00
Phil Estes da0c9286a9 Merge pull request #18315 from jfrazelle/change-frozen-image-v2
update download-frozen-image.sh to v2 registry
2015-12-01 17:12:00 -05:00
Alexander Morozov 3962fe5d7b Merge pull request #18343 from calavera/unify_debug_logging
[Carry 18260] Remove info logging from every api call.
2015-12-01 13:42:57 -08:00
Chris Weyl 8fd2630d01
newtork -> network (minor spelling correction)
...yeah, that was bugging me. :)

Signed-off-by: Chris Weyl <cweyl@alumni.drew.edu>
2015-12-01 15:26:36 -06:00
Alexander Morozov 5efb37616f Merge pull request #18308 from mountkin/delete-graphdb-later
fix 2 corner cases in container create cleanup and container removal
2015-12-01 13:19:59 -08:00
Jessica Frazelle 359d0c247f
update download-frozen-image.sh to v2 registry
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-01 13:16:42 -08:00
David Calavera 82323294db Unify both debug logging middlewares.
We can remove one function from the stack by injecting the middleware
only when logging in enabled and the level is debug.

Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-01 14:33:33 -05:00
moxiegirl f199a4bad6 Merge pull request #18341 from thaJeztah/fix-broken-link
docs: fix broken link to 1.7 Hub API
2015-12-01 09:46:45 -08:00
Shijiang Wei 4953ea1eae fix 2 corner cases in container create cleanup and container removal
- avoid empty Names in container list API when fails to remove
    a container
  - avoid dead containers when fails to create a container

Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-12-02 01:37:50 +08:00
Sebastiaan van Stijn 09742bcd69 docs: fix broken link to 1.7 Hub API
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-01 17:57:12 +01:00
Phil Estes c6f1feb07b Merge pull request #18321 from icecrime/maintainers_rework
MAINTAINERS file cleanup
2015-12-01 11:48:22 -05:00
Brian Goff 7b23976a83 Merge pull request #18261 from runcom/fix-shm-size
fix shm size handling
2015-12-01 11:47:27 -05:00
Arnaud Porterie bd2d53af2c Update core maintainers, remove duplicates
Move cpuguy83, duglin, tianon to core maintainers to reflect reality.

Remove james (duplicate for jamtur01) and add [people.jamtur01] section.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-12-01 07:56:19 -08:00
Antonio Murdaca ef1d410b02 fix shm size handling
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-01 16:29:40 +01:00
Phil Estes c8891158bd Merge pull request #18310 from rhvgoyal/log-fs-creation
devmapper: Log start and end of filesystem creation
2015-12-01 09:49:13 -05:00
Sebastiaan van Stijn c6a2bce919 Merge pull request #18331 from runcom/fix-typo
daemon: daemon_experimental.go: fix typo
2015-12-01 15:48:10 +01:00
Sebastiaan van Stijn 27bfa93b69 Merge pull request #18330 from thaJeztah/re-enable-api-v1.22
docs: add API v1.22 to the list again
2015-12-01 14:18:53 +01:00
Vivek Goyal a489e685c0 devmapper: Log start and end of filesystem creation
ext4 filesystem creation can take a long time on 100G thin device and
systemd might time out and kill docker service. Often user is left thinking
why docker is taking so long and logs don't give any hint. Log an info
message in journal for start and end of filesystem creation. That way
a user can look at logs and figure out that filesystem creation is
taking long time.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
2015-12-01 13:05:46 +00:00
Tibor Vass c247b3d104 Merge pull request #18318 from calavera/fix_dns_setting_on_hostconfig_start
Make sure container start doesn't make the DNS fields nil.
2015-12-01 12:43:16 +01:00
Antonio Murdaca 4c8088268c daemon: daemon_experimental.go: fix typo
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-01 12:03:50 +01:00
Sebastiaan van Stijn 3ddd21b8b6 docs: add API v1.22 to the list again
The 1.22 API was temporarily removed in e4d86c2c38
to prevent it showing up in the 1.9 documentation.

This reverts that change and tweaks the aligning
of the table headers in Markdown source.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-01 11:59:45 +01:00
Vincent Demeester 657085dfdb Merge pull request #18198 from aditirajagopal/16756-docker_api_inspect_test
Checkers on docker_api_inspect_test.go
2015-12-01 09:56:01 +01:00
David Calavera d7117a1b71 Make sure container start doesn't make the DNS fields nil.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-30 22:46:31 -05:00
Shuwei Hao 6295345005 Modify docker volume inspect to return existed volumes
Signed-off-by: Shuwei Hao <haoshuwei24@gmail.com>
2015-12-01 01:43:02 +00:00
David Calavera 1ddd4b1dcc Merge pull request #18320 from jfrazelle/add-license-selinux
add licence to rpm
2015-11-30 16:20:08 -08:00
Jessica Frazelle 09d448f924
add licence to rpm
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-30 15:19:31 -08:00
David Calavera 94997e56a9 Merge pull request #18211 from Djelibeybi/master
Updated LICENSE file
2015-11-30 14:37:29 -08:00
Aditi Rajagopal 85e5b05018 Checkers on docker_api_inspect_test.go
Applying #16756 to integration-cli/docker_api_inspect_test.go

Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
2015-11-30 16:23:46 -06:00
David Calavera dc9f9d9445 Merge pull request #18216 from aditirajagopal/16756-docker_api_containers_test
Checkers on docker_api_containers_test
2015-11-30 14:04:54 -08:00
Tianon Gravi 91c653d73a Merge pull request #18317 from jfrazelle/fix-gopath
fix gopath when building debs
2015-11-30 14:04:41 -08:00