a0ef20d025
Fix small missing equal sign for 'docker daemon --cluster-store-opt'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 4ba173630ad2b7a5fc59df280617a1bfa1dda323
Component: engine
2015-12-14 21:20:49 +01:00
0d312f9927
Add zsh completion for 'docker daemon --authz-plugin'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 76844d786bea2e435d25f150044fa242206ce364
Component: engine
2015-12-14 21:16:54 +01:00
6e0f72dc84
Merge pull request #18637 from dnephin/move_auth_config
...
Move more api types to api/types package
Upstream-commit: 75d69ce0da2e360773736502acd92d4a9cf7faa5
Component: engine
2015-12-14 11:53:30 -08:00
7890f1c0f3
Merge pull request #18642 from tophj-ibm/add-z-unshare-image
...
Add unshare image to s390x Dockerfile
Upstream-commit: 0c2dd27581048102b5d8803f95e6bc58834842d7
Component: engine
2015-12-14 11:32:27 -08:00
7e7a8a6ffd
Remove timeout shared function.
...
Handle timeouts when it's necessary based on a Timeout interface.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 9dc7d07fc11163205985b7d56742a4f9b89d7e09
Component: engine
2015-12-14 14:24:21 -05:00
884e98d4cc
Merge pull request #18639 from calavera/force_api_version
...
Force API versioning in the client library.
Upstream-commit: 984282e28cf68e658112f199e8baa5f0931cc242
Component: engine
2015-12-14 11:20:12 -08:00
89d947a31f
Merge pull request #18570 from suihkulokki/control-fix
...
hack/make/.build-deb/control: add missing fields
Upstream-commit: 03e2923e42446dbb830c654d0eec323a0b4ef02a
Component: engine
2015-12-14 10:41:56 -08:00
df6285237c
Merge pull request #18372 from Microsoft/jjh/winci-ensurefrozen
...
Windows CI Fix: No subshell due to bash 3.x
Upstream-commit: b13fd10109db75996a31fd52393ef3410feee3ca
Component: engine
2015-12-14 10:32:53 -08:00
cc9801b915
Add unshare image to s390x Dockerfile
...
This adds unshare image to Dockerfile.s390x
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 52e53814ea860919f8ddf2c82a6b24d41630072c
Component: engine
2015-12-14 12:16:18 -06:00
18aa0ef1ba
Merge pull request #18393 from qzio/apparmor/ptrace-ubuntu14
...
Enable ptrace in a container on apparmor below 2.9
Upstream-commit: c38aa60180792210a21f162a57958bda86f9c381
Component: engine
2015-12-14 10:07:01 -08:00
a55d187756
Force API versioning in the client library.
...
Remove dependencies on docker's version packages.
Allow empty version as a fallback to latest version.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: b679eb9a8263d2cb00fecc8741d62d2b35db5ac5
Component: engine
2015-12-14 12:06:42 -05:00
7f5dff04d0
Move IndexInfo and ServiceConfig types to api/types/registry/registry.go
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com >
Upstream-commit: 96c10098ac32f700f37358e2adc36c94741772bb
Component: engine
2015-12-14 11:28:02 -05:00
f21c49a3d1
Merge pull request #18631 from tiborvass/cleanup-utils
...
Create `builder/dockerignore` and `pkg/gitutils` to clean up `utils`
Upstream-commit: 44299989b24507dad0bcd66fefcbc2a00e13665c
Component: engine
2015-12-14 17:22:01 +01:00
0d867da41c
Move AuthConfig to api/types
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com >
Upstream-commit: 5b321e328769cc93c3454e82ec3fe07672156f2e
Component: engine
2015-12-14 11:22:01 -05:00
c91a6d546b
Removing the restriction to push to a 'official' repo
...
Signed-off-by: toli <toli@docker.com >
Upstream-commit: 0d824c760ec2413f4df7855b9b6559424d01e556
Component: engine
2015-12-14 07:45:00 -08:00
a1551674ac
Add some unit and integration tests
...
Add a unit test and couple of integration tests for volume propagation.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
Upstream-commit: f988c98ff318dcfecb9d2db9511fe78e70b43e44
Component: engine
2015-12-14 10:39:53 -05:00
a9fa7f4c75
Check Propagation properties of source mount point
...
Whether a shared/slave volume propagation will work or not also depends on
where source directory is mounted on and what are the propagation properties
of that mount point. For example, for shared volume mount to work, source
mount point should be shared. For slave volume mount to work, source mount
point should be either shared/slave.
This patch determines the mount point on which directory is mounted and
checks for desired minimum propagation properties of that mount point. It
errors out of configuration does not seem right.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
Upstream-commit: d4b4ce2588d02acd3602d42b788c6b36ab9b01e5
Component: engine
2015-12-14 10:39:53 -05:00
c0860c6bed
Add capability to specify mount propagation per volume
...
Allow passing mount propagation option shared, slave, or private as volume
property.
For example.
docker run -ti -v /root/mnt-source:/root/mnt-dest:slave fedora bash
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
Upstream-commit: a2dc4f79f260247afe55ab7117c9de02a769d883
Component: engine
2015-12-14 10:39:53 -05:00
07745f2aef
Merge pull request #18618 from dnephin/refactor_resolve_auth_config
...
Refactor ResolveAuthConfig to remove the builder dependency on cli code
Upstream-commit: 5e0283effa73223e5528c61beb4e05b5018c5d6b
Component: engine
2015-12-14 15:23:36 +01:00
1caa5bd099
utils: move dockerignore function to builder/dockerignore
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 63e3816c1dd449de63500a2b5fec9c2a33a0894c
Component: engine
2015-12-14 14:59:52 +01:00
86409751de
utils: move git functions to pkg/gitutils
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 135cca6f52c7862f13f50c30ccf5925038ba40a9
Component: engine
2015-12-14 14:59:52 +01:00
c145ea67c2
Merge pull request #18112 from daehyeok/fix_dry_run_test
...
Change TestRunNonRootUserResolvName Fail log.
Upstream-commit: f8bc4ed573e4bf6883d8888b8143ddfb7d31a1d7
Component: engine
2015-12-14 13:31:17 +01:00
8c2749da9e
layer: layer_store.go: return on error
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: f7ed97a6303787983f6f01f72afff74e7d2b0690
Component: engine
2015-12-14 12:03:39 +01:00
99a16e1ac6
Merge pull request #18616 from calavera/move_client_version_to_docker_cli
...
Move client version to the docker cli.
Upstream-commit: 5fd9a8f6030558d90f4e1a3e55f6b0017d34d23f
Component: engine
2015-12-14 11:43:01 +01:00
df9b4bd431
Change TestRunNonRootUserResolvName Fail log.
...
Signed-off-by: Daehyeok Mun <daehyeok@gmail.com >
Upstream-commit: ba6b69adc2a790331701f021ac798ee23e059151
Component: engine
2015-12-13 19:59:51 -07:00
c540865248
Add support for Arch Linux ARM. ( Close #16695 )
...
Signed-off-by: Giampaolo Mancini <giampaolo@trampolineup.com >
Switch to "case"
Signed-off-by: Giampaolo Mancini <giampaolo@trampolineup.com >
Support multiple ARM architectures
Signed-off-by: Giampaolo Mancini <giampaolo@trampolineup.com >
Add check for ArchLinuxARM Keyring
Signed-off-by: Giampaolo Mancini <giampaolo@trampolineup.com >
mkimage-arch.sh: Fix for merging
Signed-off-by: Giampaolo Mancini <giampaolo@trampolineup.com >
Upstream-commit: 824ae856325b53d4c84bd000713f63720d79b67a
Component: engine
2015-12-13 19:48:40 +01:00
3c4fcf6b7a
Fix typos found across repository
...
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com >
Upstream-commit: 927b334ebfc786276a039e45ec097e71bf9a104c
Component: engine
2015-12-13 18:04:12 +02:00
7a127054c1
Merge pull request #18620 from jeffjohnston/DOC-16770
...
Update configuring Docker article
Upstream-commit: f5e6b09783b592c67631e77c43c81e996a3971c3
Component: engine
2015-12-13 14:10:46 +01:00
941029f664
update network settings on container creating
...
To make docker inspect return a consistent result of networksettings
for created container and stopped container, it's bettew to update
the network settings on container creating.
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: c427131c94369d5c49a4f14d78e6ab9c678e12df
Component: engine
2015-12-13 02:34:44 -05:00
22a82ca57b
Merge pull request #18389 from wenchma/doc_update_for_container-basics
...
docs: delete draft container-basics.md
Upstream-commit: 94026969b43fddee3fbf35e5888dee006a14e098
Component: engine
2015-12-12 21:39:34 -08:00
57399179d4
Merge pull request #18438 from bfirsh/update-getting-started-in-readme
...
Link getting started in readme to installation instructions
Upstream-commit: 34e38312bf2c1a54b4230d30664c655a23d8e5a2
Component: engine
2015-12-12 21:29:26 -08:00
0364b03cd5
Update configuring Docker article
...
Signed-off-by: Jeff Johnston <jeff.johnston.mn@gmail.com >
Upstream-commit: a77861bca7b93489dc3d804ef816b0070dbb678e
Component: engine
2015-12-12 20:36:48 -06:00
e8e575a14a
Merge pull request #18270 from hqhq/hq_refactor_verify_config
...
Move verify container resources to a separate function
Upstream-commit: 51ffc088a55728b124045e297be216a83506a438
Component: engine
2015-12-12 12:47:19 +01:00
1d681e5873
Merge pull request #15365 from twistlock/14674-docker-authz
...
Docker authorization plug-in infrastructure
Upstream-commit: 1fffc0270ffb56d99a8440a10a0effdb3acd934d
Component: engine
2015-12-12 12:30:33 +01:00
9ef77e3f82
Merge pull request #18592 from hqhq/hq_fix_start
...
Add lock for container update
Upstream-commit: 241f6d71078916e987e131e3dd07beb0c5a1242e
Component: engine
2015-12-12 12:17:18 +01:00
5ff0f9ef5e
Refactor ResolveAuthConfig to remove the builder dependency on cli code.
...
registry.ResolveAuthConfig() only needs the AuthConfigs from the ConfigFile, so
this change passed just the AuthConfigs.
Signed-off-by: Daniel Nephin <dnephin@gmail.com >
Upstream-commit: 920ea13516c24d00931cac42b608b5827986ede7
Component: engine
2015-12-11 19:31:24 -08:00
c5bbeb25cd
Move client version to the docker cli.
...
This removes the dockerversion dependency from the client library.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 229d3bace8fbf1c077c063047710a6857ee2aaa6
Component: engine
2015-12-11 19:03:33 -05:00
579142820b
Merge pull request #18613 from calavera/flack_streaming_events_test
...
Log events stream when TestEventStreaming fails.
Upstream-commit: 8d36f097cfe8fd3a4e6bed6123fb1fea24889c7b
Component: engine
2015-12-12 00:40:25 +01:00
0a2fe060b5
Merge pull request #18608 from calavera/rename_get_to_get_container
...
Rename `Daemon.Get` to `Daemon.GetContainer`.
Upstream-commit: 83d0a8647037954fafe646a4261ccfb427ea8ff9
Component: engine
2015-12-12 00:10:42 +01:00
aa7be52b1d
Log events stream when TestEventStreaming fails.
...
Let the tag event some more time to be emitted.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: a3056f9f72baf71655a47ac5b891c892d0174ac4
Component: engine
2015-12-11 17:20:40 -05:00
0d0535be72
Merge pull request #18610 from runcom/fix-warn
...
api: client: info: add newline after warning
Upstream-commit: 91799c232e5f4e2f5dbfd78e0520a97eb2d826c0
Component: engine
2015-12-11 13:41:14 -08:00
ee840662b3
Merge pull request #18591 from calavera/inspector_tests
...
Make sure template inspector always prints a carriage return.
Upstream-commit: a84982a9c764a86358a6f53715efdc9caa0814e8
Component: engine
2015-12-11 22:03:42 +01:00
fbb93e6251
Update runc/libcontainer to v0.0.6
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Upstream-commit: e8f7d5885dad5364b25a8f1efa8bb6b29afa89b1
Component: engine
2015-12-11 15:24:32 -05:00
85dc531227
api: client: info: add newline after warning
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: bb3d7e1e6543a49fd344e765169265a08a19331a
Component: engine
2015-12-11 20:54:51 +01:00
f09e1890f6
Change authz plugin argument name
...
Signed-off-by: Liron Levin <liron@twistlock.com >
Upstream-commit: de4ffdfe488494c9c300a785ad4f2263c6182988
Component: engine
2015-12-11 20:59:15 +02:00
2cee7ddb46
Rename Daemon.Get to Daemon.GetContainer.
...
This is more aligned with `Daemon.GetImage` and less confusing.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: d7d512bb927023b76c3c01f54a3655ee7c341637
Component: engine
2015-12-11 12:39:28 -05:00
c6e3ae9ff6
Merge pull request #18595 from mariussturm/gelf-no-trim-18568
...
don't trim GELF message
Upstream-commit: 5525593a681a478dc51d7ce10a8cb3135d39e785
Component: engine
2015-12-11 07:39:44 -08:00
96b1d45a1b
Merge pull request #18242 from jfrazelle/i-have-no-idea
...
Remove ipc rule in docker-engine apparmor profile
Upstream-commit: cd648dce3adf0f15059eb848d3140d5c7b9f350f
Component: engine
2015-12-11 11:23:41 +01:00
46aa4e0b30
dont trim gelf log message
...
Signed-off-by: Marius Sturm <marius@graylog.com >
Upstream-commit: a31435c8a2c4560b6e1a0e84450c45490fa587be
Component: engine
2015-12-11 10:28:24 +01:00
a88be4a01d
Fixing documentation comments by @thaJeztah
...
Signed-off-by: Dima Stopel <dima@twistlock.com >
Upstream-commit: b7af5bcd20b64e7481538490a0ee1d844f5a462e
Component: engine
2015-12-11 07:03:58 +02:00
