Commit Graph

20987 Commits

Author SHA1 Message Date
Jessica Frazelle 354272cd56 bump docker-py
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: d34bbb66d5d5f2f07b8f0c1b63df5f058f20b436
Component: engine
2015-12-28 10:26:52 -08:00
Jessica Frazelle 3f03a2c89c add docs and unconfined to run a container without the default seccomp profile
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 15674c5fb74df00d7560fb35619a5372ea2ee74e
Component: engine
2015-12-28 10:26:51 -08:00
Jessica Frazelle aac8048807 add default seccomp profile tests
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: a48fe6238494547f392b06adf9d48944b4dd8ac3
Component: engine
2015-12-28 10:26:48 -08:00
Jessica Frazelle b5ffb5a2c4 set default seccomp profile
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 947293a28084cb5ee2e10e4d128c6e2b9d9da89d
Component: engine
2015-12-28 10:18:47 -08:00
Jess Frazelle 1ce165db7f Merge pull request #18923 from albers/completion-network-ls--filter
bash completion for `docker network ls --filter`
Upstream-commit: 00362f8ea28a1ae04be66372ccee55d80c4bb11c
Component: engine
2015-12-28 10:16:17 -08:00
Daniel Nephin 6e4bd4dbf1 Move graph driver registration out of the daemon package.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 91154e9235c71bc120b93d2e16632970e0f0ce0e
Component: engine
2015-12-28 13:02:24 -05:00
Daniel Nephin 2526161bde Remove the graph driver from the daemon, move it into the layer store.
Support restoreCustomImage for windows with a new interface to extract
the graph driver from the LayerStore.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f5916b10ae02c7db83052a97205ac345a3d96300
Component: engine
2015-12-28 12:55:48 -05:00
Vincent Demeester ee65b7d001 Merge pull request #18939 from dnephin/dont_use_parse_from_builder
Remove the need for runconfig.Parse() in the builder
Upstream-commit: ad56c972b4dc07fa23ebdaf6a35735764503c415
Component: engine
2015-12-28 18:47:05 +01:00
Jess Frazelle e1e0c90deb Merge pull request #18807 from FlorinAsavoaie/master
New features in mkimage-yum.sh script
Upstream-commit: 206046f0baed3476ed83211837202a1d7ce7ee69
Component: engine
2015-12-28 09:09:33 -08:00
David Calavera 3ae3fdb79c Merge pull request #15078 from hqhq/hq_add_set_api_v2
Implement docker update command
Upstream-commit: 8669ea01ba93139a51783ac17658dedd47538b9c
Component: engine
2015-12-28 08:55:32 -08:00
Daniel Nephin 73f5d740e8 Move ValidateContextDirectory to the one package that uses it.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9e19b4839fe32d2935306a630305e7b821544c14
Component: engine
2015-12-28 11:22:39 -05:00
Sebastiaan van Stijn 78e703beaa Move Vishnu to alumni
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 5facd0e94be0bce668a4d335b1b6bb284934df94
Component: engine
2015-12-28 16:30:05 +01:00
cristiano balducci b147f556c5 Additional repo and container cleanup
- Added support for adding custom repo (defaults to community)
- Added cleanup of the test container (--rm)
- Added --text to grep in apkv() to avoid "Binary file matches" output on Fedora

Signed-off-by: Cristiano Balducci <cristiano.balducci@gmail.com>
Upstream-commit: 7fa40ef513aedffefce9237a7db30340be0b6696
Component: engine
2015-12-28 14:11:56 +01:00
Qiang Huang c4af30652d Implemet docker update command
It's used for updating properties of one or more containers, we only
support resource configs for now. It can be extended in the future.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 8799c4fc0feadede6ae60e77bd7d9dfd7cc72a79
Component: engine
2015-12-28 19:19:26 +08:00
Daniel Nephin 753d6942df Remove the need for runconfig.Parse() in the builder.
By using a container.Config directly.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 6dba0b5d89bfa262757493679788b171f23b891c
Component: engine
2015-12-27 19:58:51 -05:00
Sebastiaan van Stijn cab7e6492d Be more explicit about "+1" comments
Add some more information about not leaving random
"+1" comments.

Also removed the requirements to send "uname -a",
because that information is now included in the output
of "docker version".

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 849f64eeab5c026bad3e10bef06097c1bc684bf3
Component: engine
2015-12-28 00:26:05 +01:00
Harald Albers e18180f247 bash completion for docker network ls --filter
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: f2ba1e4d80c6c811f2c0a6c905f5590d65e70812
Component: engine
2015-12-27 09:28:19 -08:00
Arnaud Porterie 88aefd745d Merge pull request #18907 from mountkin/rm
ingnore the NotExist error when removing inexistent files
Upstream-commit: 603d488a00ea59ba7a7bd0e4cb0d6226e4b8cf03
Component: engine
2015-12-26 19:20:10 -08:00
Sebastiaan van Stijn 451c1a819a Merge pull request #18782 from aditirajagopal/docker-no-like-x86
Specify that Docker requires x64
Upstream-commit: 087e4c10241d70803bc0b7ae61fa2258879ddccf
Component: engine
2015-12-27 01:19:38 +01:00
Aditi Rajagopal 6a84e60720 Specify that Docker requires x64
Adds this requirement to docker/docker. Already replicated in docker/tutorials

Resolves: #18401

Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
Upstream-commit: 8134a562c603679a02bc7841f10676ddba6e4001
Component: engine
2015-12-26 19:02:20 -05:00
Sebastiaan van Stijn 3dd9453e30 Merge pull request #18775 from mrjana/mh
libnetwork vendoring
Upstream-commit: d4270c1764bbebb2eaaafc86837970b62699865e
Component: engine
2015-12-26 11:42:55 +01:00
Shijiang Wei 3ad8eda6ea ingnore the NotExist error when removing inexistent files
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: de7f6cf16be659cca9217ece6e5dc1221706d504
Component: engine
2015-12-25 15:19:48 +08:00
Lei Jitang 89492a4249 Fix network disconnect does not save the config to disk
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: c0bde4e92c1da26e206bfbcb8308bd9a5f037659
Component: engine
2015-12-25 02:09:37 -05:00
Jess Frazelle 91a83f8dd4 Merge pull request #18900 from icecrime/dirty_to_unsupported
Rename `-dirty` to `-unsupported`
Upstream-commit: d1b7d58e7353c6e2d707eaf613b4d7e45052b471
Component: engine
2015-12-24 11:06:25 -07:00
Arnaud Porterie 29a743c21a Rename -dirty to -unsupported
Nightly and unofficial builds of Docker bear the suffix `-dirty` in the
version string. Change this suffix to `-unsupported` to make it explicit
that no support will be provided on such versions, and that it is for
example unnecessary to file an issue for it.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 3e298c5928d0a2cbf5e1b374783ce59de2076637
Component: engine
2015-12-24 09:11:49 -08:00
Chris Swan d743d1334b Fix --storage-driver example (and --graph)
Signed-off-by: Chris Swan <chris.swan@iee.org>
Upstream-commit: 5eef38d364c2d850bd98c70824a67178a44d94c0
Component: engine
2015-12-24 17:02:58 +00:00
Chris Swan b5eef30f35 Fix --storage-driver example
Signed-off-by: Chris Swan <chris.swan@iee.org>
Upstream-commit: b6be4acfcc1d8801dc4250acd3701a7d3325334f
Component: engine
2015-12-24 16:43:37 +00:00
Antonio Murdaca 602cbecb67 integration-cli: fix --net=none build
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: bb8e1dc8fa7bda27592b140b433b5ffabdb44917
Component: engine
2015-12-24 16:36:37 +01:00
Brian Goff 70ad786bca Merge pull request #18834 from dmcgowan/layerstore-refactor-rw-layer
Layerstore refactor rw layer
Upstream-commit: d08ac6e256933b50dc956abddac6d1fd5c750bf9
Component: engine
2015-12-24 08:02:15 -05:00
Vincent Demeester 37af5f2e9b Merge pull request #18895 from hqhq/hq_remove_dup_oomkilldisable
Remove duplicated OomKilldisable
Upstream-commit: 824a865e41ab06023824753f8d55f812382797a7
Component: engine
2015-12-24 11:29:24 +01:00
Qiang Huang 9b042e6617 Remove duplicated OomKilldisable
It's in Resources, but wrongly added back to HostConfig in
https://github.com/docker/docker/pull/18762

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 2e02077e9f9608e1f5aa462be2bb88655763a113
Component: engine
2015-12-24 15:28:56 +08:00
Victoria Bialas ac71b2f7e1 fixed links in Digital Ocean example
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: 3ff20fafccdce09428171511982305a180dc9928
Component: engine
2015-12-23 16:31:49 -08:00
Antonio Murdaca a2f37707c9 Merge pull request #18878 from calavera/conditional_load_response
Make `docker load` to output json when the response content type is json.
Upstream-commit: b0be88c1116d4a3e12df42fb903456f608a19756
Component: engine
2015-12-24 01:11:54 +01:00
Arnaud Porterie 1d3ad033b8 Merge pull request #18810 from runcom/pkg-authz-fixes
pkg: authorization: do not register the same plugin
Upstream-commit: 914fad8b7d3426d9c637bfa07ccb47c141048163
Component: engine
2015-12-23 15:09:06 -08:00
David Calavera 8a1bc78867 Merge pull request #18885 from samueldg/fix-btrfs-docs-typos
Fix typo in btrfs userguide doc
Upstream-commit: 725eef361a5d4610db1849f5f95392ecf6e3a7f0
Component: engine
2015-12-23 13:44:17 -08:00
David Calavera b27636f219 Merge pull request #18862 from dnephin/move_ulimit_opts_to_runconfig
Move ulimit opts to runconfig
Upstream-commit: 3499e3a2305c9dcc937e55d37b3252bccfdecb92
Component: engine
2015-12-23 12:26:54 -08:00
Vincent Demeester fcf5c5b0e0 Merge pull request #18861 from dnephin/move_blkiodev_to_runconfig
Move runconfig blkiodev options and parsing into runconfig/opts package
Upstream-commit: 9ae6d7d551bba84e7007cdc140eb0fc175ef404b
Component: engine
2015-12-23 21:19:44 +01:00
Samuel Dion-Girardeau e2277fc388 Fix typo in btrfs userguide doc
Signed-off-by: Samuel Dion-Girardeau <samuel.diongirardeau@gmail.com>
Upstream-commit: 63f9f2c05bd4c62dbd366f1acb97f4a0b1b52f1d
Component: engine
2015-12-23 15:10:01 -05:00
Antonio Murdaca 547bf07eca pkg: authorization: do not register the same plugin
This patches avoids registering (and calling) the same plugin more than
once. Using an helper map which indexes by name guarantees this and keeps
the order.
The behavior of overriding the same name in a flag is consistent with,
for instance, the `docker run -v /test -v /test` flag which register
the volume just once.
Adds integration tests.

Without this patch:
```
Dec 20 19:34:52 localhost.localdomain docker[9988]:
time="2015-12-20T19:34:52.080901676+01:00" level=debug msg="Calling
GET
/v1.22/info"
Dec 20 19:34:52 localhost.localdomain docker[9988]:
time="2015-12-20T19:34:52.081213202+01:00" level=debug msg="AuthZ
request using plugin docker-novolume-plugin"
Dec 20 19:34:52 localhost.localdomain docker[9988]:
time="2015-12-20T19:34:52.081268132+01:00" level=debug
msg="docker-novolume-plugin implements: authz"
Dec 20 19:34:52 localhost.localdomain docker[9988]:
time="2015-12-20T19:34:52.081699788+01:00" level=debug msg="AuthZ
request using plugin docker-novolume-plugin"
Dec 20 19:34:52 localhost.localdomain docker[9988]:
time="2015-12-20T19:34:52.081762507+01:00" level=debug
msg="docker-novolume-plugin implements: authz"
Dec 20 19:34:52 localhost.localdomain docker[9988]:
time="2015-12-20T19:34:52.082092480+01:00" level=debug msg="GET
/v1.22/info"
Dec 20 19:34:52 localhost.localdomain docker[9988]:
time="2015-12-20T19:34:52.628691038+01:00" level=debug msg="AuthZ
response using plugin docker-novolume-plugin"
Dec 20 19:34:52 localhost.localdomain docker[9988]:
time="2015-12-20T19:34:52.629880930+01:00" level=debug msg="AuthZ
response using plugin docker-novolume-plugin"
```

With this patch:
```
Dec 20 19:37:32 localhost.localdomain docker[16620]:
time="2015-12-20T19:37:32.376523958+01:00" level=debug msg="Calling
GET
/v1.22/info"
Dec 20 19:37:32 localhost.localdomain docker[16620]:
time="2015-12-20T19:37:32.376715483+01:00" level=debug msg="AuthZ
request using plugin docker-novolume-plugin"
Dec 20 19:37:32 localhost.localdomain docker[16620]:
time="2015-12-20T19:37:32.376771230+01:00" level=debug
msg="docker-novolume-plugin implements: authz"
Dec 20 19:37:32 localhost.localdomain docker[16620]:
time="2015-12-20T19:37:32.377698897+01:00" level=debug msg="GET
/v1.22/info"
Dec 20 19:37:32 localhost.localdomain docker[16620]:
time="2015-12-20T19:37:32.951016441+01:00" level=debug msg="AuthZ
response using plugin docker-novolume-plugin"
```

Also removes a somehow duplicate debug statement (leaving only the
second one as it's a loop of plugin's manifest):
```
Dec 20 19:52:30 localhost.localdomain docker[25767]:
time="2015-12-20T19:52:30.544090518+01:00" level=debug
msg="docker-novolume-plugin's manifest: &{[authz]}"
Dec 20 19:52:30 localhost.localdomain docker[25767]:
time="2015-12-20T19:52:30.544170677+01:00" level=debug
msg="docker-novolume-plugin implements: authz"
```

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: c28fc06e002e06deed3437da76bc213b7bd752ba
Component: engine
2015-12-23 21:08:40 +01:00
David Calavera f2e9351eed Merge pull request #18876 from konstruktoid/tmpfs_apparmor
add /bin/tar to apparmor profile
Upstream-commit: fc87c5a2f1120a70e04d787a340abfa204e3fb13
Component: engine
2015-12-23 11:39:38 -08:00
Derek McGowan df32f2591a Revert create return parameter removal
Cleanup does not happen if retErr is not set on return

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 54f8ba7e9e496ae58c15eddb084fbd51418ab197
Component: engine
2015-12-23 11:21:02 -08:00
Derek McGowan 3b1545d1b1 Fix race condition between container register and mount
When a container is created it is registered before the mount is created. This can lead to mount does not exist errors when inspecting between create and mount.

Fixes #18753

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: d8e090669ed4d9b27206d7f8797c01ed4b2cd20f
Component: engine
2015-12-23 11:20:51 -08:00
Derek McGowan 64820f351d Refactor RWLayer to use referenced object instead of string
RWLayer will now have more operations and be protected through a referenced type rather than always looked up by string in the layer store.
Separates creation of RWLayer (write capture layer) from mounting of the layer.
This allows mount labels to be applied after creation and allowing RWLayer objects to have the same lifespan as a container without performance regressions from requiring mount.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: d04fa49a0dec89d2f71a813ce8eaa182184139c5
Component: engine
2015-12-23 11:19:17 -08:00
Daniel Nephin 1cfbdcfe91 Remove package pkg/ulimit, use go-units instead.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 83237aab2b9430a88790467867505cc9a5147f3e
Component: engine
2015-12-23 13:27:58 -05:00
Daniel Nephin b109cc7bb5 Move ulimit options to runconfig opts
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 5adbea7075b2fda6ea9947d131aaa2a5db0c1295
Component: engine
2015-12-23 13:27:58 -05:00
Daniel Nephin 889a0e3758 Upgrade go-units vendor to latest version with ulimits.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3b8301b6600855e348bf4eeacabe5059f52e9d99
Component: engine
2015-12-23 13:27:58 -05:00
David Calavera 60c9e9b1c7 Merge pull request #18863 from dnephin/upgrade_connections_pkg
Update go-connections vendor to pickup addition of parser functions
Upstream-commit: 577cf61afad695f0ba226cdf8a995a8c78883e51
Component: engine
2015-12-23 10:02:25 -08:00
David Calavera 595a0cd27e Merge pull request #18839 from aaronlehmann/v1-fallback-404
When a manifest is not found, allow fallback to v1
Upstream-commit: 95b708cf19f24dcf0044f2f4e96db2579201cbeb
Component: engine
2015-12-23 10:01:39 -08:00
David Calavera 2fc88144d2 Merge pull request #18875 from thaJeztah/move-erikh-to-alumni
Move Erik to alumni
Upstream-commit: 0295b0a02655d496b30e46781ea24f304022fe4e
Component: engine
2015-12-23 09:15:59 -08:00
Thomas Sjögren 2db5ffe958 add /bin/tar to apparmor profile
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
Upstream-commit: 602498d1b093e4d066e8434aa1cbc041999d44ea
Component: engine
2015-12-23 18:11:16 +01:00