Commit Graph

12484 Commits

Author SHA1 Message Date
fc2be6379b Merge pull request #9985 from jfrazelle/fix-exited-filter-should-not-show-running
`docker ps --filter exited=status` should not show running containers
Upstream-commit: 3ec695924009421f9b1f79368e9e5b1e3e2ca94f
Component: engine
2015-01-12 15:09:22 -05:00
41d533f2c1 Merge pull request #9953 from evverx/patch-1
Update Ubuntu image tag to 14.04
Upstream-commit: a52c3a74f8806e49915a4d5134ea14151519a954
Component: engine
2015-01-12 12:07:12 -08:00
6e3c62c8f5 Merge pull request #9987 from jfrazelle/fix-filter-status-exited-not-require-all
`docker ps --filter status=exited should not require passing -a`
Upstream-commit: e90e754682a4f041e9e7c8a23201524362a2433d
Component: engine
2015-01-12 15:05:58 -05:00
f517945c4b Merge pull request #9988 from nponeccop/patch-1
FsMagic should avoid sign extension on i686
Upstream-commit: 16fe2ac6b2f8a9f109d15cd4105ac8a5e7c49dd4
Component: engine
2015-01-12 12:02:09 -08:00
51bf382f08 Merge pull request #9992 from iKevinY/readme-italics
Add missing italics to list items in README
Upstream-commit: ed47284f0d6afd7afb17ed053aa03fc8a2d34a7c
Component: engine
2015-01-12 11:50:04 -08:00
66d4635c4c Merge pull request #10014 from tianon/fix-msys
Fix a few minor issues with building/running inside msysGit
Upstream-commit: 862a124db4a740b7059bf121672fcdb850513c97
Component: engine
2015-01-12 11:44:43 -08:00
87c9f594f0 Merge pull request #10047 from vbatts/vbatts-graphdriver_driver_put_with_error
graphdriver: change (*Driver).Put signature
Upstream-commit: 83ab6237ac0d58e54c2f6f9308136594774386ba
Component: engine
2015-01-12 11:42:11 -08:00
641ddd33d7 Merge pull request #10009 from jfrazelle/add-master-docs-to-readme
Add link to master docs.
Upstream-commit: d17e4175b6061f3f988df9ca724c73386e23e882
Component: engine
2015-01-12 11:31:11 -08:00
7f5bc0b9fa Merge pull request #10048 from vbatts/vbatts-dm_no_newline
devmapper: remove newline string
Upstream-commit: 1c57555285b3dae6fd8d3734c80daf6547b24c66
Component: engine
2015-01-12 14:26:19 -05:00
8a3bf98a1e Merge pull request #10049 from crosbymichael/update-libcontainer-jan12
Update libcontainer to 6460fd79667466d2d9ec03f77f3
Upstream-commit: 1a73946e95c92ef958adbf7700e813859cee49b9
Component: engine
2015-01-12 11:15:12 -08:00
c0b5b7e2d2 Update lxc with libcontainer SetupUser change
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 582a79f00a1d87ba0debd8f3785d867c02451e5f
Component: engine
2015-01-12 10:43:33 -08:00
dad1430323 Merge pull request #9560 from jlhawn/image_spec
Adds Docker Image v1 Spec Documention
Upstream-commit: 0192b6c539b78e8c83b2797b2f088a5552d87c25
Component: engine
2015-01-12 10:41:44 -08:00
67a17d26c7 devmapper: remove newline string
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 2b51d1a167055834df331fb23c6cd373ebc06211
Component: engine
2015-01-12 13:40:42 -05:00
c9c0b0be61 Update libcontainer to 6460fd79667466d2d9ec03f77f3
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 115d8bac6017cc5703fe34e679f1a30a4759a9ff
Component: engine
2015-01-12 10:38:15 -08:00
16b3adaadc Adds Docker Image v1 Spec Documention
Many iterations have gone into documenting a v1 specification of Docker's Image
format.

v1 Image spec: clarify parent field

- metalivedev pointed out that the description was ambiguous, so I've removed
  mention that it was randomly generated. It IS the ID of the parent image.

Updated v1 image specificatino documentation

- More complete details and deprication notifications for each field
  in the JSON metadata of an image.
- Details on the format for packaging combined Image JSON + Filesystem
  Changeset archives for all layers of an image.

Clarify description of an image "Layer" in v1 spec

Updated intro of image v1 spec

Updated image v1 spec after more review

- Removed description of "Image" from the terminology section. The entire
  document is meant to serve this purpose.
- Updated the definition of "Image Filesystem Changeset".
- Clarified the level of randomness needed for generating image IDs.
- Updated the description of "Image Checksum".
- Added term descriptions for "Repository" and "Tag"
- Removed extraneous/implementation-specific fields from the Image JSON
  example file and field descriptions:
  - removed "container_config" and "docker_version" fields.
  - Added missing "author" field example and description.
- Removed extraneous/implementation-specific fields from the "config" struct
  example and description:
  - removed "Hostname", "Domainname", "Cpuset", "AttachStdin", "AttachStdout",
    "AttachStderr", "PortSpecs", "Tty", "OpenStdin", "StdinOnce", "Image",
    "NetworkDisabled", and "OnBuild".
- Updated example Image JSON config with better example values for "Env",
  "Cmd", "Volumes", "WorkingDir", "Entrypoint", "CpuShares", "Memory",
  "MemorySwap", and "User".
- Added notices that any fields not specified are to be considered as
  implementation specific and should be ignored my implementations which
  are unable to interpret them.
- Updated example of creating layer filesystem changesets to use less formal
  language.
- Listed more details in the section regarding extraction of a bundle of image
  layers into the root filesystem of a container.
- Updated the closing mention of Docker as an evolving implementation.

More updates to the v1 image spec

- Added line wrapping after 80 columns per line to adhere to documentation
  style guides, as pointed out by @jamtur01

- Removed references to any specific docker commands, updated a few descriptions
  or drop repeated statements, as pointed out by @cpuguy83

Cleanup image v1 spec draft after fredlf comments

Address comments by mmdriley on v1 image spec

Improve description of image v1 spec 'config.User`

- Improves description of image v1 specification for the 'User' runtime
  parameter after recomendations by tianon.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 79910625f0a7aa76590e4362817dda22f28343aa
Component: engine
2015-01-12 10:37:46 -08:00
0e444dd64f graphdriver: change (*Driver).Put signature
There are a couple of drivers that swallow errors that may occur in
their Put() implementation.

This changes the signature of (*Driver).Put for all the drivers implemented.

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
Upstream-commit: 00fd63e55807c36fedf0878645dfec995fba381d
Component: engine
2015-01-12 13:34:35 -05:00
7bde3c37f9 Merge pull request #9990 from hqhq/fix_minor_type
registry: fix minor typo
Upstream-commit: cb4ea2c778eb022475e5bcd9305176e7b8413fad
Component: engine
2015-01-12 13:32:16 -05:00
dd12a29c6a Merge pull request #10006 from jfrazelle/docs-release-fixes
Update docs release script so we can have autodeploys
Upstream-commit: 1781fed7305dcba5e69df448d5df0438fec7e366
Component: engine
2015-01-12 10:03:33 -08:00
8ffe7cacc7 Update docs release script so we can have autodeploys
to docs.master.dockerproject.com.

- Make the invaidation profile the bucket variable, not hard coded.
- Add no cache variable for settings cache to "no-cache"

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: a6a748b9a0ce459fe1e250fdc5d107363315aeca
Component: engine
2015-01-12 09:56:43 -08:00
52715f71cc Merge pull request #10028 from soulshake/add-laura-poitras
Add Laura Poitras to the names generator.
Upstream-commit: 966c8b00c76d15cfae652653bedd51c0494a5fea
Component: engine
2015-01-12 09:52:31 -08:00
e142c94642 Add Laura Poitras to the names generator.
http://www.wired.com/2014/10/laura-poitras-crypto-tools-made-snowden-film-possible/

Signed-off-by: AJ Bowen <aj@gandi.net>
Upstream-commit: 883d1415355244b2a2710d0860e5019bc697839b
Component: engine
2015-01-12 09:35:12 -08:00
88f6da30fe Merge pull request #10018 from estesp/resolvconf-updater-bugfix
Properly handle containers which pre-date the resolv.conf update feature
Upstream-commit: de9783980be2a7b3ca10eb8183ea5989acbd3e7e
Component: engine
2015-01-10 20:24:29 -08:00
db8fcb622b Merge pull request #10020 from jfrazelle/add-aaron-swartz
Add Aaron Swartz to the names generator.
Upstream-commit: 5a56361c1e2e23008cf0891c07bc4ced4d1d7755
Component: engine
2015-01-10 10:28:23 -05:00
78ad19e428 Add Aaron Swartz to the names generator.
https://en.wikiquote.org/wiki/Aaron_Swartz

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 5b8c8b1819d0f2dcbe7d708b1ae8f579a73401bd
Component: engine
2015-01-09 22:25:53 -08:00
1f71c08b6d Properly handle containers which pre-date the resolv.conf update feature
This fixes the container start issue for containers which were started
on a daemon prior to the resolv.conf updater PR. The update code will
now safely ignore these containers (given they don't have a sha256 hash
to compare against) and will not attempt to update the resolv.conf
through their lifetime.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 30eff2720a110f3ece0e429ef1897a254f0d9e71
Component: engine
2015-01-10 00:48:41 -05:00
b2132ace2c Merge pull request #10017 from jfrazelle/apparmor_lxc
Add apparmor package to Dockerfile
Upstream-commit: 91b5634deeabb90eaa41d8d47802746bbe19e512
Component: engine
2015-01-09 19:44:01 -07:00
5689fc7e46 Add apparmor
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: cdc14c7cbf3ad912588e8cc51f798183f369c9cc
Component: engine
2015-01-09 18:22:19 -08:00
c24f558440 Fix a few minor issues with building/running inside msysGit
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: d43f0b9fc5ec3eae816466ec0307682c13945b31
Component: engine
2015-01-09 17:28:40 -07:00
cc553c40b7 Merge pull request #10010 from tianon/fix-lol
Fix silly little syntax mistake
Upstream-commit: 8ba4484084b573874331797d3590ea7cd57421f5
Component: engine
2015-01-09 14:53:00 -08:00
2ef483a8f2 Fix silly little syntax mistake
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 6292354dc359a6d8f47b3199284147d557d2c697
Component: engine
2015-01-09 15:03:11 -07:00
b7f0bdc4b0 Add link to master docs.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 4374d3bc81cf47866bd3f5c240307915931084cf
Component: engine
2015-01-09 13:53:03 -08:00
7b5ac8b23f Merge pull request #9996 from tianon/gofmt
Add "gofmt" from Go 1.3.3
Upstream-commit: fac1213ecb8a8e9292615ba4da0e466d55d1a042
Component: engine
2015-01-09 13:14:02 -08:00
0fe916329b Merge pull request #9995 from tianon/versions
Refactor Dockerfile version number usage
Upstream-commit: b79c31ce97d517eb8c0c6245ca43175fd6d3af94
Component: engine
2015-01-09 13:06:47 -08:00
a1663344f6 Add "gofmt" from Go 1.3.3
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: b20363c4c056bebe256f0d53283ca1e537ed5cf6
Component: engine
2015-01-09 09:54:58 -07:00
1f9824720a Refactor Dockerfile version number usage
This refactors version number usage for several of our "download/install this exact version" bits so we have an easier time replacing the version numbers in Jenkins.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 2677f1add48961115f08016da422d74cafbf4c8b
Component: engine
2015-01-09 09:53:39 -07:00
c2ad023d0c Merge pull request #9948 from tangicolin/improve-doc-networking
Improve networking documentation with default mac address range
Upstream-commit: ef2d6dda0f25d29e19b7cc6afeee57c2d6971660
Component: engine
2015-01-09 07:44:49 -05:00
bf959c1542 Merge pull request #9964 from duglin/MoveBuildDocs
Move docs on the build API out of 'misc' and under 'Images' section
Upstream-commit: 90149b11dbc1d2f8adb8c65d66b9209c9901db14
Component: engine
2015-01-09 07:17:53 -05:00
9b3e85e5fb Merge pull request #9974 from lasote/master
Added c++ client library for REST API
Upstream-commit: 2675f1a153140f99b1c9758d14ccccd6d08b637e
Component: engine
2015-01-09 07:16:38 -05:00
0ed50630d4 Merge pull request #9963 from duglin/FixDocV1.17
Make API docs v1.17 visible
Upstream-commit: cd4d3b8d36fa6c21d6293a7e2d59165d843189b7
Component: engine
2015-01-09 07:15:47 -05:00
e30cddee49 Merge pull request #9991 from littleidea/delete_redundant_macaddress
remove redundant 'Get' for MacAddress
Upstream-commit: a83e904611006c3039d932e0b4907ab802224c8b
Component: engine
2015-01-08 18:38:44 -08:00
40a780692e Add missing italics to list items in README
Signed-off-by: Kevin Yap <me@kevinyap.ca>
Upstream-commit: 21fcca7fdc8622567b79bc84c3921a9ae7c22501
Component: engine
2015-01-08 18:10:59 -08:00
668643ba96 remove redundant 'Get' for MacAddress
remove second redundant call to set MacAddress from env

Signed-off-by: Andrew Clay Shafer <andrewcshafer@gmail.com>
Upstream-commit: fa8560e3859037e7f5a7e2b37fedd91c7f6d0cf9
Component: engine
2015-01-08 21:09:23 -05:00
5fb2c19adf Merge pull request #9947 from jfrazelle/lxc-version
Install lxc from source.
Upstream-commit: 645a752f17c0bf66942357dc3c54ce0475c795e6
Component: engine
2015-01-08 17:37:52 -08:00
be31b29591 registry: fix minor type
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 7724260224c69eeb948c75c247d4868256e5081a
Component: engine
2015-01-09 09:06:27 +08:00
21a475ffb1 FsMagic should avoid sign extension on i686
`uint64(buf.Type)` on i686 is ffffffff9123683e on i686 due to sign extension, so it cannot be compared with `FsMagic(0x9123683E)`

Signed-off-by: Andrii Melnykov <andy.melnikov@gmail.com>
Upstream-commit: c754555b8742df282bd46ef056837934e973be98
Component: engine
2015-01-09 02:44:04 +02:00
3a63bcc0c5 Merge pull request #9980 from erikh/parser-with-no-command
Fix a parser error where an empty RUN statement would cause a panic
Upstream-commit: 32cde64c04acb0c227b9371028f68de1666bf503
Component: engine
2015-01-08 19:34:06 -05:00
24f7ba3a1f docker ps --filter exited=status should not show running containers
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 81f84023bef5e94dfbcfbb44443bc03707b355c4
Component: engine
2015-01-08 16:23:54 -08:00
4855fe16b0 Merge pull request #8947 from MalteJ/ipv6-daemon
Adding IPv6 network support to docker daemon
Upstream-commit: 3fbf723e81fa2696daa95847ccdcacddba6484da
Component: engine
2015-01-08 15:49:20 -08:00
5b02f75ce3 docker ps --filter status=exited should not require passing -a
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 2639e073b19f526ceecbede9439aed0aba0a4ad8
Component: engine
2015-01-08 15:37:07 -08:00
146962fdd3 Adding IPv6 network support to docker
Signed-off-by: Malte Janduda <mail@janduda.net>
Upstream-commit: 813ff7f19d6a097f39dae363d8dd81b70eee515a
Component: engine
2015-01-09 00:13:09 +01:00