Solomon Hykes
7c517d635a
Merge branch 'simpler-build-upload' ( #900 ) into builder_server-3 ( #848 )
...
Upstream-commit: 352991bdf4c0a7702fcc791b961a516fb684f4c1
Component: engine
2013-06-20 22:02:36 -07:00
Guillaume J. Charmes
9587bb386c
Merge branch 'master' into builder_server-3
...
Conflicts:
docs/sources/use/builder.rst
Upstream-commit: 659e8460060d2216329d874cf6617fc24ec479fd
Component: engine
2013-06-20 10:27:12 -07:00
Solomon Hykes
eb87dc37e0
Merge branch 'master' into simpler-build-upload
...
Upstream-commit: 79efcb545d76970843e02c48492a61450dba5564
Component: engine
2013-06-19 18:48:19 -07:00
Solomon Hykes
41c1e7ceb7
* Builder: fixed the behavior of ADD to be (mostly) reverse-compatible, predictable and well-documented.
...
Upstream-commit: 5be7b9af3ee9b884482220979735e2a8ea969ce3
Component: engine
2013-06-18 20:28:49 -07:00
Guillaume J. Charmes
61d11ddffb
Merge branch 'master' into builder_server-3
...
Conflicts:
buildfile.go
Upstream-commit: 34a434616a7056a89328348ce3f92afd2730c777
Component: engine
2013-06-18 16:12:30 -07:00
Solomon Hykes
4ff35be219
Nicer output for 'docker build'
...
Upstream-commit: cb9d0fd3bc13a381f3017d06cd057da2cd3f1c15
Component: engine
2013-06-18 12:26:56 -07:00
Guillaume J. Charmes
0b3b002cd4
Merge branch 'master' into builder_server-3
...
Conflicts:
buildfile_test.go
Upstream-commit: 555552340dd07eb446e54011071a621430fd83a0
Component: engine
2013-06-17 14:01:32 -07:00
Solomon Hykes
fe13f8b67b
Merge pull request #897 from dotcloud/fix-overlapping-add
...
* Builder: ADD improvements: use tar for copy + automatically unpack local archives
Upstream-commit: 22b0a38df51acd9f96ae1a82f8a5b86640b5f3b5
Component: engine
2013-06-17 13:32:34 -07:00
Solomon Hykes
4bba5db0ac
* Builder: simplify the upload of the build context. Simply stream a tarball instead of multipart upload with 4 intermediary buffers. Simpler, less memory usage, less disk usage, and faster.
...
Upstream-commit: 38554fc2a722d1a77514f477a189b0dbd149691b
Component: engine
2013-06-15 09:38:18 -07:00
Solomon Hykes
8e1839cf72
Fix a bug which caused builds to fail if ADD was the first command
...
Upstream-commit: 080f35fe65a7bb88ccf2abefa985c7a4ae88a47b
Component: engine
2013-06-15 09:16:35 -07:00
Solomon Hykes
2105eec29d
+ Builder: ADD of a local file will detect tar archives and unpack them
...
into the container instead of copying them as a regular file.
* Builder: ADD uses tar/untar for copies instead of calling 'cp -ar'.
This is more consistent, reduces the number of dependencies, and
fixe #896 .
Upstream-commit: 5b8287617de65d4e14ed6affb0eb46867e9ee617
Component: engine
2013-06-14 16:43:39 -07:00
Guillaume J. Charmes
57ce6972e0
Fix issue with ADD
...
Upstream-commit: f03ebc20aa33dbb9b468fe476ce26467eb328060
Component: engine
2013-06-13 18:42:27 -07:00
Guillaume J. Charmes
18df81b8e1
Merge branch 'master' into builder_server-3
...
Conflicts:
buildfile.go
commands.go
docs/sources/api/docker_remote_api.rst
Upstream-commit: 4b4918f2a78c129c4ca745147fd38f985d2635c2
Component: engine
2013-06-13 18:11:22 -07:00
Guillaume J. Charmes
c822b87ed3
Remove run() where it is not needed within the builder
...
Upstream-commit: 452128f0daf8117502fad2fe2f72b6f022223ddb
Component: engine
2013-06-13 15:18:15 -07:00
Guillaume J. Charmes
30e88c1b6c
Remove run from non-running commmands
...
Upstream-commit: f5fe3ce34e12f1660ee98cecdbe2c104567d88a6
Component: engine
2013-06-13 15:08:53 -07:00
Guillaume J. Charmes
cac3a28159
Remove run from the ADD instruction
...
Upstream-commit: d0084ce5f23453fbc008f5a2c5dd147b0df890e7
Component: engine
2013-06-13 14:57:50 -07:00
Victor Vieux
0a236e493a
bump to master
...
Upstream-commit: f2383151cbcc727450f87cb80a392e2858d4b0ca
Component: engine
2013-06-12 17:39:32 +00:00
Francisco Souza
18e0ba9ccf
build: don't ignore last line in Dockerfile when it doesn't end with \n
...
Upstream-commit: 2e9403b047d926d39d5b299abc071f3c29627fc6
Component: engine
2013-06-11 11:39:06 -03:00
Guillaume J. Charmes
0891327703
Allow multiple tab/spaces between instructions and arguments
...
Upstream-commit: b103ac70bfb9f9419d4487bf969b0f244b260014
Component: engine
2013-06-10 09:31:59 -07:00
Guillaume J. Charmes
9ad1867af2
Move isUrl to utils.IsURL
...
Upstream-commit: f4a4cfd2cc748859d4f28b90274c81098afa8d5d
Component: engine
2013-06-06 15:50:09 -07:00
Guillaume J. Charmes
6e022d99e9
Fix issue EXPOSE override CMD within builder
...
Upstream-commit: eaa2183d77435bd5d65f36287e96a341696cb79c
Component: engine
2013-06-06 15:48:12 -07:00
Guillaume J. Charmes
6bac392c45
Allow remote url to be passed to the ADD instruction within the builder
...
Upstream-commit: 31d2b258c15a28402c3fc5df6440c5b8644a6d76
Component: engine
2013-06-06 15:40:46 -07:00
Victor Vieux
83d9b24a84
bump to master
...
Upstream-commit: c906239220c7ba06b8615f001fab2f42fb063aeb
Component: engine
2013-06-05 10:23:45 +00:00
Victor Vieux
4747c5b99f
linted names
...
Upstream-commit: fd224ee590dc9f003f6507b529a9f47cceb02c44
Component: engine
2013-06-04 18:00:22 +00:00
Victor Vieux
9c0086fb7d
drop/omit
...
Upstream-commit: 86ada2fa5d00820288df8a59eca3deef83f4aeb6
Component: engine
2013-06-04 13:51:12 +00:00
Victor Vieux
5a833bafbe
bump to master
...
Upstream-commit: 62c78696cda5660524dee596a07aac66d89437af
Component: engine
2013-06-03 11:06:13 +00:00
Guillaume J. Charmes
934fcbd514
Merge pull request #719 from dotcloud/json_stream-feature
...
* API: push, pull, import, insert -> Json Stream
Upstream-commit: 9bc71c101c8f1299427013bfb5503bf85173c28f
Component: engine
2013-05-31 16:05:15 -07:00
Solomon Hykes
4be68db978
* Build: never remove temporary images and containers
...
Upstream-commit: caaea2e08f85438b7a6bee006e803f1c4351c445
Component: engine
2013-05-30 16:24:26 -07:00
Solomon Hykes
7959cb95a2
* Builder: keep temporary images after a build fails, to allow caching
...
Upstream-commit: c903a6baf83b4aaa51d7198643e0eef9211c99ed
Component: engine
2013-05-30 15:52:09 -07:00
Guillaume J. Charmes
736941c2f5
Fix issue with CMD instruction within docker build
...
Upstream-commit: 6d2e3d2ec0dedc6c1429e87800e9f3d7e4ada095
Component: engine
2013-05-30 12:21:57 -07:00
Guillaume J. Charmes
79331052da
Deprecate INSERT and COPY
...
Upstream-commit: a4e6025cc1103d1ad9c86fa5d75f832526d2a7b8
Component: engine
2013-05-30 12:10:54 -07:00
Victor Vieux
e8420b7464
move auth to the client WIP
...
Upstream-commit: 49e656839fb3d846dc65fec544f2984a9c72a2cf
Component: engine
2013-05-30 15:39:43 +00:00
Solomon Hykes
5d18bff14c
'docker build': remove INSERT command (should add support for remote sources in ADD instead)
...
Upstream-commit: 97247c5c733db355f7261ddad5223a00c33c635e
Component: engine
2013-05-29 21:57:36 -07:00
Guillaume J. Charmes
76555eb6cc
Fix issue with mkdir within docker build
...
Upstream-commit: 9a394041270d2a8ba648f215dacc186473140552
Component: engine
2013-05-29 18:55:00 -07:00
Solomon Hykes
74b27108da
Fixed phrasing, typos and formatting in 'docker build'
...
Upstream-commit: dcab408f6a047d5a4ccac0d3999d8c896f0a63dc
Component: engine
2013-05-29 18:14:50 -07:00
Guillaume J. Charmes
b335672d16
Fix ADD behavior on single files
...
Upstream-commit: faafbf211899bc28e7e21e76de051d87ef5b5cd2
Component: engine
2013-05-29 17:58:05 -07:00
Guillaume J. Charmes
e52d45783c
Fix cache miss issue within docker build
...
Upstream-commit: 560a74af1562de007ba487e102fd00a2f658e6a0
Component: engine
2013-05-29 16:11:04 -07:00
Guillaume J. Charmes
b5f45b53d3
Create a layer for each operation (expose, cmd, etc)
...
Upstream-commit: b6165daa775bbf20451ecbe570ab0fb85ad35128
Component: engine
2013-05-29 15:03:00 -07:00
Guillaume J. Charmes
6cbd6d934f
Fix autorun issue within docker build
...
Upstream-commit: ae0d555022411025607acce43ea1929bafd7174a
Component: engine
2013-05-29 14:37:03 -07:00
Guillaume J. Charmes
71357b495f
Fix issue with unknown instruction within docker build
...
Upstream-commit: 6cbc7757b2b4d068a98287754da552028fd62212
Component: engine
2013-05-29 10:53:24 -07:00
Victor Vieux
06534c45f7
bump to master
...
Upstream-commit: f339fc2eb921986749a628b92d2c9f2ecf47e3c2
Component: engine
2013-05-29 13:52:18 +00:00
Guillaume J. Charmes
9b55c462fd
Make sure the last line of docker build is the image id
...
Upstream-commit: 54af0536232ca71d37f7c6440f1bb17b3ed112db
Component: engine
2013-05-28 15:40:22 -07:00
Guillaume J. Charmes
4fefd78435
Add directory contents instead of while directory for docker build
...
Upstream-commit: 2897cb04760d7e4e7e52ccc20e94c94e3743667e
Component: engine
2013-05-28 15:22:01 -07:00
Guillaume J. Charmes
a6fa39e648
Small fix
...
Upstream-commit: cfb8cbe5214c58690ca99cd44b25bd202c4dbcf7
Component: engine
2013-05-28 13:51:21 -07:00
Guillaume J. Charmes
20562fdb8c
Fix merge issue
...
Upstream-commit: a48799016a43e6badae72e855f9a90592b6cdd98
Component: engine
2013-05-28 13:46:52 -07:00
Guillaume J. Charmes
dda3557a3e
Implement the CmdAdd instruction
...
Upstream-commit: 6ae3800151025ff73a97c40af578ee714164003b
Component: engine
2013-05-28 13:38:26 -07:00
Guillaume J. Charmes
ef0eab1820
Add Extension() method to Compresison type
...
Upstream-commit: 54db18625aa7154c9dd230907444676fa3079b99
Component: engine
2013-05-28 13:37:49 -07:00
Guillaume J. Charmes
a2645c511c
Add missing buildfile.go
...
Upstream-commit: e3f04298597195a95557c4224c05df752dc08695
Component: engine
2013-05-23 18:33:31 -07:00