Commit Graph

138 Commits

Author SHA1 Message Date
10c689f549 move pull and import to a job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 9dcbdbc4b1addb67c0fdcadab1c8f98f30e58b4c
Component: engine
2014-01-24 14:46:31 -08:00
31fb352a08 Merge pull request #3558 from tianon/buildfile-run-json
Add support for RUN [""] in Dockerfiles
Upstream-commit: 2a6e93a6fb9870cd2c2e1942afcdea5f154f1715
Component: engine
2014-01-22 11:51:34 -08:00
36def61b75 Remove container.EnsureMounted
This was deprecated already and all it did was call Mount().
The use of this was a bit confusing since we need to pair Mount/Unmount
calls which wasn't obvious with "EnsureMounted".

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 191aa17d16c0935a7deda03b4c3bc879f7a316eb
Component: engine
2014-01-21 11:26:11 +01:00
145ef0e1f4 Fix support for registry auth with Dockerfile build.
Docker-DCO-1.1-Signed-off-by: Jake Moshenko <jake@devtable.com> (github: jakedt)
Upstream-commit: 6e6ff85362dfa823c392392cb9e70d620e308911
Component: engine
2014-01-20 18:35:14 -05:00
0aa4f1bddd detect compressed archives in API /build call
AFAIK in some previous version it was possible to give a compressed docker file
to the API's build command and that was handled properly (aka compression was
detected and archive uncompressed accordingly). Fails with at least 0.7.5.

Fixed this using the DecompressStream method from the archive package.

Docker-DCO-1.1-Signed-off-by: Gereon Frey <me@gereonfrey.de> (github: gfrey)
Upstream-commit: 4f53722dee6c8ea18a9c30bde2cc6fee24b03d32
Component: engine
2014-01-17 12:21:26 +01:00
c10cddede6 Fix "foo: no such file or directory" test failure, and normalize creation of custom error to always depend on if os.IsNotExist(err) so we don't hide other errors that might crop up in these tests
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 7a6255efbcb83458ca179b2148fda7a0160a4bd7
Component: engine
2014-01-14 11:42:03 -07:00
3dc8c2a33a Stop ADD from following symlinks outside the context when passed as the first argument
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: fb63cfa9a502e2410597422f8877cf16b0bbaad2
Component: engine
2014-01-11 05:46:11 -07:00
f19f8cb54e Add support for RUN [""] in Dockerfiles for greater specificity in what is actually executed
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: fd78128870b78c282b65976cfff100c4101569b1
Component: engine
2014-01-11 04:00:52 -07:00
a678ed131c Make sure the remote ADD are cached properly
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 0fd9c98de3fc2c8fb1da6dc3ef277b3325106b26
Component: engine
2014-01-08 14:22:49 -08:00
4ac9027377 Make sure file are cached correctly during build
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: e24e9c09f8533b662d1d829123431540bb95ea51
Component: engine
2014-01-08 14:22:49 -08:00
ffd759db06 Potential fix for ADD .
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: 93ff70a3e70e14762314f04e2b9f61c8710d5353
Component: engine
2014-01-08 14:22:24 -08:00
7e278d9841 Disable compression for build. More space usage but much faster upload
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: c6350bcc2411dfc5039976239e143f6b9da64444
Component: engine
2014-01-08 14:21:13 -08:00
b0481e14ce Fix issue with file caching + prevent wrong cache hit
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: f3103e5c9157aed2a5ab0f4c70e328cd0aa69b59
Component: engine
2014-01-07 16:53:55 -08:00
45fc411688 Fix ADD caching issue with . prefixed path
Docker-DCO-1.0-Signed-off-by: Guillaume J. Charmes <charmes.guillaume@gmail.com> (github: creack)
Upstream-commit: 811341423bd9d3d65640cb4aa04d2840817182ca
Component: engine
2014-01-07 16:02:20 -08:00
cc98eeb0c8 Merge pull request #3297 from jaseg/master
Return meaningful error for meaningless Dockerfiles
Upstream-commit: ee6823d797e527a18291561aa84cfd6346dd3893
Component: engine
2014-01-06 10:58:24 -08:00
1c8add2753 Merge pull request #3367 from cpuguy83/3362-unify_cmd_entrypoint_handling
Use same error handling while unmarshalling args for CMD and ENTRYPOINT
Upstream-commit: e5b09523dcfabcd252113a8ebda5391c88e777e5
Component: engine
2014-01-06 10:29:37 -08:00
81433035f2 Use same error handling while unmarshalling args for CMD and ENTRYPOINT
Upstream-commit: 323c4b5211ecef4cffcbe0a97811ddd93c469164
Component: engine
2014-01-06 13:15:14 -05:00
5791b4e848 Hash the sums for directory (ureadable when there is too many
Upstream-commit: cd735496da6d977748d5c3b19976f42d2cc1933e
Component: engine
2013-12-26 16:42:05 -08:00
e485023364 Change BuildFile in order to use TarSum instead of custom checksum
Upstream-commit: 894d4a23fba1a67087ae5bbe9c50c56e6dc09289
Component: engine
2013-12-26 16:16:26 -08:00
e297baa1c0 Merge pull request #2809 from graydon/880-cache-ADD-commands-in-dockerfiles
Issue #880 - cache ADD commands in dockerfiles
Upstream-commit: efaf2cac5c8d54a5098f7036e738e1f919f84452
Component: engine
2013-12-24 16:22:51 -08:00
7529ef336e Return meaningful error for meaningless Dockerfiles
Upstream-commit: b8cd2bc94d58e9ca1c6f9a41979b857cfa4b698f
Component: engine
2013-12-20 16:19:21 +01:00
0b51803275 Return error if Dockerfile is empty
Upstream-commit: f7ba1c34bb7670b1a8d761b73eb9a775fa0f6bbe
Component: engine
2013-12-20 14:13:52 +01:00
981ec0641d Record added-tree sha256 in buildfile.CmdAdd, probe and use cache.
Upstream-commit: 3f9416b58da029b7d82a4908f6c066cee0695edf
Component: engine
2013-12-16 17:36:51 -08:00
7ca46955f3 Factor cache-probing logic out of buildfile.commit() and CmdRun().
Upstream-commit: 7afd7a82bd672bf7b3976458197b8c56c17407de
Component: engine
2013-12-16 17:36:50 -08:00
e18bf01fe0 Merge pull request #3099 from vieux/fix_pull_build
added authConfig to docker build
Upstream-commit: b3ad3307829dc4601cb996be3d6d8cfa37e71c79
Component: engine
2013-12-16 10:53:10 -08:00
e34a28d653 added authConfig to docker build
Upstream-commit: 228091c79ed043d1896afb04cd0573ee972c2607
Component: engine
2013-12-06 14:27:10 -08:00
d92518e8b2 fix jsonmessage in build
Upstream-commit: 05f416d869777aa613a5a197ad287c18b77366d3
Component: engine
2013-12-06 14:09:27 -08:00
8eac8d89db remove unused parameter in Download
Upstream-commit: 12180948be8040a4cdf99a0e660098cd33e32832
Component: engine
2013-12-04 11:54:11 -08:00
3412149ffe Do not format at each write but use a Writer instead (build)
Upstream-commit: de4429f70d51056c3ec32072f3f18898e36171b3
Component: engine
2013-12-02 11:43:41 -08:00
26b3fb6752 Merge pull request #2829 from dotcloud/refactor_opts
Refactor opts
Upstream-commit: fe571dd29328efe5f5318c0b146d0aa5a66217a2
Component: engine
2013-12-02 10:41:30 -08:00
85e4b81e0c Make docker build return exit code of build step
If a command during build fails, `docker build` now returns with
the exit code of that command.

This makes it necessary to change the build api endpoint to
return a json object stream.
Upstream-commit: b04c6466cdc89a107879af7a22b0917006b38730
Component: engine
2013-12-02 17:52:37 +01:00
34e8bb0db2 Merge pull request #2692 from SvenDowideit/add-specific-feedback-for-bad-ADD
Add specific feedback for ADD outside context
Upstream-commit: 926f7b579e48dcd5bda26bcd7a0ef0e25aed94da
Component: engine
2013-11-28 17:55:11 -08:00
f211a9a21d Refactor Opts
Upstream-commit: 1ba11384bf82f824b0efbab31aaca439cfba1b4f
Component: engine
2013-11-26 17:46:06 +00:00
542c84c74e Merge branch 'master' into 0.6.5-dm-plugin
Upstream-commit: 43c7df946d56a9d9d0e0b7226042a0dd6a58a17b
Component: engine
2013-11-26 02:00:25 +00:00
2f447b8d32 add more searchable info to the error message when ADD tries to go outside the context
Upstream-commit: 96b5be9dd9606a9bfbf0fdbe98bcaf8b6e77e4b1
Component: engine
2013-11-23 12:23:31 +10:00
63cc3164f1 Remove useless New*Opt functions, singleline Opt types
Upstream-commit: c67f9b671df024d06b0af0a0eaa02058e69ee9f5
Component: engine
2013-11-22 14:42:30 -08:00
084cb15f1a Allow drivers to implement ApplyDiff in Differ interface
Upstream-commit: 5d9723002bc764e2c768e5184994d7949f55fc49
Component: engine
2013-11-11 19:09:57 -08:00
33ea8b01c4 Use parent image config in buildfile
Upstream-commit: 99141ea3ca3c0429ecdfc3bdb097a68957beab71
Component: engine
2013-11-04 13:20:14 -08:00
5e4f415366 Refactor HostConfig and escape apparmor confinement
Upstream-commit: 31638ab2ad2a5380d447780f05f7aa078c9421f5
Component: engine
2013-11-01 13:55:19 -07:00
fb9771da9e Move archive.go to sub package
Upstream-commit: 96d1e9bb5a269936afeb9748a894f6995b17e0a4
Component: engine
2013-10-31 16:57:45 -07:00
d2b1922a6b continue build on expose with :, but displays a warning
Upstream-commit: b2503a72f1f1db887fd11199036f05efe3d35992
Component: engine
2013-10-30 11:13:10 -07:00
7ce1e20657 Add -name for docker run
Remove docker link
Do not add container id as default name
Create an auto generated container name if not
specified at runtime.
Upstream-commit: 0d2924408bad7aa797bfaf0610e836d82928296f
Component: engine
2013-10-28 18:09:08 -07:00
952ac8a789 Add links for container relationships and introspection
Upstream-commit: 1cbdaebaa1c2326e57945333420d25d6f77011d5
Component: engine
2013-10-25 15:13:24 -07:00
d8ab9dfa35 fix race condition in docker build with verbose + cleanup hostIntegration debug
Upstream-commit: 10e10c9573a0f20243212192fa782feb35651b18
Component: engine
2013-10-22 15:01:06 -07:00
9ff0513e0d change an errorf to a debugf
Upstream-commit: 3acfc600285dedd2e10a3780e041af0cc39675a7
Component: engine
2013-10-16 19:45:10 +00:00
8c6c389ec3 Remove error messages which are not actually errors
Upstream-commit: cbc49d7d76dfc9e259d5227a0077a83e5faf1202
Component: engine
2013-10-15 23:12:27 +00:00
b2ba4dc1a1 Initial steps to fix Issue #936
Use utils.Errorf instead of utils.Debugf
Upstream-commit: ad723bbfe7cda7839b3c7f82e63699bf2b9c4911
Component: engine
2013-10-11 08:04:40 -05:00
4878575100 use empty string so TempDir uses the OS's temp dir automatically (Closes #2117)
Upstream-commit: d03022b9ca5e658e551ab3b9907da946b11a0b4c
Component: engine
2013-10-08 13:24:20 +10:00
4de754b9f6 Merge pull request #1848 from dotcloud/build-clean
Add rm option to docker build to remove intermediate containers
Upstream-commit: 33972627b7feb7bddce87e92d3789de6eb4611ef
Component: engine
2013-09-13 10:58:59 -07:00
efc88e6663 Add rm option to docker build to remove intermediate containers
Upstream-commit: b7a3fc687ec55b68ee0cadf78d7f1eff3e531fbd
Component: engine
2013-09-12 16:55:36 +00:00