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
Mary Anthony
dc899c4eaf Adding in minor copy edits
Signed-off-by: Mary Anthony <mary@docker.com>
2015-03-14 21:31:36 -07:00
James Turnbull
495f5e4998 Merge pull request #11321 from duglin/CmdLineTweak
Add "Docker" to Reference pull-down for Command Line
2015-03-14 21:04:25 -06:00
moxiegirl
2830b6fa58 Merge pull request #11297 from moxiegirl/11235-tweak-doc
Consistency in the restart policy docs
2015-03-14 19:58:46 -07:00
Dave Henderson
30e0ca00b6 Wait for any activeTransactions to finish during Create
This adds an additional wait phase to make sure any active Transactions
are completed before Create tries to SSH in to the new host. This is
sometimes necessary because SSH can become available before SoftLayer
is fully done setting up the host and strange things can happen...

Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-03-14 21:33:57 -04:00
Jeffrey Morgan
58f62ece2b Update ROADMAP.md 2015-03-14 20:24:34 -04:00
Jessie Frazelle
e0cb65b4a9 Merge pull request #11389 from aidanhs/aphs-allow-nonexistent-gid-fix
Correctly check that gid parses as an int
2015-03-14 16:12:35 -07:00
Aidan Hobson Sayers
8ef79ae8e4 Correctly check that gid parses as an int
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2015-03-14 23:02:53 +00:00
Jessie Frazelle
649d8333ce Merge pull request #11377 from aidanhs/aphs-allow-nonexistent-gid
Allow a non-existent groupid to own the docker socket
2015-03-14 15:01:10 -07:00
Shishir Mahajan
9839e9784d Docker Tag command: Relax the restriction on namespace (username) length from 30 to 255 characters.
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2015-03-14 16:45:44 -04:00
Jeffrey Morgan
a23e90ecd5 Update CONTRIBUTING.md 2015-03-14 16:31:45 -04:00
Jeffrey Morgan
d88c83671f Update CONTRIBUTING.md 2015-03-14 16:31:34 -04:00
Jeffrey Morgan
99b9bcdb9b Update CONTRIBUTING.md 2015-03-14 16:31:20 -04:00
Evan Hazlett
ff3b733689 Merge pull request #782 from ehazlett/fix-default-docker-dir
fix default docker config dir
2015-03-14 16:17:20 -04:00
Evan Hazlett
9bff87f9bb fix default docker config dir
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-14 16:14:06 -04:00
Jeffrey Morgan
bc7438d946 Fixing npm install 2015-03-14 14:18:43 -04:00
Andrea Luzzardi
019e411d78 Add coveralls badge to README. 2015-03-13 18:26:32 -07:00
Victor Vieux
07121dc7df Merge pull request #474 from aluzzardi/coveralls
Enable coveralls.
2015-03-13 18:23:26 -07:00
Andrea Luzzardi
9ddadcd880 Enable coveralls.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2015-03-13 18:15:45 -07:00
Stephen Day
47cf298bd0 Merge pull request #261 from jlhawn/url_for_method
Refactor Layer interface to return a Handler
2015-03-13 17:27:42 -07:00
Olivier Gambier
40ec1222a9 Merge pull request #259 from stevvooe/validate-var-prefixes
context: validate prefix lookups for WithRequest/WithResponse contexts
2015-03-13 16:54:40 -07:00
Doug Davis
8a5b50d65d Generate an error on unknown Dockerfile instruction
Instead of just printing a warning and going on, this will generate
an error and stop processing.

This used to be part of #10561 but I decided it might need its own
independent discussion/PR as to not derail #10561.

Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-13 16:08:34 -07:00
James Turnbull
e2ca237aa2 Merge pull request #11345 from x1022as/cli
Change cli.md to show right `docker rmi` output
2015-03-13 16:33:03 -06:00
Jessie Frazelle
d2f925fb27 Merge pull request #11373 from tianon/move-hack-scripts-back
Move scripts back to hack/, leave docs in project/
2015-03-13 15:26:54 -07:00
Alexander Morozov
02c1dd899a Merge pull request #10238 from miminar/ephemeral-port-range-allocation
Use system's ephemeral port range for port allocation
2015-03-13 15:18:05 -07:00
Alexander Morozov
bdf3a0295d Fail docker logs on all logging drivers apart from 'json-file'
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-13 15:02:09 -07:00
Evan Hazlett
2486755347 Merge pull request #775 from nathanleclaire/wait_for_ssh
Add generic function to wait for SSH
2015-03-13 17:04:05 -04:00
Evan Hazlett
7a44b3575c Merge pull request #764 from nathanleclaire/wait_for_state
Wait for state before return on start, stop, restart, kill
2015-03-13 17:01:34 -04:00
moxiegirl
db39cc8351 Merge pull request #11379 from sbasyal/patch-1
Update Centos links
2015-03-13 13:50:53 -07:00
Tianon Gravi
949a21b55f Move scripts back to hack/, leave docs in project/
This also removes the now-defunct `*maintainer*.sh` scripts that don't work with the new TOML format, and moves a couple not-build-or-release-related scripts to `contrib/` instead.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-03-13 14:04:08 -06:00
Ben Firshman
198598c936 Remove wercker status from readme
Because it doesn't really work anymore and looks scary when it's broken.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-03-13 19:36:54 +00:00
Michael Crosby
a97fbe7d78 Merge pull request #11378 from LK4D4/update_libcontainer
Update libcontainer to 5d6c507d7cfeff97172deedf3db13b5295bcacef
2015-03-13 12:14:54 -07:00
Alexander Morozov
dd6d2cd660 Tests for --log-driver options
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-13 12:13:37 -07:00
Alexander Morozov
47a6afb93f Default 'json-file' logging driver and none logging driver
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-13 12:13:21 -07:00
Darren Shepherd
03cea0ef23 Docs changes for labels based on feedback
Signed-off-by: Darren Shepherd <darren@rancher.com>
2015-03-13 11:56:33 -07:00
Sabin Basyal
dba4651760 Update Centos links
Signed-off-by: Sabin Basyal <sabin.basyal@gmail.com>
2015-03-13 11:48:09 -07:00
Alexander Morozov
14887e2e1f Interface Logger for logging drivers
Also there is aux datastructure Copier which can copy lines from streams
to Loggers

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-13 11:46:59 -07:00
Alexander Morozov
eade8eac09 Update libcontainer to 5d6c507d7cfeff97172deedf3db13b5295bcacef
It includes new Type() method for Factory, which needed for replacing
execdriver.Driver.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-13 11:33:49 -07:00
Aidan Hobson Sayers
334382a8c3 Allow a non-existent groupid to own the docker socket
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2015-03-13 18:12:50 +00:00
Ben Firshman
8b5a882459 Merge pull request #867 from knutwalker/feature/timeout-flag
Add timeout flag to stop, restart, and up
2015-03-13 17:41:16 +00:00
Nathan LeClaire
f890f9b6cd Implement wait for desired state before exiting
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-13 10:26:51 -07:00
Darren Shepherd
5de1298f41 Add more tests for labels on containers
Signed-off-by: Darren Shepherd <darren@rancher.com>
2015-03-13 10:02:04 -07:00
Sebastiaan van Stijn
7d89e66dac Add labels documentation
Adds more documentation for labels and adds the label instruction to the
man-pages.

Also included is a document called "Labels - custom meta-data in Docker"
in the user-guide, this is still a work-in-progress I started to describe
the "namespaces" conventions, an example on storing structured data.

I ran a bit "out of steam" (writers block?) on that document, but kept
it in (for now), in case it still ends up useful.

The Remote API documentation changes will need to be moved to the
docker_remote_api_v1.18.md document when rebasing the whole PR.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Darren Shepherd <darren@rancher.com>
2015-03-13 10:02:04 -07:00
Darren Shepherd
389eee1084 Add docs for container/image labels
Signed-off-by: Darren Shepherd <darren@rancher.com>
2015-03-13 10:02:04 -07:00
Darren Shepherd
abb5e9a077 Set labels on container create
Signed-off-by: Darren Shepherd <darren@rancher.com>
2015-03-13 10:02:04 -07:00
Ben Firshman
dae451019b Merge pull request #1099 from aanand/fix-env-file-resolution
Fix env file resolution
2015-03-13 16:49:10 +00:00
Dan Walsh
cdfdfbfb62 Allow specification of Label Name/Value pairs in image json content
Save "LABEL" field in Dockerfile into image content.

This will allow a user to save user data into an image, which
can later be retrieved using:

docker inspect IMAGEID

I have copied this from the "Comment" handling in docker images.

We want to be able to add Name/Value data to an image to describe the image,
and then be able to use other tools to look at this data, to be able to do
security checks based on this data.

We are thinking about adding version names,
Perhaps listing the content of the dockerfile.
Descriptions of where the code came from etc.

This LABEL field should also be allowed to be specified in the
docker import --change LABEL:Name=Value
docker commit --change LABEL:Name=Value

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2015-03-13 09:47:09 -07:00
Ben Firshman
dfc729b8f2 Merge pull request #1108 from aanand/fix-deps-tests
Fix Project.up() tests
2015-03-13 16:38:25 +00:00
Arnaud Porterie
6374c12fbb Merge pull request #11350 from delftswa2014/utils-directory-windows
Makes `directory` pkg compilable on Windows.
2015-03-13 09:26:08 -07:00
Aanand Prasad
eb7ea76d6c Merge pull request #1100 from vmalloc/patch-3
Remove restriction for requests version, update docker-py requirement
2015-03-13 16:22:40 +00:00
Arnaud Porterie
b44aae395a Merge pull request #11374 from tianon/cpusets
Add CONFIG_CPUSETS to check-config.sh
2015-03-13 09:12:21 -07:00