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

52 Коммитов

Автор SHA1 Сообщение Дата
Victor Vieux 603e00a3a7 move inspect from server to daemon 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-05-20 19:36:15 +00:00
Victor Vieux e304e3a662 remove addString and replace Tail 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-05-09 18:09:59 +00:00
Michael Crosby 672edfe807 Remove the concept of a root dir out of engine 
This makes the engine more general purpose so that we can
use it and the job routing functionality for reexec'ing our binary
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)

Conflicts:
	integration/runtime_test.go
 2014-04-22 19:04:03 -07:00
Victor Vieux fcbc717f9a convert so rm tests to integration-cli 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-04-18 17:40:12 +00:00
Alexander Larsson 359b7df5d2 Rename runtime/* to daemon/* 
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-04-17 14:43:01 -07:00
Solomon Hykes 30f22ee9e3 Convert a legacy integration test to a clean v2 CLI integration test. 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
 2014-04-07 20:34:21 +00:00
Solomon Hykes 615ac8feb2 Deprecate 'docker insert' 
'docker insert' is an old command which predates 'docker build'. We no
longer recommend using it, it is not actively maintained, and can be
replaced with the combination of 'docker build' and 'ADD'.

This removes the command from usage and documentation, and prints a
warning when it is called.

The command still works but it will be removed in a future version.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
 2014-04-03 23:52:09 +00:00
Michael Crosby f1bd79ec97 Revert "fix failing test to use kill instead of stop" 
This reverts commit 4434dcee89.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-24 12:03:41 +00:00
unclejack 4434dcee89 fix failing test to use kill instead of stop 
TestCreateStartRestartStopStartKillRm was failing because stop has been
changed to not kill containers.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-03-19 23:23:45 +02:00
Victor Vieux 326f6a4b4d fix tests 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-03-17 19:17:40 +00:00
Guillaume J. Charmes 75738b8527 Merge pull request #4673 from vieux/update_test_TestCreateRmRunning 
update TestCreateRmRunning
 2014-03-14 15:50:27 -07:00
Victor Vieux 123ebf9053 update TestCreateRmRunning 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-03-14 18:16:14 +00:00
Michael Crosby 8cf0b80a78 Update integration tests for server pkg 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-14 09:46:56 -07:00
Tianon Gravi 44fe8cbbd1 Update to double-dash everywhere 
These were found using `git grep -nE '[^-a-zA-Z0-9<>]-[a-zA-Z0-9]{2}'` (fair warning: _many_ false positives there).

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-03-13 11:46:02 -06:00
Guillaume J. Charmes db1afee3f0 Merge pull request #4000 from cap10morgan/1141-merge-configs-on-commit 
merge existing config when committing
 2014-03-12 17:49:11 -07:00
Wes Morgan 3b969aad4a merge existing config when committing 
Fixes #1141

Docker-DCO-1.1-Signed-off-by: Wes Morgan <cap10morgan@gmail.com> (github: cap10morgan)
 2014-02-28 15:27:05 -07:00
Brian Goff d78fcb32ff Add ability to force removal of running container via docker rm -f 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
 2014-02-27 23:31:36 -05:00
Victor Vieux 8dad771daa add version pkg 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-02-25 21:08:38 +00:00
Victor Vieux 964d82d005 fix tests 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-02-25 21:08:08 +00:00
Victor Vieux 795ed6b1e5 Rewrite docker rmi 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-02-25 21:08:07 +00:00
Solomon Hykes 92c3927b5d Cleanup integration tests 
Refactor integration tests to remove special cases in the creation of
test engines. All test engines are now created through newTestEngine.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
 2014-02-24 19:24:30 +00:00
Solomon Hykes 6393c38339 Move the canonical run configuration objects to a sub-package 
* Config is now runconfig.Config
    * HostConfig is now runconfig.HostConfig
    * MergeConfig is now runconfig.Merge
    * CompareConfig is now runconfig.Compare
    * ParseRun is now runconfig.Parse
    * ContainerConfigFromJob is now runconfig.ContainerConfigFromJob
    * ContainerHostConfigFromJob is now runconfig.ContainerHostConfigFromJob

This facilitates refactoring commands.go and shrinks the core.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
 2014-02-11 20:18:46 -08:00
Victor Vieux 9eea7f28f0 Move serveapi to api/api.go 
Remove api import from server.go
Rename initapi to init server

Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-31 23:06:00 +00:00
Michael Crosby 643c7dc25d Merge pull request #3829 from vieux/fix_api_regression 
Fix ID -> Id api
 2014-01-31 10:38:57 -08:00
Victor Vieux 5b82a1b726 add tests 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-30 00:55:29 +00:00
Victor Vieux 54072dbbd6 fix ID -> Id api 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-29 20:31:49 +00:00
Fabio Falci 1ee1dc2340 Improve test for container list `ps` 
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
 2014-01-26 23:14:50 +00:00
Victor Vieux 5ea2986ce5 Move containers to a job 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-24 16:07:42 -08:00
Victor Vieux 564e6bc780 Move docker rmi to a job 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-24 14:55:11 -08:00
Guillaume J. Charmes 0376a69cb1
Fix wait on stopped container (after docker restart) + add Unit test for that case 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
 2014-01-21 16:49:24 -08:00
Victor Vieux 0fb8a55753 move insert to a job 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-15 14:52:58 -08:00
Victor Vieux 3a610f754f Add compat 1.8 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-13 15:50:20 -08:00
Solomon Hykes 17a806c8a0 Port 'docker images' to the engine API 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
 2014-01-13 15:49:33 -08:00
Victor Vieux 6dde20c0c5 Merge pull request #3180 from vieux/job_container_delete 
Move container_delete to job
 2014-01-10 15:53:38 -08:00
Victor Vieux 15689b56c8 Move restart to a job 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-10 15:51:48 -08:00
Victor Vieux aa3339cf39 move container_delete to job 
handle error

remove useless errStr

Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor@docker.com> (github: vieux)
 2014-01-10 15:34:10 -08:00
Michael Crosby 62213ee314 Allow untag operations with no container validation 2013-12-16 13:29:43 -08:00
Victor Vieux 4b5ceb0f24 use args 2013-12-13 14:29:27 -08:00
Victor Vieux 930ec9f52c move commit to job 2013-12-13 14:19:56 -08:00
Guillaume J. Charmes aaa1c48d24 Merge pull request #3175 from vieux/engine-job-stop 
Move stop to job
 2013-12-13 14:15:58 -08:00
Victor Vieux e43ff2f6f2 move tag to job 2013-12-12 11:52:11 -08:00
Victor Vieux 6ba456ff87 move t from arg to env 2013-12-11 15:36:50 -08:00
Solomon Hykes dbe1915fee Engine: new command 'stop' gracefully stops a container. 2013-12-11 11:52:59 -08:00
Michael Crosby 5fd3c8204d Merge pull request #2735 from shykes/engine-job-kill 
New engine command: 'kill'
 2013-12-11 10:35:57 -08:00
Solomon Hykes 3569d080af New engine command: 'wait' 2013-12-06 23:05:21 +00:00
Solomon Hykes 2546a2c645 Hack: use new 'kill' command in integration tests 2013-12-06 23:02:27 +00:00
Solomon Hykes a4f8a2494b Engine: integer job status, improved stream API 
* Jobs return an integer status instead of a string
* Status convention mimics unix process execution: 0=success, 1=generic error, 127="no such command"
* Stdout and Stderr support multiple thread-safe data receivers and ring buffer filtering
 2013-11-30 00:25:46 +00:00
Josh Poimboeuf fef41ef7bf test: fix TestRmi race condition 2013-11-18 15:07:06 -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