toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,422 Commits 3 Branches 295 Tags
4dcbf560125b675dce146e06fcd75646d9c27530
Commit Graph

451 Commits

Author SHA1 Message Date
Michael Crosby
0d5a02c8f6 Merge pull request #7955 from LK4D4/ignore_delete_err_on_unmap_#7954 
Deallocate port before trying to delete iptables chain
Upstream-commit: 25f7840993b9f4ae47b900fcbde67fcd86d537ee
Component: engine
 2014-09-09 17:41:26 -07:00
Michael Crosby
765de5955d Merge pull request #7897 from LK4D4/refactoring_net_mode 
Add IsPrivate method for NetworkMode
Upstream-commit: f9c345ddfae25d5512b775968fb14ed1abb00504
Component: engine
 2014-09-09 14:20:59 -07:00
Alexandr Morozov
53bdf11639 Add IsPrivate method for NetworkMode 
This method indicates that container using private network stack

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 080ca8619172b020c7da29b46f2fe4c939bb47ca
Component: engine
 2014-09-10 00:46:43 +04:00
Alexandr Morozov
73455edf0c Deallocate port before trying to delete iptables chain 
Fixes #7954
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 2e7cf6b0cec3e5cc6f05fa5011cf7b5e49a44ae4
Component: engine
 2014-09-10 00:40:46 +04:00
Jessie Frazelle
114dd7f292 Merge pull request #7660 from rhatdan/selinux-volumes 
Change default label of container volumes to shared SELinux Label
Upstream-commit: 971240696f3fd74ece726245afd60bca1f86ecbc
Component: engine
 2014-09-09 11:16:19 -07:00
Daniel, Dao Quang Minh
cf5c443ddd fix console attribute in lxc template 
commit 4aa5da278f49c889d43191f82ff42d3a95266d62 moves `Console` from Command to
ProcessConfig, but missed the change in lxc_template. Therefore creating a
container with tty using lxc driver with fail with error

template: lxc:60:20: executing "lxc" at <.Console>: Console is not a field of
struct type struct { *execdriver.Command; AppArmor bool; ProcessLabel string; MountLabel string }

This changes lxc_console template to refers to `.ProcessConfig.Console`

Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
Upstream-commit: 4b3b54ca388cd49cd790def66fbce9af2be2f20f
Component: engine
 2014-09-09 13:51:13 -04:00
Dan Walsh
2a0b4ab45f Change default label of container volumes to shared SELinux Label 
Since these will be shared between containers we want to label
them as svirt_sandbox_file_t:s0.  That will allow multiple containers
to write to them.

Currently we are allowing container domains to read/write all content in
/var/lib/docker because of container volumes.  This is a big security hole
in our SELinux story.

This patch will allow us to tighten up the security of docker containers.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 73617e5e18159e5f791d2860c7857cd5dea31be4
Component: engine
 2014-09-09 08:18:20 -04:00
Hu Tao
ced73947d9 typo fix: immediatly -> immediately 
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Upstream-commit: fcc7ec8073311cf9d150179895e5d0a32f4cb2e7
Component: engine
 2014-09-09 01:16:19 -04:00
Jessica Frazelle
2ff1cc83fb fixes #7802, when api version 1.11 is json.Marshaling the container struct 
Signed-off-by: Jessica Frazelle <jfrazelle@users.noreply.github.com>

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jfrazelle@users.noreply.github.com> (github: )
Upstream-commit: f49c3f287b0d26dc705940effa0ec03e1de7bb99
Component: engine
 2014-09-08 09:30:33 -07:00
Tibor Vass
0f1377200f Merge pull request #7878 from LK4D4/fix_net_for_none 
Don't initialize network for 'none' mode
Upstream-commit: 1a2a4f61abb3a5b40de70b10f39c90d7593679a5
Component: engine
 2014-09-04 15:30:03 -07:00
Alexandr Morozov
dc74831ee4 Don't initialize network for 'none' mode 
Fixes #7837

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: ba24820284a7a87642f2b668987c1627d6977ea2
Component: engine
 2014-09-04 09:50:58 +04:00
Ward Vandewege
05579b5900 fix typos in error messages 
Signed-off-by: Ward Vandewege <ward@jhvc.com> (github: cure)
Upstream-commit: a447894946ca2ac47bf1c46f78c4839c75fd740d
Component: engine
 2014-09-03 13:12:10 -04:00
unclejack
e9ab736d16 move some io related utils to pkg/ioutils 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 76212635b594d4472dd8d5b2e071fac416addbe7
Component: engine
 2014-09-03 11:36:21 +03:00
Alexandr Morozov
13e3017817 Use State as embedded to Container 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: e0339d4b88989a31b72be02582eee72433d2f0ec
Component: engine
 2014-09-03 00:01:11 +04:00
Michael Crosby
0886b9cbe5 Update mount struct with reference 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 688741df31396ece5f72cbc5ecc0250b3d06a8bc
Component: engine
 2014-09-01 15:18:30 -07:00
Vishnu Kannan
559392405c Rename 'StdConfig' to 'StreamConfig'. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: 3a7e07355a1ad67f71ee4255e06526186fd48f7a
Component: engine
 2014-09-01 14:31:01 -07:00
Vishnu Kannan
a7e2cb4124 Refactoring execdriver.Command and Container structs to support 'docker exec' and other 
similar features in the future.

Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: 4aa5da278f49c889d43191f82ff42d3a95266d62
Component: engine
 2014-09-01 14:30:16 -07:00
Michael Crosby
94c61e97d5 Merge pull request #7812 from erikh/fix_top 
docker top: fix command when multiple arguments are supplied
Upstream-commit: 388ed88042b54b3e0fff7096c1749f2bfc2c7e40
Component: engine
 2014-09-01 11:31:38 -07:00
Erik Hollensbe
c382a20d9b docker top: fix command when multiple arguments are supplied 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 394a6d3154fe810565ddc5619447c8a82e7ce38c
Component: engine
 2014-08-31 01:18:15 -07:00
Alexandr Morozov
fe6985381c Use increment operator 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 16e850fe3ea42f5103c9a11f3db17d11dc4f6ada
Component: engine
 2014-08-30 21:43:48 +04:00
Alexandr Morozov
76ca127323 Merge Container and State mutexes 
Resolved all deadlocks and fixed race between kill and
monitor.resetContainer
Fixes #7600

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 517ba44e3742c39c4c3fc249b8c40e9b7ddd845f
Component: engine
 2014-08-29 12:56:04 +04:00
Erik Hollensbe
b36a54587e builder: fix references to jobs in daemon, make builder a first class 
package referring to evaluator

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 1ae4c00a19edb7d3b41c050489e56339833d8e01
Component: engine
 2014-08-27 18:52:30 -07:00
Michael Crosby
364fb8763b Merge pull request #7677 from erikh/update_hosts_linked_containers 
Update /etc/hosts when linked container is restarted
Upstream-commit: 2a5e29adc62b0a45e7548c51e5cebc4855d54b48
Component: engine
 2014-08-27 19:54:09 -07:00
Michael Crosby
a040de5fce Merge pull request #7672 from cpuguy83/cleanup_volumes_from 
Cleanup: applyVolumesFrom
Upstream-commit: 77eefbc68894c77862608632822619abfc0c58d6
Component: engine
 2014-08-27 19:43:16 -07:00
Victor Vieux
ac32065d5c Update /etc/hosts when linked container is restarted 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 450740c891c60dda15b7abe29f35b8e142c2c40e
Component: engine
 2014-08-27 18:23:41 -07:00
Alexandr Morozov
04c32fc20e Skip "no chain" error on deleting chain in Unmap 
Fixes #6904
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: bd049b3800b967bba06d03fd23ab135c51467ae3
Component: engine
 2014-08-27 20:24:27 +04:00
Brian Goff
054561d764 Cleanup: applyVolumesFrom 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 7495fbc0e3f23c932562cb02ea6e7df204d29dfa
Component: engine
 2014-08-26 20:52:58 -04:00
Tibor Vass
b00ca614f6 Merge pull request #7744 from LK4D4/fix_race_cleanup_start_#6904 
Fix race condition between cleanup and Start
Upstream-commit: c4a190db0c7020ee39672421d1bbca3678f86683
Component: engine
 2014-08-26 14:17:11 -04:00
Michael Crosby
f5f64f68ea Merge pull request #7642 from LK4D4/style_fixes 
Style fixes for daemon package
Upstream-commit: 55f7dd8198549b704089a51662e3c511d028706c
Component: engine
 2014-08-26 10:59:05 -07:00
Michael Crosby
ff69012bd1 Merge pull request #7702 from LK4D4/fix_panic_on_bad_device_#7701 
Handle error from GetDevice early
Upstream-commit: 89f64712faecddbfd92c7bfe6612dd5890c966dd
Component: engine
 2014-08-26 10:53:40 -07:00
Alexandr Morozov
62eb5165d1 Fix race condition between cleanup and Start 
There was problem when Start might be before cleanup

Fixes #6904

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 12ff89a3901cd2debf13e7ccc3a1a780380e4dd9
Component: engine
 2014-08-26 20:57:12 +04:00
Alexandr Morozov
6eedef59d9 Remove redundant elses 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 698392cb512ba0c85e69a669f115d67c1d50cb98
Component: engine
 2014-08-26 09:28:54 +04:00
Alexandr Morozov
71bf8c685a Use ++ instead of += 1 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 1ba15b8acaf8625db23ccd7d0ba7d3acf7d2f69e
Component: engine
 2014-08-26 09:27:07 +04:00
Michael Crosby
601611b982 Merge pull request #7629 from LK4D4/fix_follow_hang_on_stop 
Fix logs -f hanging on stopped containers
Upstream-commit: 228eda4fd5a79dfe5eab1194f4133a71472fef0e
Component: engine
 2014-08-25 15:24:20 -07:00
Tibor Vass
ddfb7cb734 Merge pull request #7659 from somaopensource/soma 
daemon: rename from "delete" job to "rm"
Upstream-commit: 34438efffefdf4a2d93e5b2192dff4645828d745
Component: engine
 2014-08-25 15:54:14 -04:00
Alexandr Morozov
81067d8cbd Handle error from GetDevice early 
Also more verbose error.

Fixes panic from #7701

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 17b95ecb08f1705bd74d6c94c8bcfd4c87ccfca6
Component: engine
 2014-08-24 14:09:30 +04:00
Chris Armstrong
21c698ffdf Fix typo for --restart deprecation 
Signed-off-by: Chris Armstrong <chris@opdemand.com>
Upstream-commit: ef9a5926e9af408d68b3c68638a69727e42079fa
Component: engine
 2014-08-22 12:56:43 -07:00
Victor Vieux
f77d69a509 Merge pull request #7638 from vivekdasgupta/minor-fixes 
Fix data space reporting from Kb/Mb to KB/MB
Upstream-commit: 094cd7040b538910f6b4d1d362162185099eb5af
Component: engine
 2014-08-22 11:40:49 -05:00
Vivek Dasgupta
65adfb2362 Fix data space reporting from Kb/Mb to KB/MB 
Docker-DCO-1.1-Signed-off-by: Vivek Dasgupta <vdasgupt@redhat.com> (github: vivekdasgupta)
Upstream-commit: a327d9b91edf6d36ee5b286ebe968bcca6658f5b
Component: engine
 2014-08-21 21:03:44 +05:30
limsy
87669d6e48 daemon: rename from "delete" job to "rm" 
This commit fixes following FIXMEs:

// FIXME: rename "delete" to "rm" for consistency with the CLI command
// FIXME: rename ContainerDestroy to ContainerRm for consistency with the CLI command

Signed-off-by: lim seong yeol <seongyeol37@gmail.com>
Upstream-commit: 239e932485c3e0f72a4f88ce1301ebe269eb2e27
Component: engine
 2014-08-21 19:58:26 +09:00
Alexandr Morozov
1ff07a2840 Fix logs -f hanging on stopped containers 
Fixes #7020

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: badf8247afa378d04835ec19243ede2fb89a7b31
Component: engine
 2014-08-19 22:23:02 +04:00
Victor Vieux
796b032af2 allow /etc/hosts /etc/resolv.conf and /etc/hostname to be changed 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: f3b2c93b9f01ac909de4f93753a21eacb02bcd9f
Component: engine
 2014-08-19 17:06:17 +00:00
Solomon Hykes
ef058f588f Cleanup: move image depth checks in image/ 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 2a39635d30a5ecbf3f8020dcb272cd8ae939fe06
Component: engine
 2014-08-15 00:43:12 +00:00
Alexandr Morozov
0b9e4ed61e Cleanup: Make channels unbuffered 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 0d4d7e4a2851c60f768f71a79a78c068fd9dffe8
Component: engine
 2014-08-14 21:51:25 +04:00
Alexandr Morozov
c26305d808 Fix race on state serialization 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: f1975cbc7c5b551e5a206c15f32aef3d51904408
Component: engine
 2014-08-14 21:51:15 +04:00
Alexandr Morozov
1b8bad68b3 Fix race between container cleanup and inspect/ps 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 93d6adf8a19855edf118d27d0239222f572d8292
Component: engine
 2014-08-14 21:51:06 +04:00
Alexandr Morozov
f4db7d15dc Fix race condition in sending started signal from monitor 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 1480168e9f6178e4015aa4dcc035a6963c59f431
Component: engine
 2014-08-14 21:50:56 +04:00
Victor Vieux
9df494bb71 another commit to do like @crosbymichael 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: a0392324f194f4f92e3205f0c0ed8b71dc2fc93f
Component: engine
 2014-08-14 01:36:26 +00:00
Victor Vieux
0bb709c134 remove double newline 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: fcf37be2b1efa11da1958658da0e04755a225c89
Component: engine
 2014-08-14 01:08:27 +00:00
Michael Crosby
9b55fc0736 Deprecate --restart on the daemon 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 25c519e829640ebb23061b82c6ace88c5983b63d
Component: engine
 2014-08-13 16:08:50 -07:00