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
22ef779db9
Merge pull request #17207 from azurezk/assert_docker_cli_help_test
...
update docker_cli_help_test.go
2015-11-05 15:15:52 +01:00
bb9eca9036
Merge pull request #17671 from Microsoft/sjw/skip_mount_on_create
...
Optimize Create Container to skip extra mount on Windows.
2015-11-05 09:15:28 -05:00
71db33738d
Merge pull request #17574 from Microsoft/10662-devicetool
...
Windows: Fix docker device tool
2015-11-05 13:05:28 +01:00
f267e4be54
Merge pull request #17697 from jfrazelle/test-old-apt-repo
...
add script to test the old apt-repo
2015-11-05 12:11:57 +01:00
5baf56ca00
Merge pull request #17717 from WeiZhang555/docsAndTypo
...
Fix docs typo and wrong word
2015-11-05 11:35:33 +01:00
1eafc7264c
Merge pull request #17715 from cpuguy83/17708_fix_inspect_output_on_error
...
Reutrn immediately when inspect connection failed
2015-11-04 22:43:02 -08:00
725b7c9d43
Fix docs typo and wrong word
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-11-05 14:17:37 +08:00
72aeb63a47
Reutrn immediately when inspect connection failed
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-11-04 21:17:05 -05:00
f18c5e9714
Merge pull request #17703 from aboch/np
...
Verify Endpoint.Info() before accessing it
2015-11-04 19:23:11 -05:00
1ef3b1f857
Merge pull request #17694 from hrldcpr/patch-1
...
fix documentation inconsistency for volume create
2015-11-05 01:16:09 +01:00
3f27479435
add script to test the old apt-repo
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-11-04 16:01:19 -08:00
236913f4e8
Merge pull request #14012 from sallyom/exitCodes
...
Change 'docker run' exit codes to distinguish docker/contained errors
2015-11-05 00:50:08 +01:00
9c1006c8bf
Merge pull request #17673 from LK4D4/elim_str_comparison
...
Do not rely on string comparison in truncindex
2015-11-04 15:39:19 -08:00
9112d90b27
Optimize Create Container to skip extra mount on Windows.
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
2015-11-04 14:43:50 -08:00
fa0ee3fb89
Merge pull request #17705 from alexwlchan/patch-1
...
Fix typo in dockervolumes.md
2015-11-04 14:26:47 -08:00
40dc0c4861
Fix typo in dockervolumes.md
...
Signed-off-by: Alex Chan <alex@alexwlchan.net>
2015-11-04 22:13:35 +00:00
b2f14f9bec
Merge pull request #17639 from mrjana/restart
...
Fix a corner case issue when daemon panics
2015-11-04 13:37:45 -08:00
54d22cbd9a
Verify Endpoint.Info() before accessing it
...
- During concurrent operations in multihost environment,
it is possible that the implementer of `EndpointInfo`
is nil. It simply means the endpoint is no longer
available in the datastore.
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-11-04 13:27:17 -08:00
92132a7841
Merge pull request #17698 from moxiegirl/nigel-fixes
...
Fixing BTRFS > Btrfs
2015-11-04 22:05:27 +01:00
41de7a18d8
Change 'docker run' exit codes to distinguish docker/contained errors
...
The purpose of this PR is for users to distinguish Docker errors from
contained command errors.
This PR modifies 'docker run' exit codes to follow the chroot standard
for exit codes.
Exit status:
125 if 'docker run' itself fails
126 if contained command cannot be invoked
127 if contained command cannot be found
the exit status otherwise
Signed-off-by: Sally O'Malley <somalley@redhat.com>
2015-11-04 15:18:50 -05:00
37849ce1fb
Merge pull request #17184 from cpuguy83/fix_external_volume_tests
...
Fix bug in volume driver test implementation
2015-11-04 12:08:11 -08:00
0cdc96cd8f
Merge pull request #17695 from runcom/restore-images-log
...
graph: do not error out if images can't be restored
2015-11-04 11:45:44 -08:00
d718388df7
Merge pull request #17578 from brahmaroutu/fix_unit_tests_gccgo
...
after the changes to unit test framework, fixing gccgo to run unit tests
2015-11-04 20:35:17 +01:00
d4a8d09d1a
Do not rely on string comparison in truncindex
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-04 11:34:05 -08:00
90e16ab8f9
Fixing BTRFS > Btrfs
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-11-04 11:23:16 -08:00
eaa4047792
graph: do not error out if images can't be restored
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-11-04 19:46:54 +01:00
f67da614e9
fix documentation inconsistency for volume create
...
the example command uses `/world` but the description refers to `/src`
Signed-off-by: Harold Cooper <hrldcpr@gmail.com>
2015-11-04 13:22:53 -05:00
55711a22e0
Merge pull request #17662 from calavera/decouple_container_and_daemon
...
Remove daemon field from within container.
2015-11-04 10:21:58 -08:00
63efc12070
Remove further references to the daemon within containers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:28:54 -05:00
444c82d19d
Remove daemon field from container.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:49 -05:00
5dc3a9a6da
Decouple daemon and container from the stats collector.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:49 -05:00
c412300dd9
Decouple daemon and container to configure logging drivers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:49 -05:00
669949d6b4
Decouple daemon and container to manage networks.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:48 -05:00
019c337b93
Decouple daemon and container to cleanup containers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:48 -05:00
ca5ede2d0a
Decouple daemon and container to log events.
...
Create a supervisor interface to let the container monitor to emit events.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:48 -05:00
2c72015ce3
Decouple daemon and container to manage volumes.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:48 -05:00
c1c42db060
Decouple daemon and container to execute processes.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:48 -05:00
ebf707ec5f
Move `Daemon.containerCopy` to daemon/archive.go
...
It's the only place where it's used.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:48 -05:00
89decc4446
Remove unused function `Container.getImage`.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:48 -05:00
6ea9a880dc
Remove unnecessary `Container.changes` function.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:48 -05:00
3a49765046
Decouple daemon and container to mount and unmount filesystems.
...
Side effects:
- Decouple daemon and container to start containers.
- Decouple daemon and container to copy files.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:47 -05:00
1c94f5f53a
Decouple daemon and container to export containers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:47 -05:00
9f79cfdb2f
Decouple daemon and container to pause and unpause containers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:47 -05:00
4f2a5ba360
Decouple daemon and container to stop and kill containers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:47 -05:00
581380cc6c
Move `exportContainerRw` to the daemon.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-04 12:27:47 -05:00
7e5f904830
Merge pull request #17664 from jfrazelle/fedora-23
...
add fedora 23
2015-11-04 08:27:54 -08:00
fbd18cbce7
Merge pull request #17683 from haoshuwei/fix-wordspelling-in-network
...
Fixing wrong word spelling in api/client/network.go
2015-11-04 16:02:08 +01:00
11062ea177
Fixing wrong word spelling in api/client/network.go
...
Signed-off-by: Shuwei Hao <haoshuwei24@gmail.com>
2015-11-04 13:42:34 +00:00
0f41761290
Merge pull request #17672 from LK4D4/unn_var
...
Remove unnecessary var decls
2015-11-04 12:24:52 +01:00
Stefan Berger
Antonio Murdaca
Brian Goff
Vincent Demeester
Alexander Morozov
Zhang Wei
Sebastiaan van Stijn
Jessica Frazelle
Jess Frazelle
Stefan J. Wernli
David Calavera
Alex Chan
Alessandro Boch
Sally O'Malley
Alexander Morozov
Mary Anthony
Antonio Murdaca
harold cooper
Tianon Gravi
Shuwei Hao