David Calavera
754c2e08b7
Merge pull request #17751 from guilhem/patch-1
...
Fix missing `-d` flag in docker.fish
2015-11-06 14:59:30 -08:00
Lei Jitang
451b79d691
Test to verify --mac-address doesn't get applied to new endpoint
...
created on network connect.
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
2015-11-06 14:52:35 -08:00
Vincent Demeester
2d87403704
Merge pull request #17767 from LK4D4/nice_logs_message
...
Return nice client-side message for docker logs
2015-11-06 23:51:05 +01:00
Aditi Rajagopal
1c9a5d7be7
Checkers on docker_cli_by_digest_test
...
Applying #16756 to integration-cli/docker_cli_by_digest_test.go
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com >
2015-11-06 16:15:35 -06:00
Christopher Jones
93939c3f9f
Fixed broken links in docker_remote_api
...
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
2015-11-06 16:12:51 -06:00
Santhosh Manohar
dedcf6a6ff
Allow port mapping only for endpoint created on docker run
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
2015-11-06 13:54:17 -08:00
John Howard
eb2acb8f0e
Windows [TP4] localhost mitigation
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-11-06 13:52:59 -08:00
Vincent Demeester
7a82429b3d
Use checker for docker_cli_run_unix_test.go
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-11-06 22:49:16 +01:00
moxiegirl
8aa8d51610
Merge pull request #17713 from nathanleclaire/mhs_nits_2_the_sequel_electric_overloo
...
Revise commands in Compose section of multi-host quickstart
2015-11-06 13:04:43 -08:00
Alexander Morozov
e37e329074
Return nice client-side message for docker logs
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-11-06 11:40:48 -08:00
Tonis Tiigi
47da59f7ec
Fix symlink handling in builder ADD/COPY commands
...
Fixes #17290
Fixes following issues:
- Cache checksums turning off while walking a broken symlink.
- Cache checksums were taken from symlinks while targets were actually copied.
- Copying a symlink pointing to a file to a directory used the basename of the target as a destination basename, instead of basename of the symlink.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2015-11-06 10:58:12 -08:00
Alexander Morozov
38e34cf6da
Use name instead of container in Commit
...
It will make daemon interface separation easier later.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-11-06 10:22:00 -08:00
Alexander Morozov
cc207aa136
Merge pull request #17185 from cpuguy83/use_finer_locking_for_volume_store
...
Fix potential races in the volume store
2015-11-06 08:48:12 -08:00
Vivek Goyal
2c8b7c597a
devmapper: Provide more error information if blkid fails
...
Right now if blkid fails we are just logging a debug message and don;t return
the actual error to caller. Caller gets the error message that thin pool
base device UUID verification failed and it might give impression that thin
pool changed. But that's not the case. Thin pool is in such a state that we
could not even query the thin device UUID. Retrun error message appropriately
to make situation more clear.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-11-06 08:21:20 -05:00
Doug Davis
6ba7d04d16
Merge pull request #17753 from runcom/fix-typo-tests-reqs
...
integration-cli: requirements: fix typo
2015-11-06 07:02:51 -05:00
Antonio Murdaca
7dda44004d
Merge pull request #17746 from coolljt0725/remove_lxcconfig
...
Remove LxcConf in daemon_test.go and fix a typo
2015-11-06 12:21:33 +01:00
Antonio Murdaca
313b85fa47
integration-cli: requirements: fix typo
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
2015-11-06 12:15:42 +01:00
Guilhem Lettron
4a3cd88172
Fix missing -d flag in docker.fish
...
Signed-off-by: Guilhem Lettron <guilhem@lettron.fr >
2015-11-06 11:53:17 +01:00
Gou Rao
1a8cd193f9
Update plugins.md
...
Signed-off-by: Gou Rao <gou@portworx.com >
2015-11-05 21:16:26 -08:00
Brian Goff
f1834153de
Merge pull request #17383 from Microsoft/10662-volumeerrors
...
Fix volume error messages
2015-11-05 21:58:03 -05:00
Lei Jitang
00d00b429f
Remove LxcConf in daemon_test.go and fix a typo
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-11-06 09:58:06 +08:00
Sebastiaan van Stijn
5e2f31e992
Merge pull request #17696 from thaJeztah/update-ubuntu-install
...
Docs: add "Linux kernel extra" to manual install
2015-11-06 02:04:05 +01:00
Sebastiaan van Stijn
7a2669f596
Merge pull request #17610 from thaJeztah/add-env-example
...
Add examples for ENV vars in API
2015-11-06 01:19:58 +01:00
Sven Dowideit
a1ecd8e68c
Merge pull request #17693 from tophj-ibm/fixed-docs-contribution-link
...
Fixed link to contribution page in docs/README.md.
2015-11-06 09:57:07 +10:00
Solomon Hykes
2519f46550
Merge pull request #17700 from calavera/remove_lxc
...
Remove LXC support.
2015-11-05 15:22:37 -08:00
David Calavera
98ec6bc14c
Merge pull request #16692 from vdemeester/16690-fix-etc-osrelease-panic
...
Fix panic in parsing /etc/os-release
2015-11-05 15:11:02 -08:00
David Calavera
b232362310
Merge pull request #17735 from LK4D4/errcode_resize
...
Move errcode handling for resize upper
2015-11-05 15:00:48 -08:00
John Howard
9c765040a5
Windows: Fix docker login
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-11-05 14:19:48 -08:00
David Calavera
157b66ad39
Remove exec-driver global daemon option.
...
Each platform has only a driver now.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-11-05 17:09:58 -05:00
David Calavera
3b5fac462d
Remove LXC support.
...
The LXC driver was deprecated in Docker 1.8.
Following the deprecation rules, we can remove a deprecated feature
after two major releases. LXC won't be supported anymore starting on Docker 1.10.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-11-05 17:09:57 -05:00
Tianon Gravi
6417c53c5a
Merge pull request #17731 from PerfectMemory/upstart-start-on-filesystem
...
Update upstart init script to start on filesystem (not only on local ones).
2015-11-05 13:51:07 -08:00
Jess Frazelle
31fa27d47e
Merge pull request #17496 from chasebolt/centos-rpm-dep
...
setting device-mapper-libs version dependency for centos 7 rpm
2015-11-05 13:46:27 -08:00
Alexander Morozov
bb0e7eb196
Move errcode handling for resize upper
...
It'll allow to separate daemon layer more cleanly later.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-11-05 13:42:33 -08:00
David Calavera
b52bedbd48
Merge pull request #17726 from runcom/fix-errors-format
...
Fix errors format
2015-11-05 13:30:57 -08:00
Brian Goff
8de3d630ad
Merge pull request #17678 from asbjornenge/tm_syntax_updates
...
Added ARG instruction and aligned with src repo
2015-11-05 16:30:19 -05:00
David Calavera
c7b65288e4
Merge pull request #17685 from WeiZhang555/cluster-parser
...
Fix `--cluster-store` option parser
2015-11-05 13:21:52 -08:00
Brian Goff
9465d6ee6a
Merge pull request #17534 from Microsoft/10662-filterhyperv
...
Windows: Add isolation to ps filter
2015-11-05 15:55:47 -05:00
Stefan J. Wernli
37ba67bf63
Fixing last access time on Windows to unblock python.
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
2015-11-05 12:15:18 -08:00
Julien Pervillé
6f83dd22a3
Update upstart init script to start on filesystem (not only on local ones).
...
Signed-off-by: Julien Pervillé <julien.perville@perfect-memory.com >
2015-11-05 20:38:52 +01:00
Jess Frazelle
3c6962f22d
Merge pull request #17677 from fboudra/master
...
Remove yum cache to reduce image size
2015-11-05 11:16:40 -08:00
Vincent Demeester
7b102dc114
Fix panic in parsing /etc/os-release
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-11-05 19:59:29 +01:00
Vincent Demeester
b09a452c1f
Vendor mattn/go-shellwords
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-11-05 19:59:28 +01:00
Jess Frazelle
5353ccb05c
Merge pull request #17273 from stefanberger/apparmor_policy_1.9
...
More Rules for AppArmor
2015-11-05 10:52:43 -08:00
John Howard
9c5814171c
Windows: Add isolation to ps filter
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-11-05 10:18:24 -08:00
Antonio Murdaca
77826333fe
Fix errors format
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
2015-11-05 18:17:37 +01:00
Sebastiaan van Stijn
336dea3e50
Merge pull request #17725 from polonskiy/patch-1
...
fix typo
2015-11-05 17:40:45 +01:00
Anton Polonskiy
3f331eaa40
fix typo
...
Signed-off-by: Anton Polonskiy <anton.polonskiy@gmail.com >
2015-11-05 18:33:16 +02:00
Stefan Berger
02411987ff
More Rules for AppArmor
...
This patch addresses the following AppArmor complains:
type=AVC msg=audit(1445537397.873:547): apparmor="ALLOWED" operation="mount"
info="failed srcname match" error=-13 profile="/usr/bin/docker"
name="/.pivot_root602836504/" pid=11512 comm="exe" flags="rw, rprivate"
type=AVC msg=audit(1445537265.325:502): apparmor="ALLOWED"
operation="file_lock" profile="/usr/bin/docker"
name="/var/lib/docker/network/files/local-kv.db" pid=9574 comm="docker"
requested_mask="k" denied_mask="k" fsuid=0 ouid=0
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com >
2015-11-05 11:06:18 -05:00
Vincent Demeester
c05e1b7d57
Merge pull request #17722 from jeroenj/patch-1
...
Fixes typo in docs/userguide/dockervolumes.md
2015-11-05 16:22:32 +01:00
Christopher Jones
f48f850a24
Updated link to https.
...
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
2015-11-05 09:20:20 -06:00