Commit Graph
11606 Commits
Author SHA1 Message Date
golubbe 0b7ffe7460 Create GOVERNANCE.md
Information on Governance Advisory Board and associated proposals

Signed-off-by: Ben Golub <ben.golub@docker.com>
Upstream-commit: d453d8b3210310f12a66a64a57b2946ce93653b8
Component: engine
2014-11-05 21:48:17 +00:00
Fred Lifton d833712ff9 Merge pull request #8874 from whoshuu/patch-1
Fix apparent copy paste mistake
Upstream-commit: f10fefe408d2b6b40191d802c5244ea6379954f9
Component: engine
2014-11-05 12:24:53 -08:00
Vivek Goyal 9b64c7701c devmapper: Fix gofmt related build failures
My pull request failed the build due to gofmat issues. I have run gofmt
on specified files and this commit fixes it.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: ff56531de47c08157b2a37e6c6b6189a5006dba2
Component: engine
2014-11-05 14:39:54 -05:00
Josh Hawn 5426d99b67 Compute TarSum on storage of image layer content
Now, newly created/imported layers will have the checksum of
the layer diff computed and stored in the image json file.

For now, it is not an error if the computed checksum does not
match an existing checksum, only a warning message is logged. The
eventual goal is to use the checksums in the image JSON to verify
the integrity of the layer contents when doing `docker load` or
`docker pull`, and error out if it does not match.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 059e589c3427b1afa1b112acc931f59b5b063e16
Component: engine
2014-11-05 10:17:55 -08:00
Alexandr Morozov 07c8c2eea7 Fix vet errors
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 18d9f1978b311ff9cadce9f0237313db14502f9f
Component: engine
2014-11-05 08:26:22 -08:00
Brian Goff 412668aa98 Bring API docs inline with 1.3
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: e86223e7b3ea7766164d809d2fbd463870e0614a
Component: engine
2014-11-05 09:38:44 -05:00
Vivek Goyal 71157e5ee3 devmapper: Save and restore NextDeviceId in a file
The way thin-pool right now is designed, user space is supposed to keep
track of what device ids have already been used. If user space tries to
create a new thin/snap device and device id has already been used, thin
pool retuns -EEXIST.

Upon receiving -EEXIST, current docker implementation simply tries the
NextDeviceId++ and keeps on doing this till it finds a free device id.

This approach has two issues.

- It is little suboptimal.
- If device id already exists, current kenrel implementation spits out
  a messsage on console.

[17991.140135] device-mapper: thin: Creation of new snapshot 33 of device 3 failed.

Here kenrel is trying to tell user that device id 33 has already been used.
And this shows up for every device id docker tries till it reaches a point
where device ids are not used. So if there are thousands of container and
one is trying to create a new container after fresh docker start, expect
thousands of such warnings to flood console.

This patch saves the NextDeviceId in a file in
/var/lib/docker/devmapper/metadata/deviceset-metadata and reads it back
when docker starts. This way we don't retry lots of device ids which 
have already been used. 

There might be some device ids which are free but we will get back to them
once device numbers wrap around (24bit limit on device ids).

This patch should cut down on number of kernel warnings.

Notice that I am creating a deviceset metadata file which is a global file
for this pool. So down the line if we need to save more data we should be
able to do that.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 8c9e5e5e05f8ddfcf8cd5218edb83d9fe8238d81
Component: engine
2014-11-05 09:25:02 -05:00
Vivek Goyal e178fdae88 devmapper: Export nextDeviceId so that json.Marshal() can operate on it
I was trying to save nextDeviceId to a file but it would not work and
json.Marshal() will do nothing. Then some search showed that I need to
make first letter of struct field capital, exporting this field and
now json.Marshal() works.

This is a preparatory patch for the next one.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 8e9a18039be6ade0b8db65f7f298959055d86192
Component: engine
2014-11-05 09:25:02 -05:00
Vivek Goyal cbe4b0091a devmapper: Move file write and rename functionality in a separate function
Currently we save device metadata and have a helper function saveMetadata()
which converts data in json format as well as saves it to file. For
converting data in json format, one needs to know what is being saved.

Break this function down in two functions. One function only has file
write capability and takes in argument about byte array of json data.
Now this function does not have to know what data is being saved. It
only knows about a stream of json data is being saved to a file.

This allows me to reuse this function to save a different type of
metadata. In this case I am planning to save NextDeviceId so that
docker can use this device Id upon next restart. Otherwise docker
starts from 0 which is suboptimal.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 67fbd34d8379a1b8232aea5d126a389f64bdc59a
Component: engine
2014-11-05 09:25:02 -05:00
Blake Geno 92c39891ed Removed fixme from utils_test.go
Signed-off-by: Blake Geno <blakegeno@gmail.com>
Upstream-commit: cbb88741e40315c5e92f2be92faedc178cf32d1c
Component: engine
2014-11-05 08:36:08 -05:00
James Turnbull 458ef2c326 Merge pull request #8876 from whoshuu/docpatch-2
Remove out-of-context code block
Upstream-commit: a61c4dc959bd9370f6c6240efbeff2bf73433676
Component: engine
2014-11-05 10:52:50 +01:00
unclejack 537f6ff11c bump fpm to 1.3.2
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 03f67aa46a07024a98dd9677a3b3e73ea5da80c3
Component: engine
2014-11-05 10:12:57 +02:00
unclejack 9683bcb389 Merge pull request #8577 from vbatts/vbatts-registry_certs
registry: don't iterate through certs
Upstream-commit: 662efd95c7a30e5593ca9fdc672ad3f1d6f9703c
Component: engine
2014-11-05 09:46:24 +02:00
James Turnbull e4bc9907a8 Merge pull request #8915 from gDD/patch-1
Remove extra line feed typo
Upstream-commit: 387c892126534a12d8dccffaed8c8a8f5f2548b8
Component: engine
2014-11-05 08:22:09 +01:00
James Turnbull f4fd766b12 Merge pull request #8908 from medimatrix/patch-1
Grammatical mistake in docs
Upstream-commit: 49ecc499d7f0898fc046cd19468a187b7d5e4d5c
Component: engine
2014-11-05 08:21:00 +01:00
George Xie b25bfe881c unify (en dash) to - when specifying options
Signed-off-by: Xie Shi <georgexsh@gmail.com>
Upstream-commit: c81337d5dbcc6a670d24f2faf9b181730fe547e4
Component: engine
2014-11-05 13:50:59 +08:00
Josh Hawn ed13d0fdd5 Finalize TarSum Version 1 w/ refactor
The current Dev version of TarSum includes hashing of extended
file attributes and omits inclusion of modified time headers.

I refactored the logic around the version differences to make it
more clear that the difference between versions is in how tar
headers are selected and ordered.

TarSum Version 1 is now declared with the new Dev version continuing
to track it.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: a7aa2c8ad26149e9be753bc08964f35cb09d313c
Component: engine
2014-11-04 21:38:52 -08:00
Sven Dowideit 169fd0e84d Merge pull request #8900 from nhsiehgit/updatefooter
Updatefooter
Upstream-commit: 0d513b5a845f274c4ff06f6e7bc772e49167cda3
Component: engine
2014-11-04 17:14:58 -08:00
Tibor Vass ab8d055502 Merge pull request #8345 from duglin/Issue5184
Add a better error message when we get an unknown http issue
Upstream-commit: b79211f4ae0f08975d02c5d51bb482f965d60a88
Component: engine
2014-11-04 20:07:41 -05:00
Doug Davis 1a2c21becb Add a better error message when we get an unknown http issue
Closes #5184

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 6fdaa66652d65558d8225d58f3ac48904ebac1de
Component: engine
2014-11-04 16:46:41 -08:00
Sven Dowideit acc213bbca Merge pull request #8892 from fredlf/relnotes-edit
Edits and refinements to 1.3.1 release notes.
Upstream-commit: 098ccba6bd9d64f11690c4ef9cc61e371557316d
Component: engine
2014-11-04 16:43:07 -08:00
Blake Geno cf0b29ad8c made getDefaultNetworkMtu private
Signed-off-by: Blake Geno <blakegeno@gmail.com>
Upstream-commit: 224999d9c21dc6d1d9aa43fb364ded09726e1d56
Component: engine
2014-11-04 18:53:34 -05:00
Nathan Hsieh 1b36243f30 Updated footer to match rest of site
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com>
Upstream-commit: ebeccee968e5edba5043920581a5b6976aa504c0
Component: engine
2014-11-04 15:28:38 -08:00
Alexandr Morozov fa6d8281bd Add check for IP_NF_FILTER
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: e621f99923ae8ab74a44d1fa2416e28a6dbc6eb0
Component: engine
2014-11-04 14:47:13 -08:00
Tianon Gravi 3b3d561fb2 Merge pull request #8404 from danjpgriffin/master
Preserve extended attributes and acls on archlinux build
Upstream-commit: c478143ec0ca8f610f7980991b9b2ba0e1160b3e
Component: engine
2014-11-04 14:14:10 -07:00
Vincent Batts 8b766a1400 registry: don't iterate through certs
the golang tls.Conn does a fine job of that.
http://golang.org/src/pkg/crypto/tls/handshake_client.go?#L334

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: a368e064a972ab75561ee50067a3168b9d8d277e
Component: engine
2014-11-04 16:12:23 -05:00
Tianon Gravi e0fdd888ad Merge pull request #8936 from jfrazelle/drone-server
Switch Travis for Drone
Upstream-commit: 14e65b4f81004b0946816f93a46576bd991fe6e2
Component: engine
2014-11-04 11:18:39 -07:00
Tianon Gravi 94faaa2f15 Merge pull request #8700 from unclejack/install_no_pull
contrib/install.sh: remove pull of hello-world
Upstream-commit: c6cf978b4ba8f246094001be8f8d8d6a4319f697
Component: engine
2014-11-04 10:28:43 -07:00
Solomon Hykes 1b800d5ab8 Merge pull request #8950 from Bertg/patch-1
makes the -s --size option documentation clearer
Upstream-commit: 59d4161f6945cf50889c2e7418f8c8334b9b53ea
Component: engine
2014-11-04 09:09:15 -08:00
unclejack 53dcf06a52 contrib/install.sh: remove pull of hello-world
This removes the pull of the hello-world image from install.sh to
address privacy concerns.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: f9d80712d9417feadd63cb71c0c7825c4e9f9fd4
Component: engine
2014-11-04 19:05:47 +02:00
Alexandr Morozov 866705ded6 Merge pull request #8946 from unclejack/stream_decode
Decode JSON to avoid ReadFile
Upstream-commit: b8678aa7f5f2b266644825a460a0126fe6439b76
Component: engine
2014-11-04 09:02:40 -08:00
Bert Goethals de998bcb26 makes the -s --size option documentation clearer
Upstream-commit: 762ffda95d9ddd4f75fa94971ac85c52389648c1
Component: engine
2014-11-04 17:49:39 +01:00
Jessie Frazelle 0e78b6c4a5 Merge pull request #8871 from tonistiigi/start-wait-hijack
Wait for hijack on docker start command
Upstream-commit: a34f31b488dce94314e3218e3d52c38747cabc2f
Component: engine
2014-11-04 08:46:56 -08:00
Tibor Vass 87ba3d709c Merge pull request #8877 from erikh/proxy_error_check
proxy: Fix a potential panic handling error states.
Upstream-commit: fa59fe997c83e2a6968f8c03c64352acd71c26da
Component: engine
2014-11-04 11:40:02 -05:00
Tibor Vass 8e8fff205d Merge pull request #8813 from jlhawn/aufs_exclude_on_tar_layer
Exclude `.wh..wh.*` AUFS metadata on layer export
Upstream-commit: 6718791ea28be1bd6bce49cd9f49844c24f9dcf7
Component: engine
2014-11-04 11:38:12 -05:00
Arnaud Porterie beb511a224 Merge pull request #8906 from dqminh/remove-copy-directory
change util.CopyDirectory to archive.CopyWithTar
Upstream-commit: edae8830a9030e23e68cb2fe1edc6f58f825c1b4
Component: engine
2014-11-04 08:02:35 -08:00
Alexandr Morozov 1ce2377d8b Merge pull request #8390 from MalteJ/set-macaddress
Adding docker-cli run param to set MAC address
Upstream-commit: 9eb8fcd58a5dc0a6fd812fc2bdc410f36dd63cc0
Component: engine
2014-11-04 07:54:59 -08:00
Malte Janduda d1a9c32b50 enhancing set-macaddress docu #2
Signed-off-by: Malte Janduda <mail@janduda.net>
Upstream-commit: 28605bc4d55bcfc7a5562e4de3e01b1d5cd9bdcd
Component: engine
2014-11-04 15:19:47 +01:00
unclejack ec75c9da78 volume: stream JSON & Decode
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: f665be55fe832086202e54449402c1513cf4f195
Component: engine
2014-11-04 16:15:07 +02:00
unclejack 617b00b175 image: stream img JSON & Decode in LoadImage
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 4dbbe4f51a22a9ec335fbf2f6e3981132f868312
Component: engine
2014-11-04 16:15:00 +02:00
unclejack af218ee675 daemon/container: stream & decode JSON
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 4bc28f4e6bb38ec70fb98a4deea723a2d0812d98
Component: engine
2014-11-04 16:14:47 +02:00
Sven Dowideit 8be6c529c8 Merge pull request #8924 from pdericson/api-doc-fix
Fix typo in api docs: stdou -> stdout
Upstream-commit: b68d7d39bcd96744eec883bb305e907c10fe6aa6
Component: engine
2014-11-03 23:09:16 -08:00
Patrick Hemmer 5fd84c98fc Support hairpin NAT
This re-applies commit b39d02b with additional iptables rules to solve the issue with containers routing back into themselves.

The previous issue with this attempt was that the DNAT rule would send traffic back into the container it came from. When this happens you have 2 issues.
1) reverse path filtering. The container is going to see the traffic coming in from the outside and it's going to have a source address of itself. So reverse path filtering will kick in and drop the packet.
2) direct return mismatch. Assuming you turned reverse path filtering off, when the packet comes back in, it's goign to have a source address of itself, thus when the reply traffic is sent, it's going to have a source address of itself. But the original packet was sent to the host IP address, so the traffic will be dropped because it's coming from an address which the original traffic was not sent to (and likely with an incorrect port as well).

The solution to this is to masquerade the traffic when it gets routed back into the origin container. However for this to work you need to enable hairpin mode on the bridge port, otherwise the kernel will just drop the traffic.
The hairpin mode set is part of libcontainer, while the MASQ change is part of docker.

This reverts commit 63c303eecdbaf4dc7967fd51b82cd447c778cecc.

Docker-DCO-1.1-Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com> (github: phemmer)
Upstream-commit: 95a400e6e1a3b5da68431e64f9902a3fac218360
Component: engine
2014-11-03 23:09:08 -05:00
Tibor Vass a59bba1a32 Merge pull request #8799 from jlhawn/remove_jsondata_arg
Remove `jsonData` argument from `image.StoreImage`
Upstream-commit: 5b03a21963931f917297e52cb17a62680f1c2a6e
Component: engine
2014-11-03 20:55:40 -05:00
Jessica Frazelle c408fa1be8 Switch travis status to drone.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 4b4b88a8730b459944b0b0ab51adc7d401c87667
Component: engine
2014-11-03 17:48:50 -08:00
Jessica Frazelle 2066d9b496 Remove travis CI.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 471adb73a9c3a23ac7c599621531b5fada1a127f
Component: engine
2014-11-03 17:46:33 -08:00
Josh Hawn ade837e2a4 Remove jsonData argument from image.StoreImage
The argument specified the json data to save to disk when registering
a new image into the image graph. If it is nil, then the given image
is serialized to json and that is written by default. This default
behavior is sufficient if the given image was originally deserialzed
from this jsonData to begin with which has always been the case.

Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 26184de8ab1dfe812094c55c9becd8ebb60ed7be
Component: engine
2014-11-03 17:39:21 -08:00
Tibor Vass 57dd70ac4a Merge pull request #8863 from vbatts/vbatts-archive_stat
./pkg/archive: clean up Stat_t assertion
Upstream-commit: 54d6d12556d7f83ad3e9a3ee081ddb6cc98549b4
Component: engine
2014-11-03 19:14:39 -05:00
Tibor Vass 9bfa240ca3 Merge pull request #8590 from jfrazelle/8307-iptables-d-restart-fix
On daemon shutdown iptables cleanup successfully
Upstream-commit: b8ab729ae63e3b21105ee00478995d8d81dc7d3d
Component: engine
2014-11-03 18:29:51 -05:00
Fred Lifton 78e3305d6c Added missing item from Changelog
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 06f366bf0041a223ae848e6a8df0c8cc41f08001
Component: engine
2014-11-03 13:51:51 -08:00