5f2492cd77
Merge pull request #8125 from somaopensource/8102-fix
...
Check whether net.ParseIP returned nil or not
Upstream-commit: 4778d7d52d97666b3c7d886861f30a39ecc1bb24
Component: engine
2014-09-22 23:00:25 +04:00
ab7d3fd292
daemon/attach: avoid mem alloc for interface
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 950bfe419390bc0e5777ae70bd01f781ae61701a
Component: engine
2014-09-22 21:17:50 +03:00
73f9db0dca
daemon/logs: lower allocations in loop
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: d2c104c3a01217f1a860d23143672af74a32e93a
Component: engine
2014-09-22 18:57:28 +03:00
3b7b455265
Merge pull request #8159 from LK4D4/fix_goroutine_leak_in_logs
...
Fix goroutine leak in logs following
Upstream-commit: 9c7d97561499b1fd92bef755ea485b6942e65a66
Component: engine
2014-09-22 11:16:48 -04:00
eb02e608df
Merge pull request #6101 from LK4D4/ip_range_#4986
...
Implement allocating IPs from CIDR within bridge network
Upstream-commit: 9fb34ae5710faaadc730a7005f785cefc56eed4b
Component: engine
2014-09-22 17:09:16 +03:00
4420332c09
Merge pull request #8137 from jfrazelle/8135-event-log-die-start-fail
...
After container fails to start, log the event die.
Upstream-commit: 5ad82d3ea641a9cc569fc49853759bb98f043fa9
Component: engine
2014-09-22 12:47:04 +04:00
d6c649f11a
Check whether net.ParseIP returned nil or not
...
This is fix of #8102
Signed-off-by: Oh Jinkyun <tintypemolly@gmail.com >
Upstream-commit: c2dc4245f1fb9462d0f22e0bc2aceb02903211ab
Component: engine
2014-09-22 16:52:23 +09:00
f5deb7d0f9
Close logs pipes and catch write errors
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: a7ee201ee85c95afb8556323d79e32cf9e2d8737
Component: engine
2014-09-22 10:55:46 +04:00
d3a449f426
Merge pull request #7972 from cpuguy83/split_volumes_from_daemon
...
Split volumes out from daemon
Upstream-commit: e7a9662974ad12e1926599e64dca44aaf1a90145
Component: engine
2014-09-20 16:23:20 +04:00
3a9c8d29c9
This reduces the amount of logging in the integration tests
...
There were a new areas in the brige driver that did not need to have log
output. Those were removed. Also set the engine's logging to false
when running the integration tests.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 8a9e827216eb5db4fcbe67c3c638f9e85f4de9bf
Component: engine
2014-09-19 17:30:37 -07:00
b74caf4edc
After container fails to start, log the event die.
...
Fixes #8135 .
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: d64d55eca85232af721859a8cc6f20ff473ce94c
Component: engine
2014-09-19 16:06:49 -07:00
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
5503a73c31
Merge pull request #7694 from eyakubovich/master
...
Add an option to disable IP masquerading
Upstream-commit: 72e901559177a4a49f82779dbaa108487dce086d
Component: engine
2014-09-18 18:33:45 -07:00
924f51b1d5
Initialize execStore while restoring a container from checkpoint.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: 003afaf1ce9f9d2983c84093fb00f4b68a99b0fa
Component: engine
2014-09-18 21:40:53 +00:00
2508e0d078
Adding additional documentation for fixed-cidr networking
...
Docker-DCO-1.1-Signed-off-by: Frederick F. Kautz IV <fkautz@alumni.cmu.edu > (github: fkautz)
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 3bb12d390a8a965e4dc680db7ecdab8c76f23990
Component: engine
2014-09-18 08:48:24 +04:00
cb5f7b942d
add the timeutils package
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 9ae3134dc9f0652ef48ec1fd445f42d8fe26de35
Component: engine
2014-09-17 14:30:08 +03:00
9ba82afe29
Add an option to disable IP masquerading
...
For the cases where --bip option is used it is sometimes best to disable
IP masquerading as the provided bridge IP range may be routable.
Signed-off-by: Eugene Yakubovich <eugene.yakubovich@coreos.com >
Upstream-commit: 4dc4d56db9797159e2e329845e0b94e3e0f780a0
Component: engine
2014-09-16 20:00:15 -07:00
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
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
dc62b54723
Merge pull request #7110 from tiborvass/merge-6907
...
Docker create (rebase of 6907)
Upstream-commit: ca39a3e36b8b76539bc30f0f4e2761222c50919f
Component: engine
2014-09-17 03:23:50 +04:00
9cf50f0282
Merge pull request #7989 from jlhawn/graphdriver_differ_refactor
...
Refactor use of graphdriver.Differ
Upstream-commit: 37b3b34afa11b352fb164625f17e76b7d851ee60
Component: engine
2014-09-16 18:58:38 -04:00
d6a77f1cb7
Merge pull request #8068 from jfrazelle/cleanup-various-fix-me-refs
...
Cleanup various fix me refs
Upstream-commit: ffbd8fe5b9a5913c8336045c7b25c848c53f783d
Component: engine
2014-09-17 02:54:54 +04:00
764b128304
Add "docker create" support
...
This exposes the already existing "create container" operation. It is
very similar to "docker run -d" except it doesn't actually start the
container, but just prepares it. It can then be manually started using
"docker start" at any point.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Conflicts:
api/client/commands.go
runconfig/parse.go
server/container.go
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: 3a90004f3c2d86ec849f4674c8046693ea061ed1
Component: engine
2014-09-16 18:40:24 -04:00
ec0fc2a729
graphdriver interface name change, typo fix
...
Signed-off-by: Josh Hawn <josh.hawn@docker.com >
Upstream-commit: 09ad65ebd5b50fdd7621f42136278102586a7ea8
Component: engine
2014-09-16 15:10:32 -07:00
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
1f9dd77aaf
Fix #7792 - Order mounts
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: 0a3211f131b63b0646be4a19c3ea5147bd557844
Component: engine
2014-09-16 14:51:06 -07:00
bcad074599
Merge pull request #7976 from duglin/Issue7902
...
Fix for issue 7902 - add trailing zeros to timestamps so logs align
Upstream-commit: 51b26853ef2f124ea837364c02585cbf96999d6a
Component: engine
2014-09-16 13:55:03 -07:00
d25c9ab27a
Merge pull request #8062 from vishh/run_in_phase2
...
Add support for 'docker exec' - phase 2
Upstream-commit: 00fd008170e463426001ec4c56fc4c39450fd8d0
Component: engine
2014-09-16 23:56:12 +04:00
8b57e6f159
Adding docker exec support in CLI.
...
Fixed a bug in daemon that resulted in accessing of a closed pipe.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: c786a8ee5e9db8f5f609cf8721bd1e1513fb0043
Component: engine
2014-09-16 19:24:25 +00:00
dbf2eb7488
Proper JSON handling of strings that could be represented as other types
...
Addresses #6830
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 1b0b1ec65729a2e018df1334b70b851714995e9e
Component: engine
2014-09-16 13:51:02 -04:00
18829722f0
Return errors in NewDaemonFromDirectory instead of calling Fatal
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 23b2c39a40186ce9b6deb4ae9201d5c20cc75abe
Component: engine
2014-09-16 10:42:59 -07:00
a1bab7db37
DisableNetworkBidge doesn't need to be public anymore
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 67c254a60a77c1f80804be7ab97353530987c846
Component: engine
2014-09-16 10:37:50 -07:00
a36831cc2a
Fix for issue 7902.
...
Use utils.RFC3339NanoFixed ("2006-01-02T15:04:05.000000000Z07:00")
instead of time.RFC3339Nano to format our log timestamps - this way
things are aligned, in particular the nano seconds are padded with zeros
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: cd7a5f5c0998f288f71d307076e661ed54f1a5f1
Component: engine
2014-09-16 10:28:37 -07:00
6689bc7ede
Adding state to exec commands to prevent multiple starts of a single exec command.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: 39030382c4809029cc3897e59f97948b00d57ad1
Component: engine
2014-09-15 23:14:04 +00:00
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
3da88c8c53
Merge pull request #8020 from erikh/rewrite_hosts_files
...
Links v2: Mutable network files
Upstream-commit: fbae71326ccc24f6be720f64e0ea48c59376452b
Component: engine
2014-09-15 23:03:30 +04:00
40a1e3c634
Address review comments.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: 669561c2aa8966f9327eca4304a06168bcf5bc49
Component: engine
2014-09-15 17:00:00 +00:00
78fee01e67
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)
Upstream-commit: d130c10ab78417ebf64284c2a399304767446c88
Component: engine
2014-09-15 16:59:05 +00:00
b0ee16aad4
Import nsenter in docker.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: e1cf95b593a57e0c8f15d50bb3e5e8ccfb55defa
Component: engine
2014-09-15 16:59:05 +00:00
a9173e0a9b
Adding 'exec' command to remote API and CLI.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: 985d57958675ee11e23070e009605c8968d547cf
Component: engine
2014-09-15 16:59:03 +00:00
a11625614e
Adding support for docker exec in daemon.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: 5130fe5d38837302e72bdc5e4bd1f5fa1df72c7f
Component: engine
2014-09-15 16:57:52 +00:00
f867da582c
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)
Upstream-commit: f3c767d798f945192d32441cf624bdd54e746b74
Component: engine
2014-09-15 16:57:52 +00:00
560885c335
Merge pull request #7698 from tamsky/tune2fs_base_filesystem
...
use tune2fs to disable ext4 mount counts and mount intervals
Upstream-commit: a10a86d437148fe93c0ad128a233f42b17b22700
Component: engine
2014-09-15 15:42:52 +03:00
eb7e1f51d1
Merge pull request #8010 from LK4D4/fix_ps_s_hang_#7999
...
Fix ps -s hang
Upstream-commit: c751e1739d56e38aa9a813c369d78c6dbdc37b07
Component: engine
2014-09-15 13:54:29 +03:00
d8cb453d89
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)
Upstream-commit: 09b700288e4804162ef86c99466e08b6b016e0c4
Component: engine
2014-09-13 11:27:34 -07:00
921f58e1dd
Merge pull request #8014 from jfrazelle/8012-prevent-container-names-starting-dash
...
Ensure container names start with a-zA-Z0-9
Upstream-commit: da4dba2e8c9866219ad99308d2d503a5aae634ec
Component: engine
2014-09-12 23:15:16 +03:00
a8bfc34d1d
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)
Upstream-commit: aa2af817bee123827f4a857555db8fea5e01e7d7
Component: engine
2014-09-12 10:45:07 -07:00
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
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
06ff531f43
Fix my own comments from #7927
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com >
Upstream-commit: 41e9e93e27ccd637d9490412622529bdc7d7b8ff
Component: engine
2014-09-12 10:05:07 +04:00
