e45c92153d
Rewrite TestBuildCopyAddMultipleFiles to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:54:29 -07:00
5a20dc67b0
Merge pull request #8567 from LK4D4/add_log_done
...
Add logDone for TestBuildAddSingleFileToNonExistDir
2014-10-17 11:20:12 -07:00
09ceae5c9c
Merge pull request #8486 from duglin/Issue5701
...
Add failing testcase for single quotes in CMD
2014-10-17 11:11:49 -07:00
b1e3c9e9cd
Cleanup errorOut resp in build tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:20 -07:00
9edf967824
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>
2014-10-16 14:40:55 -07:00
fcfe80f633
Minor fix of tests names
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-14 11:47:01 -07:00
fbaa41b5aa
Add logDone for TestBuildAddSingleFileToNonExistDir
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-14 11:17:41 -07:00
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
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
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
50fa9dffcf
Allow child to overwrite entrypoint from parent
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-10-07 23:45:35 +00:00
12203e475d
Merge pull request #8434 from tiborvass/ignore_invalid_Dockerfile_instructions
...
Ignore unknown dockerfile instructions
2014-10-07 14:45:51 -07:00
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
9fe1dd3103
Add test for ignoring invalid dockerfile instructions
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-10-06 23:14:25 -04:00
a650ab7f29
Merge pull request #8409 from unclejack/integcli_lint
...
integcli: lint fixes
2014-10-06 14:32:08 -07:00
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
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
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
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
7c1aee6291
Merge pull request #8289 from duglin/FixTestcaseFor8230
...
Fixes the new testcase for PR #8230
2014-09-29 15:33:51 -07:00
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
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
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
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
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
acd40d5079
add wildcard support to copy/add
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-09-25 20:44:51 -07:00
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
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
d302d92961
Rewrite TestContextTar tests to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-24 17:09:18 +04:00
51a56399f6
Rewrite TestBuildWithInaccessibleFilesInContext to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-24 17:09:14 +04:00
52cf331206
Rewrite TestBuildRm to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-24 13:15:55 +04:00
1625cbfc4c
Rewrite TestBuildForceRm to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-24 12:29:27 +04:00
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
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
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
5ce7ee61ef
Merge pull request #8179 from erikh/parser_fix_cmd_null
...
Parser fix cmd null
2014-09-23 13:42:55 -04:00
0c899cefdd
Rewrite TestBuildAddWholeDirToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-23 18:58:32 +04:00
570f1153b9
Rewrite TestBuildAddEtcToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-23 18:58:28 +04:00
c58391bbd0
Rewrite TestBuildAddDirContentToExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-23 15:15:58 +04:00
2d802d7f23
Rewrite TestBuildAddDirContentToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-23 15:15:58 +04:00
139b6ed3aa
Rewrite TestAddSingleFileToNonExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-23 15:15:58 +04:00
6bb44b6d74
Rewrite TestAddSingleFileToExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-23 15:15:58 +04:00
5e2ea69606
Rewrite TestAddSingleFileToWorkdir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-23 15:15:58 +04:00
682fbe0134
Rewrite TestAddSingleFileToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-23 15:15:09 +04:00
3824ec62e8
Rewrite TestBuildSixtySteps to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-23 15:15:09 +04:00
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
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
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
66cd3640f1
Use prefix naming for build tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-19 22:11:50 +04:00
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
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
aa0449c813
Fix logDone message for TestCopySingleFileToExistDir
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-18 09:02:05 +04:00
be924087eb
integcli: run build tests in tmpdir
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-17 20:05:33 +03:00
31c0039022
clean up the context when a build fails
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-15 16:01:23 +03:00
576416c99a
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)
2014-09-11 06:00:24 -07:00
78a847a47a
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)
2014-09-11 06:00:24 -07:00
ac107995ae
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)
2014-09-11 06:00:24 -07:00
1858746978
clean up context on build completion & add test
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-02 17:35:25 +03:00
cb51681a6d
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)
2014-08-27 18:52:30 -07:00
075e1bc1c3
Remove internet dependency from TestBuildCacheADD
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-18 14:13:43 +04:00
391c35c822
Fix go vet warnings
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-08-13 11:37:30 +04:00
b36f630817
Merge pull request #7304 from unclejack/refactor_build_tests
...
integration cli: minor refactor of the build tests
2014-08-08 01:24:51 +03:00
5e20b0027c
Fix TestBuildForbiddenContextPath after TMPDIR change
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-08-06 14:24:00 -04:00
1b6546b840
Cleanup Cmd on ENTRYPOINT instruction
...
Fixes #5147
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-08-04 20:48:36 +04:00
b1496effe3
Merge pull request #7312 from tianon/update-libcontainer
...
Bump libcontainer dep
2014-07-31 15:20:07 -07:00
27cca4c70c
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)
2014-07-31 15:10:56 -07:00
57b9467f45
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)
2014-07-31 12:46:36 -06:00
372f9bb58b
integcli: use dockerCmdInDir in build tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-07-29 16:01:56 +03:00
030676444a
Merge pull request #7140 from proppy/more-addtar-tests
...
integration-cli: add more tests for BuildAddTar
2014-07-28 11:58:29 -04:00
da40d9b7a5
Merge pull request #7209 from LK4D4/test_build_from_git
...
Test on building from GIT url
2014-07-28 11:15:50 -04:00
7978b32127
Merge pull request #7097 from LK4D4/fix_eof_dockerignore_#7093
...
Skip whole dir dockerignoring with warning
2014-07-28 17:34:44 +03:00
b3ee9ac74e
update go import path and libcontainer
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-07-24 22:19:50 +00:00
5b0d4cf296
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)
2014-07-24 11:19:16 +04:00
5d8e80ba8d
integration-cli/TestBuildAddTar: embed Dockerfile
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
2014-07-21 15:02:31 -07:00
24c00c8508
integration-cli/TestBuildAddTar: generate context from test
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
2014-07-21 13:03:00 -07:00
30519330c7
integration-cli: add more tests for BuildAddTar
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
2014-07-21 11:56:49 -07:00
7d97a5f476
Skip whole dir dockerignoring with warning
...
Fixes #7093
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-07-18 09:35:54 +04:00
68bb56a4a5
integcli: fix map randomization failures
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-07-17 23:11:45 +03:00
fc2631b499
Simple additions to TestBuildAddTar
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-07-09 13:41:57 +04:00
cfa4999d69
Tests for ADD tar
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-07-08 15:34:04 -04:00
1d4862b7a2
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)
2014-07-06 15:36:34 +04:00
9189db3aff
Add .dockerignore support
...
Fixes #2224
Docker-DCO-1.1-Signed-off-by: Travis Cline <travis.cline@gmail.com> (github: tmc)
2014-06-26 22:49:08 +00:00
03c5c1930d
fix whitespace that precedes the escape in a multiline string.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-06-25 13:39:47 -07:00
edcb41451a
api/client/build: allow tar as context for docker build -
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
2014-06-23 13:34:09 -07:00
a57298791c
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)
2014-06-19 20:33:17 +10:00
cc42eeac21
Move TestBuildAddToSymlinkDest to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-17 23:44:30 +04:00
690711b584
Move TestBuildOnBuildForbiddenMaintainerTrigger to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-17 11:39:47 +04:00
1c8ec01c55
Move TestBuildOnBuildForbiddenFromTrigger to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-17 11:36:45 +04:00
1e0e86360f
Move TestBuildOnBuildForbiddenChainedTrigger to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-17 11:24:47 +04:00
2629e2ec23
Move TestBuildOnBuildTrigger to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-17 11:14:45 +04:00
08a10f936b
Move TestBuildFailsDockerfileEmpty to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-17 11:06:44 +04:00
d3023f25f5
Move TestBuildFails to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-17 11:06:40 +04:00
f1d7ed35bd
Move TestBuildInheritance to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-17 11:05:45 +04:00
62d97afaf8
Move TestBuildADDFileNotFound to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-17 11:05:36 +04:00
686786f107
Move TestForbiddenContextPath to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-17 10:38:45 +04:00
c5b82f5e8d
Move TestBuildEntrypointRunCleanup to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-17 10:16:36 +04:00
5febba93ba
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)
2014-06-04 06:54:19 +10:00
c024c9bd1e
Add test for volume ownership and perms
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-06-02 18:10:52 -07:00
ae128437ce
Move build cache tests to integration-cli
...
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-02 23:40:14 +04:00
bf4d907092
More verbose build tests
...
I've decided that custom asserts only hide the meaning of tests
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
2014-06-02 23:40:13 +04:00
Alexandr Morozov
Jessie Frazelle
Jessica Frazelle
Doug Davis
Tianon Gravi
Erik Hollensbe
Michael Crosby
Sven Dowideit
Tibor Vass
Alexandr Morozov
unclejack
Adrien Folie
Rafe Colton
Victor Vieux
Daniel, Dao Quang Minh
Brian Goff
unclejack
Michael Crosby
Bruno Renié
Victor Vieux
Johan Euphrosine
Travis Cline
cyphar
SvenDowideit
Michael Crosby