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
Solomon Hykes
e7457bd29b
Merge branch 'build-add-file' into simpler-build-upload
...
Conflicts:
buildfile_test.go
Upstream-commit: c1a5318d8eb58d58aa7de2cf1d73f6612665d242
Component: engine
2013-06-20 20:42:19 -07:00
Solomon Hykes
99b7da757b
* Builder: simplified unit tests. The tests are now embedded in the build itself. Yeah baby.
...
Upstream-commit: cc0f59742f192ccbc178c59bdc7eb98d0f6dd943
Component: engine
2013-06-20 20:16:39 -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
a327fa094d
* Builder: remove duplicate unit test
...
Upstream-commit: 55edbcd02fe5d519069677c3970ea90e9973a4eb
Component: engine
2013-06-19 14:59:42 -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
39f9189f02
* Builder: added a regression test for #895
...
Upstream-commit: f50e40008f39c77cab2b516ac2102f875bdef215
Component: engine
2013-06-15 11:35:56 -07:00
Solomon Hykes
89a21cc6a6
* Builder: reorganized unit tests for better code reuse, and to test non-empty contexts
...
Upstream-commit: 061f8d12e04e494fdcbee949facaf598d201c2ec
Component: engine
2013-06-15 11:07:49 -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
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
d4a6b05778
Add build UT
...
Upstream-commit: 2f14dae83f23f62085015243a74df4ffc415c6c4
Component: engine
2013-06-13 18:52:41 -07: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
Victor Vieux
4747c5b99f
linted names
...
Upstream-commit: fd224ee590dc9f003f6507b529a9f47cceb02c44
Component: engine
2013-06-04 18:00:22 +00:00
Guillaume J. Charmes
2c506017f0
Readd build tests
...
Upstream-commit: 5b33b2463a27aa3356a4b6200cf4b81dd83c26a0
Component: engine
2013-05-28 15:31:06 -07:00