Daniel Nephin
59d4f304ee
Run pre-commit on all files
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-08-24 17:04:50 -04:00
Frank Sachsenheim
227584b864
Adds pause and unpause-commands
...
Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
2015-08-21 12:43:13 +02:00
Joel Hansson
61936f6b88
log_opt: change address to syslog-address
...
Signed-off-by: Joel Hansson <joel.hansson@ecraft.com>
2015-08-20 16:46:06 +02:00
Karol Duleba
56f03bc20a
Allow to specify image by digest. Fixes #1670
...
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
2015-08-19 21:13:34 +01:00
Maxime Horcholle
18a474211d
remove extra ```
...
Signed-off-by: mhor <maxime.horcholle@gmail.com>
2015-08-18 09:09:37 +02:00
Daniel Nephin
b87c09b9fc
Merge pull request #1824 from mrfuxi/run-with-ports
...
Allow manual port mapping when using "run" command
2015-08-13 08:29:25 -07:00
Karol Duleba
ff87ceabbd
Allow manual port mapping when using "run" command. Fixes #1709
...
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
2015-08-12 18:54:42 +01:00
Aanand Prasad
ed31673069
Merge pull request #1827 from mnowster/port-ranges
...
Port ranges
2015-08-12 11:17:22 +01:00
Mary Anthony
d454a584da
Fixing links after crawl
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-08-11 09:38:49 -07:00
Aanand Prasad
46e8e4322a
Show a warning when a relative path is specified without "./"
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-10 19:56:36 +01:00
Mary Anthony
7c128b46a1
- Closes #1811 for Toolbox
...
- Updating with comments
Signed-off-by: Mary Anthony <mary@docker.com>
2015-08-09 10:51:39 -07:00
Mazz Mosley
d1455acb64
Update docs inline with feedback
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-08-07 16:30:00 +01:00
Yuval Kohavi
557cbb616c
ports documentation
...
Signed-off-by: Yuval Kohavi <yuval.kohavi@gmail.com>
2015-08-07 16:22:39 +01:00
Aanand Prasad
8b5bd945d0
Interpolate environment variables
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-08-06 11:18:57 +01:00
Aanand Prasad
41b9df7639
Merge pull request #1800 from aanand/volume-driver-support
...
Support volume_driver
2015-07-31 16:28:46 +01:00
Luke Marsden
a68ee0d9c2
Support volume_driver in compose
...
* Add support for volume_driver parameter in compose yml
* Don't expand volume host paths if a volume_driver is specified
(i.e., disable compose feature "relative to absolute path
transformation" when volume drivers are in use, since volume drivers
can use name where host path is normally specified; this is a
heuristic)
Signed-off-by: Luke Marsden <luke@clusterhq.com>
2015-07-31 15:23:15 +01:00
David BF
1a9ddf645d
Remove useless postgres 'port' configuration
...
Signed-off-by: David BF <burretfresket@gmail.com>
2015-07-31 14:40:29 +02:00
Aanand Prasad
118a389646
Update API version to 1.19
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-29 15:44:21 +01:00
Aanand Prasad
b08e23d351
Add hint about OS X binary compatibility
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-29 10:44:38 +01:00
Mary Anthony
7eabc06df5
Updating build so that contributors can build public docs
...
Changed base image
Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-27 09:43:16 -07:00
Aanand Prasad
e832e86f09
Merge pull request #1762 from aanand/update-changelog-and-install
...
Update CHANGES.md and install.md for latest stable version
2015-07-23 16:37:02 +01:00
Aanand Prasad
227435f613
Update CHANGES.md and install.md for latest stable version
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-23 11:09:27 +01:00
Aanand Prasad
04a773f1c8
Deprecate --allow-insecure-ssl
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-23 10:56:21 +01:00
Mazz Mosley
cc0bfea8a1
Merge pull request #1711 from aanand/custom-names
...
Add container_name option for specifying a custom container name
2015-07-21 14:28:16 +01:00
Aanand Prasad
4ba9d9dac2
Make parallel tasks interruptible with Ctrl-C
...
The concurrent.futures backport doesn't play well with
KeyboardInterrupt, so I'm using Thread and Queue instead.
Since thread pooling would likely be a pain to implement, I've just
removed `COMPOSE_MAX_WORKERS` for now. We'll implement it later if we
decide we need it.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-20 14:13:25 +01:00
Aanand Prasad
4ffae4a1ac
Merge pull request #1725 from moxiegirl/update-docs-dockerfile
...
Updating with the latest image
2015-07-20 12:00:18 +01:00
Aanand Prasad
5f6d0d0824
Merge pull request #1721 from moxiegirl/remove-boot2docker-1720
...
Removing references to boot2docker
2015-07-20 11:52:15 +01:00
Aanand Prasad
9df2be80a8
Merge pull request #1717 from aanand/fix-up-docs
...
Fix regression in docs for 'up'
2015-07-20 11:45:50 +01:00
Mary Anthony
949dd5b2c7
Updating with the latest image
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-19 16:08:01 -07:00
Mary Anthony
4ca210edd7
Removing references to boot2docker
...
- Replace with machine references
- 1.8 boot2docker is deprecated
Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-17 16:17:46 -07:00
Mary Anthony
2407193594
remove cli
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-17 09:15:29 -07:00
Aanand Prasad
98eab03c61
Merge pull request #1068 from likeon/master
...
Docs: yml link in getting started with django
2015-07-17 17:11:38 +01:00
Aanand Prasad
a3191ab90f
Add container_name option
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-17 15:50:09 +01:00
Aanand Prasad
35092f1d5e
Fix regression in docs for 'up'
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-17 15:29:02 +01:00
Mary Anthony
36f4d413fd
Updating Compose documentation
...
- Split out commands into individual pages for maintainability
- Add full usage in commands pages for usability
- Updated description of the run command
- adding in Aanand's comment
Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-17 07:05:45 -07:00
Aanand Prasad
ced94a3504
Make smart recreate the default
...
Add --force-recreate flag to enable the old default behaviour of
recreating everything.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-17 11:28:02 +01:00
Aanand Prasad
f03dec766d
Rename max workers env var and fix docs
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-15 16:43:43 +01:00
Mazz Mosley
03d34336a8
Document DEFAULT_MAX_WORKERS
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-15 11:56:06 +01:00
Aanand Prasad
a8ad13734e
Merge pull request #1666 from mnowster/docs-for-extends-file-default-behaviour
...
Docs for `file` default behaviour
2015-07-07 17:12:29 +01:00
Mazz Mosley
ef8ae07145
Docs for `file` default behaviour
...
Change in behaviour, `file` key is optional and if not set the
default is to look within the same file as `extends` is defined.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-07 17:01:09 +01:00
Mazz Mosley
6f31e8ebe9
Add support for log_opt
...
When specifying a log_driver you want to specify some options for
the logger as per the docker run --log-opt option. The logger
options are key value pairs.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-07 16:26:43 +01:00
Mazz Mosley
fc26982132
Add in memswap_limit run option
...
By allowing the memswap_limit option to be defined we also need to
check that mem_limit is set, you can't have swap without a limit.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-06 17:08:57 +01:00
Daniel Nephin
20218394b9
Merge pull request #1649 from albers/doc-completion-zsh
...
Mention zsh command completion in general install section
2015-07-06 06:41:09 -07:00
Aanand Prasad
0fa5808389
Merge pull request #1623 from mnowster/documentation-fixes
...
Documentation fixes
2015-07-06 13:25:56 +01:00
Harald Albers
2fc7cd6e03
Mention zsh command completion in general install section
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-07-05 19:18:24 +02:00
Daniel Nephin
ae96fc0071
Support reading config from stdin.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-07-02 22:16:22 -04:00
Mazz Mosley
8a47791161
Re-arrange for the more common case
...
boot2docker is the more common case so let's have that one first.
Also be more explicit and clear that the localhost:5000 is applicable
for people running on linux.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 16:20:29 +01:00
Mazz Mosley
ab03f2310b
Include zsh shell
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 16:20:29 +01:00
Mazz Mosley
c45c16cead
Improve localhost & boot2docker info
...
Added a link to boot2docker for those unfamiliar with it.
http://0.0.0.0:5000 didn't resolve for me, however localhost:5000
did, so included reference to that.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 15:58:11 +01:00
Mazz Mosley
d0c499329e
Add a note not to worry
...
When reading through the code for the first time and seeing redis,
those unfamiliar with docker first thought might be that they need
to install redis. Adding this sentence helps make it clearer that
this is not needed. Docker will take care of this in services.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-01 15:58:10 +01:00