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

300 Commits

Author SHA1 Message Date
Michael Crosby
52930d7389 Merge pull request #6232 from LK4D4/wait_functions_for_state 
Wait functions for state
Upstream-commit: 680adb98e1fb4efc2116259887016e5d0fdd8c42
Component: engine
 2014-06-27 13:33:13 -07:00
unclejack
0892a09088 Merge pull request #6701 from crosbymichael/mount-root 
Allow / as source of -v
Upstream-commit: 510f1ba4382dfeafaede4cc4ffd6111e9a60bd7d
Component: engine
 2014-06-27 19:03:21 +03:00
Alexandr Morozov
53991068e0 Use State waiting functions 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 57d86a5619adae5e08e0e28fba99f6a7c2f5ee54
Component: engine
 2014-06-27 15:07:40 +04:00
Michael Crosby
8928210aef Merge pull request #6696 from cpuguy83/remove_dup_run_tests 
Remove integration tests moved to integration-cli(dups)
Upstream-commit: aecdbf347104907cf9fcfaa1bb44320f53f4f922
Component: engine
 2014-06-26 16:29:32 -07:00
Michael Crosby
cae5fc8047 Remove api test for bind mount / 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: af025f2a95090974eaaf3d8792d5f467d0a637be
Component: engine
 2014-06-26 15:39:45 -07:00
Brian Goff
c725e7ada4 Remove integration tests moved to integration-cli(dups) 
integration/commands_test.go/TestRunHostname == integration-cli/docker_cli_run_tests.go/TestModeHostname
integration/commands_test.go/TestRunWorkdir  == integration-cli/docker_cli_run_tests.go/TestDockerRunWorkingDirectory
integration/commands_test.go/TestRunWorkdirExists  == integration-cli/docker_cli_run_tests.go/TestDockerRunWorkingDirectory
integration/commands_test.go/TestAttachstdIn == integration-cli/docker_cli_run_tests.go/TestRunStdinPipe
integration/commands_test.go/TestCmdLogs     == integration-cli/docker_cli_logs_tests.go
integration/commands_test.go/TestCmdKill     == integration-cli/docker_cli_kill_test.go

Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 7606412d53b522774b2b7cea93fa2618b784e886
Component: engine
 2014-06-26 12:57:12 -04:00
Tibor Vass
f6a0457a3f Merge pull request #6649 from vieux/fix_api_return_codes_start_stop 
return 304 is status isn't modified in start and stop
Upstream-commit: 5743151118d5b6965f573743ecaddf72792df034
Component: engine
 2014-06-25 19:10:19 -04:00
Victor Vieux
9328b2b9ef fix tests 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: b18c72155530aef29028694d7a92d97440c04a78
Component: engine
 2014-06-25 01:44:48 +00:00
Guilherme Salgado
403b31a70b Migrate TestGetEvents into a unit and a CLI test 
Docker-DCO-1.1-Signed-off-by: Guilherme Salgado <gsalgado@gmail.com> (github: gsalgado)
Upstream-commit: 1c291ccbbe91b8d8ff3fefb439b20306fd0af2b7
Component: engine
 2014-06-24 17:43:26 +02:00
LK4D4
6f7299924f Move sorter_test from integration to integration-cli 
TestServerListOrderedImagesByCreationDateAndTag was redundant and broken
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 386d1ecc6e2489401aac685eb11da15d21c4b0a7
Component: engine
 2014-06-23 22:19:52 +04:00
Michael Crosby
a1e9b8d6d0 Merge pull request #6405 from gsalgado/migrate-test-getcontainersbyname 
Convert TestGetContainersByName into a unit test
Upstream-commit: ba4ae2c46d0ea77eecb05b2b01405dbeffafc58b
Component: engine
 2014-06-17 14:01:42 -07:00
Alexandr Morozov
017a78b3c1 Move TestBuildAddToSymlinkDest to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: cc42eeac21caa962bed94878fe2eab00735cd00d
Component: engine
 2014-06-17 23:44:30 +04:00
Alexandr Morozov
f48cbf9c53 Move TestBuildOnBuildForbiddenMaintainerTrigger to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 690711b5840be388fb13fb72856de337bdf645c7
Component: engine
 2014-06-17 11:39:47 +04:00
Alexandr Morozov
3ac290e972 Move TestBuildOnBuildForbiddenFromTrigger to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 1c8ec01c551b3cfac8548d7fd22a50b3c236e362
Component: engine
 2014-06-17 11:36:45 +04:00
Alexandr Morozov
17786f89f8 Move TestBuildOnBuildForbiddenChainedTrigger to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 1e0e86360f8fefbeb3d70642aa0402bcb0c97a1a
Component: engine
 2014-06-17 11:24:47 +04:00
Alexandr Morozov
417be2b8be Move TestBuildOnBuildTrigger to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 2629e2ec236a377973e7be296013e366b4074d44
Component: engine
 2014-06-17 11:14:45 +04:00
Alexandr Morozov
0c3b5a8a2c Move TestBuildFailsDockerfileEmpty to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 08a10f936b4b5a69d3be6d320499c025a399fddb
Component: engine
 2014-06-17 11:06:44 +04:00
Alexandr Morozov
85c70b022e Move TestBuildFails to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: d3023f25f5c9e1173fe1cf1dbb449a926dc85cfd
Component: engine
 2014-06-17 11:06:40 +04:00
Alexandr Morozov
285461876d Move TestBuildInheritance to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: f1d7ed35bd17c5e8e8f4d1882b5e98ae5419e9f1
Component: engine
 2014-06-17 11:05:45 +04:00
Alexandr Morozov
fd55280b29 Move TestBuildADDFileNotFound to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 62d97afaf8d328b42c028323f10c3f4782f03561
Component: engine
 2014-06-17 11:05:36 +04:00
Alexandr Morozov
f7987f5c93 Move TestForbiddenContextPath to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 686786f107582c27c69a6f40655c8fc52a8e4d00
Component: engine
 2014-06-17 10:38:45 +04:00
Alexandr Morozov
f81562b040 Move TestBuildEntrypointRunCleanup to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: c5b82f5e8dd5c519330e02502e5b9f9031a6509a
Component: engine
 2014-06-17 10:16:36 +04:00
Guilherme Salgado
6e1924abe9 Convert TestGetContainersByName into a unit test 
Docker-DCO-1.1-Signed-off-by: Guilherme Salgado <gsalgado@gmail.com> (github: gsalgado)
Upstream-commit: c44c98edec6822edf17cc969038e21be6ccdbd93
Component: engine
 2014-06-17 07:56:57 +02:00
Alexander Larsson
83cd706353 Add --storage-opt graph driver option and pass through to driver 
This lets you add storage specific options for the daemon.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 822ea97ffcf10645720bb93108a60f8b9ce9931d
Component: engine
 2014-06-05 10:42:27 +02: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
SvenDowideit
ddc2df6d84 IANA allocated Docker port: 2375 
2375/2376 are assigned:
http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=docker

For #1440

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 5febba93babcf8c4b01862e88b6f6e11a1532bc8
Component: engine
 2014-06-04 06:54:19 +10:00
Michael Crosby
cd037b482e Merge pull request #6143 from LK4D4/move_some_more_tests_to_cli 
Move some more tests to integration cli
Upstream-commit: f65fadbda080647ccb7e07dc64a8cc020170c4c7
Component: engine
 2014-06-02 18:06:11 -07:00
Victor Vieux
da1e276039 fix busybox image detection 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 730d9ba17421e82012664c44aef7f64600b756cb
Component: engine
 2014-06-02 19:57:20 +00:00
LK4D4
21fda68864 Move build cache tests to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: ae128437cefa93bba082a0231e2cd05d33991c81
Component: engine
 2014-06-02 23:40:14 +04:00
Victor Vieux
2a289bda14 Standardize API keys: CamelCase 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 68fb7f4b744bf71206898d32fe203556a6261e5d
Component: engine
 2014-05-31 01:22:07 +00:00
Alexandr Morozov
d887d96ffe Move entrypoint build test to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: b25a9b7138e44950bee646c1bcb691a3dd273ea1
Component: engine
 2014-05-27 08:36:38 +04:00
LK4D4
ed1a6f580d Move expose build test to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 81d16411398c20a7ddc0bbe3e5e1ce0bd95d6519
Component: engine
 2014-05-27 08:00:35 +04:00
LK4D4
26be5cc632 Move cmd build test to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: c58991f31a6a2ceaee7a3a327bfbc697b059ff51
Component: engine
 2014-05-27 08:00:35 +04:00
LK4D4
966a80b8ce Move env build test to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: b05be686ec490ba68de82434f1ecaff01a84fcfa
Component: engine
 2014-05-27 08:00:35 +04:00
LK4D4
23e7a90af8 Move relative workdir build test to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 40630ce4b65755683e496bb7dbf3779b96ec5393
Component: engine
 2014-05-27 08:00:35 +04:00
LK4D4
cfeef64a2d Move user build test to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 360fb3d4ea192e28a4d2579589cd16954bb959c1
Component: engine
 2014-05-27 08:00:34 +04:00
LK4D4
07ea87f779 Move maintainer build test to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 3dd4c5f49977bb9538ae1c39605895fde69c86ee
Component: engine
 2014-05-27 08:00:34 +04:00
LK4D4
ee7d24f0a0 Move volume build test to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 11f7f0bf9b510e09a853a9fd2030a95b72462164
Component: engine
 2014-05-27 08:00:34 +04:00
Michael Crosby
456a42e6c9 Merge pull request #5839 from unclejack/improve_build_rm 
add --force-rm to clean up after a failed build
Upstream-commit: db1a3551a34e054ee687545ab4922114d13d29d0
Component: engine
 2014-05-22 10:54:05 -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
unclejack
978fda27ac bump remote api to 1.12 & add --force-rm to build 
This adds a `--force-rm` flag to docker build which makes the Docker
daemon clean up all containers, even when the build has failed.

This new flag requires that we bump the remote API, so we also bump the
remote API version.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 667e2bd4ea5fbc8698c34565f955cb92cff92890
Component: engine
 2014-05-19 23:10:49 +03:00
Victor Vieux
8003cf19d2 do not merge -i or -t options 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 2c8b63cb754128a64083426e5c3e6016118e78df
Component: engine
 2014-05-16 22:31:16 +00:00
Victor Vieux
a03989227c add test 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 366f084eb0864db6dcf5cc47e434b3c6f43500d7
Component: engine
 2014-05-16 22:23:32 +00:00
Solomon Hykes
24c85b9176 Merge pull request #5706 from vieux/remove_add_string 
Upstream-commit: 8d213e91b3ef0ed77d43ec20d378be01dfe7ed5c
Component: engine
 2014-05-14 17:31:52 -07: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
unclejack
90fcda8544 rename goruntime import to runtime 
This renames the goruntime import of the runtime package back to
runtime.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 4c2b9d732446adb472667c2a7017ba3e8cc58c0d
Component: engine
 2014-05-09 10:14:37 +03:00
Victor Vieux
fda92cf483 Revert "refactor build job to know only configFile" 
This reverts commit b9731bccf2b2cc8c06ef8bdb41f72ca4791e63db.

Conflicts:
	server/server.go

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 2aff119baa15cff37f9b2004755f144f16a87801
Component: engine
 2014-05-07 22:59:13 +00:00
Victor Vieux
1095c42f89 fix https 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 45be6f6dff1a8be328e5ade008aae8f9062f5cef
Component: engine
 2014-05-02 19:49:12 +00:00
Guillaume J. Charmes
87fcb82bfa Merge pull request #5448 from crosbymichael/selinux-defaults 
Add selinux label support for processes and mount
Upstream-commit: 2a711d16e05b69328f2636f88f8eac035477f7e4
Component: engine
 2014-04-30 14:14:39 -07:00
Tianon Gravi
bde45636d6 Fix various MAINTAINERS format inconsistencies 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: defecac2799ca0c72532b7e6ed6005cc54ee2e25
Component: engine
 2014-04-30 11:22:11 -06:00