p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,632 Commits 2 Branches 295 Tags
f95bb42771e73e558ab56ec0ffdbba398aced7ac
Commit Graph

55 Commits

Author SHA1 Message Date
Fabio Falci
0085f61a68 Move docker ps test to integration cli 
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
Upstream-commit: 261dc5e2f60d8c47c36e719db0ecebd77258847e
Component: engine
 2014-07-18 09:43:40 +01:00
Brian Goff
0c1cce45f2 Remove dup tests 
integration/server_test.go/TestCreateNumberUsername == integration-cli/docker_cli_run_test.go/TestUserByID
integration/server_test.go/TestRmi == integration-cli/docker_cli_images_test.go/TestCLIImageTagRemove

Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 0a3abe33f0bd9b7dfc36021b6f10d0857a432d40
Component: engine
 2014-07-03 17:35:03 -04:00
Michael Crosby
e29c2c6bde Totally remove insert feature 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 7a145b022a3b50b0d04cb0471d517f7c6c5efc67
Component: engine
 2014-06-04 17:35:15 -07:00
Victor Vieux
74d86a8d61 move inspect from server to daemon 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 603e00a3a7644caf118d3efd0932500b4dfc4de3
Component: engine
 2014-05-20 19:36:15 +00:00
Victor Vieux
cc0e75c911 remove addString and replace Tail 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: e304e3a6624e740159e99e83d6d13f0a3cdfeb49
Component: engine
 2014-05-09 18:09:59 +00:00
Michael Crosby
5c5b3c1ca6 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
Upstream-commit: 672edfe807c597a1c245bce996a150dfdf273a3c
Component: engine
 2014-04-22 19:04:03 -07:00
Victor Vieux
86a52f5d6b convert so rm tests to integration-cli 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: fcbc717f9aa11dae75d7418482f51cb61c0bf001
Component: engine
 2014-04-18 17:40:12 +00:00
Alexander Larsson
f7be50364d Rename runtime/* to daemon/* 
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 359b7df5d2af5733b8a1ea6746d062053053b23e
Component: engine
 2014-04-17 14:43:01 -07:00
Solomon Hykes
42a6758106 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)
Upstream-commit: 30f22ee9e3ea1012ca663a0383c8c9c2330c52cc
Component: engine
 2014-04-07 20:34:21 +00:00
Solomon Hykes
96808698c3 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)
Upstream-commit: 615ac8feb27b2b3db0c06b37ecd87b710eabffef
Component: engine
 2014-04-03 23:52:09 +00:00
Michael Crosby
a7b2642223 Revert "fix failing test to use kill instead of stop" 
This reverts commit 4434dcee89f7d0d0239f6b492b24e940cdbafb21.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: f1bd79ec97c125148c690d66ebd3ac5ab3f388b2
Component: engine
 2014-03-24 12:03:41 +00:00
unclejack
f7bce0a8cc 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)
Upstream-commit: 4434dcee89f7d0d0239f6b492b24e940cdbafb21
Component: engine
 2014-03-19 23:23:45 +02:00
Victor Vieux
2f4b69fe2b fix tests 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 326f6a4b4d942bf75ecb003e5c0d439bcb9d67cf
Component: engine
 2014-03-17 19:17:40 +00:00
Guillaume J. Charmes
de094b3b6d Merge pull request #4673 from vieux/update_test_TestCreateRmRunning 
update TestCreateRmRunning
Upstream-commit: 75738b8527f7578f8a18696bc6b49961790414cd
Component: engine
 2014-03-14 15:50:27 -07:00
Victor Vieux
294ad1e10b update TestCreateRmRunning 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 123ebf905367f1da0d9480153d08912d58b721fc
Component: engine
 2014-03-14 18:16:14 +00:00
Michael Crosby
e71ba07505 Update integration tests for server pkg 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 8cf0b80a7843633018b66a35d9a55f30814a56b6
Component: engine
 2014-03-14 09:46:56 -07:00
Tianon Gravi
c48adc6929 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)
Upstream-commit: 44fe8cbbd174b5d85d4a063ed270f6b9d2279b70
Component: engine
 2014-03-13 11:46:02 -06:00
Guillaume J. Charmes
fcd3746eaa Merge pull request #4000 from cap10morgan/1141-merge-configs-on-commit 
merge existing config when committing
Upstream-commit: db1afee3f023957adf43a4e9a565568e11e81d2d
Component: engine
 2014-03-12 17:49:11 -07:00
Wes Morgan
6bcc9e7159 merge existing config when committing 
Fixes #1141

Docker-DCO-1.1-Signed-off-by: Wes Morgan <cap10morgan@gmail.com> (github: cap10morgan)
Upstream-commit: 3b969aad4af430372d5cac1e700f75dba8a38a13
Component: engine
 2014-02-28 15:27:05 -07:00
Brian Goff
d1105407b3 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)
Upstream-commit: d78fcb32ffd4736462792407abe734b51b81367a
Component: engine
 2014-02-27 23:31:36 -05:00
Victor Vieux
af968e2231 add version pkg 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 8dad771daa6572ca15949d3e53e825f4837c0af9
Component: engine
 2014-02-25 21:08:38 +00:00
Victor Vieux
fcbc1feb4a fix tests 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 964d82d00506c3005d102b9a1f94848182c5989d
Component: engine
 2014-02-25 21:08:08 +00:00
Victor Vieux
0724fa65be Rewrite docker rmi 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 795ed6b1e511fa6713fbc9ea4e8569aab15b98ff
Component: engine
 2014-02-25 21:08:07 +00:00
Solomon Hykes
95f410bd66 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)
Upstream-commit: 92c3927b5de73f81c490900b2718d218ec097bd3
Component: engine
 2014-02-24 19:24:30 +00:00
Solomon Hykes
e378922981 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)
Upstream-commit: 6393c38339e11b4a099a460ecf46bb5cafc4283b
Component: engine
 2014-02-11 20:18:46 -08:00
Victor Vieux
140db53b4e 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)
Upstream-commit: 9eea7f28f0c64d43ef2a9987999a29774fa1476b
Component: engine
 2014-01-31 23:06:00 +00:00
Michael Crosby
4ca789745b Merge pull request #3829 from vieux/fix_api_regression 
Fix ID -> Id api
Upstream-commit: 643c7dc25df4759c1894ba2ff3aa71fe11a06ea4
Component: engine
 2014-01-31 10:38:57 -08:00
Victor Vieux
5eea23ed5b add tests 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 5b82a1b726291d4aaaad797df5b29a74de28d318
Component: engine
 2014-01-30 00:55:29 +00:00
Victor Vieux
af8535454e fix ID -> Id api 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 54072dbbd6260a9d8a7249cae0bd17513f15c3fc
Component: engine
 2014-01-29 20:31:49 +00:00
Fabio Falci
80cd671c19 Improve test for container list ps 
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
Upstream-commit: 1ee1dc2340ef030fc3ed132ff51d196536b46600
Component: engine
 2014-01-26 23:14:50 +00:00
Victor Vieux
b7a9dba025 Move containers to a job 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 5ea2986ce5cfce1b86fdc92610dbc6d670691168
Component: engine
 2014-01-24 16:07:42 -08:00
Victor Vieux
4dfa12a504 Move docker rmi to a job 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 564e6bc7802b606d829a498eee0c2bb8ce4032e1
Component: engine
 2014-01-24 14:55:11 -08:00
Guillaume J. Charmes
f30d57c548 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)
Upstream-commit: 0376a69cb1cc839f7e1a147623b399147a5976c9
Component: engine
 2014-01-21 16:49:24 -08:00
Victor Vieux
42a6830aeb move insert to a job 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 0fb8a55753269603eb8f01f725675ceacae79c29
Component: engine
 2014-01-15 14:52:58 -08:00
Victor Vieux
1ccf04f8d4 Add compat 1.8 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 3a610f754f425ea6042c3f8b5452273656a06c90
Component: engine
 2014-01-13 15:50:20 -08:00
Solomon Hykes
5f902c5a09 Port 'docker images' to the engine API 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 17a806c8a0b6add2aa773dfca272acefee9b638c
Component: engine
 2014-01-13 15:49:33 -08:00
Victor Vieux
d1d0fdf0a6 Merge pull request #3180 from vieux/job_container_delete 
Move container_delete to job
Upstream-commit: 6dde20c0c517833224689c0eff2d247910a7083b
Component: engine
 2014-01-10 15:53:38 -08:00
Victor Vieux
aee266dfbc Move restart to a job 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 15689b56c8e397d3207dad5b23937cb9b1e453cd
Component: engine
 2014-01-10 15:51:48 -08:00
Victor Vieux
cf41511c88 move container_delete to job 
handle error

remove useless errStr

Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor@docker.com> (github: vieux)
Upstream-commit: aa3339cf39b88e4a4b3d830d9b0831d4abff1dcb
Component: engine
 2014-01-10 15:34:10 -08:00
Michael Crosby
8986c6ae1a Allow untag operations with no container validation 
Upstream-commit: 62213ee314d0669a278fae1e3052329f4ca35f75
Component: engine
 2013-12-16 13:29:43 -08:00
Victor Vieux
f8c4f98d81 use args 
Upstream-commit: 4b5ceb0f24285718620465bb4073269d6fb8097b
Component: engine
 2013-12-13 14:29:27 -08:00
Victor Vieux
3eb9010924 move commit to job 
Upstream-commit: 930ec9f52ceceabcb72589ac7f20e1e8bbccbed5
Component: engine
 2013-12-13 14:19:56 -08:00
Guillaume J. Charmes
3c2d9ba7fe Merge pull request #3175 from vieux/engine-job-stop 
Move stop to job
Upstream-commit: aaa1c48d243e693b29bc52e382e3c37637c8bc3c
Component: engine
 2013-12-13 14:15:58 -08:00
Victor Vieux
07befa45fc move tag to job 
Upstream-commit: e43ff2f6f2630f971c9494aed285f1d410e42df9
Component: engine
 2013-12-12 11:52:11 -08:00
Victor Vieux
c49a4958ea move t from arg to env 
Upstream-commit: 6ba456ff87cfe2687db7df896e2983636ca9fe1e
Component: engine
 2013-12-11 15:36:50 -08:00
Solomon Hykes
342605f90e Engine: new command 'stop' gracefully stops a container. 
Upstream-commit: dbe1915fee1beb034459fb875928c96e27ecbfce
Component: engine
 2013-12-11 11:52:59 -08:00
Michael Crosby
5cde259caa Merge pull request #2735 from shykes/engine-job-kill 
New engine command: 'kill'
Upstream-commit: 5fd3c8204de3a8188097add6a75ca70536e1375a
Component: engine
 2013-12-11 10:35:57 -08:00
Solomon Hykes
d007e15eed New engine command: 'wait' 
Upstream-commit: 3569d080afc721a1eb04ad4a65f1309b53da1238
Component: engine
 2013-12-06 23:05:21 +00:00
Solomon Hykes
1b6ebfe317 Hack: use new 'kill' command in integration tests 
Upstream-commit: 2546a2c645c59d094bc2c09dc9eb0d8eb5c36786
Component: engine
 2013-12-06 23:02:27 +00:00
Solomon Hykes
b0f24a88da 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
Upstream-commit: a4f8a2494b0fb755db52c68cf61ddc8ff52d2965
Component: engine
 2013-11-30 00:25:46 +00:00