a60a5fd425
Merge pull request #18945 from jbruni/patch-2
...
Fixed /etc/defaults/docker to /etc/default/docker
Upstream-commit: a3ca176e3c23907225f2e34a3b4a565b6f7bf31a
Component: engine
2015-12-29 00:05:45 +01:00
3f6acddbd7
Fixed /etc/defaults/docker to /etc/default/docker
...
/etc/default/docker is the correct file location in my system, and also according Docker's own documentation at https://github.com/docker/docker/blob/master/docs/articles/configuring.md#configuring-docker
Signed-off-by: J Bruni <contato@jbruni.com.br >
Upstream-commit: 153948ac46851397c9c4fd8117647c608f4d216a
Component: engine
2015-12-28 20:57:36 -02:00
5ec30c4d85
Merge pull request #18835 from dnephin/move_validate_context_dir
...
Move utils.ValidateContextDirectory to the one package that uses it
Upstream-commit: 6cd167386b0133600ea5bbcd0f93d464e6f89e0c
Component: engine
2015-12-28 22:06:13 +01:00
383605ec04
Merge pull request #18899 from cpswan/18898-fix-storage-driver-example
...
Fix --storage-driver example
Upstream-commit: 8c6ad0991e313805ea2c67275086f2c9130cceda
Component: engine
2015-12-28 21:58:43 +01:00
e2082c5e38
Merge pull request #18937 from cbalducci/patch-1
...
[mkimage-alpine.sh] Additional repo and container cleanup
Upstream-commit: 8b68853ef5015f5dea9fb5a06e6715d0876a1eef
Component: engine
2015-12-28 12:51:31 -08:00
4bf36f597c
Merge pull request #18905 from coolljt0725/fix_disconnect_not_save
...
Fix network disconnect does not save the config to disk
Upstream-commit: 1d4306d2fa73506ed101cd085fea3174a3edda8b
Component: engine
2015-12-28 12:38:16 -08:00
9a3edea8a4
Merge pull request #18942 from thaJeztah/move-vish-to-alumni
...
Move Vishnu to alumni
Upstream-commit: b6a251a551395dc727d458062fe49b9dc110529f
Component: engine
2015-12-28 12:31:18 -08:00
3849375325
Merge pull request #18715 from calavera/remove_is_paused_from_interface
...
Remove `IsPaused` from backend interface.
Upstream-commit: baee7ae045019d33e6833043bbf86bd76e1b9d41
Component: engine
2015-12-28 11:25:11 -08:00
3b4ed44ee4
Merge pull request #18897 from runcom/fix-net-none-build
...
integration-cli: fix --net=none build
Upstream-commit: 38440cadf3e27b32b3ee7b9011b1a0a87cbcca69
Component: engine
2015-12-28 10:51:18 -08:00
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
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
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
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
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
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
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
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
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
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
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
661c845f7b
Don't log EPIPE errors on client download abort
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 79c23fdbf4ab5aea2170c7bc6762e24c44eb84e0
Component: engine
2015-12-28 11:04:02 -05:00
524c469eb3
Daemon Restart: attempt to wait for container deps
...
This provides a best effort on daemon restarts to restart containers
which have linked containers that are not up yet instead of failing.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 19762da67e40879be77b1b55c21a9754235fbb78
Component: engine
2015-12-28 11:00:16 -05:00
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
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
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
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
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
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
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
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
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
3dd9453e30
Merge pull request #18775 from mrjana/mh
...
libnetwork vendoring
Upstream-commit: d4270c1764bbebb2eaaafc86837970b62699865e
Component: engine
2015-12-26 11:42:55 +01:00
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
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
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
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
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
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
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
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
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
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
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
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
04c33e2ef9
Allow v1 protocol fallback when pulling all tags from a repository unknown to v2 registry
...
This is a followup to #18839 . That PR relaxed the fallback logic so that
if a manifest doesn't exist on v2, or the user is unauthorized to access
it, we try again with the v1 protocol. A similar special case is needed
for "pull all tags" (docker pull -a). If the v2 registry doesn't
recognize the repository, or doesn't allow the user to access it, we
should fall back to v1 and try to pull all tags from the v1 registry.
Conversely, if the v2 registry does allow us to list the tags, there
should be no fallback, even if there are errors pulling those tags.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 589a5226e7d4880ab7afa9e31202849db08a4bfa
Component: engine
2015-12-23 15:21:43 -08:00
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
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
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
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
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
