75d69ce0da
Merge pull request #18637 from dnephin/move_auth_config
...
Move more api types to api/types package
2015-12-14 11:53:30 -08:00
0c2dd27581
Merge pull request #18642 from tophj-ibm/add-z-unshare-image
...
Add unshare image to s390x Dockerfile
2015-12-14 11:32:27 -08:00
9dc7d07fc1
Remove timeout shared function.
...
Handle timeouts when it's necessary based on a Timeout interface.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-14 14:24:21 -05:00
984282e28c
Merge pull request #18639 from calavera/force_api_version
...
Force API versioning in the client library.
2015-12-14 11:20:12 -08:00
03e2923e42
Merge pull request #18570 from suihkulokki/control-fix
...
hack/make/.build-deb/control: add missing fields
2015-12-14 10:41:56 -08:00
b13fd10109
Merge pull request #18372 from Microsoft/jjh/winci-ensurefrozen
...
Windows CI Fix: No subshell due to bash 3.x
2015-12-14 10:32:53 -08:00
52e53814ea
Add unshare image to s390x Dockerfile
...
This adds unshare image to Dockerfile.s390x
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2015-12-14 12:16:18 -06:00
c38aa60180
Merge pull request #18393 from qzio/apparmor/ptrace-ubuntu14
...
Enable ptrace in a container on apparmor below 2.9
2015-12-14 10:07:01 -08:00
b679eb9a82
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>
2015-12-14 12:06:42 -05:00
96c10098ac
Move IndexInfo and ServiceConfig types to api/types/registry/registry.go
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-12-14 11:28:02 -05:00
44299989b2
Merge pull request #18631 from tiborvass/cleanup-utils
...
Create `builder/dockerignore` and `pkg/gitutils` to clean up `utils`
2015-12-14 17:22:01 +01:00
5b321e3287
Move AuthConfig to api/types
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-12-14 11:22:01 -05:00
0d824c760e
Removing the restriction to push to a 'official' repo
...
Signed-off-by: toli <toli@docker.com>
2015-12-14 07:45:00 -08:00
f988c98ff3
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>
2015-12-14 10:39:53 -05:00
d4b4ce2588
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>
2015-12-14 10:39:53 -05:00
a2dc4f79f2
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>
2015-12-14 10:39:53 -05:00
5e0283effa
Merge pull request #18618 from dnephin/refactor_resolve_auth_config
...
Refactor ResolveAuthConfig to remove the builder dependency on cli code
2015-12-14 15:23:36 +01:00
63e3816c1d
utils: move dockerignore function to builder/dockerignore
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-12-14 14:59:52 +01:00
135cca6f52
utils: move git functions to pkg/gitutils
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-12-14 14:59:52 +01:00
f8bc4ed573
Merge pull request #18112 from daehyeok/fix_dry_run_test
...
Change TestRunNonRootUserResolvName Fail log.
2015-12-14 13:31:17 +01:00
f7ed97a630
layer: layer_store.go: return on error
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-14 12:03:39 +01:00
5fd9a8f603
Merge pull request #18616 from calavera/move_client_version_to_docker_cli
...
Move client version to the docker cli.
2015-12-14 11:43:01 +01:00
ba6b69adc2
Change TestRunNonRootUserResolvName Fail log.
...
Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
2015-12-13 19:59:51 -07:00
ec1002db58
Merge pull request #18623 from jutaz/bugfix/typos
...
Bugfix - Typos
2015-12-13 19:52:31 +01:00
927b334ebf
Fix typos found across repository
...
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com>
2015-12-13 18:04:12 +02:00
f5e6b09783
Merge pull request #18620 from jeffjohnston/DOC-16770
...
Update configuring Docker article
2015-12-13 14:10:46 +01:00
c427131c94
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>
2015-12-13 02:34:44 -05:00
94026969b4
Merge pull request #18389 from wenchma/doc_update_for_container-basics
...
docs: delete draft container-basics.md
2015-12-12 21:39:34 -08:00
34e38312bf
Merge pull request #18438 from bfirsh/update-getting-started-in-readme
...
Link getting started in readme to installation instructions
2015-12-12 21:29:26 -08:00
a77861bca7
Update configuring Docker article
...
Signed-off-by: Jeff Johnston <jeff.johnston.mn@gmail.com>
2015-12-12 20:36:48 -06:00
51ffc088a5
Merge pull request #18270 from hqhq/hq_refactor_verify_config
...
Move verify container resources to a separate function
2015-12-12 12:47:19 +01:00
1fffc0270f
Merge pull request #15365 from twistlock/14674-docker-authz
...
Docker authorization plug-in infrastructure
2015-12-12 12:30:33 +01:00
241f6d7107
Merge pull request #18592 from hqhq/hq_fix_start
...
Add lock for container update
2015-12-12 12:17:18 +01:00
920ea13516
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>
2015-12-11 19:31:24 -08:00
229d3bace8
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>
2015-12-11 19:03:33 -05:00
8d36f097cf
Merge pull request #18613 from calavera/flack_streaming_events_test
...
Log events stream when TestEventStreaming fails.
2015-12-12 00:40:25 +01:00
83d0a86470
Merge pull request #18608 from calavera/rename_get_to_get_container
...
Rename `Daemon.Get` to `Daemon.GetContainer`.
2015-12-12 00:10:42 +01:00
a3056f9f72
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>
2015-12-11 17:20:40 -05:00
91799c232e
Merge pull request #18610 from runcom/fix-warn
...
api: client: info: add newline after warning
2015-12-11 13:41:14 -08:00
a84982a9c7
Merge pull request #18591 from calavera/inspector_tests
...
Make sure template inspector always prints a carriage return.
2015-12-11 22:03:42 +01:00
e8f7d5885d
Update runc/libcontainer to v0.0.6
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-12-11 15:24:32 -05:00
bb3d7e1e65
api: client: info: add newline after warning
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-11 20:54:51 +01:00
de4ffdfe48
Change authz plugin argument name
...
Signed-off-by: Liron Levin <liron@twistlock.com>
2015-12-11 20:59:15 +02:00
d7d512bb92
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>
2015-12-11 12:39:28 -05:00
5525593a68
Merge pull request #18595 from mariussturm/gelf-no-trim-18568
...
don't trim GELF message
2015-12-11 07:39:44 -08:00
cd648dce3a
Merge pull request #18242 from jfrazelle/i-have-no-idea
...
Remove ipc rule in docker-engine apparmor profile
2015-12-11 11:23:41 +01:00
a31435c8a2
dont trim gelf log message
...
Signed-off-by: Marius Sturm <marius@graylog.com>
2015-12-11 10:28:24 +01:00
b7af5bcd20
Fixing documentation comments by @thaJeztah
...
Signed-off-by: Dima Stopel <dima@twistlock.com>
2015-12-11 07:03:58 +02:00
c6bfb54ac1
Move verify container resources to a separate function
...
Make the code easy to view.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-12-11 10:59:29 +08:00
464eefd795
Add lock for container update
...
Container needs to be locked when updating the fields, and
this PR also remove the redundant `parseSecurityOpt` since
it'll be done in `setHostConfig`.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-12-11 10:33:13 +08:00
David Calavera
Jess Frazelle
Christopher Jones
Daniel Nephin
Tibor Vass
toli
Vivek Goyal
Vincent Demeester
Tibor Vass
Antonio Murdaca
Antonio Murdaca
Daehyeok Mun
Justas Brazauskas
Sebastiaan van Stijn
Lei Jitang
moxiegirl
Jeff Johnston
Mrunal Patel
Liron Levin
Alexander Morozov
Marius Sturm
Dima Stopel
Qiang Huang