1
0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
Evan Hazlett
8d40d8219c fixes #229: wait for docker before adding to known_hosts
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-12 15:20:03 -05:00
Stephen Day
e9e26bd362 Merge pull request #56 from stevvooe/blob-upload-unknown
Correctly handle missing layer upload
2015-01-12 12:14:32 -08:00
Vincent Batts
3ec6959240 Merge pull request #9985 from jfrazelle/fix-exited-filter-should-not-show-running
`docker ps --filter exited=status` should not show running containers
2015-01-12 15:09:22 -05:00
Michael Crosby
a52c3a74f8 Merge pull request #9953 from evverx/patch-1
Update Ubuntu image tag to 14.04
2015-01-12 12:07:12 -08:00
Vincent Batts
e90e754682 Merge pull request #9987 from jfrazelle/fix-filter-status-exited-not-require-all
`docker ps --filter status=exited should not require passing -a`
2015-01-12 15:05:58 -05:00
Michael Crosby
16fe2ac6b2 Merge pull request #9988 from nponeccop/patch-1
FsMagic should avoid sign extension on i686
2015-01-12 12:02:09 -08:00
Michael Crosby
ed47284f0d Merge pull request #9992 from iKevinY/readme-italics
Add missing italics to list items in README
2015-01-12 11:50:04 -08:00
Jessica Frazelle
cd5902fc7b Fix range for go 1.3
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2015-01-12 11:49:52 -08:00
Michael Crosby
862a124db4 Merge pull request #10014 from tianon/fix-msys
Fix a few minor issues with building/running inside msysGit
2015-01-12 11:44:43 -08:00
Alexander Morozov
83ab6237ac Merge pull request #10047 from vbatts/vbatts-graphdriver_driver_put_with_error
graphdriver: change (*Driver).Put signature
2015-01-12 11:42:11 -08:00
Jessie Frazelle
d17e4175b6 Merge pull request #10009 from jfrazelle/add-master-docs-to-readme
Add link to master docs.
2015-01-12 11:31:11 -08:00
Vincent Batts
1c57555285 Merge pull request #10048 from vbatts/vbatts-dm_no_newline
devmapper: remove newline string
2015-01-12 14:26:19 -05:00
Jessie Frazelle
1a73946e95 Merge pull request #10049 from crosbymichael/update-libcontainer-jan12
Update libcontainer to 6460fd79667466d2d9ec03f77f3
2015-01-12 11:15:12 -08:00
Victor Vieux
c76c29fd11 Merge pull request #235 from aluzzardi/public-node
Container: Make Node public instead of exposing it through Node().
2015-01-12 11:14:48 -08:00
Olivier Gambier
bbc94aef39 Clarify maturity of this
Fixes https://github.com/docker/docker-registry/issues/894
2015-01-12 11:10:13 -08:00
Stephen Day
16e1c441f1 Merge pull request #57 from icecrime/groups_in_readme
Add Google Groups to README.md
2015-01-12 11:09:18 -08:00
Michael Crosby
582a79f00a Update lxc with libcontainer SetupUser change
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-12 10:43:33 -08:00
Jessie Frazelle
0192b6c539 Merge pull request #9560 from jlhawn/image_spec
Adds Docker Image v1 Spec Documention
2015-01-12 10:41:44 -08:00
Vincent Batts
2b51d1a167 devmapper: remove newline string
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-01-12 13:40:42 -05:00
Michael Crosby
115d8bac60 Update libcontainer to 6460fd79667466d2d9ec03f77f3
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-01-12 10:38:15 -08:00
Josh Hawn
79910625f0 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)
2015-01-12 10:37:46 -08:00
Vincent Batts
00fd63e558 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>
2015-01-12 13:34:35 -05:00
Doug Davis
cb4ea2c778 Merge pull request #9990 from hqhq/fix_minor_type
registry: fix minor typo
2015-01-12 13:32:16 -05:00
Andrea Luzzardi
87ac21d9e0 Merge pull request #208 from vieux/protocol
Proposal: standardise protocols : only ip:port
2015-01-12 19:15:49 +01:00
Jessie Frazelle
1781fed730 Merge pull request #10006 from jfrazelle/docs-release-fixes
Update docs release script so we can have autodeploys
2015-01-12 10:03:33 -08:00
Jessica Frazelle
a6a748b9a0 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)
2015-01-12 09:56:43 -08:00
Jessie Frazelle
966c8b00c7 Merge pull request #10028 from soulshake/add-laura-poitras
Add Laura Poitras to the names generator.
2015-01-12 09:52:31 -08:00
soulshake
883d141535 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>
2015-01-12 09:35:12 -08:00
Andrea Luzzardi
7cc70ee276 Store: Move the store into the state package.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-12 09:19:05 -08:00
Andrea Luzzardi
410e7969b7 Store: Store the RequestedState rather than the entire Container.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-12 09:10:06 -08:00
Simon Thulbourn
861b16dba9 add machine name to VM name and hostname
This work sets the machine name in the Cloud API or Hypervisor. As well
as setting the hostname inside the VM.

I've added the machine name to the NewDriver func to allow for
identification by Cloud APIs and for the driver package.

Each driver will attempt to set the hostname for the VM, except for
Azure, which sets it based on the DNS name.

Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-01-12 16:46:00 +00:00
Evan Hazlett
8a0d468a49 Merge pull request #236 from nathanleclaire/docs
Add Machine docs
2015-01-12 11:45:16 -05:00
Arnaud Porterie
cbb493e881 Add Google Groups to README.md
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-01-12 08:31:04 -08:00
Aanand Prasad
4827e60641 Merge pull request #568 from Aigeruth/fix/project_name
Convert project_name to lowercase
2015-01-12 16:23:09 +00:00
Andrea Luzzardi
94cf009e46 Container: Make Node public instead of exposing it through Node().
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-12 08:14:11 -08:00
Andrea Luzzardi
155131a364 Add a simple key<->Container persistent store.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-01-12 07:43:31 -08:00
Jeffrey Morgan
6bdfdb0b12 Merge branch 'master' of github.com:kitematic/kitematic into jmorgan_react_refactor
Conflicts:
	meteor/client/lib/apputil.js
	meteor/client/lib/docker.js
	meteor/client/lib/imageutil.js
	meteor/client/lib/metrics.js
	meteor/client/lib/startup.js
	meteor/client/lib/util.js
	meteor/client/main.js
2015-01-12 09:36:50 -05:00
Jeffrey Morgan
4c3d3ad08b Merge branch 'master' of github.com:kitematic/kitematic into jmorgan_react_refactor
Conflicts:
	meteor/client/lib/apputil.js
	meteor/client/lib/docker.js
	meteor/client/lib/imageutil.js
	meteor/client/lib/metrics.js
	meteor/client/lib/startup.js
	meteor/client/lib/util.js
	meteor/client/main.js
2015-01-12 09:36:50 -05:00
Jeffrey Morgan
b7b725cbca Merge branch 'master' into jmorgan_react_refactor 2015-01-12 09:36:11 -05:00
Jeffrey Morgan
f7087e4e6b Merge branch 'master' into jmorgan_react_refactor 2015-01-12 09:36:11 -05:00
Jeffrey Morgan
5f06cb9ad3 Ported kitematic setup 2015-01-12 09:28:29 -05:00
Jeffrey Morgan
13cd6ed0b4 Ported kitematic setup 2015-01-12 09:28:29 -05:00
Aanand Prasad
74a0c47389 Merge pull request #830 from ggtools/cpu_shares
Add cpu_shares option in fig.yml
2015-01-12 12:09:08 +00:00
HuKeping
8d414fd434 docs: update docker inspect part of docs
The docker inspect part of docs is quit different with what it
really be.

Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-01-12 13:20:27 +08:00
Christophe Labouisse
aa0c43df96 Add cpu_shares option in fig.yml
This options maps exactly the docker run option with the same name.

Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
2015-01-11 20:10:48 +01:00
Alexander Morozov
de9783980b Merge pull request #10018 from estesp/resolvconf-updater-bugfix
Properly handle containers which pre-date the resolv.conf update feature
2015-01-10 20:24:29 -08:00
Evan Hazlett
4c285dcffa Merge pull request #258 from sthulb/unknown-command
Add unknown command help
2015-01-10 10:14:10 -08:00
Evan Hazlett
e0cbae3461 Merge pull request #257 from sthulb/ssh-keygen-fix
Adds check for SSH keygen command
2015-01-10 10:08:30 -08:00
Tibor Vass
5a56361c1e Merge pull request #10020 from jfrazelle/add-aaron-swartz
Add Aaron Swartz to the names generator.
2015-01-10 10:28:23 -05:00
Simon Thulbourn
ab9a19a85b Adds check for SSH keygen command
Adds a check to find ssh-keygen in the user's $PATH, in the event it
can't find it, return an error with a friendly message

Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-01-10 12:17:40 +00:00