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

74 Commits

Author SHA1 Message Date
Doug Davis
55b8ec78cc Add support for copy/add with multiple src files 
Part one of solution for issue #6820

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 05b8a1eb363ce03a9dfa3315fbac59c42af2df54
Component: engine
 2014-09-18 20:12:13 -07:00
Alexandr Morozov
e4806321a3 Add Build prefix to Copy tests 
Now we can do "-run TestBuild" to test all build-tests and "-run
TestBuildCopy" for test all copy-tests

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 184fe67bbc3759307adb6cb3e5338b5325bb88bb
Component: engine
 2014-09-18 09:09:10 +04:00
Alexandr Morozov
c6ab84449d Fix logDone message for TestCopySingleFileToExistDir 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: aa0449c8139afec8e1446bb8650acad886b0a194
Component: engine
 2014-09-18 09:02:05 +04:00
unclejack
699424477b integcli: run build tests in tmpdir 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: be924087eb5a2ab0ad79c069782e82805dd31d58
Component: engine
 2014-09-17 20:05:33 +03:00
unclejack
8ef9f79072 clean up the context when a build fails 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 31c0039022234972c79947a6299c0fa382436487
Component: engine
 2014-09-15 16:01:23 +03:00
Erik Hollensbe
665c625297 move entrypoint integration-cli test for blank entrypoint to separate function 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 576416c99a0ae8ad27467f217ec21f598e4f4cc8
Component: engine
 2014-09-11 06:00:24 -07:00
Erik Hollensbe
b3a58e1095 evaluator: ensure entrypoint stays blank if set blank while CMD is set. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 78a847a47ac777f4090c06a82e875ee30f9a1cbd
Component: engine
 2014-09-11 06:00:24 -07:00
Erik Hollensbe
76991d395e builder: Fix entrypoint and cmd semantics in evaluator. Test c/o @cnf 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: ac107995ae4a24195f8bb6b70c26393a87d19982
Component: engine
 2014-09-11 06:00:24 -07:00
unclejack
9046d6de2c clean up context on build completion & add test 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 18587469789594f7ca26fc942c6d23b971a14dd3
Component: engine
 2014-09-02 17:35:25 +03:00
Erik Hollensbe
e5b50b40c8 builder: Fix handling of ENV references that reference themselves, plus tests. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: cb51681a6db4b7c62d91998ba3b1d3b98c09c61c
Component: engine
 2014-08-27 18:52:30 -07:00
Alexandr Morozov
b18ccc6846 Remove internet dependency from TestBuildCacheADD 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 075e1bc1c35b5f130f6ae7961782ff9af79817bc
Component: engine
 2014-08-18 14:13:43 +04:00
Alexandr Morozov
00b87e1af9 Fix go vet warnings 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 391c35c82252633eb415fdade08103a8a0818fde
Component: engine
 2014-08-13 11:37:30 +04:00
unclejack
081e88cd1a Merge pull request #7304 from unclejack/refactor_build_tests 
integration cli: minor refactor of the build tests
Upstream-commit: b36f6308176ccb44d93704388514fa0041a8584e
Component: engine
 2014-08-08 01:24:51 +03:00
Tibor Vass
ddc4e78a18 Fix TestBuildForbiddenContextPath after TMPDIR change 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 5e20b0027c19efdd83228cbbb9995847cb5cb8ed
Component: engine
 2014-08-06 14:24:00 -04:00
LK4D4
3ee2b7b6cb Cleanup Cmd on ENTRYPOINT instruction 
Fixes #5147
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 1b6546b8407ce0fa41340efefc081beadf26d41c
Component: engine
 2014-08-04 20:48:36 +04:00
Michael Crosby
85222943a2 Merge pull request #7312 from tianon/update-libcontainer 
Bump libcontainer dep
Upstream-commit: b1496effe37ef6161faf0b4e987f4261329c0a66
Component: engine
 2014-07-31 15:20:07 -07:00
Bruno Renié
604012d742 Fix .dockerignore when ignoring unreadable dirs 
The initial `ValidateContextDirectory` implementation fails loudly when a file
lacks read permissions in the current context. However that situation is valid
if the file is included in the `.dockerignore` patterns.

Docker-DCO-1.1-Signed-off-by: Bruno Renié <brutasse@gmail.com> (github: brutasse)
Upstream-commit: 27cca4c70cc7f0cccfda693ca7bbb2422eec3e13
Component: engine
 2014-07-31 15:10:56 -07:00
Tianon Gravi
cdc00db1ec Add support for autodetected HOME from USER (if HOME is unset) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 57b9467f45571c1bd98ebe4b73c6cf3d97ff051c
Component: engine
 2014-07-31 12:46:36 -06:00
unclejack
93bee1a9de integcli: use dockerCmdInDir in build tests 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 372f9bb58b820b85ed1975ea713958b684c17e94
Component: engine
 2014-07-29 16:01:56 +03:00
Tibor Vass
93d0b8352d Merge pull request #7140 from proppy/more-addtar-tests 
integration-cli: add more tests for BuildAddTar
Upstream-commit: 030676444ade28ded0953ff179d65fe99bbf4fed
Component: engine
 2014-07-28 11:58:29 -04:00
Tibor Vass
3fc02efa64 Merge pull request #7209 from LK4D4/test_build_from_git 
Test on building from GIT url
Upstream-commit: da40d9b7a50704b0ff28f885dc4e87ffb77cd01b
Component: engine
 2014-07-28 11:15:50 -04:00
unclejack
4eed6ed770 Merge pull request #7097 from LK4D4/fix_eof_dockerignore_#7093 
Skip whole dir dockerignoring with warning
Upstream-commit: 7978b3212789203ffe75af60792d85132fb1c519
Component: engine
 2014-07-28 17:34:44 +03:00
Victor Vieux
6ae4c9014c update go import path and libcontainer 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: b3ee9ac74e171e00f14027e39278013629e681b8
Component: engine
 2014-07-24 22:19:50 +00:00
Alexandr Morozov
51f29305ff Test on building from GIT url 
Also I added fake git server to utils
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 5b0d4cf29629eabb8855400159c097cbd7502922
Component: engine
 2014-07-24 11:19:16 +04:00
Johan Euphrosine
07d7985c4e integration-cli/TestBuildAddTar: embed Dockerfile 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 5d8e80ba8da808fb70d529711359e2d826db2407
Component: engine
 2014-07-21 15:02:31 -07:00
Johan Euphrosine
c5f83694a2 integration-cli/TestBuildAddTar: generate context from test 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 24c00c8508b33de4229280f0be2e7b5761d6ed0e
Component: engine
 2014-07-21 13:03:00 -07:00
Johan Euphrosine
41d8a0c6c0 integration-cli: add more tests for BuildAddTar 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 30519330c723374526e7dbfc14807cc8da86c2c0
Component: engine
 2014-07-21 11:56:49 -07:00
Alexandr Morozov
fb5c0827a3 Skip whole dir dockerignoring with warning 
Fixes #7093
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 7d97a5f4760da388c22a5a29ed95888b89a23d57
Component: engine
 2014-07-18 09:35:54 +04:00
unclejack
e55262927d integcli: fix map randomization failures 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 68bb56a4a5a5905a7f5eb0781782e1db5cfc7a89
Component: engine
 2014-07-17 23:11:45 +03:00
Alexandr Morozov
2199b246f3 Simple additions to TestBuildAddTar 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: fc2631b499ba27350f20e7466f54cb06b5c65079
Component: engine
 2014-07-09 13:41:57 +04:00
Tibor Vass
ff37e700fc Tests for ADD tar 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: cfa4999d695d98f30d942460576d5f9c03a64d92
Component: engine
 2014-07-08 15:34:04 -04:00
LK4D4
3c88fb5533 Moved last build tests to integration-cli 
Also removed skipped tests on "viz" and "tree" because they
blocked integration/buildfile_test.go removing.

Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 1d4862b7a2d0c3b0641ce6d539eabecee686c794
Component: engine
 2014-07-06 15:36:34 +04:00
Travis Cline
a23ad7fc08 Add .dockerignore support 
Fixes #2224

Docker-DCO-1.1-Signed-off-by: Travis Cline <travis.cline@gmail.com> (github: tmc)
Upstream-commit: 9189db3aff3e9d72b215b5e204cfac018b2acc5d
Component: engine
 2014-06-26 22:49:08 +00:00
Erik Hollensbe
4526ee08e7 fix whitespace that precedes the escape in a multiline string. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 03c5c1930d884f0052b4940643fa5b4fc57bdea7
Component: engine
 2014-06-25 13:39:47 -07:00
Johan Euphrosine
794a8c5ccb api/client/build: allow tar as context for docker build - 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: edcb41451aa388abe03d4f837ab5ee316a53a030
Component: engine
 2014-06-23 13:34:09 -07:00
cyphar
11e34c9ae0 integration-cli: add build test for NOCACHE 
This patch adds CLI integration tests to ensure that NOCACHE instructions
in Dockerfiles only apply to direct children of the original image.

Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
Upstream-commit: a57298791c882a2a065989b3386b5b14084e8639
Component: engine
 2014-06-19 20:33:17 +10: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
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
fef574365b Add test for volume ownership and perms 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: c024c9bd1ec13aade038f87266a03a1d1bc13441
Component: engine
 2014-06-02 18:10:52 -07: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