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

102 Commits

Author SHA1 Message Date
Phil Estes
113374480e Provide full hostname with domainname to underlying container layer 
Addresses #7851

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 5239ba3d06b2efccd986231a93e839d4693d2d0c
Component: engine
 2014-09-25 09:23:39 -04:00
Brian Goff
1ce355084d Split volumes out from daemon 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 45407cf00af95b04dd2ff11ce330dd397bf1e095
Component: engine
 2014-09-19 17:47:47 -05:00
Jessie Frazelle
118f175983 Merge pull request #8019 from thockin/add-host 
Allow extra lines in /etc/hosts
Upstream-commit: f98a1f1f7d9b3ef10c13fc3b6438c978b4d6aa78
Component: engine
 2014-09-16 17:19:16 -07:00
Tim Hockin
604739ede9 Allow extra lines in /etc/hosts 
This adds a --add-host host:ip flag which appends lines to /etc/hosts.  This is needed in places where you want the container to get a different name resolution than it would through DNS.  This was submitted before as #5525, closed, and now I am re-opening.  It has come up 2 or 3 times in the last couple days.

Signed-off-by: Tim Hockin <thockin@google.com>
Upstream-commit: 68e48b65a64df10fc797cbaa89d6caa2188eadc9
Component: engine
 2014-09-16 23:38:23 +00:00
Josh Hawn
861f46b221 Refactor use of graphdriver.Differ 
Some graphdrivers are Differs and type assertions are made
in various places throughout the project. Differ offers some
convenience in generating/applying diffs of filesystem layers
but for most graphdrivers another code path is taken.

This patch brings all of the logic related to filesystem
diffs in one place, and simplifies the implementation of some
common types like Image, Daemon, and Container.

Signed-off-by: Josh Hawn <josh.hawn@docker.com>
Upstream-commit: dee6b481fe0da1d845261ffff2e610fb05898d3c
Component: engine
 2014-09-16 15:10:32 -07:00
Vishnu Kannan
ca62c3b92b 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)
Upstream-commit: bfebdfde78753f85d53d62634654de0b80f6872d
Component: engine
 2014-09-15 22:56:47 +00:00
Alexandr Morozov
7af74b4383 Use unlocked version of changes for GetImage 
Fixes #7999

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 82bdd88e9c9db40ee8072f7c4c2832dfb3f73823
Component: engine
 2014-09-12 11:44:51 +04:00
Alexandr Morozov
8627c41d84 Use defined variable 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 555ce0cb54943dab39f16582fc1923467e42af14
Component: engine
 2014-09-12 11:42:12 +04: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
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
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
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
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
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
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
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
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
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
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
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
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
02f3d4abed Rebased changes to return on first start's error 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 2ec1b697c1a7c0ecc534b9ebffd7ba40ea285ff7
Component: engine
 2014-08-13 15:58:55 -07:00
Michael Crosby
5ac7ecfbf7 Honor the restarting state in Stop 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: c4a00d549d0b895bb990491cbdf58aabe2891842
Component: engine
 2014-08-13 15:58:54 -07:00
Michael Crosby
b614c77a54 Refactor container monitor into type 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: 2b0776c883c41cda0b86808fe86e4df6e1aa1cd5
Component: engine
 2014-08-13 15:56:53 -07:00
Michael Crosby
a9837fc603 Add typed RestartPolicy 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: d9753ba20d5e602b0980687353d76c874b563042
Component: engine
 2014-08-13 15:56:34 -07:00
Michael Crosby
b662f7de79 Cleanup restart logic in monitor 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: e0a076d486ea49529dc3aeef2179eb0c406d0773
Component: engine
 2014-08-13 15:56:34 -07:00
Michael Crosby
49eb58207e Restart containers based on restart policy 
Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: bd8c9dc2395032a893e959e48f9a8536858d67e0
Component: engine
 2014-08-13 15:56:34 -07:00
Josiah Kiehl
4737f7cea5 Extract log utils into pkg/log 
Docker-DCO-1.1-Signed-off-by: Josiah Kiehl <josiah@capoferro.net> (github: capoferro)
Upstream-commit: a02f67be5b17da63d475e6f35956c1e72c3b2e7b
Component: engine
 2014-08-13 15:18:15 -07:00
Victor Vieux
01c8dcaf20 fix goroutines leak and exit code 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)

Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: b06311a72e7979653f09ba8175e10733e7116985
Component: engine
 2014-08-13 00:03:56 +00:00
LK4D4
6fa220da5d Fix error message on logging events 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 7afc49b40bd3a2c86a807a5ab4c722b12932d856
Component: engine
 2014-08-09 18:45:38 +04:00
Solomon Hykes
90ba5c6273 Remove last trace of Daemon->Server dependency 
This removes a shim `daemon.Server` interface which was used to start
separating Daemon from Server *gradually*, without getting cyclic
dependency errors.

Now that the last Daemon->Server dependency has been removed, we can
finally remove the shim. Yay!

Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 20b0841c1bd07c6add812597e0d656d7584e48ac
Component: engine
 2014-08-06 17:56:12 +00:00
Solomon Hykes
812a1a7ed4 Replace Server.IsRunning with Engine.IsShutdown 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 78f0a914ee982126793534286682e6c6e4270e97
Component: engine
 2014-08-06 17:56:11 +00:00
Michael Crosby
bdc2cfec82 Merge pull request #7329 from erikh/move_broadcastwriter 
Cleanup: utils/broadcastwriter -> pkg/broadcastwriter
Upstream-commit: bc9f5cdeb5c000de5be291a5628d6eb99c1ab91d
Component: engine
 2014-08-07 14:51:42 -07:00
Erik Hollensbe
00eca7c915 utils/broadcastwriter -> pkg/broadcastwriter 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 5ab09f2f7129225220fc9c0b76b2e2aec6823ee1
Component: engine
 2014-08-06 16:37:01 -07:00
Solomon Hykes
a40eb6a232 Rename "log_event" to "log" 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 1c11d7f93e2070c94ad22dfec3336eb1cd548280
Component: engine
 2014-08-06 10:08:23 +00:00
Alexandr Morozov
a195939eec Separate events subsystem 
* Events subsystem merged from `server/events.go` and
  `utils/jsonmessagepublisher.go` and moved to `events/events.go`
* Only public interface for this subsystem is engine jobs
* There is two new engine jobs - `log_event` and `subscribers_count`
* There is auxiliary function `container.LogEvent` for logging events for
  containers

Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
[solomon@docker.com: resolve merge conflicts]
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 8d056423f8c433927089bd7eb6bc97abbc1ed502
Component: engine
 2014-08-06 10:08:19 +00:00
Tianon Gravi
cdc00db1ec Add support for autodetected HOME from USER (if HOME is unset) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 57b9467f45571c1bd98ebe4b73c6cf3d97ff051c
Component: engine
 2014-07-31 12:46:36 -06:00
Erik Hollensbe
17543b1068 server/buildfile.go -> builder/builder.go; add maintainers file 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 3a177ccd3afdfe481a7248fccb2efe0f2cbdfcca
Component: engine
 2014-07-29 11:35:02 -07:00
Victor Vieux
2273fb0f55 gofmt -s -w 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 5a0ef08c940b9a17c400389bca8e7f54935ceba9
Component: engine
 2014-07-24 22:25:29 +00:00
Victor Vieux
6ae4c9014c update go import path and libcontainer 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: b3ee9ac74e171e00f14027e39278013629e681b8
Component: engine
 2014-07-24 22:19:50 +00:00
Michael Crosby
eeb4d6b698 Copy values out of hostConfig 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: ddb2086ca9e0991ca12e0771a0e581e782c57f50
Component: engine
 2014-07-22 00:16:26 -07:00
Michael Crosby
cd609dc421 Merge pull request #6954 from LK4D4/fix_container_run_after_restart_#4766 
Set state running before dumping to disk
Upstream-commit: 5702029a0f12cd382845e0ae1a31c61450851ee0
Component: engine
 2014-07-16 11:35:14 -07:00
Alexandr Morozov
5ddda4b09a Set state running before dumping to disk 
Fixes #4766
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 97a38079010bddfe6316c4087c13825fd8df64b7
Component: engine
 2014-07-14 21:16:27 +04:00
Victor Vieux
ca489c2f49 Basic --cap-add and --cap-drop support for native 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 94e6dc978134b61a2b30aa9118f98f6fadd10535
Component: engine
 2014-07-11 23:43:21 +00:00
Michael Crosby
8850edab1a Merge pull request #6979 from LK4D4/fix_race_inspect_start 
Use container.Lock in public ToDisk method
Upstream-commit: c3f247860aa169f4a9530d025da935d71af72f20
Component: engine
 2014-07-11 13:44:01 -07:00