Commit Graph

10054 Commits

Author SHA1 Message Date
2e080f911c Merge pull request #8408 from tonistiigi/8407-fix-host-header
Fix Host header on stream commands
Upstream-commit: 887d9238f5af04123755dcf513c28c891246363b
Component: engine
2014-10-06 09:48:12 -07:00
46821ac41b Fix streaming JSON Content-type for postBuild
See #8101

lineDelim is used by streamJSON() so it needs to be set
before its called.

Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
Upstream-commit: 30d6ff99fc6a22937b21bd9f35610d5f74a9b6e7
Component: engine
2014-10-06 19:20:10 +03:00
4d3be83da7 Fix Host header on stream commands
Fixes #8407

Setting Host on URL only works if the Request does not
already have its Host property set.

Note that the API version was also swallowed.

Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
Upstream-commit: e457b21db32359af085b04b5900ca6aab993ac86
Component: engine
2014-10-06 17:04:27 +03:00
712eaeae70 Merge pull request #8388 from merty/patch-1
Fixed a typo in "Installing Docker on Mac OS X"
Upstream-commit: 44264f48e43bd556636326229e7e11c0fb8a23e1
Component: engine
2014-10-03 22:03:50 -04:00
4bc322dfa5 Merge pull request #8360 from duglin/Issue5509
Add note to docs about lack of shell processing in JSON form - Issue 5509
Upstream-commit: 62391d68a4b9c1dafd52d087a03cf3a847a4f477
Component: engine
2014-10-03 22:03:31 -04:00
f49339f3ba Merge pull request #8222 from fredlf/adding_official-repo-guidelines
Edits and fixes based on review.
Upstream-commit: 95e169a6a14b46c9db6b6d316524b28abfdc3391
Component: engine
2014-10-03 22:03:05 -04:00
505d3e474a Merge pull request #8392 from jfrazelle/pr_8389
Invalid mount mode for volumes in
Upstream-commit: 84d9fd37b05c22a61af2ab86c6783089b456790b
Component: engine
2014-10-03 17:22:21 -07:00
143d6d0145 Add test for invalid mount mode for volumes in.
Closes #8389.

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: b10b458b6ef8327268676744a7c3230e33c9baf6
Component: engine
2014-10-03 16:17:51 -07:00
4380fb4361 Merge pull request #8297 from aluzzardi/f-stable-ip
Stable Networking: Keep the same network settings during the entire container lifecycle.
Upstream-commit: d152a93b5f3acbd14e9176169934b83963f3ab61
Component: engine
2014-10-03 14:19:46 -07:00
c05ce270f8 Fixes bad validMountMode check
Needed to check if the mode was invalid and return error, not valid and
return error.

This didn't get picked up because the existing integration-cli tests
were all either expecting errors when a valid mode was passed in (e.g.
"ro" passed in, we expected an error because it was testing write).  So
modified a test which was testing for "rw" to actually pass in "rw"
instead of assuming the "rw"

Docker-DCO-1.1-Signed-off-by: Brian Goff <bgoff@cpuguy83-mbp.home> (github: cpuguy83)
Upstream-commit: 007b4f63409c6c642fb075640a8ec7d58825edc8
Component: engine
2014-10-03 16:55:39 -04:00
bad1803f92 Stable MAC addresses: Add support for MAC address restoring.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: b669025949f1dba1ad3af9bab6711736863d6e24
Component: engine
2014-10-03 13:46:24 -07:00
e8d74130ef Daemon: Restore network settings at startup.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: f1087c5fcf070f151601f643418f3963facfea84
Component: engine
2014-10-03 13:46:24 -07:00
5b30bf9410 Stable Networking: Keep the same network settings across container restarts.
This change will allocate network settings (IP and public ports) at
container creation rather than start and keep them throughout the
lifetime of the container (i.e. until it gets destroyed) instead of
discarding them when the container is stopped.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: a4875937293f3b0a8ffc569608bbca40a456e9c8
Component: engine
2014-10-03 13:46:24 -07:00
2fa4089519 Container: Add restore network functionality.
RestoreNetwork() allows the container to restore its NetworkSettings (IP
and public ports).

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: deffc572ced3909c0ecd77dd21686e0e67c0ea33
Component: engine
2014-10-03 13:46:24 -07:00
6b98f72598 Container: Make allocateNetwork and releaseNetwork public.
Since we are moving network allocation outside of container scope (it
will be managed by create/destroy), those functions need to be
accessible from the outside.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: ab4188c08d9eb63c84c461a9b922f2af479b5a04
Component: engine
2014-10-03 13:46:24 -07:00
89c89a77ed Network Allocation: Proper rollback in case of failure allocation.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 103a4e0676f0099759e6f9a29ea1c9dc32766806
Component: engine
2014-10-03 13:46:24 -07:00
c852b13067 Merge pull request #8371 from aluzzardi/f-consistent-mac
Support for consistent MAC address.
Upstream-commit: beff5067c8b97b37c4fd7e9bee08a0adb8947c99
Component: engine
2014-10-03 13:28:03 -07:00
4418404026 Support for consistent MAC address.
Right now, MAC addresses are randomly generated by the kernel when
creating the veth interfaces.

This causes different issues related to ARP, such as #4581, #5737 and #8269.

This change adds support for consistent MAC addresses, guaranteeing that
an IP address will always end up with the same MAC address, no matter
what.

Since IP addresses are already guaranteed to be unique by the
IPAllocator, MAC addresses will inherit this property as well for free.

Consistent mac addresses is also a requirement for stable networking (#8297)
since re-using the same IP address on a different MAC address triggers the ARP
issue.

Finally, this change makes the MAC address accessible through docker
inspect, which fixes #4033.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 88e21c6a75310da158bbee3a5fdc135697c93ba1
Component: engine
2014-10-03 13:22:38 -07:00
5187532659 Fixed a typo in "Installing Docker on Mac OS X"
evironment -> environment
Upstream-commit: 81cddaaa7ddd09cd928529e988df28d17a180203
Component: engine
2014-10-03 23:18:40 +03:00
ddc310264c Merge pull request #8375 from fgrehm/patch-2
docs: Update `docker exec` examples
Upstream-commit: 94da44cacf189de091509d73298cfdc19fda557e
Component: engine
2014-10-03 11:30:37 -07:00
6025f8d6c7 Merge pull request #8324 from cpuguy83/6231_fix_chunked_encoding
Fix #6231 - Accept chunked encoding on start
Upstream-commit: 5a627e41ff853ca50586603eae166b63a94a62a6
Component: engine
2014-10-03 11:27:57 -07:00
fce5950bb6 Fix #6231 - Accept chunked encoding on start
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 86bfb9bca6a5e1e78b01741b076505c137f52673
Component: engine
2014-10-03 14:18:25 -04:00
b84c9439ff Merge pull request #8336 from kwk/improve_docs_with_note_about_registry_frontend_web_app
Improve docs with note about registry frontend web app
Upstream-commit: 23dc2ca2d5eb74675acf44f0f8b7a8a666c13263
Component: engine
2014-10-03 11:00:32 -07:00
9b0677b8de Merge pull request #8320 from dmcgowan/provenance_pull
Official image provenance pull flow
Upstream-commit: eaaf9e31258ca0af042e07c707f6bbb3afeb293b
Component: engine
2014-10-03 10:56:54 -07:00
16bdc4eee3 Add note to docs about lack of shell processing in JSON form
Closes #5509

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 98ceae1a8499979f725bd04dfbc47ccf831331a7
Component: engine
2014-10-03 05:18:25 -07:00
b21689409c docs: Update docker exec examples
Signed-off-by: Fabio Rehm <fgrehm@gmail.com>
Upstream-commit: 6480b30a997a8fe9884504f669b9c5a68d887f55
Component: engine
2014-10-03 01:13:59 -03:00
5bef25580f Make volume.Containers private
Also wrap access in mutex.
Makes sure we don't have any pontential for races in accessing this.
It also doesn't really need to be/shouldn't be in the config.json anyway

Docker-DCO-1.1-Signed-off-by: Brian Goff <bgoff@cpuguy83-mbp.home> (github: cpuguy83)
Upstream-commit: c5e728c953e29b8008cdfb8367910e33ba28b99c
Component: engine
2014-10-02 20:46:17 -04:00
1510f709b8 Add comment for permission and fix wrong format variable
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 22e59009e491dc8b32b512e0d2297662d278af45
Component: engine
2014-10-02 17:41:57 -07:00
02413ae0ec Merge pull request #8351 from kencochrane/8347_fix_broken_doc_build
Fixed issue with docs not getting built due to ssl error.
Upstream-commit: 8a0733ce69a12cd129953b903c106ac0f85b818d
Component: engine
2014-10-02 15:58:18 -07:00
57338d434f docker rm <unknown>
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 3eaa1c99c1acf8758175658450d58b15ddf0764a
Component: engine
2014-10-02 22:52:37 +00:00
824c8d6309 Update libconatiner to b3570267c7b7995d5d618974d8f
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 193654e3ef26067315d6c68c3066215e5c509ae5
Component: engine
2014-10-02 22:19:56 +00:00
46af7d8ab7 Merge pull request #8364 from tianon/bash-completion-filters
Optimize the bash completion even further
Upstream-commit: 45667fb1bb30fb206dd6c481f0bd8952c68cf122
Component: engine
2014-10-02 15:00:01 -07:00
f00d6f8a4d Merge pull request #8358 from docker/6969-reponame-rest-api
Added validity checks for repo name and tag in build job
Upstream-commit: 34f4144b7f7038de40e4d45ff5b1178c788404c0
Component: engine
2014-10-02 14:22:57 -07:00
641063cc8e Optimize the bash completion even further
The biggest/bestest change here is cutting down on the number of calls to Docker in the filtering helpers (`__docker_containers_running`, etc), especially calls to the really heavy `docker images`.

Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 0597b6445db0b0aeb4a0459f3af4f074a865a42f
Component: engine
2014-10-02 15:13:37 -06:00
6da135ab37 Edits and fixes to Dockerfile Best Practices based on review feedback.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 36db0a30fa471aa96cf5acd8139b554db78cec22
Component: engine
2014-10-02 14:08:39 -07:00
9056c02a80 add bash completion support for pause and unpause
Signed-off-by: Michael Scharf <github@scharf.gr>
Upstream-commit: cbb81c30bd50952f84d4a60e850c1cede3318a77
Component: engine
2014-10-02 14:18:47 -06:00
ec180a21a6 Merge pull request #8213 from brahmaroutu/pull_status_2404
Print a status message when pull command is executed
Upstream-commit: f69a262464bd9d6dccb1d059b3a84c6ef9587a87
Component: engine
2014-10-02 09:56:18 -07:00
6fa0bb6bd9 Added validity checks for repo name and tag in build job.
Signed-off-by: Joffrey F <joffrey@docker.com>
Upstream-commit: aabba9801a63228bb2e5144c8688b60e4d429ac2
Component: engine
2014-10-02 17:37:13 +02:00
cf801a51a6 Typo: changed "Maintainers" to "maintainers"
Signed-off-by: Konrad Kleine <konrad.wilhelm.kleine@gmail.com>
Upstream-commit: e08f22cdb2b1e10661f76582f9a8ba7d1cb80bea
Component: engine
2014-10-02 08:43:30 +02:00
4d78f5d6d8 Add provenance pull flow for official images
Add support for pulling signed images from a version 2 registry.
Only official images within the library namespace will be pull from the
new registry and check the build signature.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 7c88e8f13d9f0c68de6da0cd467a541231304dd5
Component: engine
2014-10-01 18:26:06 -07:00
fd74b5fbc9 Fixed issue with docs not getting built due to ssl error.
Signed-off-by: Ken Cochrane <ken@docker.com>
Upstream-commit: 7f261ebe6cc60c01fd10f5f86f1c22d512be3f5f
Component: engine
2014-10-01 21:11:10 -04:00
cc46ff71c2 Merge pull request #8346 from juliantaylor/mkimage-debootstrap
fix help message for mkimage debootstrap with components
Upstream-commit: 7304c09ecc8cd7c97ca1a30e97f8e2a206e8b737
Component: engine
2014-10-01 17:47:26 -07:00
ff11ba1435 Print a status message when pull command is executed
Using repo tag in the status message for better usability, as per review comments
Added documentation and Changed code to print Status after downloads are complete

Addresses #2404

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: ecff6303a366a5e8fd178b7baa1c64895a3a3622
Component: engine
2014-10-01 22:55:29 +00:00
0172f7a1f0 Merge pull request #8350 from erikh/add_erikh_maintainer_proxy
Add erikh as maintainer of pkg/proxy
Upstream-commit: 4c8b8861ecb6b47230e0e021760922e15e8afd3f
Component: engine
2014-10-01 15:50:41 -07:00
b0e52e738c Add erikh as maintainer of pkg/proxy
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 10efa07fa28e400a597ed7076aa0d730a081ebf2
Component: engine
2014-10-01 15:37:46 -07:00
68f6cb4aa6 Merge pull request #8337 from tjwebb123/patch-1
Update host_integration.md
Upstream-commit: 23221c55665ca63fb2ff9d7e846665a2506a7a0f
Component: engine
2014-10-01 15:37:02 -07:00
1849734cbc fix help message for mkimage debootstrap with components
debootstrap needs the suite as the second argument, for this the script
reorders arguments beginning with a minus but components separated by
space, as stated by the help message, is not handled and will lead to
the rootfs being passed as suite to debootstrap.
The poor mans solution is to fix the help message to pass the long
option as one argument.

Signed-off-by: Julian Taylor <jtaylor.debian@googlemail.com>
Upstream-commit: 34672240b4e69f5f50448e462540bb0259eecf31
Component: engine
2014-10-01 23:18:23 +02:00
8635bae7b0 Update libtrust version
Updated to version of libtrust with the trust graph implementation

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 8a6c7100ea7f6ea82ba567863b6401f45766625b
Component: engine
2014-10-01 13:19:40 -07:00
082c35423e registry: getting Endpoint ironned out
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 61c6f206b073159c5463a083e0d04e5934351dfe
Component: engine
2014-10-01 13:19:40 -07:00
9710588070 Merge pull request #8316 from duglin/Issue4787
Add a note about using an open schema model - Issue #4787
Upstream-commit: 04251b3e544d82db2dfc140bd27172a7f1876e5e
Component: engine
2014-10-01 11:21:09 -07:00