Adrien Folie
7810070630
Stop/Kill options for containers removal
...
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com > (github: folieadrien)
2014-07-11 23:26:08 +00:00
Ben Firshman
f983110492
Remove empty lists from default Service args
...
This will cause terrifying bugs.
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-07-11 16:07:31 -07:00
unclejack
d53db040c8
Merge pull request #6896 from vieux/add_parsing_deamon_side
...
Add repo/tag parsing on the daemon for pull and import
2014-07-12 01:44:32 +03:00
Victor Vieux
00c1668011
Merge pull request #6985 from vieux/fix_api_1.14
...
bump api to 1.14 & update docs
2014-07-11 15:35:25 -07:00
Victor Vieux
cdfdbe9bc6
proper rebase
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-11 22:39:43 +00:00
Aanand Prasad
9fd296f416
Merge pull request #310 from orchardup/fix-race-condition-in-recreate-containers
...
Fix race condition in recreate containers
2014-07-11 15:14:17 -07:00
Ben Firshman
bb89f85984
Remove stop timeout in recreate containers
...
This doesn't seem like a good idea – 1 second isn't enough time
to stop gracefully.
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-07-11 14:53:56 -07:00
Ben Firshman
b573b87a92
Fix race condition in recreate containers
...
Container might have stopped between checking `is_running` and
calling `stop()`, which then threw an exception.
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-07-11 14:53:46 -07:00
Aanand Prasad
036adb2de9
Merge pull request #309 from orchardup/update-docs-to-be-0.5.0
...
Update docs to be 0.5.0
2014-07-11 14:29:38 -07:00
Ben Firshman
36f4e30dba
Add 0.5.0 to docs
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-07-11 14:16:39 -07:00
Ben Firshman
9f0cfbdfd2
Document release process
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-07-11 14:16:29 -07:00
Victor Vieux
7e7b4bb5ac
use an array for verbs
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-11 21:11:36 +00:00
Aanand Prasad
e117a7822d
Merge pull request #307 from orchardup/ship-0.5.0
...
Ship 0.5.0
2014-07-11 14:07:40 -07:00
Michael Crosby
c3f247860a
Merge pull request #6979 from LK4D4/fix_race_inspect_start
...
Use container.Lock in public ToDisk method
2014-07-11 13:44:01 -07:00
Ben Firshman
5489465905
Ship 0.5.0
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-07-11 13:21:01 -07:00
Ben Firshman
4afcdbdb3c
Add docs for volumes_from
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-07-11 12:52:22 -07:00
Ben Firshman
94d82d4acb
Merge pull request #308 from orchardup/fix-fig-up-attach
...
Regardless of dependencies, `fig up` only attaches to what you specify
2014-07-11 20:51:54 +01:00
LK4D4
eae5cf1e20
Use container.Lock in public ToDisk method
...
Here was possible race with inspect where we changing HostConfig.Links
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
2014-07-11 23:31:03 +04:00
Aanand Prasad
d528f9f642
Regardless of dependencies, fig up only attaches to what you specify
...
Without this, if you go:
$ fig up -d db
$ fig up web
you'll get output for both db and web, and Ctrl-C will kill them both.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2014-07-11 11:58:59 -07:00
Fred Lifton
358758e99f
Edits based on feedback from docs team.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-07-11 11:42:29 -07:00
James Turnbull
2944d8ca3e
Merge pull request #6890 from huslage/tls-doc-fixes2
...
Clarification of TLS Docs
2014-07-11 14:36:24 -04:00
Aaron Huslage
c3d91263a8
Clarified TLS Docs
...
Made a "Secure by default" section, create 2048-bit keys, various cleanups.
Docker-DCO-1.1-Signed-off-by: Aaron Huslage <huslage@gmail.com > (github: huslage)
2014-07-11 14:35:01 -04:00
Ben Firshman
99d7a474af
Merge pull request #297 from ryanbrainard/resolve-env
...
Resolve environment without values to values on host
2014-07-11 18:55:40 +01:00
Ryan Brainard
d1052ff666
Add documention for key-only environment
...
Signed-off-by: Ryan Brainard <brainard@heroku.com >
2014-07-11 10:18:17 -07:00
Ryan Brainard
44a91e6ba8
Resolve environment without values to values on host
...
For parity with the Docker CLI, allow environment variables without
values to be automatically resolved to their values on the host.
Signed-off-by: Ryan Brainard <brainard@heroku.com >
Conflicts:
tests/integration/service_test.py
2014-07-11 10:18:05 -07:00
Ben Firshman
3996947024
Merge pull request #304 from Elemecca/t-domainname
...
add support for domainname, qualified hostname
2014-07-11 17:40:19 +01:00
Ben Firshman
b7afaba56a
Merge pull request #305 from ryanbrainard/fix-dir-typo
...
Fix typo in script dir name
2014-07-11 17:37:13 +01:00
Ryan Brainard
2ce3685e32
Fix typo in script dir name
...
Signed-off-by: Ryan Brainard <brainard@heroku.com >
2014-07-11 09:13:00 -07:00
Solomon Hykes
1a99f36580
Add Tibor Vass as maintainer
...
* hack/
* archive/
* integration/
* server/buildfile.go
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com > (github: shykes)
2014-07-11 12:28:11 +00:00
James Turnbull
7c4f7780a1
Merge pull request #6209 from zdover23/03_Jun_2014
...
BZ#1104401 - correcting flags in docker-commit
2014-07-11 08:03:36 -04:00
Sam Hanes
699bbe9ca2
Split the domainname out of qualified hostnames.
...
Docker doesn't like it when a fully qualified hostname is passed in
the `hostname` parameter. When an FQDN is provided with `-h` the
official CLI puts the first component in `hostname` and the rest in
`domainname`. This change replicates that behavior when the user
specifies an FQDN in `hostname` in their `fig.yml`.
Signed-off-by: Sam Hanes <sam@maltera.com >
2014-07-10 20:18:09 -07:00
Victor Vieux
9216ced003
Merge pull request #6961 from crosbymichael/devices-flag
...
Add --device flag to allow additional host devices in container
2014-07-10 17:44:44 -07:00
Ben Firshman
4b890bffde
Merge pull request #290 from d11wtq/bugfix/multiplexed_non_tty
...
BUGFIX: Update dockerpty for non-TTY multiplexing.
2014-07-11 01:44:31 +01:00
Victor Vieux
e8762bfe39
add FSETID back to the caps whitelist
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
2014-07-11 00:30:56 +00:00
Fred Lifton
e80d075633
Added bitbucket hook info and warning re: validating accounts.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2014-07-10 16:51:16 -07:00
Sam Hanes
789e1ba82b
Add domainname to allowed container config.
...
Signed-off-by: Sam Hanes <sam@maltera.com >
2014-07-10 15:56:26 -07:00
Timothy
e855c4b921
Add --device flag to allow additional host devices in container
...
We add a --device flag which can be used like:
docker run --device /dev/sda:/dev/xvda:rwm ubuntu /bin/bash
To allow the container to have read write permissions to access the host's /dev/sda via a node named /dev/xvda in the container.
Note: Much of this code was written by Dinesh Subhraveti dineshs@altiscale.com (github: dineshs-altiscale) and so he deserves a ton of credit.
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz > (github: timthelion)
2014-07-10 10:35:53 -07:00
Ben Firshman
1a9614c35e
Merge pull request #293 from binarin/master
...
Change working dir through fig.yml
2014-07-10 10:31:57 -07:00
Alexey Lebedeff
d83bdd5164
Change working dir through fig.yml
...
Closes #144
Signed-off-by: Alexey Lebedeff <binarin@gmail.com >
2014-07-10 21:22:45 +04:00
unclejack
840ed5ace2
Merge pull request #6939 from snitm/thinp-blocksize-fix
...
devmapper: revert the default dm-thin-pool blocksize back to 64K
2014-07-10 19:57:07 +03:00
Ben Firshman
e1a3fc2536
Merge pull request #303 from mozz100/master
...
Use yaml.safe_load instead of yaml.load
2014-07-10 09:50:51 -07:00
unclejack
0c67dcb0df
Merge pull request #6920 from vieux/pr_6408
...
Add support for IPv6 addresses in --dns parameters.
2014-07-10 19:16:23 +03:00
Tibor Vass
85761b7fdb
Merge pull request #6941 from tiborvass/use-copy-in-docker-dockerfile
...
Replace ADD with COPY in Dockerfile
2014-07-10 10:46:13 -04:00
Richard Morrison
251aa7efb6
Use yaml.safe_load instead of yaml.load
...
http://pyyaml.org/wiki/PyYAMLDocumentation#LoadingYAML
Signed-off-by: Richard Morrison <richard@rmorrison.net >
2014-07-10 15:15:55 +01:00
Sven Dowideit
d9265007a0
Merge pull request #6854 from tomfotherby/patch-1
...
Add documention on how to Mount a Host File as a Data Volume
2014-07-10 10:29:15 +00:00
Sven Dowideit
98e099e3a0
Merge pull request #6945 from fredlf/copyedit-builds
...
New screenshots and revisions to builds.md
2014-07-10 09:06:58 +00:00
Sven Dowideit
1c50f3797c
Merge pull request #6948 from squarejaw/master
...
Fix typos
2014-07-10 09:05:48 +00:00
Tianon Gravi
439d7ea701
Merge pull request #6922 from tianon/bash-complete-build-directories
...
Update bash completion to only complete on directories as the argument to "docker build"
2014-07-10 00:26:14 -06:00
Bryan Bess
1df4049e17
Fix typos
...
Docker-DCO-1.1-Signed-off-by: Bryan Bess <squarejaw@bsbess.com > (github: squarejaw)
2014-07-09 23:14:06 -05:00
Adrien Folie
680e27d6ec
bump api to 1.14 & update docs
...
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com > (github: folieadrien)
2014-07-10 03:24:01 +02:00