Commit Graph

20395 Commits

Author SHA1 Message Date
529645209e Modified ubuntulinux.md for instructions to configure DNS for Ubuntu 15.04 or greater
modified note to provide a link for installation instructions on Ubuntu 15.04 or above

cleaned up typos for ubuntulinux.md

Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com>
Upstream-commit: 0fb1845e957353792b39475751221d1b8b66da52
Component: engine
2015-12-02 17:21:05 +01:00
cf1f5d3461 Merge pull request #18350 from duglin/Issue9798a
Deprecate -f flag from docker tag
Upstream-commit: fcccf2dae4770bdb7781d57e20ae94b9565b67ac
Component: engine
2015-12-02 08:16:09 -08:00
d6f6dfdf0d Merge pull request #18365 from estesp/clarify-error-messages
Differentiate integration test error messages
Upstream-commit: d9163e088e41491cfe6d49fef17b1dff149a1b0e
Component: engine
2015-12-02 08:14:53 -08:00
cd57abf420 Merge pull request #18351 from LK4D4/fix_rm_race
Fix race between two ContainerRm
Upstream-commit: e07769bc5a50355d972cbc71d150dc2d339f7370
Component: engine
2015-12-02 08:13:52 -08:00
79750c94df 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>
Upstream-commit: 93d1dd8036d57f5cf1e5cbbbad875ae9a6fa6180
Component: engine
2015-12-02 11:12:42 -05:00
26a5e0a515 update order and address review notes
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 920a2618392d5235b9823b97aeb80ad858639b81
Component: engine
2015-12-02 16:38:51 +01:00
cec860f76a add examples in search.md
Signed-off-by: gwx296173 <gaojing3@huawei.com>
Upstream-commit: 42d4eabeb22f98267c2294bbf7551f1fe0c13cb1
Component: engine
2015-12-02 16:38:51 +01:00
dad4518af4 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)
Upstream-commit: 800505729b280a19fb0c2779b1081b6c4e20d43c
Component: engine
2015-12-02 10:30:13 -05:00
fb726f0d76 Revert "prevent journald from being built on ARM"
This reverts commit 6f6f10a75f8b447637e8a89d685452871899e9c0, so that we
can apply a different workaround.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> (github: nalind)
Upstream-commit: 0ca6d77e6e17ea378ff04b59f971dc1338e0ddc2
Component: engine
2015-12-02 10:30:13 -05:00
21abdff772 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)
Upstream-commit: 3241b564a5c2799cac9836101b9e208b216a9ff5
Component: engine
2015-12-02 10:25:00 -05:00
71b21cf347 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>
Upstream-commit: b3e527dfd242ad30c0297c8b257862116cf2c50e
Component: engine
2015-12-02 10:06:59 -05:00
f2ea55aeff Add NETWORK_NAME_or_ID value for --net= option
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 08328cb703c51ed4a2dfe985f618925fe3234080
Component: engine
2015-12-02 22:49:35 +08:00
c529eb3ce9 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>
Upstream-commit: 9daca1222adabf3aeae97a2c4e5f4ed1bb8c15e1
Component: engine
2015-12-02 22:40:18 +08:00
1e2b4815df Add docs for option --isolation
Add docs for `run`/`create`/`build` command option `isolation`

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 38ec5d86a355674cfddf8c998591abb098475bab
Component: engine
2015-12-02 22:24:33 +08:00
e0517ddf70 rename req to resp
Signed-off-by: mqliang <mqliang.zju@gmail.com>
Upstream-commit: 519236b47866cc77a3400b7905ffb97d79e39b0f
Component: engine
2015-12-02 20:38:54 +08:00
22eaa04494 Move defaultSHMSize in daemon pkg
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 2969abc6c55a9ab126b90d0af4b67860b4103f3f
Component: engine
2015-12-02 10:28:10 +01:00
e9c9b85f8b Fix race between two ContainerRm
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 4d1007d75c24f4e9f1d8df18cb3faae53b183661
Component: engine
2015-12-01 20:13:18 -08:00
2603d9d05a 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>
Upstream-commit: 8d4fe141c4c3f456df9c2be75ffe5071d1665717
Component: engine
2015-12-01 19:53:49 -08:00
b52058194c 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>
Upstream-commit: 4089b4e4400d44f7c0a5b15065c70228f10ebf0c
Component: engine
2015-12-02 10:53:52 +08:00
3ffe69d3e4 Move security opt adaption to adapt function
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 1415f55cc09230e19ca3110af7174baa3f5569ba
Component: engine
2015-12-02 08:26:11 +08:00
66c2c983d6 update go-md2man because code.google.com needs to go away
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 6842c906c44fefeb3ca78aae550e64341e040391
Component: engine
2015-12-01 16:02:40 -08:00
d5614b1f4a Merge pull request #18315 from jfrazelle/change-frozen-image-v2
update download-frozen-image.sh to v2 registry
Upstream-commit: da0c9286a9e82a88e75eb9298e96426978fba4bc
Component: engine
2015-12-01 17:12:00 -05:00
a68d03ab84 Merge pull request #18343 from calavera/unify_debug_logging
[Carry 18260] Remove info logging from every api call.
Upstream-commit: 3962fe5d7b47383b752383b48adf7e1ac0a6f202
Component: engine
2015-12-01 13:42:57 -08:00
d0c344304f newtork -> network (minor spelling correction)
...yeah, that was bugging me. :)

Signed-off-by: Chris Weyl <cweyl@alumni.drew.edu>
Upstream-commit: 8fd2630d01d65dd64053091ef9b35a98f4fc3d5c
Component: engine
2015-12-01 15:26:36 -06:00
5ed9289ac6 Merge pull request #18308 from mountkin/delete-graphdb-later
fix 2 corner cases in container create cleanup and container removal
Upstream-commit: 5efb37616ffd4b848578424ebb7b290af9965eff
Component: engine
2015-12-01 13:19:59 -08:00
a29b07bf59 update download-frozen-image.sh to v2 registry
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 359d0c247fe523ef82676f9ae4046b79e6854fe1
Component: engine
2015-12-01 13:16:42 -08:00
d583bad1ef 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>
Upstream-commit: 82323294db96e8043244027c262481af6c8f478d
Component: engine
2015-12-01 14:33:33 -05:00
54b7c08e2c 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>
Upstream-commit: 4953ea1eae211366c7214bfd2381a4a189d5466a
Component: engine
2015-12-02 01:37:50 +08:00
efeb394283 docs: fix broken link to 1.7 Hub API
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 09742bcd692b2594800631e5c5c16d76dcf0e9f2
Component: engine
2015-12-01 17:57:12 +01:00
eccd86ee34 Merge pull request #18321 from icecrime/maintainers_rework
MAINTAINERS file cleanup
Upstream-commit: c6f1feb07be5fbeb058a29dc9a9b1efff5431d50
Component: engine
2015-12-01 11:48:22 -05:00
db9d4c9cd6 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>
Upstream-commit: bd2d53af2c6b8da6ab136298650318186cabbdf8
Component: engine
2015-12-01 07:56:19 -08:00
ec12c4920e fix shm size handling
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: ef1d410b0270fa7309d76aded34113396def7fb2
Component: engine
2015-12-01 16:29:40 +01:00
142c1d2bdc Merge pull request #18310 from rhvgoyal/log-fs-creation
devmapper: Log start and end of filesystem creation
Upstream-commit: c8891158bd1499b060346f42f52be45484a3ac94
Component: engine
2015-12-01 09:49:13 -05:00
965af57894 Merge pull request #18331 from runcom/fix-typo
daemon: daemon_experimental.go: fix typo
Upstream-commit: c6a2bce9198efe21ae40213fed2e3c25df9de613
Component: engine
2015-12-01 15:48:10 +01:00
d58d25e766 Merge pull request #18330 from thaJeztah/re-enable-api-v1.22
docs: add API v1.22 to the list again
Upstream-commit: 27bfa93b696a955693f1f581e4723a9ea7d1691a
Component: engine
2015-12-01 14:18:53 +01:00
b17c4f91f6 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>
Upstream-commit: a489e685c0d17455463945316cfe366e4e65dca6
Component: engine
2015-12-01 13:05:46 +00:00
935eda07b8 Merge pull request #18318 from calavera/fix_dns_setting_on_hostconfig_start
Make sure container start doesn't make the DNS fields nil.
Upstream-commit: c247b3d104ad7e768e2540fccb3861c36eb2e60f
Component: engine
2015-12-01 12:43:16 +01:00
b48e8b7de2 daemon: daemon_experimental.go: fix typo
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 4c8088268ccef8652add808e3367faafe713f485
Component: engine
2015-12-01 12:03:50 +01:00
2ba0212c1d docs: add API v1.22 to the list again
The 1.22 API was temporarily removed in e4d86c2c38f4c99660da8ed65a8103e283e07e23
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>
Upstream-commit: 3ddd21b8b66be248ea04eb74c7a81349bffddac1
Component: engine
2015-12-01 11:59:45 +01:00
4f7a986f9e Merge pull request #18198 from aditirajagopal/16756-docker_api_inspect_test
Checkers on docker_api_inspect_test.go
Upstream-commit: 657085dfdb5ef789d07d0a3985aedbdeb4a1b4d9
Component: engine
2015-12-01 09:56:01 +01:00
121cf6f1ca Make sure container start doesn't make the DNS fields nil.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: d7117a1b713042096bd97815bbb9663a4a01c8af
Component: engine
2015-11-30 22:46:31 -05:00
bd71e2ab92 Modify docker volume inspect to return existed volumes
Signed-off-by: Shuwei Hao <haoshuwei24@gmail.com>
Upstream-commit: 6295345005b5c251b465f18fd6e77edad50a50b7
Component: engine
2015-12-01 01:43:02 +00:00
3bd7baa41a add licence to rpm
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 09d448f924aabf67ad476ce20539efa78a2715ca
Component: engine
2015-11-30 15:19:31 -08:00
1f54cbf9d8 Merge pull request #18211 from Djelibeybi/master
Updated LICENSE file
Upstream-commit: 94997e56a9a65ee651f759377be1f83f03693656
Component: engine
2015-11-30 14:37:29 -08:00
94a444216d 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>
Upstream-commit: 85e5b05018a5b8095dc7390644829845794a56f7
Component: engine
2015-11-30 16:23:46 -06:00
1003fb6c11 Merge pull request #18216 from aditirajagopal/16756-docker_api_containers_test
Checkers on docker_api_containers_test
Upstream-commit: dc9f9d9445afe9dff091ff49259a622745a2f457
Component: engine
2015-11-30 14:04:54 -08:00
a54bece846 MAINTAINERS file cleanup
First phase in cleaning up the MAINTAINERS file to make it better
reflect reality by:

- Removing "Operators" that have no practical role.
- Removing "Subsystems" as they often are separate repositories with
  their own MAINTAINERS files.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 29dbce8357358a675cc90ecb0cd29b1a59633881
Component: engine
2015-11-30 14:00:12 -08:00
4fd3238892 fix gopath when building debs
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 4935f7f500b8473ce53848e0c9673bac7a9fb522
Component: engine
2015-11-30 13:44:59 -08:00
b034893275 Checkers on docker_api_containers_test
Applying #16756 to integration-cli/docker_api_containers_test.go

Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
Upstream-commit: 4bdf957c26559d659af604dc6814a5cd2225a0f3
Component: engine
2015-11-30 14:31:48 -06:00
57432b4d63 Merge pull request #17438 from pmalmgren/17037-systemd226-cgroup
Fix docker status incorrectly reports containerized
Upstream-commit: c84f5dfd7431dfef94a073b47f591515a58d9e00
Component: engine
2015-11-30 11:47:16 -08:00