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

7525 commits

Author SHA1 Message Date
Vishnu Kannan
bfebdfde78 Splitting the exec remote API into two separate APIs inorder to support resizing of tty sessions. 
1. /container/<name>/exec - Creates a new exec command instance in the daemon and container '<name>'. Returns an unique ID for each exec command.
2. /exec/<name>/start - Starts an existing exec command instance. Removes the exec command from the daemon once it completes.

Adding /exec/<name>/resize to resize tty session of an exec command.

Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-15 22:56:47 +00:00
Alexandr Morozov
fbae71326c Merge pull request #8020 from erikh/rewrite_hosts_files 
Links v2: Mutable network files
 2014-09-15 23:03:30 +04:00
Vishnu Kannan
669561c2aa Address review comments. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-15 17:00:00 +00:00
Vishnu Kannan
d130c10ab7 Fix bug in attach handling for docker exec. Add docs for 'docker exec' feature. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-15 16:59:05 +00:00
Vishnu Kannan
e1cf95b593 Import nsenter in docker. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-15 16:59:05 +00:00
Vishnu Kannan
985d579586 Adding 'exec' command to remote API and CLI. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-15 16:59:03 +00:00
Vishnu Kannan
5130fe5d38 Adding support for docker exec in daemon. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-15 16:57:52 +00:00
Vishnu Kannan
f3c767d798 Adding Exec method to native execdriver. 
Modified Attach() method to support docker exec.

Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-09-15 16:57:52 +00:00
unclejack
a10a86d437 Merge pull request #7698 from tamsky/tune2fs_base_filesystem 
use tune2fs to disable ext4 mount counts and mount intervals
 2014-09-15 15:42:52 +03:00
unclejack
c751e1739d Merge pull request #8010 from LK4D4/fix_ps_s_hang_#7999 
Fix ps -s hang
 2014-09-15 13:54:29 +03:00
Erik Hollensbe
09b700288e Allow /etc/hosts and /etc/resolv.conf to be updated both outside and 
inside the container.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-09-13 11:27:34 -07:00
unclejack
da4dba2e8c Merge pull request #8014 from jfrazelle/8012-prevent-container-names-starting-dash 
Ensure container names start with a-zA-Z0-9
 2014-09-12 23:15:16 +03:00
Jessica Frazelle
aa2af817be Ensure container names start with a-zA-Z0-9 
Closes #8012.

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-09-12 10:45:07 -07:00
Alexandr Morozov
82bdd88e9c Use unlocked version of changes for GetImage 
Fixes #7999

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-09-12 11:44:51 +04:00
Alexandr Morozov
555ce0cb54 Use defined variable 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-09-12 11:42:12 +04:00
Alexandr Morozov
41e9e93e27 Fix my own comments from #7927 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-09-12 10:05:07 +04:00
Erik Hollensbe
3b6a29b81a Fix an issue where already allocated ports would not trigger an error. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-09-12 09:51:14 +04:00
Michael Crosby
32b5d145fa Merge pull request #7963 from jfrazelle/7845-remove-image-fail-dont-untag 
Failing to remove an image, will not remove the image name/tag.
 2014-09-11 18:06:18 -07:00
Jessica Frazelle
b2efdc538d Removing an image that fails, also removes the image name/tag. 
Fixes #7845 and #7801, and a real pain point I had :)

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-09-11 11:29:25 -07:00
Michael Crosby
ed7fb3bbda Merge pull request #7202 from timbot/add-registry-mirror-flag 
Add daemon flag to specify public registry mirrors
 2014-09-11 11:11:01 -07:00
Michael Crosby
25f7840993 Merge pull request #7955 from LK4D4/ignore_delete_err_on_unmap_#7954 
Deallocate port before trying to delete iptables chain
 2014-09-09 17:41:26 -07:00
Michael Crosby
f9c345ddfa Merge pull request #7897 from LK4D4/refactoring_net_mode 
Add IsPrivate method for NetworkMode
 2014-09-09 14:20:59 -07:00
Alexandr Morozov
080ca86191 Add IsPrivate method for NetworkMode 
This method indicates that container using private network stack

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-09-10 00:46:43 +04:00
Alexandr Morozov
2e7cf6b0ce Deallocate port before trying to delete iptables chain 
Fixes #7954
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-09-10 00:40:46 +04:00
Tim Smith
69a75c673c Add daemon flag to specify public registry mirrors 
Adds support for a --registry-mirror=scheme://<host>[:port]
daemon flag. The flag may be present multiple times. If
provided, mirrors are prepended to the list of endpoints used
for image pull. Note that only mirrors of the public
index.docker.io registry are supported, and image/tag resolution
is still performed via the official index.

Docker-DCO-1.1-Signed-off-by: Tim Smith <timbot@google.com> (github: timbot)
 2014-09-09 19:03:38 +00:00
Jessie Frazelle
971240696f Merge pull request #7660 from rhatdan/selinux-volumes 
Change default label of container volumes to shared SELinux Label
 2014-09-09 11:16:19 -07:00
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