0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
48897 commits 14 branches 412 tags 338 MiB
Commit graph

8199 commits

Author SHA1 Message Date
Daniel, Dao Quang Minh
4b3b54ca38 fix console attribute in lxc template 
commit 4aa5da278f 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)
 2014-09-09 13:51:13 -04:00
Dan Walsh
73617e5e18 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)
 2014-09-09 08:18:20 -04:00
Hu Tao
fcc7ec8073 typo fix: immediatly -> immediately 
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
 2014-09-09 01:16:19 -04:00
Jessica Frazelle
f49c3f287b 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: )
 2014-09-08 09:30:33 -07:00
Marc Tamsky
d229821501 use tune2fs to disable ext4 mount counts and mount intervals 
Signed-off-by: Marc Tamsky <mtamsky@gmail.com> (github: tamsky)
 2014-09-05 19:32:39 -07:00
Tibor Vass
1a2a4f61ab Merge pull request #7878 from LK4D4/fix_net_for_none 
Don't initialize network for 'none' mode
 2014-09-04 15:30:03 -07:00
Alexandr Morozov
ba24820284 Don't initialize network for 'none' mode 
Fixes #7837

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-09-04 09:50:58 +04:00
Ward Vandewege
a447894946 fix typos in error messages 
Signed-off-by: Ward Vandewege <ward@jhvc.com> (github: cure)
 2014-09-03 13:12:10 -04:00
unclejack
76212635b5 move some io related utils to pkg/ioutils 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-03 11:36:21 +03:00
Alexandr Morozov
e0339d4b88
Use State as embedded to Container 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-09-03 00:01:11 +04:00
Michael Crosby
688741df31 Update mount struct with reference 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-09-01 15:18:30 -07:00
Vishnu Kannan
3a7e07355a Rename 'StdConfig' to 'StreamConfig'. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-01 14:31:01 -07:00
Vishnu Kannan
4aa5da278f 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)
 2014-09-01 14:30:16 -07:00
Michael Crosby
388ed88042 Merge pull request #7812 from erikh/fix_top 
docker top: fix command when multiple arguments are supplied
 2014-09-01 11:31:38 -07:00
Erik Hollensbe
394a6d3154 docker top: fix command when multiple arguments are supplied 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-08-31 01:18:15 -07:00
Alexandr Morozov
16e850fe3e
Use increment operator 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-30 21:43:48 +04:00
Alexandr Morozov
b101022dbe
Implement allocating IPs from CIDR within bridge network 
Fixes #4986

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-29 16:21:07 +04:00
Alexandr Morozov
42dd48315f
More ipallocator refactoring 
Now x1.5 faster

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-29 16:20:49 +04:00
Alexandr Morozov
517ba44e37
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>
 2014-08-29 12:56:04 +04:00
Erik Hollensbe
1ae4c00a19 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)
 2014-08-27 18:52:30 -07:00
Michael Crosby
2a5e29adc6 Merge pull request #7677 from erikh/update_hosts_linked_containers 
Update /etc/hosts when linked container is restarted
 2014-08-27 19:54:09 -07:00
Michael Crosby
77eefbc688 Merge pull request #7672 from cpuguy83/cleanup_volumes_from 
Cleanup: applyVolumesFrom
 2014-08-27 19:43:16 -07:00
Victor Vieux
450740c891 Update /etc/hosts when linked container is restarted 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-08-27 18:23:41 -07:00
Alexandr Morozov
bd049b3800
Skip "no chain" error on deleting chain in Unmap 
Fixes #6904
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-27 20:24:27 +04:00
Brian Goff
7495fbc0e3 Cleanup: applyVolumesFrom 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
 2014-08-26 20:52:58 -04:00
Tibor Vass
c4a190db0c Merge pull request #7744 from LK4D4/fix_race_cleanup_start_#6904 
Fix race condition between cleanup and Start
 2014-08-26 14:17:11 -04:00
Michael Crosby
55f7dd8198 Merge pull request #7642 from LK4D4/style_fixes 
Style fixes for daemon package
 2014-08-26 10:59:05 -07:00
Michael Crosby
89f64712fa Merge pull request #7702 from LK4D4/fix_panic_on_bad_device_#7701 
Handle error from GetDevice early
 2014-08-26 10:53:40 -07:00
Alexandr Morozov
12ff89a390
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>
 2014-08-26 20:57:12 +04:00
Alexandr Morozov
698392cb51 Remove redundant elses 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-26 09:28:54 +04:00
Alexandr Morozov
1ba15b8aca Use ++ instead of += 1 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-26 09:27:07 +04:00
Michael Crosby
228eda4fd5 Merge pull request #7629 from LK4D4/fix_follow_hang_on_stop 
Fix logs -f hanging on stopped containers
 2014-08-25 15:24:20 -07:00
Tibor Vass
34438efffe Merge pull request #7659 from somaopensource/soma 
daemon: rename from "delete" job to "rm"
 2014-08-25 15:54:14 -04:00
Alexandr Morozov
17b95ecb08
Handle error from GetDevice early 
Also more verbose error.

Fixes panic from #7701

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-24 14:09:30 +04:00
Chris Armstrong
ef9a5926e9 Fix typo for --restart deprecation 
Signed-off-by: Chris Armstrong <chris@opdemand.com>
 2014-08-22 12:56:43 -07:00
Victor Vieux
094cd7040b Merge pull request #7638 from vivekdasgupta/minor-fixes 
Fix data space reporting from Kb/Mb to KB/MB
 2014-08-22 11:40:49 -05:00
Vivek Dasgupta
a327d9b91e Fix data space reporting from Kb/Mb to KB/MB 
Docker-DCO-1.1-Signed-off-by: Vivek Dasgupta <vdasgupt@redhat.com> (github: vivekdasgupta)
 2014-08-21 21:03:44 +05:30
limsy
239e932485 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>
 2014-08-21 19:58:26 +09:00
Alexandr Morozov
badf8247af
Fix logs -f hanging on stopped containers 
Fixes #7020

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-19 22:23:02 +04:00
Victor Vieux
f3b2c93b9f 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)
 2014-08-19 17:06:17 +00:00
Solomon Hykes
2a39635d30 Cleanup: move image depth checks in image/ 
Signed-off-by: Solomon Hykes <solomon@docker.com>
 2014-08-15 00:43:12 +00:00
Alexandr Morozov
0d4d7e4a28
Cleanup: Make channels unbuffered 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-14 21:51:25 +04:00
Alexandr Morozov
f1975cbc7c
Fix race on state serialization 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-14 21:51:15 +04:00
Alexandr Morozov
93d6adf8a1
Fix race between container cleanup and inspect/ps 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-14 21:51:06 +04:00
Alexandr Morozov
1480168e9f
Fix race condition in sending started signal from monitor 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-14 21:50:56 +04:00
Victor Vieux
a0392324f1 another commit to do like @crosbymichael 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-08-14 01:36:26 +00:00
Victor Vieux
fcf37be2b1 remove double newline 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-08-14 01:08:27 +00:00
Michael Crosby
25c519e829 Deprecate --restart on the daemon 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 16:08:50 -07:00
Michael Crosby
73ced63680 Update based on comments from the code review 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 15:58:55 -07:00
Michael Crosby
2ec1b697c1 Rebased changes to return on first start's error 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-13 15:58:55 -07:00