0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
11081 commits 14 branches 412 tags 338 MiB
Commit graph

122 commits

Author SHA1 Message Date
Erik Hollensbe
9fc8b7f4e1 builder: Restore /bin/sh handling in CMD when entrypoint is specified with JSON 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-30 09:17:11 -04:00
Erik Hollensbe
463297ffe9 builder: whitelist verbs useful for environment replacement. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-30 09:17:11 -04:00
Erik Hollensbe
2dac82eb82 builder: handle escapes without swallowing all of them. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-30 09:17:11 -04:00
Erik Hollensbe
7f8cdeb18b builder: some small fixups + fix a bug where empty entrypoints would not override inheritance. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-30 09:17:11 -04:00
Erik Hollensbe
21ab75afe0 builder: handle cases where onbuild is not uppercase. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-21 17:08:05 -04:00
Erik Hollensbe
cf23053eb1 builder: fix escaping for ENV variables. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-10-20 16:53:37 -04:00
Tianon Gravi
24189b2c36 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>
 2014-10-14 00:58:55 -06:00
Erik Hollensbe
1150c1639a 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)
 2014-10-14 01:59:45 +00:00
Jessica Frazelle
de32f48e66 Fix Tag Test for longer tags 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-07 19:37:08 -07:00
Michael Crosby
50fa9dffcf Allow child to overwrite entrypoint from parent 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-10-07 23:45:35 +00:00
Jessie Frazelle
12203e475d Merge pull request #8434 from tiborvass/ignore_invalid_Dockerfile_instructions 
Ignore unknown dockerfile instructions
 2014-10-07 14:45:51 -07:00
Sven Dowideit
40cad37f0a Merge pull request #8341 from unclejack/add_workdir_test 
add test for workdir env vars and add docs
 2014-10-07 14:27:32 +10:00
Tibor Vass
9fe1dd3103 Add test for ignoring invalid dockerfile instructions 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-10-06 23:14:25 -04:00
Alexandr Morozov
a650ab7f29 Merge pull request #8409 from unclejack/integcli_lint 
integcli: lint fixes
 2014-10-06 14:32:08 -07:00
unclejack
c0e632246d integcli: lint fixes 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-10-06 23:15:17 +03:00
Alexandr Morozov
21dff8cbec Fix TestBuildCacheADD to check cache in out, not in id 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-10-06 10:04:10 -07:00
Adrien Folie
2c5b5cfc92 Add ENV variables support to WORKDIR build command 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)

Conflicts:
	builder/builder.go
		This file has been deleted.
 2014-10-01 17:34:36 +03:00
Rafe Colton
30d5a42c1f Move archive package into pkg/archive 
Now that the archive package does not depend on any docker-specific
packages, only those in pkg and vendor, it can be safely moved into pkg.

Signed-off-by: Rafe Colton <rafael.colton@gmail.com>
 2014-09-29 23:23:36 -07:00
Victor Vieux
7c1aee6291 Merge pull request #8289 from duglin/FixTestcaseFor8230 
Fixes the new testcase for PR #8230
 2014-09-29 15:33:51 -07:00
Doug Davis
8b3fbac15c Fixes the new testcase for PR #8230 
This new version makes sure that the same context is used for the two
builds run in the test.  If you don't use the same build then about 1/2 the
time the file copied into the container will look like a different file,
probably due to timestamp differences.  But reusing the same context we
re-use the same file on disk and therefore avoid the change in timestamps,
and we use the cache on the 2nd build.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2014-09-29 13:35:09 -07:00
Tibor Vass
670c8696a2 Merge pull request #8284 from erikh/fix_cmd_again 
builder: Fix CMD to inject /bin/sh -c when provided with a non-json value
 2014-09-29 15:56:16 -04:00
Erik Hollensbe
9f142bf9be builder: Fix CMD to inject /bin/sh -c when provided with a non-json value. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-09-29 12:22:18 -07:00
Erik Hollensbe
1cd6135972 Merge pull request #8230 from duglin/Issue6820 
add wildcard support to COPY/ADD (part 2 of issue #6820)
 2014-09-29 11:19:01 -07:00
Daniel, Dao Quang Minh
8833d800bf check tag's validity before building. 
When user passes an invalid tag to `docker build`
(i.e.  `docker build -t abcd:A0123456789B0123456789C0123456789 .`), check the
tag first and terminate-early so user can specify the tag again

Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
 2014-09-29 06:21:54 -04:00
Doug Davis
acd40d5079 add wildcard support to copy/add 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2014-09-25 20:44:51 -07:00
Tibor Vass
d369612b41 Merge pull request #7994 from erikh/parser_fix_volume_parsing 
builder: Fix handling of VOLUME command where multiple volumes are specified in a space delimited list.
 2014-09-25 12:45:48 -04:00
Erik Hollensbe
a5ca549a18 builder: Fix handling of VOLUME command where multiple volumes are 
specified in a space delimited list.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-09-25 09:44:19 -07:00
Alexandr Morozov
d302d92961 Rewrite TestContextTar tests to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-24 17:09:18 +04:00
Alexandr Morozov
51a56399f6 Rewrite TestBuildWithInaccessibleFilesInContext to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-24 17:09:14 +04:00
Alexandr Morozov
52cf331206 Rewrite TestBuildRm to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-24 13:15:55 +04:00
Alexandr Morozov
1625cbfc4c Rewrite TestBuildForceRm to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-24 12:29:27 +04:00
Victor Vieux
81a643211b Merge pull request #8186 from duglin/ErrInCopyCache 
Make sure COPY/ADD on dirs doesn't grab too many files
 2014-09-23 15:16:57 -07:00
Doug Davis
cd329d062b Make sure COPY/ADD on dirs doesn't grab too many files 
Add check for / first - per LK4D4's comment.
Add a comment to explain why we're adding a /

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2014-09-23 14:16:00 -07:00
Erik Hollensbe
8edacc673a builder: properly communicate onbuild trigger information during 
subsequent builds.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-09-23 13:55:51 -07:00
Tibor Vass
5ce7ee61ef Merge pull request #8179 from erikh/parser_fix_cmd_null 
Parser fix cmd null
 2014-09-23 13:42:55 -04:00
Alexandr Morozov
0c899cefdd Rewrite TestBuildAddWholeDirToRoot to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-23 18:58:32 +04:00
Alexandr Morozov
570f1153b9 Rewrite TestBuildAddEtcToRoot to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-23 18:58:28 +04:00
Alexandr Morozov
c58391bbd0 Rewrite TestBuildAddDirContentToExistDir to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-23 15:15:58 +04:00
Alexandr Morozov
2d802d7f23 Rewrite TestBuildAddDirContentToRoot to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-23 15:15:58 +04:00
Alexandr Morozov
139b6ed3aa Rewrite TestAddSingleFileToNonExistDir to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-23 15:15:58 +04:00
Alexandr Morozov
6bb44b6d74 Rewrite TestAddSingleFileToExistDir to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-23 15:15:58 +04:00
Alexandr Morozov
5e2ea69606 Rewrite TestAddSingleFileToWorkdir to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-23 15:15:58 +04:00
Alexandr Morozov
682fbe0134 Rewrite TestAddSingleFileToRoot to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-23 15:15:09 +04:00
Alexandr Morozov
3824ec62e8 Rewrite TestBuildSixtySteps to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-23 15:15:09 +04:00
Erik Hollensbe
d1613e1d59 builder: integration-cli test for the previous commit. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-09-22 23:18:46 -07:00
unclejack
c6965e3e45 integcli: add & use dockerCmdWithTimeout & InDir 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-22 21:02:51 +03:00
Brian Goff
45407cf00a Split volumes out from daemon 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
 2014-09-19 17:47:47 -05:00
Alexandr Morozov
66cd3640f1 Use prefix naming for build tests 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-19 22:11:50 +04:00
Doug Davis
05b8a1eb36 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>
 2014-09-18 20:12:13 -07:00
Alexandr Morozov
184fe67bbc 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>
 2014-09-18 09:09:10 +04:00