017e4a61cb
Fix merge issue
...
Upstream-commit: 6e17cc45eabf6d094241fc3e017a90da8ba6f5d9
Component: engine
2013-06-18 12:33:06 -07:00
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
569fd3d92a
Merge pull request #911 from dotcloud/add_port_redirection_doc
...
* Documentation: add port redirection doc
Upstream-commit: 6e2c32eb9a86c65c55d9097e58a5ad5c9a950e66
Component: engine
2013-06-17 13:57:08 -07:00
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
00898589d5
Typo
...
Upstream-commit: cb58e63fc54fb3f1c620c8372269a8e308e43bee
Component: engine
2013-06-17 14:28:04 -06:00
cafa9cc449
Added content to port redirect doc
...
Upstream-commit: 862659875335c953bf6974af4cace397c7ec3902
Component: engine
2013-06-17 13:25:50 -07:00
5e2d23d571
add port redirection doc
...
Upstream-commit: 36231345f17e6fdb08b0f756c4872294d4745048
Component: engine
2013-06-17 22:05:58 +02:00
cec1c67f6e
Merge branch 'master' into builder_server-3
...
Conflicts:
buildfile.go
Upstream-commit: 79b3265ef1f654181db4a1a85154f9735a0fac6e
Component: engine
2013-06-17 11:09:53 -07:00
21a945c9c4
Merge pull request #887 from dotcloud/761-packaging-dockerbuilder
...
Packaging, dockerbuilder: Automate pushing docker binary packages
Upstream-commit: 389db5f5987e927bf2f8f90ea536fec3a95ac1cb
Component: engine
2013-06-17 08:40:01 -07:00
4015efd9be
FIXMEs
...
Upstream-commit: 6746c385bd7938e1bbcf588a27651de63a2de04a
Component: engine
2013-06-15 12:24:20 -07:00
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
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
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
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
f839c4752b
FIXMEs
...
Upstream-commit: 5799806414b266c14a8ea2802cfa0906d920c62d
Component: engine
2013-06-14 16:29:19 -07:00
3562ef766f
Various FIXME items
...
Upstream-commit: 14265d9a18a4a2151bfd4e5c7e94de45377b6375
Component: engine
2013-06-14 15:11:34 -07:00
158248b9fd
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: 17235eb0893fc7f8658ed36da0ec336b2d1fca5d
Component: engine
2013-06-14 15:07:05 -07:00
40bdb17b30
Remove duplicate 'WARNING'
...
Upstream-commit: 7f118519eb007b2423fff428aceddabd6c1c301d
Component: engine
2013-06-14 14:46:08 -07:00
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
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
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
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
f884195c28
add test: fail to create container if mem limit < 512KB
...
Upstream-commit: d3f83a6592e3d79768d9d3805edec80642b69c4b
Component: engine
2013-06-14 22:55:00 +03:00
4bc27f700a
Add examples for local import.
...
Upstream-commit: 7958f1f694ac411dcfeb8fbf0d702a7c552306ae
Component: engine
2013-06-14 13:42:59 -06:00
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
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
5026ebfb0a
Merge branch 'master' of ssh://github.com/dotcloud/docker
...
Upstream-commit: c701de939f645030b36f2f89acbbcf30979fe5be
Component: engine
2013-06-14 11:58:46 -07:00
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
600eb1d103
Merge branch 'master' into postupload-endpoints-header
...
Conflicts:
server.go
Upstream-commit: 78e4a385f77c33933afc47c8b3f4436ce648eb54
Component: engine
2013-06-14 11:50:58 -07:00
25419889e5
install aufs-tools when setting up the testing vagrant box
...
Upstream-commit: 822abab17e33a0f87ef1d785a9148d3ea11cbb60
Component: engine
2013-06-14 21:41:12 +03:00
9b310a0f72
install aufs-tools when setting up the hack vagrant box
...
Upstream-commit: f1d16ea0035ee45341e5d4a143cdce5798847cb5
Component: engine
2013-06-14 21:41:12 +03:00
1d89b8f78f
add aufs-tools package to dev env docs page
...
Upstream-commit: fb7eaf67d1c01eea28fcbed61d6d8abd8117c965
Component: engine
2013-06-14 21:41:12 +03:00
1ee51a2d56
add aufs-tools to lxc-docker dependencies
...
Upstream-commit: e53721ef69b13365c18c9189145ae1fadb931f01
Component: engine
2013-06-14 21:38:15 +03:00
5f39923376
run auplink before unmounting aufs
...
Upstream-commit: 2f67a62b5b48862948b1ce92aeffbb83c3707ee0
Component: engine
2013-06-14 21:38:15 +03:00
d7771969bf
validate memory limits & error out if less than 512 KB
...
Upstream-commit: 9ee11161bf0c635a0b0164ae1dee806c6fcfe7b7
Component: engine
2013-06-14 19:52:44 +03:00
b78bf5bb71
update docs
...
Upstream-commit: e49f82b9e1a920c902c1cd813596dc1a78817e63
Component: engine
2013-06-14 10:10:26 +00:00
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
5bf955bfcc
fix virtual size on images
...
Upstream-commit: 00cf2a1fa264c167dff0dd50e296c93d4c59908f
Component: engine
2013-06-14 10:05:01 +00:00
9eee7b53cc
Packaging, dockerbuilder: Automate pushing docker binary packages
...
Upstream-commit: 3384943cd3bc5bb9fd79ccbda9d32a582ada69b3
Component: engine
2013-06-13 22:14:43 -07:00
d4a6b05778
Add build UT
...
Upstream-commit: 2f14dae83f23f62085015243a74df4ffc415c6c4
Component: engine
2013-06-13 18:52:41 -07:00
57ce6972e0
Fix issue with ADD
...
Upstream-commit: f03ebc20aa33dbb9b468fe476ce26467eb328060
Component: engine
2013-06-13 18:42:27 -07:00
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
c822b87ed3
Remove run() where it is not needed within the builder
...
Upstream-commit: 452128f0daf8117502fad2fe2f72b6f022223ddb
Component: engine
2013-06-13 15:18:15 -07:00
30e88c1b6c
Remove run from non-running commmands
...
Upstream-commit: f5fe3ce34e12f1660ee98cecdbe2c104567d88a6
Component: engine
2013-06-13 15:08:53 -07:00
cac3a28159
Remove run from the ADD instruction
...
Upstream-commit: d0084ce5f23453fbc008f5a2c5dd147b0df890e7
Component: engine
2013-06-13 14:57:50 -07:00
bc53b19305
Fix non-tty run issue
...
Upstream-commit: 2eaa0a1dd7354e429c056d68515f903351e3eeb4
Component: engine
2013-06-13 12:57:35 -07:00
77afac0ce2
Merge pull request #751 from dotcloud/660-auth_client-feature
...
* Registry: Move auth to the client
Upstream-commit: 80857545076ade871eff7fc76c2fe83554219e3f
Component: engine
2013-06-13 11:52:40 -07:00
4147a474f5
rebase master
...
Upstream-commit: c46382ba29c82eedab2b1601da5a81a047f078c2
Component: engine
2013-06-13 17:58:06 +00:00
5f7f6d9927
Updated build usage
...
Upstream-commit: b38c6929be500336de6f6a5f7a52d73cbf543fb6
Component: engine
2013-06-13 10:50:55 -07:00
87329359a3
Fix merge issue
...
Upstream-commit: 42d1c36a5c775a37a0173cf315086fde1c1b7dd8
Component: engine
2013-06-13 10:25:43 -07:00
