Commit Graph

11558 Commits

Author SHA1 Message Date
59accfd690 Merge pull request #9973 from duglin/Issue9880
Make sure that ADD/COPY still populate the cache even if they don't use it
Upstream-commit: 99a15ec8bd548563a1ac4f652c55d4bb1ff769e4
Component: engine
2015-01-13 11:17:34 -08:00
62d740bb49 Merge pull request #10064 from hqhq/hq_fix_flag_comments
correct the flag comments
Upstream-commit: eaeaf0d8e312dff5f4677f660a6e5356f6f82d84
Component: engine
2015-01-13 11:06:24 -08:00
663cdb3f16 Merge pull request #9951 from andersjanmyr/add-proxy-from-environment-to-client
Add ProxyFromEnvironment enables client via proxy.
Upstream-commit: ab86f591c323b38c918a026f38a26df120a475ac
Component: engine
2015-01-13 10:53:00 -08:00
a7f4603fba Merge pull request #9764 from ztombol/fix-reduce-arch-rootfs-size
Revisiting mkimage-arch.sh
Upstream-commit: 21cf4b4c4cd6cc1f4667db4f334286bdbe39e2e2
Component: engine
2015-01-13 10:39:45 -08:00
080d79ba9a Merge pull request #8570 from brahmaroutu/rename_container_3036
Rename a existing container
Upstream-commit: b9e42d66e790535fe1226adea4ff39e25f493b51
Component: engine
2015-01-13 10:37:29 -08:00
c9dd2d86fb Merge pull request #10013 from icecrime/9979_oom_exit_code
Fix error code when exiting on OOM
Upstream-commit: 9621e59909a93b90a4dd04b628bcbe821b2a1e51
Component: engine
2015-01-13 10:33:21 -08:00
d5a1764c0a Delete man pages of installed packages in mkimage-arch.sh
Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com> (github: ztombol)
Upstream-commit: 18c0b415644b594969bbec49de51098be62d18f8
Component: engine
2015-01-13 18:10:50 +01:00
88f9df3419 Revise list of installed packages in mkimage-arch.sh
Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com> (github: ztombol)
Upstream-commit: 9f59b057be25656214d65040ae113c0d76d99324
Component: engine
2015-01-13 18:10:50 +01:00
287a9987a0 Fix docker run/exec/create not printing error messages
If an error message happens while parsing docker run or docker exec, the message
is not being printed out.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 12a7e78b125afd277adb7cd099817a419f4faaa0
Component: engine
2015-01-13 09:23:13 -05:00
dea4567bd2 correct the flag comments
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 00bd7b4c414061d71d7f94b5850cbe132da623f0
Component: engine
2015-01-13 15:40:24 +08:00
d6590e04a1 Test case for error code when exiting on OOM
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 9a9339d9a23e0005b769bd2f44c722c4a6be730f
Component: engine
2015-01-12 23:16:28 -08:00
37a68ceed5 Merge pull request #10055 from icecrime/upgrade_libcontainer
Upgrade libcontainer to 1d3b2589d734dc94a1719a3af4
Upstream-commit: 9f2c48614497dee2448b65c81aa6d44953484372
Component: engine
2015-01-12 20:44:25 -08:00
eacdfc7d44 rename a existing container
Closes #3036

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 21a809d9ae0ef8392f37c9262dca93ff31966e22
Component: engine
2015-01-13 03:27:17 +00:00
9e47357d55 Fix tgz for Windows binaries
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 71b03d8aeb76b50ca05116c04ad724f380ef08f3
Component: engine
2015-01-12 19:56:53 -07:00
f0e21e0f5c Upgrade libcontainer to 1d3b2589d734dc94a1719a3af4
Correct exit code when dying on a signal (fixes #9979).

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 009041cdfd815c0ab49493f9f5757b171ee8c987
Component: engine
2015-01-12 18:12:59 -08:00
6a864dec5f Merge pull request #10029 from soulshake/add-cecilia-payne-gaposchkin
Add Cecilia Payne-Gaposchkin to names generator.
Upstream-commit: 9b0072a7e63f560614fb9ba1b454b444cf4fe13e
Component: engine
2015-01-12 17:31:19 -08:00
aa2236d495 Add Cecilia Payne-Gaposchkin to the names generator.
Signed-off-by: AJ Bowen <aj@gandi.net>
Upstream-commit: 41178adb7e4e3df27c99c462b069dc9c196af2c3
Component: engine
2015-01-12 16:24:15 -08:00
c05f481a32 Merge pull request #10054 from shin-/docker-py-bump-0.7.1
Bumped docker-py version to latest release
Upstream-commit: 0da9540eda55caaa8ed486b6814afc253a0e181d
Component: engine
2015-01-12 15:27:44 -08:00
1ea6d14644 Bumped docker-py version to latest release
Signed-off-by: Joffrey F <joffrey@docker.com>
Upstream-commit: 3873b19c31a882a3240fc04b63e23e8a557028c0
Component: engine
2015-01-12 15:01:09 -08:00
502d87f39d fix issue with goimport
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: b70632ec532d4a948e227a646f8286d7c439cb4f
Component: engine
2015-01-12 22:52:19 +00:00
8015360eaf update copyrights to 2015
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: e5869b2b0bdf85d15813c714565fd49943c3d754
Component: engine
2015-01-12 22:47:36 +00:00
d352fd4587 Merge pull request #9962 from andi5/fix-doc-cmdline-port
Fix order of pause and port in command line documentation.
Upstream-commit: 43a75f5b9332f4b3c002f79ea342b00127811b5b
Component: engine
2015-01-12 13:22:51 -08:00
e4632e05c1 Merge pull request #10051 from thaJeztah/fix-error-message
Fix typo in error-message.
Upstream-commit: 4e0f656d74a932e2b56bbb0a4529afb247b0fe06
Component: engine
2015-01-12 13:12:10 -08:00
b37502e6c0 Merge pull request #10019 from jfrazelle/9954-text-plain-content-type
Use "text/plain" content-type
Upstream-commit: 9215c3901eb8499f7bf86cf23512a451a951b449
Component: engine
2015-01-12 12:50:35 -08:00
8f2bd63073 Fix typo in error-message.
This fixes a small typo in the errormessage for memory-swap.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 5f699a465dd428d6285080ca07cb4a6634952744
Component: engine
2015-01-12 21:48:44 +01:00
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
9665ff2e03 Fix range for go 1.3
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: cd5902fc7bb0da36fedb6ff6a1bb8ef200b212d9
Component: engine
2015-01-12 11:49:52 -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
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