Darren Coxall
3c67a28493
More informative error message on name collisions
...
This is the proposed fix for #2506 . It provides a more complete message
with regards to name collisions including informing of the opposing
containers ID.
I have included a test to ensure that the correct short id is displayed
to make the message easier to understand.
2013-11-18 17:51:47 +00:00
Solomon Hykes
2a209afe5f
gofmt
2013-11-14 10:50:43 -08:00
Solomon Hykes
359a6f49b9
Move integration tests to integration/, expose missing public methods in the core
2013-11-14 10:50:00 -08:00
Victor Vieux
4c7d24bc8b
Merge branch 'master' of https://github.com/zilin/docker into zilin-master
...
Conflicts:
container.go
2013-11-11 12:59:18 -08:00
Victor Vieux
87c8437a90
Merge pull request #2140 from SvenDowideit/2098-run-cidfile-should-return-longid
...
Server: always return long id's
2013-11-11 13:06:19 -08:00
Sven Dowideit
b3974abe4f
make all image ID and container ID API responses use the Long ID ( Closes #2098 )
2013-11-09 12:16:49 +10:00
Josh Poimboeuf
2448058ee2
setup network when reconnecting to ghost container
...
Re-adding the line to setup the network when reconnecting to a ghost
container. It was inadvertently removed by commit
31638ab2ad
.
2013-11-08 16:28:41 -06:00
Victor Vieux
26f846bf77
fix Assign id as name when all else fails
2013-11-07 12:23:29 -08:00
Michael Crosby
a9ed238bb7
Ensure container name on register
2013-11-04 09:28:40 -08:00
Victor Vieux
f9901ead06
use a symlink instead of a copy
2013-11-01 13:55:19 -07:00
Jérôme Petazzoni
31638ab2ad
Refactor HostConfig and escape apparmor confinement
2013-11-01 13:55:19 -07:00
Victor Vieux
e3c49843d7
Merge pull request #2494 from shykes/engine-links
...
Engine: Minimal, unintrusive implementation of a cleaner Job API.
2013-10-31 16:32:49 -07:00
Zilin Du
b543516556
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
container.go
2013-10-31 10:53:40 -07:00
Michael Crosby
8227ea35cf
Assign id as name when all else fails
2013-10-30 18:31:18 -07:00
Victor Vieux
ee81405567
fix warning in build
2013-10-30 14:36:38 -07:00
Victor Vieux
1c7ca51f32
fix typos
2013-10-30 13:18:48 -07:00
Victor Vieux
8fa6e2b103
improve error message
2013-10-30 11:24:50 -07:00
Victor Vieux
b2503a72f1
continue build on expose with :, but displays a warning
2013-10-30 11:13:10 -07:00
Michael Crosby
0d2924408b
Add -name for docker run
...
Remove docker link
Do not add container id as default name
Create an auto generated container name if not
specified at runtime.
2013-10-28 18:09:08 -07:00
Solomon Hykes
7e691e11b0
Rename 'GraphPath' to the more logical 'Root'. This does not affect users except for a slight text change in the usage messge
2013-10-26 14:24:13 -07:00
Solomon Hykes
1b8eef4efb
Engine: centralize checks for supported architectures and kernel versions
2013-10-26 14:21:04 -07:00
Michael Crosby
356af1540f
Ensure child containers are started before parents
2013-10-25 15:13:26 -07:00
Michael Crosby
2e6b241dc7
Add default entity and edge to graph on runtime load
2013-10-25 15:13:26 -07:00
Michael Crosby
7c882a8003
Move name parsing logic to GetByName method
2013-10-25 15:13:25 -07:00
Michael Crosby
7d440f70fd
Add missing else when checking for linkgraph.db
2013-10-25 15:13:25 -07:00
Michael Crosby
7c08aeeba4
Use persistent connection for links database
...
Add close method to Runtime and Server to make sure
that any underlying connections are cleaned up
2013-10-25 15:13:25 -07:00
Tianon Gravi
21161dbd51
Add dynbinary and dyntest scripts for building/testing a separate static dockerinit binary
...
After a nice long brainstorming session with @shykes on IRC, we decided on using a SHA1 hash of dockerinit compiled into the dynamic docker binary to ensure that we always use the two in a perfect pair, and never mix and match.
2013-10-25 15:13:25 -07:00
Victor Vieux
256b7537e3
no more name encoding
2013-10-25 15:13:25 -07:00
Victor Vieux
c4923757f1
replace == by HasPrefix for names and improve error message
2013-10-25 15:13:25 -07:00
Michael Crosby
0e24db3a68
Updated fixes post rebase from master
...
Removed test cases that are no longer
applicable with links and the port changes.
Remove test case where a test was hitting an
external ip.
2013-10-25 15:13:24 -07:00
Michael Crosby
1cbdaebaa1
Add links for container relationships and introspection
2013-10-25 15:13:24 -07:00
Solomon Hykes
7e4d008403
Runtime: remove unused field kernelVersion
2013-10-23 00:44:57 -06:00
Michael Crosby
4196c704f0
Merge pull request #1943 from dotcloud/1940-prevent_crash_parseNat_build-fix
...
Abort build if mergeConfig returns an error and fix duplicate error message
2013-10-15 17:40:48 -07:00
Karl Grzeszczak
ad723bbfe7
Initial steps to fix Issue #936
...
Use utils.Errorf instead of utils.Debugf
2013-10-11 08:04:40 -05:00
Zilin Du
7d95d300ab
replace 127.0.0.1 by the assigned IP address in the container's /etc/hosts file.
2013-10-08 14:29:22 -07:00
unclejack
22e7e107ad
automatically remove container via -rm
...
add AutoRemove to HostConfig
add -rm flag to docker run
add TestRunAutoRemove to test -rm
docs: add -rm to commandline/command/run
add hostConfig to container monitor
make monitor destroy the container via -rm
This adds support for automatically removing a container after it
exits. The removal of the container is handled on the server side.
2013-09-27 17:43:12 +03:00
Victor Vieux
5bd0437eed
abord build if mergeConfig returns an error and fix duplicate error message
2013-09-20 12:46:24 +00:00
Victor Vieux
bd847f66c6
rebase master
2013-09-09 22:11:53 +00:00
Solomon Hykes
eca861a99d
Add missing package import
2013-09-07 17:03:40 -07:00
Solomon Hykes
6a9f4ecf9b
Add missing comments to runtime.go
2013-09-06 17:43:34 -07:00
Solomon Hykes
24e02043a2
Merge builder.go into runtime.go
2013-09-06 17:33:05 -07:00
Victor Vieux
f159f4710b
remove message during tests
2013-08-29 22:59:34 +00:00
Guillaume J. Charmes
8dd3607bd1
Merge pull request #1563 from dotcloud/1073_add_loading_message
...
* Runtime: Add loading containers message in no debug
2013-08-23 11:20:22 -07:00
Victor Vieux
b21f898620
assume ip_forwarding = 1 by default
2013-08-19 12:34:30 +00:00
Victor Vieux
20b1e19641
add loading message
2013-08-16 13:43:09 +00:00
Vincent Bernat
64b817a5c1
runtime: correctly detect IPv4 forwarding
...
When memory cgroup is absent, there was not attempt to detect if IPv4
forwarding was enabled and therefore, docker was printing a warning
for each command spawning a new container. The test for IPv4
forwarding was guarded by the test for memory cgroup.
2013-08-11 11:52:16 +02:00
Colin Rice
10190be5d7
Add warning when net.ipv4.ip_forwarding = 0
...
Added warnings to api.go, container.go, commands.go, and runtime.go
Also updated APIInfo to return whether IPv4Forwarding is enabled
2013-08-07 18:28:39 -04:00
Victor Vieux
5756ba9bc4
Merge branch 'master' into new_logs
2013-07-15 13:57:54 +00:00
Victor Vieux
941e3e2ef0
wip
2013-07-11 17:18:28 +00:00
Victor Vieux
bf7d6cbb4a
rebase master
2013-07-08 13:26:29 +00:00