Sven Dowideit
1cb7b9adc6
there appears to be a slash prepended to a container name internally - don't tell the user about it in an error message, it might cause them to worry about it
2013-11-27 12:58:54 +10:00
Michael Crosby
6d34c50e89
Increase max image depth to 127
2013-11-26 17:04:55 -08:00
Marek Goldmann
9c15322894
Fix the 'but is not' typo.
2013-11-26 11:18:50 +01:00
Victor Vieux
110c4f2043
create a copy of dockerinit
2013-11-25 20:21:54 -08:00
Guillaume J. Charmes
19df6c32c0
Merge branch 'master' into use_utc_time
...
Conflicts:
image.go
2013-11-25 19:01:13 -08:00
Michael Crosby
cee0a292d0
Rename dummy driver to vfs
2013-11-25 09:04:04 -08:00
Michael Crosby
0cecc2a78c
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
container.go
image.go
2013-11-21 17:18:41 -08:00
Guillaume J. Charmes
806abe90ba
Use UTC for time
2013-11-21 16:43:36 -08:00
Guillaume J. Charmes
33e70864a2
Refactor State to be 100% thread safe
2013-11-21 16:34:58 -08:00
Michael Crosby
1b28cdc7f9
Handle image metadata when drivers are switched
2013-11-20 10:31:51 -08:00
Victor Vieux
cd022376b8
Merge branch 'master' into vieux_merge_master
...
Conflicts:
runtime.go
2013-11-19 17:32:08 -08:00
Michael Crosby
234f5ac39f
Merge pull request #2750 from jpoimboe/simplify-register-reconnect
...
Simplify the runtime Register reconnect logic
2013-11-19 17:30:59 -08:00
Michael Crosby
d4ef551d65
Merge pull request #53 from shykes/improve_cleanup
...
Improve aufs cleanup and debugging
2013-11-19 17:16:36 -08:00
Victor Vieux
76f54f3a28
Merge pull request #39 from crosbymichael/add-driver-flag
...
Add flag to set default graph driver
2013-11-19 17:16:25 -08:00
Victor Vieux
43899a77bf
improve aufs cleanup and debugging
2013-11-19 17:12:37 -08:00
Guillaume J. Charmes
f6629bbbd5
Merge pull request #50 from crosbymichael/limit-dm
...
Prohibit more than 42 layers in the core
2013-11-19 15:42:00 -08:00
Guillaume J. Charmes
28d4cbbc59
Merge branch 'master' into creack-merge-master
...
Conflicts:
api_params.go
graph.go
graph_test.go
image.go
integration/api_test.go
integration/container_test.go
integration/runtime_test.go
runtime.go
2013-11-19 14:58:12 -08:00
Josh Poimboeuf
3cbec95177
simplify the runtime Register reconnect logic
...
Refactor the Register code a little bit to make it easier to comprehend.
2013-11-19 14:09:30 -06:00
Michael Crosby
51a972f38d
Rename AufsDriver to Driver to be consistent
2013-11-19 03:27:59 -08:00
Michael Crosby
6dbeed89c0
Add flag to set default graph driver
...
Remove the env var DOCKER_DRIVER
2013-11-19 02:37:44 -08:00
Michael Crosby
af753cbad8
Prohibit more than 42 layers in the core
...
We need to do this because we still support aufs
and users on other drivers can push incompat images
to the registory that aufs users cannot use.
2013-11-19 00:51:16 -08:00
Michael Crosby
29f07f8544
Add container migration to aufs driver
2013-11-18 18:39:21 -08:00
Guillaume J. Charmes
5e941f1ca0
Lintify code with confidence=1
2013-11-18 16:24:11 -08:00
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
Guillaume J. Charmes
a518b84751
WIP
2013-11-15 17:16:30 -08:00
Guillaume J. Charmes
cbd1281ec9
rename gograph in graphdb
2013-11-15 15:55:45 -08:00
Guillaume J. Charmes
035c144242
Move all drivers to the same subdir graphdriver
2013-11-15 15:48:24 -08:00
Michael Crosby
4908d7f81d
Save driver to container and skip incompat containers
...
For people who toggle drivers we want to save the driver used
to create a container so that if the driver changes we can skip
loading the container and it should not show up in docker ps
2013-11-14 22:53:59 -08:00
Guillaume J. Charmes
2b23da1d2f
Merge pull request #34 from alexlarsson/dm-plugin-dummy-volumes
...
Use dummy driver for volumes
2013-11-15 09:41:16 -08:00
Guillaume J. Charmes
bcf96d95bc
Merge pull request #30 from alexlarsson/dm-plugins-archive-tests
...
Dm plugins archive tests
2013-11-15 09:38:17 -08:00
Alexander Larsson
10f23a94f6
Use dummy driver for volumes
...
It makes no sense to use the aufs or devicemapper drivers for volumes.
The aufs one is perhaps not a big problem, but the devicemapper one
certainly is. It will be unnecessarily using a dm
blockdevice-over-loopback with a limited size base FS.
This just hardcodes the driver to be the dummy, perhaps in the future
we can have other drivers that make sense for the volumes.
2013-11-15 11:30:28 +01:00
Alexander Larsson
d69a6a20f0
Use ExportChanges() in runtime.Diff()
...
This code was duplicated in two places, one which was unused. This
syncs the code and removes the unused version.
2013-11-15 09:49:42 +01:00
Guillaume J. Charmes
7cf60da388
Merge branch 'master' into shykes-0.6.5-dm-plugin
...
Conflicts:
utils.go
utils_test.go
2013-11-14 14:02:44 -08: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
Michael Crosby
5d9723002b
Allow drivers to implement ApplyDiff in Differ interface
2013-11-11 19:09:57 -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
Michael Crosby
4d1a537433
Remove Differ and Changer interfaces
...
Add the methods to the Driver interface
to force the drivers to implement the methods
2013-11-11 12:10:53 -08:00
Alexander Larsson
e82f8c1661
Implement fallback operation for driver.Diff()
...
This moves the Diff() operation to a separate Differ interface and
implements a fallback that uses the Changes() results to encode
a diff tar.
2013-11-11 17:46:07 +01: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
Michael Crosby
9514767587
Allow driver to provide changes if it impl the Changer interface
2013-11-08 14:54:20 -08: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
Solomon Hykes
99210c9c6e
Don't rely on drivers for diff and export
2013-11-08 02:48:52 +00:00
Solomon Hykes
81674fbbdf
New 'dummy' driver uses plain directories and regular copy
2013-11-08 01:52:56 +00:00
Michael Crosby
12ffead71a
Fix test for aufs graph and add aufs driver import
2013-11-07 17:01:57 -08:00
Solomon Hykes
9ae4bcaaf8
Move Change to the archive package, and fix a leftover merge in
...
Container.Inject()
2013-11-08 00:45:07 +00:00
Solomon Hykes
f1127b9308
gofmt
2013-11-07 23:58:03 +00:00
Solomon Hykes
165d1bdbc0
Merge branch 'master' into 0.6.5-dm-plugin
...
Conflicts:
container.go
runtime.go
2013-11-07 23:26:52 +00:00
Solomon Hykes
4a8a7d4edd
devmapper: port to the new driver API and reactivate driver
2013-11-07 22:41:55 +00:00
Solomon Hykes
f2bab1557c
Simplify graphdriver interface: Create, Get. No more external mounting or Dir/Image interface
2013-11-07 22:38:50 +00:00
Victor Vieux
26f846bf77
fix Assign id as name when all else fails
2013-11-07 12:23:29 -08:00
Michael Crosby
752bfba2c5
Add graph driver registration
2013-11-04 15:22:34 -08:00
Michael Crosby
a9ed238bb7
Ensure container name on register
2013-11-04 09:28:40 -08:00
Solomon Hykes
98c3693acf
Integrate devmapper and aufs into the common "graphdriver" framework.
...
aufs is still enabled by default, no mechanism for switching drivers
yet.
2013-11-04 17:28:35 +00:00
Solomon Hykes
ff42748bc5
Rename graph backends to 'drivers' which is probably more self-explanatory
2013-11-04 01:54:51 +00: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
Michael Crosby
699a1074fb
Initial work on moving aufs to a subpackage
2013-10-31 18:07:54 -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
Caleb Spare
1cf9c80e97
Mutex style change.
...
For structs protected by a single mutex, embed the mutex for more
concise usage.
Also use a sync.Mutex directly, rather than a pointer, to avoid the
need for initialization (because a Mutex's zero-value is valid and
ready to be used).
2013-07-02 15:53:08 -07:00
Victor Vieux
3042f11666
never remove the file and try to load it in start
2013-07-02 18:02:16 +00:00