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

111 commits

Author SHA1 Message Date
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
Michael Crosby
5d9723002b Allow drivers to implement ApplyDiff in Differ interface 2013-11-11 19:09:57 -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
Michael Crosby
9514767587 Allow driver to provide changes if it impl the Changer interface 2013-11-08 14:54:20 -08:00
Victor Vieux
f417c4b099 Merge branch '1887-allow_ro_volumes-from' of https://github.com/daniel-garcia/docker into daniel-garcia-1887-allow_ro_volumes-from 2013-11-07 17:59:55 -08:00
Daniel Garcia
f9cb6ae46a Add ability to mount volumes in readonly mode using -volumes-from 2013-11-05 11:58:51 -06:00
Paul Nasrat
95708dd35c Create new network on dead ghosts on restart. 
Fixes #2089
 2013-11-03 14:13:18 -05:00
Paul Nasrat
4cbb6ce13b Introduce failing test case for #2089 2013-11-03 11:14:59 -05:00
Jérôme Petazzoni
31638ab2ad Refactor HostConfig and escape apparmor confinement 2013-11-01 13:55:19 -07:00
Brian Olsen
1c3a674444 Fixed problem with variables containing \n. 
The /.dockerenv file is now a marshalled json array so that environment
variables with \n and other weird values are supported.
 2013-10-31 01:19:32 +01:00
Brian Olsen
25c4c87c86 Support copying value from env with -e option. 2013-10-31 01:19:09 +01: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
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
Alexander Larsson
249f5a65a5 Add a network test 
This just tries pinging first 127.0.0.1 and then 8.8.8.8.

We can't ping via a dns name, because libresolv.so is missing
from the test image, so dns resolving doesn't work.
 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
Victor Vieux
acc2aec988 remove log 2013-10-24 15:13:47 -07:00
Solomon Hykes
5c175357aa Hack: fix tests which didn't cleanup properly 2013-10-18 02:13:36 +00:00
Michael Crosby
23cf3c7a33 Merge pull request #1934 from dotcloud/host-permissions 
Only copy files and change permissions with non bindmount
 2013-09-22 09:40:52 -07:00
Michael Crosby
b45e280ee8 Only copy files and change permissions with non bindmount 2013-09-19 20:35:05 -07:00
Michael Crosby
b79bd4e864 Allow multiple volumes-from 2013-09-14 20:09:15 +00:00
Brian Olsen
9cfbaecfe5 Transfer uid and gid to volume. Fixes #1737. 2013-09-11 03:17:42 +02:00
Victor Vieux
27ca0c225a Merge branch '1582_fix_volume_content' of https://github.com/griff/docker into griff-1582_fix_volume_content 2013-09-10 16:52:46 +00:00
Solomon Hykes
24e02043a2 Merge builder.go into runtime.go 2013-09-06 17:33:05 -07:00
Brian Olsen
46c9c5c843 Made calling changelog before run return empty. Fixes #1705. 2013-08-30 22:46:07 +02:00
Brian Olsen
7a9c711832 Copies content from image to volumne if non-empty. Fixes #1582. 2013-08-30 22:02:05 +02:00
Michael Crosby
551092f9c0 Add lxc-conf flag to allow custom lxc options 2013-08-22 16:05:21 +00:00
Guillaume J. Charmes
631c449183 Merge pull request #1496 from xdissent/1351-volumes-from-before-volumes 
* Runtime: Apply volumes-from before creating volumes
 2013-08-14 15:10:41 -07:00
Michael Crosby
9662f9e56a Merge pull request #1478 from jpetazzo/929-insecure-flag 
add -privileged flag and relevant tests, docs, and examples
 2013-08-14 13:55:18 -07:00
Jérôme Petazzoni
280901e5fb add -insecure flag and relevant tests 2013-08-13 16:20:22 -07:00
Andy Rothfusz
90cb66f08d Merge pull request #1508 from pborreli/typos 
Fixed typos
 2013-08-12 15:17:02 -07:00
Pascal Borreli
9b2a5964fc Fixed typos 2013-08-12 18:53:06 +01:00
Guillaume J. Charmes
1110bb8e98 Merge pull request #1476 from dotcloud/improve_TestKillDifferentUser 
* Tests: Improve TestKillDifferentUser to prevent timeout on buildbot
 2013-08-12 10:23:08 -07:00
Greg Thornton
57b49efc98 Skip existing volumes in volumes-from 
Removes the error when a container already has a volume that would otherwise
be created by `Config.VolumesFrom`. Allows restarting containers with a
`Config.VolumesFrom` set.
 2013-08-10 06:37:57 +00:00
Greg Thornton
3bd73a9633 Apply volumes-from before creating volumes 
Copies the volumes from the container specified in `Config.VolumesFrom` before
creating volumes from `Config.Volumes`. Skips any preexisting volumes when
processing `Config.Volumes`. Fixes #1351
 2013-08-10 04:55:23 +00:00
Jérôme Petazzoni
68b09cbe3d fix typo in TestBindMounts (runContainer called without image) 2013-08-09 16:03:05 -07:00
Guillaume J. Charmes
db9d68c3e4
Improve TestKillDifferentUser to prevent timeout on buildbot 2013-08-09 10:50:58 -07:00
Jérôme Petazzoni
84790aafd8 relax the lo interface test to allow iface index != 1 2013-08-06 18:31:05 -07:00
Isao Jonas
d00fb40967 added tests for 1405 2013-08-05 09:30:27 -05:00
Guillaume J. Charmes
dde8f74cea
Fix TestEnv 2013-08-02 15:58:10 -07:00
Victor Vieux
8165e51ecc Merge branch '858-disable-network-configuration' of https://github.com/stfp/docker into stfp-858-disable-network-configuration 2013-07-23 08:44:12 +00:00
Victor Vieux
5c1af383eb fix test env 2013-07-22 16:26:05 +00:00
Stefan Praszalowicz
3342bdb331 Support networkless containers with new docker run option '-n' 2013-07-21 17:11:47 -07:00
Victor Vieux
2e0e455fa6 rebase master 2013-07-19 14:48:32 +00:00
Guillaume J. Charmes
d6fb313220 Merge pull request #1207 from crosbymichael/819-use-persistent-volume 
* Runtime: Do not overwrite container volumes from config
 2013-07-18 18:51:00 -07:00
Guillaume J. Charmes
eefbadd230
Merge -b and -v options 2013-07-15 17:51:32 -07:00
Michael Crosby
92cbb7cc80 Do not overwrite container volumes from config 
Fixes #819 Use same persistent volume when a container is restarted
 2013-07-15 11:59:11 -09:00
Guillaume J. Charmes
c8efd08384 Merge pull request #1208 from crosbymichael/1201-rw-volumes-from 
- Volumes: Copy VolumesRW values when using --volumes-from
 2013-07-15 10:59:51 -07:00
Guillaume J. Charmes
454cd147fb Merge pull request #1096 from dotcloud/remove_os_user 
* Runtime: Remove the os.user dependency and manually lookup /etc/passwd instead
 2013-07-15 10:19:09 -07:00
Guillaume J. Charmes
e41507bde2 Add unit test to check wrong uid case 2013-07-15 10:05:09 -07:00
Michael Crosby
5ae8c7a985 Copy VolumesRW values when using --volumes-from 
Fixes #1201
 2013-07-14 18:23:20 -09:00