microsoft
/
docker
зеркало из https://github.com/microsoft/docker.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
7 252 коммитов 243 Ветки 83 Теги 224 MiB
Граф коммитов

223 Коммитов

Автор SHA1 Сообщение Дата
daniel-garcia 0198f8a879 fixes #2671, add support for bind mounting individual files in to containers, rebases of #1757 #2301 2013-11-21 23:40:35 -06: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 33e70864a2
Refactor State to be 100% thread safe 2013-11-21 16:34:58 -08:00
Michael Crosby 2382a0f920 Merge branch 'master' into 0.6.5-dm-plugin 
Conflicts:
	server.go
 2013-11-20 11:07:42 -08:00
Victor Vieux 304a80fcd5 Merge pull request #2747 from jpoimboe/test-fixes 
Test fixes
 2013-11-20 10:07:40 -08:00
Guillaume J. Charmes 12e993549d
Fix unit-tests 2013-11-19 15:24:14 -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 4b80ec9aae test: remove extra args in TestExitCode 
The extra blank argument isn't needed and confuses libvirt.
 2013-11-18 15:07:11 -06:00
Josh Poimboeuf fef41ef7bf test: fix TestRmi race condition 2013-11-18 15:07:06 -06:00
Michael Crosby 4546832507 Merge pull request #2752 from dotcloud/gofmt_test 
Go fmt tests
 2013-11-18 11:34:59 -08:00
Victor Vieux ed8f75d25c gofmt_test 2013-11-18 11:25:13 -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
Josh Poimboeuf fe302fbfd2 test: 2 second timeout (not 2000) 2013-11-18 10:23:30 -06:00
Josh Poimboeuf 72d02ecdde test: skip TestCreate on Fedora due to lxc utils bug 
In the dind environment running on a Fedora host, the lxc utils get
confused by the /sys/fs/cgroup/cpuacct,cpu cgroup mount and lxc-start
fails trying to access the wrong cgroup directory.
 2013-11-18 10:23:30 -06:00
Josh Poimboeuf baa687bed2 test: fix TestCreateStartRestartStopStartKillRm 
cat needs stdin opened, otherwise it dies immediately.
 2013-11-18 10:23:30 -06:00
Josh Poimboeuf 30ea0bebce test: put each arg in a separate string 
Each arg to docker run should be placed in a separate string.
Otherwise, when starting the command via exec.Cmd, the command is
interpreted as "echo test", which can't be found.
 2013-11-18 10:23:06 -06:00
Solomon Hykes afe230718e Re-enable api integration tests using only public remote API. 2013-11-16 02:12:14 +00:00
Solomon Hykes 823674816e Move iptables test to integration tests 2013-11-15 01:15:39 +00:00
Solomon Hykes 8d3e35cd8d Split auth tests between unit tests and integration tests 2013-11-15 01:13:20 +00:00
Victor Vieux 596810d8db move TestMount to integration 2013-11-14 15:17:31 -08:00
Victor Vieux 661a8a0e0c fix Integration tests 2013-11-14 14:46:13 -08:00
Victor Vieux c001a5af67 Integration tests: remove dependency on private APIs 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