Commit Graph
2191 Commits
Author SHA1 Message Date
Solomon Hykes fa4667b670 Merge branch 'master' into simpler-build-upload
Upstream-commit: fe88b5068d125a834fe586956a69ee36000cf879
Component: engine
2013-06-15 12:35:26 -07:00
Solomon Hykes 4015efd9be FIXMEs
Upstream-commit: 6746c385bd7938e1bbcf588a27651de63a2de04a
Component: engine
2013-06-15 12:24:20 -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 667532e025 Removed deprecated file builder_client.go
Upstream-commit: cc7de8df755d9e4a845a8aa5800424b1546492d6
Component: engine
2013-06-15 09:30:52 -07:00
Solomon Hykes 1cdf6869a0 Merge pull request #895 from dotcloud/build-fixes
- Builder: fix a bug which caused builds to fail if ADD was the first command
Upstream-commit: 30f604517a5ddc15b3e9f6e9d42f4c7569c1627f
Component: engine
2013-06-15 09:23:41 -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
Guillaume J. Charmes 726da1690f Merge branch 'master' into builder_server-3
Conflicts:
	utils/utils.go
Upstream-commit: 78f86ea502694bf5dbc947802ebc0f5e5426d15c
Component: engine
2013-06-14 17:08:39 -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
Solomon Hykes f839c4752b FIXMEs
Upstream-commit: 5799806414b266c14a8ea2802cfa0906d920c62d
Component: engine
2013-06-14 16:29:19 -07:00
Guillaume J. Charmes e983ca691c Fix merge issue
Upstream-commit: 76a568fc9717ff69999ab54fba9277a0d31c305d
Component: engine
2013-06-14 16:08:08 -07:00
Solomon Hykes 3562ef766f Various FIXME items
Upstream-commit: 14265d9a18a4a2151bfd4e5c7e94de45377b6375
Component: engine
2013-06-14 15:11:34 -07:00
Solomon Hykes 158248b9fd Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: 17235eb0893fc7f8658ed36da0ec336b2d1fca5d
Component: engine
2013-06-14 15:07:05 -07:00
Solomon Hykes 40bdb17b30 Remove duplicate 'WARNING'
Upstream-commit: 7f118519eb007b2423fff428aceddabd6c1c301d
Component: engine
2013-06-14 14:46:08 -07:00
Solomon Hykes 54b69da177 Merge branch 'dns_server_side'
+ Configure dns configuration host-wide with 'docker -d -dns'
+ Detect faulty DNS configuration and replace it with a public default
Upstream-commit: 250e47e2eb12015fd436a9b695c50cc2fbfb3fdc
Component: engine
2013-06-14 14:39:05 -07:00
Guillaume J. Charmes 280d969b39 Merge pull request #857 from edx/856-vagrant-port-forwarding
* Vagrantfile: Add an option to forward all ports to the vagrant host that have been ex...
Upstream-commit: f413fb8e56ae42a762222ddcf402cbaf89878e2e
Component: engine
2013-06-14 14:37:55 -07:00
Guillaume J. Charmes 974c66090e Merge pull request #607 from dotcloud/expose_api_port_vagrant-feature
* Vagrantfile: Add the rest api port to vagrantfile's port_forward
Upstream-commit: f0e43dcdb15a160991b923f8f0ad76929e8b1c04
Component: engine
2013-06-14 14:35:53 -07:00
Guillaume J. Charmes d233a440c6 Merge branch 'master' into remove_bsdtar
Conflicts:
	docs/sources/contributing/devenvironment.rst
Upstream-commit: abf85b25085b52e19f774dc30bd87527b3295f2a
Component: engine
2013-06-14 14:34:30 -07:00
Guillaume J. Charmes 43010d8df6 Merge pull request #892 from unclejack/validate_memory_limits
* Runtime: validate memory limits & error out if it's less than 524288
Upstream-commit: 813771e6b79bb40d72895ec6f95cb7aa61b193fe
Component: engine
2013-06-14 14:32:28 -07:00
unclejack f884195c28 add test: fail to create container if mem limit < 512KB
Upstream-commit: d3f83a6592e3d79768d9d3805edec80642b69c4b
Component: engine
2013-06-14 22:55:00 +03:00
Andy Rothfusz 4bc27f700a Add examples for local import.
Upstream-commit: 7958f1f694ac411dcfeb8fbf0d702a7c552306ae
Component: engine
2013-06-14 13:42:59 -06:00
Guillaume J. Charmes 71762e1ba0 Merge pull request #816 from unclejack/524-fix_aufs_links_related_warnings
524 fix aufs links related warnings
Upstream-commit: 4a02c6dab1c3ba798370a64baa8bd94fa6f89c11
Component: engine
2013-06-14 12:32:47 -07:00
Guillaume J. Charmes 129ce7e2e2 Merge pull request #663 from dotcloud/662-fix_push_html_404-fix
* Registry: add regexp check on repo's name
Upstream-commit: 165d343d0688ac396269a07a97a6ffc25472133c
Component: engine
2013-06-14 12:30:44 -07:00
Guillaume J. Charmes 539c6ff974 Merge branch 'master' into improve_progressbar_pull
Upstream-commit: 60fd7d686dea6645ab61c27d0132d38c07a89e80
Component: engine
2013-06-14 12:01:40 -07:00
Solomon Hykes 5026ebfb0a Merge branch 'master' of ssh://github.com/dotcloud/docker
Upstream-commit: c701de939f645030b36f2f89acbbcf30979fe5be
Component: engine
2013-06-14 11:58:46 -07:00
Guillaume J. Charmes de943396cb Merge pull request #868 from dotcloud/postupload-endpoints-header
- Registry: Send X-Docker-Endpoints at the end of a push
Upstream-commit: 05b87d2d5b87c606818f5dcc10e466a355cf1630
Component: engine
2013-06-14 11:53:54 -07:00
Guillaume J. Charmes 600eb1d103 Merge branch 'master' into postupload-endpoints-header
Conflicts:
	server.go
Upstream-commit: 78e4a385f77c33933afc47c8b3f4436ce648eb54
Component: engine
2013-06-14 11:50:58 -07:00
unclejack 25419889e5 install aufs-tools when setting up the testing vagrant box
Upstream-commit: 822abab17e33a0f87ef1d785a9148d3ea11cbb60
Component: engine
2013-06-14 21:41:12 +03:00
unclejack 9b310a0f72 install aufs-tools when setting up the hack vagrant box
Upstream-commit: f1d16ea0035ee45341e5d4a143cdce5798847cb5
Component: engine
2013-06-14 21:41:12 +03:00
unclejack 1d89b8f78f add aufs-tools package to dev env docs page
Upstream-commit: fb7eaf67d1c01eea28fcbed61d6d8abd8117c965
Component: engine
2013-06-14 21:41:12 +03:00
unclejack 1ee51a2d56 add aufs-tools to lxc-docker dependencies
Upstream-commit: e53721ef69b13365c18c9189145ae1fadb931f01
Component: engine
2013-06-14 21:38:15 +03:00
unclejack 5f39923376 run auplink before unmounting aufs
Upstream-commit: 2f67a62b5b48862948b1ce92aeffbb83c3707ee0
Component: engine
2013-06-14 21:38:15 +03:00
Guillaume J. Charmes f73437e29d Update docs
Upstream-commit: 79fe864d9a117193b4dce8b7fe156a55bbadcce6
Component: engine
2013-06-14 10:58:16 -07:00
Guillaume J. Charmes c803fc1f04 Add unit tests for tar/untar with multiple compression + detection
Upstream-commit: 6f7de49aa8771ef4bc35548f9aa07fee660f1844
Component: engine
2013-06-14 10:47:49 -07:00
unclejack d7771969bf validate memory limits & error out if less than 512 KB
Upstream-commit: 9ee11161bf0c635a0b0164ae1dee806c6fcfe7b7
Component: engine
2013-06-14 19:52:44 +03:00
Victor Vieux 2a4a4027de update docs, remove config file on 401
Upstream-commit: 90f6bdd6e41ec352009ffbd073c1f45983abb74b
Component: engine
2013-06-14 13:38:51 +00:00
Victor Vieux b78bf5bb71 update docs
Upstream-commit: e49f82b9e1a920c902c1cd813596dc1a78817e63
Component: engine
2013-06-14 10:10:26 +00:00
Victor Vieux 730a1370b2 Merge branch 'master' into 22-add_sizes_images_and_containers-feature
Upstream-commit: ddf5a1940fdbe2efa7136e7f5f26c2adc1a59b3e
Component: engine
2013-06-14 10:05:06 +00:00
Victor Vieux 5bf955bfcc fix virtual size on images
Upstream-commit: 00cf2a1fa264c167dff0dd50e296c93d4c59908f
Component: engine
2013-06-14 10:05:01 +00:00
Victor Vieux 048352879c fix auth in case you change your password on index.io
Upstream-commit: 9cc72ff1a9632736adc7dd12f096e3233896fced
Component: engine
2013-06-14 09:53:48 +00:00
Daniel Mizyrycki 9eee7b53cc Packaging, dockerbuilder: Automate pushing docker binary packages
Upstream-commit: 3384943cd3bc5bb9fd79ccbda9d32a582ada69b3
Component: engine
2013-06-13 22:14:43 -07:00
Guillaume J. Charmes d4a6b05778 Add build UT
Upstream-commit: 2f14dae83f23f62085015243a74df4ffc415c6c4
Component: engine
2013-06-13 18:52:41 -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 a22d73d8b0 Remove bsdtar by checking magic
Upstream-commit: 0425f65e6373dc38cd18a6d0f2a50671544ad4b2
Component: engine
2013-06-13 17:53:38 -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
Guillaume J. Charmes bc53b19305 Fix non-tty run issue
Upstream-commit: 2eaa0a1dd7354e429c056d68515f903351e3eeb4
Component: engine
2013-06-13 12:57:35 -07:00