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

455 Commits

Author SHA1 Message Date
Alexandr Morozov
ff7999247d Rewrite TestBuildCopySingleFileToNonExistDir to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 24d83afd5203f93a22a3d95a212e9ec295aadc8b
Component: engine
 2014-10-17 11:56:28 -07:00
Alexandr Morozov
f2d974c957 Rewrite TestBuildCopySingleFileToExistDir to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 2248109ff8607264ba40d4a4ac24bad66462d105
Component: engine
 2014-10-17 11:56:01 -07:00
Alexandr Morozov
e5897b7fab Rewrite TestBuildCopySingleFileToWorkdir to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: d41cba6aed1ffdda9c3e3441d720dab9afc3eb66
Component: engine
 2014-10-17 11:55:34 -07:00
Alexandr Morozov
be8f5dfa14 Rewrite TestBuildCopySingleFileToRoot to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 83c5dced10c4e2a40990e927ccc15a1e0428529c
Component: engine
 2014-10-17 11:55:04 -07:00
Alexandr Morozov
fa31328c73 Rewrite TestBuildCopyAddMultipleFiles to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: e45c92153d0c21308fe5983aa76182cc03ef398e
Component: engine
 2014-10-17 11:54:29 -07:00
Jessie Frazelle
02f8c7b8a5 Merge pull request #8567 from LK4D4/add_log_done 
Add logDone for TestBuildAddSingleFileToNonExistDir
Upstream-commit: 5a20dc67b005717a0549fe504a3b0ccf62c913c6
Component: engine
 2014-10-17 11:20:12 -07:00
Jessie Frazelle
2cbac498ba Merge pull request #8486 from duglin/Issue5701 
Add failing testcase for single quotes in CMD
Upstream-commit: 09ceae5c9c268f2b79954b1580c5ec1632f24d0e
Component: engine
 2014-10-17 11:11:49 -07:00
Jessica Frazelle
bbf89a9e7f Cleanup errorOut remove errorOut functions 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 5af7facf18565100d52fa198a695ab98a9669825
Component: engine
 2014-10-16 15:06:20 -07:00
Jessica Frazelle
99346a8e5f Cleanup errorOut resp run tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 66ac7420a90c832bacd0cb1832bf934b5420a311
Component: engine
 2014-10-16 15:06:20 -07:00
Jessica Frazelle
168d6b41a8 Cleanup errorOut resp log tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 842d4b6b0afb0380afeea6d1638edb8913ae70bd
Component: engine
 2014-10-16 15:06:20 -07:00
Jessica Frazelle
c587404dc5 Cleanup errorOut resp restart tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 9f52d8e6e786e62aa63b06d26782120fd25daf31
Component: engine
 2014-10-16 15:06:20 -07:00
Jessica Frazelle
a8a998eeed Cleanup errorOut resp exec tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 6f1c8ff4c4fd1f001917c3af89907731561642a6
Component: engine
 2014-10-16 15:06:20 -07:00
Jessica Frazelle
2c526d9f92 Cleanup errorOut resp pull tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: eeb009729430f0858f56be37011325f3f9486386
Component: engine
 2014-10-16 15:06:20 -07:00
Jessica Frazelle
960bb7c8ed Cleanup errorOut resp in images tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: dd248dee3c889fe376a89adcc9f9d19cafb9bf69
Component: engine
 2014-10-16 15:06:20 -07:00
Jessica Frazelle
77ef164c1f Cleanup errorOut resp in version tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 50c3e7537c055a73a71999cb3ae9f2c6aa57efce
Component: engine
 2014-10-16 15:06:20 -07:00
Jessica Frazelle
029dd9ca6c Cleanup errorOut resp in push tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: f013506aad8b7c09b3c2d3307dadfa4b2d365d40
Component: engine
 2014-10-16 15:06:20 -07:00
Jessica Frazelle
7e76a1cfb9 Cleanup errorOut resp in top tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 764030ec92f8cf8b47079c26d7c1393bd963fbf4
Component: engine
 2014-10-16 15:06:20 -07:00
Jessica Frazelle
a1fc81a541 Cleanup errorOut resp in build tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: b1e3c9e9cd49591f8efcbcd00d45bcd98fbe2831
Component: engine
 2014-10-16 15:06:20 -07:00
Jessica Frazelle
c9b622420d Cleanup errorOut resp in save tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 0c87424007aa1220842acca26cbadc7c1a05bef9
Component: engine
 2014-10-16 15:06:20 -07:00
Jessica Frazelle
d073e74963 Cleanup errorOut resp in rmi tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 0e3744ec8958faf88026338dcb096198399059e8
Component: engine
 2014-10-16 15:06:20 -07:00
Jessica Frazelle
6c78c54dea Cleanup errorOut resp in inspect tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: ac24cabd9d05fe8843a382bb55fe5f2dcd4b9da2
Component: engine
 2014-10-16 15:06:19 -07:00
Jessica Frazelle
e1b85a8d45 Cleanup errorOut resp in ps tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: d33f2bdb114a9fd3c1413dbd4667440153df9431
Component: engine
 2014-10-16 15:06:19 -07:00
Jessica Frazelle
2a8b0f0a3a Cleanup errorOut resp in search tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: ef787eb824896471485522d343c62a6edb5c947f
Component: engine
 2014-10-16 15:06:19 -07:00
Jessica Frazelle
0fb5fb3bb6 Cleanup errorOut resp in docker_utils.go 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 73eadbc6a1af80dfb1e933644a9a2927004e6d0f
Component: engine
 2014-10-16 15:06:16 -07:00
Jessica Frazelle
198fd58622 Cleanup errorOut resp in diff test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: ac62c5439ac6197c3afca66db4489f96296097b6
Component: engine
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
c635846b4b Cleanup errorOut resp in links test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 7d38ae7041357e58edee5c26f721e39be9ff1fbd
Component: engine
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
043dfeea4f Cleanup errorOut resp in history test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: f7b3a6b292a1f8dc7cfffe2e93622ea2c3419623
Component: engine
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
d97b62dff0 Cleanup errorOut resp in info test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: b59d5a9dd2e0e474f04ce4eb31de41a1484d97bf
Component: engine
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
3fda727482 Cleanup errorOut resp in kill test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 0faf87598f19bd3520704ed18209afbbe6a6ee90
Component: engine
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
6e0d79bbf4 Cleanup errorOut resp in nat test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 17842840ec0fc7a0b66050b97692250b74d91372
Component: engine
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
fb004016c8 Cleanup errorOut resp in create test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 6b858b59ed6e1f594e5552e3f5e8f46351466d78
Component: engine
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
3e3c1b0cf0 Cleanup errorOut resp in tag test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 475235ba7e5ad5a8c1f3bbbad6566bb646eac0f9
Component: engine
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
9253036ce7 Cleanup errorOut resp in export test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: b645df1d39f942919a117bdf9f9528e38681dc0b
Component: engine
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
32993aa12f Cleanup errorOut resp in port test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 88d65cbdf4881c0e56556d9c8efbf60410f0645f
Component: engine
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
10afcc04ab Cleanup errorOut resp in commit test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)

Cleanup errorOut resp in commit test

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 3182ee5c9bc13f67858c3676a560427d4882f12c
Component: engine
 2014-10-16 15:05:00 -07:00
Doug Davis
9a84feded9 Add failing testcase for single quotes in CMD 
Closes #5701

This is due to @SvenDowideit comment at: https://github.com/docker/docker/issues/5701#issuecomment-58133541
where he asked for a testcase showing the error case.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 9edf96782470deb15deec3be07e3988164454148
Component: engine
 2014-10-16 14:40:55 -07:00
Michael Crosby
71238096f7 Merge pull request #8566 from jfrazelle/Cleanup-fmt-%q 
Cleanup: integration-cli ('%s' with %q)
Upstream-commit: b3cda9fc7e9dbdc23619c84ed91ad41d931b6e27
Component: engine
 2014-10-16 13:51:46 -07:00
Jessica Frazelle
47427bd007 Setting iptables=false should propagate to ip-masq=false 
Signed-off-by: Jessica Frazelle <jess@docker.com>
Upstream-commit: 3893e220e840054dfdadba637372bc30f683fe58
Component: engine
 2014-10-16 11:52:14 -07:00
Alexandr Morozov
2c00860ff9 Minor fix of tests names 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: fcfe80f63397c0a8bdd6605798c0639ec3dcda56
Component: engine
 2014-10-14 11:47:01 -07:00
Alexandr Morozov
b0b0bf7337 Add logDone for TestBuildAddSingleFileToNonExistDir 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: fbaa41b5aa920ca752481e1b94aeff29857cb76d
Component: engine
 2014-10-14 11:17:41 -07:00
Jessica Frazelle
04647d4951 Replace '%s' in test utils 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 949ab477103c93d6d4779b35efbd647541eb1b14
Component: engine
 2014-10-14 10:59:38 -07:00
Jessica Frazelle
edf116b62c Replace '%s' in run tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: c091397d518408a7a9c493f066dc47438d588985
Component: engine
 2014-10-14 10:59:19 -07:00
Jessica Frazelle
ad9f9cb9fd Replace '%s' in rm tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: be31a66b7a1f015d4f1448baebd7c7eb2c23e506
Component: engine
 2014-10-14 10:59:11 -07:00
Jessica Frazelle
5203b5e653 Replace '%s' in diff tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: a44296603f8188278241cc8d8a353952ee50ec54
Component: engine
 2014-10-14 10:59:01 -07:00
Jessica Frazelle
be07c0e702 Replace '%s' in create tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 91f33fcaaaa47ef60acc4a8cfa7a2be41edd724e
Component: engine
 2014-10-14 10:58:35 -07:00
Tianon Gravi
872f82a3de Fix builder from being over-aggressive on ${} 
`${SOME_VAR%pattern}` was turning into `SOME_VAL%pattern}` which the shell would then balk at.

I've updated the `TOKEN_ENV_INTERPOLATION` regex to account for this (ie, if `${` is used, it _must_ also match the closing `}`), and renamed the variable to not be exported (since it's not used outside the function following it).

I also added comments for the bits of `tokenEnvInterpolation` so they're easier to follow. 😄

Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 24189b2c36985f8345691fa6ec2c0766cfc133a7
Component: engine
 2014-10-14 00:58:55 -06:00
Erik Hollensbe
3381602232 builder: ONBUILD triggers were not accurately being executed in JSON cases. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 1150c1639a9efbd2e5e4ac1e71961aef77a32de0
Component: engine
 2014-10-14 01:59:45 +00:00
Victor Vieux
af887ed027 Merge pull request #8497 from aluzzardi/disable-stable-ip 
Disable stable IPs.
Upstream-commit: 72d8d94284e8239bede8b6a6df14680d5d59c259
Component: engine
 2014-10-09 15:54:33 -07:00
Andrea Luzzardi
161436147c Disable stable IPs. 
Stable IPs causes some regressions in the way people use Docker, see GH#8493.

Reverting it for 1.3, we'll enable it back for the next release.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 5b8379a4349105eb387a4b9836bbd1d83ebe6928
Component: engine
 2014-10-09 15:15:17 -07:00
Jessica Frazelle
3b7c4216ab Revert "Fix line delimited JSON response" 
This reverts commit d2f75a3040e72562ffa825d5c3efa7004af2640a.

Conflicts:
	integration-cli/docker_api_events_test.go

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: b66ac6a80990d382a3859cd5ca8c53f038bdc1ff
Component: engine
 2014-10-09 13:46:21 -07:00