c72d62f96d
Merge pull request #3187 from bfirsh/update-wordpress-example-to-use-official-images
...
Update wordpress example to use official images
2016-04-01 20:53:37 +01:00
3034803258
Better variable substitution example
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-31 15:45:14 +01:00
93901ec480
Rails Docs: Add nodejs to apt-get install command
...
When using the latest version of Rails, the tutorial currently errors when running `docker-compose up` with the following error:
```
/usr/local/lib/ruby/gems/2.3.0/gems/bundler-1.11.2/lib/bundler/runtime.rb:80:in `rescue in block (2 levels) in require': There was an error while trying to load the gem 'uglifier'. (Bundler::GemRequireError)
```
Installing nodejs in the build fixes the issue.
Signed-off-by: Jon Lemmon <jon.lemmon@enspiral.com>
2016-03-28 13:31:40 +13:00
b99037b4a6
Add support for DOCKER_* variables in .env file
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:28 -07:00
0ff53d9668
Less verbose environment invocation
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
dcdcf4869b
Mention environment file in envvars.md
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
21aa7a0448
Documentation for .env file
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
8282bb1b24
Add TLS flags to CLI reference
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-24 14:41:51 +00:00
2a09fb02db
Merge pull request #3182 from londoncalling/docs-fix-links-build-errors
...
fixed links showing as build errors per PR #3180
2016-03-23 15:08:25 -07:00
d1ea4d72ac
fixed links showing as build errors per PR #3180
...
fixed links per build errors
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-03-23 14:58:45 -07:00
a53b29467a
Update wordpress example to use official images
...
The orchardup images are very old and not maintained.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-03-22 17:19:50 -07:00
a20b84e6d2
Merge pull request #3178 from aanand/2774-off-one-offs
...
Remove one-off containers in `rm` and `down`
2016-03-22 10:12:21 +00:00
187ea4cd81
Add --all option to rm command - remove one-off containers
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-21 12:12:52 +00:00
7fc40dd7cc
Adding ssl_version to docker_clients kwargs
...
Select tls version based of COMPOSE_TLS_VERSION
Changed from SSL to TLS
Also did docs - missing default value
Using getattr and raises AttributeError in case of unsupported version
Signed-off-by: Kalle Møller <github.com@k-moeller.dk>
2016-03-19 01:15:03 +01:00
85c7d3e5ce
Add support for docker run --tmpfs flag.
...
Signed-off-by: Philip Walls <pawalls@rabidgeek.com>
2016-03-18 18:19:48 -04:00
50fe014ba9
Remove hardcoded host from Engine install URLs
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-17 18:10:32 +00:00
10dfd54ebe
Update install page with link to Windows Toolbox install instructions
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-17 18:09:38 +00:00
7424938fc8
Move ipv4_address/ipv6_address docs to reference section
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-17 11:32:36 +00:00
dd40331b44
Merge pull request #3102 from shin-/1477-a-modest-proposal
...
Add flag to up/down to remove orphaned containers
2016-03-16 10:58:15 -07:00
20c29f7e47
Add flag to up/down to remove orphaned containers
...
Add --remove-orphans to CLI reference docs
Add --remove-orphans to bash completion file
Test orphan warning and remove_orphan option in up
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-15 16:11:49 -07:00
658803edf8
Add -w or --workdir to compose run to override workdir from commandline
...
Signed-off-by: Simon van der Veldt <simon.vanderveldt@gmail.com>
2016-03-15 15:28:32 -04:00
9853b876af
Merge pull request #3101 from bfirsh/less-scary-swarm-compose-docs
...
Better Compose in production docs
2016-03-14 16:12:46 +00:00
1485a56c75
Better Compose in production docs
...
The Compose/Swarm integration has been working really well for
users, so it seems pretty safe to remove the scary warnings about
it not being ready.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-03-10 08:55:07 -08:00
ee136446a2
Fix #2804 : Add ipv4 and ipv6 static addressing
...
- Added ipv4_network and ipv6_network to the networks section in the
service section for each configured network
- Added feature documentation
- Added unit tests
Signed-off-by: Matt Daue <mattdaue@gmail.com>
2016-03-09 18:37:52 -05:00
7a30fc0983
Merge pull request #3089 from ltiao/patch-1
...
Fixed indentation level in example.
2016-03-09 10:56:50 -08:00
e700d7ca6a
Fix version in docs example
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-08 18:15:18 +01:00
000eaee16a
Update image format for service conf reference
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-03-08 17:14:38 +08:00
88a719b4b6
Fixed indentation level in example.
...
Signed-off-by: Louis Tiao <louistiao@gmail.com>
2016-03-08 15:53:55 +11:00
53a3d14046
Support multiple files in COMPOSE_FILE env var.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-02 18:47:58 -05:00
1655be6c5b
Merge pull request #2601 from dnephin/dont_build_on_up
...
Only build as part of `up` if `--build` flag is set
2016-03-02 15:02:18 -08:00
e1b87d7be0
Update reference docs for the new flag.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-02 15:32:51 -05:00
3f3c05e465
Merge pull request #3049 from aanand/clarify-depends-on
...
Clarify depends_on logic
2016-03-02 11:59:06 -08:00
aa7b862f4c
Clarify depends_on logic
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-02 10:29:24 -08:00
0b3561a7d5
Merge pull request #2720 from seguins/2227-improvements-logs
...
Add flags on logs
2016-03-01 17:41:31 -08:00
9b36dc5c54
Add --tail flag as option on logs.
...
Closes #265
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
2016-03-01 20:23:46 +01:00
d9b4286f91
Add -t, --timestamps flag as option on logs.
...
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
2016-03-01 20:23:46 +01:00
82632098a3
Add -f, --follow flag as option on logs.
...
Closes #2187
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
2016-03-01 20:23:43 +01:00
7684604830
Merge pull request #3023 from londoncalling/fix-note-3019
...
WIP: updated note format for dockerfile per Aanand's comments on PR #…
2016-03-01 11:11:55 -08:00
fc99c7ee19
Merge pull request #2584 from mjgpy3/patch-1
...
Update `volumes_from` docs to state default
2016-02-29 15:37:46 -08:00
f5ce31d43e
Merge pull request #3024 from aanand/update-build-image-docs
...
Update docs about using build and image together
2016-02-29 14:03:54 -08:00
4db1fef58c
Merge pull request #3022 from aanand/update-build-image-extends-note
...
Update note about build + image with extends
2016-02-29 14:03:28 -08:00
8d24af92e0
Merge pull request #3030 from aanand/document-startup-order-workarounds
...
Document ways to make services wait for dependencies
2016-02-29 13:01:32 -08:00
6b947ee478
Document ways to make services wait for dependencies
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-29 11:24:58 -08:00
d28c5dda92
implement exec
...
Resolves #593
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2016-02-29 10:50:09 +01:00
62fb6b99eb
Update FAQ regarding long stop times
...
- It happens on recreate, not just stop
- We now support `stop_signal`, which can help in some cases
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-26 14:34:44 -08:00
c72e9b3843
Add release notes for 1.6.2
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-25 17:55:04 -08:00
5be48ba1ed
Update docs about using build and image together
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-25 17:19:58 -08:00
5cc420e727
WIP: updated note format for dockerfile per Aanand's comments on PR #3019
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-02-25 16:47:46 -08:00
2cd1b94dd3
Update note about build + image with extends
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-25 15:15:18 -08:00
49ef8a271d
Add release notes for 1.6.1
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-23 15:13:01 -08:00
e6797e1166
updated Wordpress example to be easier to follow, added/updated images
...
docs update per Mary's comments on the PR
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-02-23 11:59:19 -08:00
176b966486
Update documentation for volume_driver option.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-22 16:51:33 -08:00
c7ceacfeae
Merge pull request #2948 from dnephin/validate_top_level
...
Validate that each section of the config is a mapping
2016-02-19 13:41:50 -05:00
bed0cfeb32
Merge pull request #2807 from aanand/swarm-doc
...
Update Swarm integration guide and make it an official part of the docs
2016-02-19 10:25:28 -08:00
0d218c34c7
Make config validation error messages more consistent.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-19 13:12:57 -05:00
520c695bf4
Update Swarm integration guide and make it an official part of the docs
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-19 09:32:43 -08:00
eb4a98c0d1
corrected description of network aliases, added real-world example per #2907
...
copyedit to make show as file format
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-02-18 18:05:52 -08:00
7152f7ea76
Handle mismatched network formats in config files
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-18 15:24:41 -08:00
825a0941f0
Network aliases are now part of the network dictionary
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-18 15:23:47 -08:00
7801cfc5d1
Document network_aliases config
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-18 15:23:47 -08:00
471264239f
Update guides to use v2 config format.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-16 16:43:26 -05:00
4de12ad7a1
Update link to docker volume create docs.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-16 16:43:22 -05:00
8af0a0f85b
update to description of files generated from examples, which are no longer owned by root w/new release
...
updated descriptions of changing file ownership and images per Seb's comments
fixed line wraps
fixed line breaks per Joffrey's comments
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-02-16 11:34:59 -08:00
b8c35e1298
Merge pull request #2884 from moxiegirl/remove-tutorials
...
Updating Dockerfile
2016-02-16 08:09:49 -08:00
7bae4cdbb2
Merge pull request #2875 from aanand/fix-version-in-install-guide
...
Fix version in install guide
2016-02-11 12:43:51 -05:00
b8f7bbb84e
Merge pull request #2830 from nubs/master
...
Add support for shm_size. Fixes #2823 .
2016-02-11 17:34:44 +00:00
643166ae98
Updating Dockerfile
...
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-10 20:47:15 -08:00
ac14642d94
Typo fixed
...
Signed-off-by: Manuel Kaufmann <humitos@gmail.com>
2016-02-10 19:00:17 -05:00
5e6dc3521c
Add support for shm_size. Fixes #2823 .
...
shm_size controls the size of /dev/shm in the container and requires
Docker 1.10 or newer (API version 1.22). This requires docker-py 1.8.0
(docker/docker-py#923 ).
Similar to fields like `mem_limit`, `shm_size` may be specified as
either an integer or a string (e.g., `64M`).
Updating docker-py to the master branch in order to get the unreleased
dependency on `shm_size` there in place.
Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
2016-02-10 15:25:18 -06:00
c43b25b0cf
Merge pull request #2827 from loic/patch-1
...
Fixed typo in compose-file.md
2016-02-10 15:58:54 +00:00
ab6e07da7d
Fix version in install guide
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-10 15:56:50 +00:00
59a2920758
Typo into the doc with `networks` in yaml
...
Signed-off-by: Yohan Graterol <yohangraterol92@gmail.com>
2016-02-09 18:45:04 -05:00
b635647105
Fixed typo in compose-file.md
...
Signed-off-by: Loïc Bistuer <loic.bistuer@gmail.com>
2016-02-05 09:50:22 +07:00
869e815213
Bump 1.7.0dev
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-04 23:46:41 +00:00
422ff623b4
Merge pull request #2819 from bfirsh/improve-names-in-compose-file-2-example
...
Improve names in Compose file 2 example
2016-02-04 19:42:22 +00:00
a7c2987991
Update docs for version being a string.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-04 12:19:43 -05:00
bdddbe3a73
Improve names in Compose file 2 example
...
Just makes it a bit clearer what's going on.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-02-03 17:42:57 -08:00
f612bc98d9
Fix example formatting for depends_on.
...
Markdown was acting against expectations here by merging the example indented YAML into the previous list item instead of treating it as a code block.
I decided that a better way of handling this would be to add a "Simple example:" line that is also used elsewhere in this file. It resets the markdown indentation in a way that works.
Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
2016-02-03 14:36:46 -06:00
a713447e0b
Fixing duplicate identifiers
...
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-02 12:04:13 -08:00
4c4e94bc19
Merge pull request #2785 from dnephin/depends_on_with_extends
...
Fix list options when used with extends and multiple files
2016-02-02 13:36:46 -05:00
3ec87adccc
Update merge docs with depends_on, and correction about how links and volumes_from are merged.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:49:43 -05:00
7b03de7d01
Move command reference to overview.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:46:52 -05:00
cf24c36c55
Rename the old environment variable page to link environment variables.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:46:29 -05:00
2df5593e8f
Cleanup command-line reference docs by renaming overview to envvars.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:46:28 -05:00
5e30f089e3
Use the same capitalization for all menu items in the docs.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:46:28 -05:00
4f92004d9a
Re-order compose docs so that quickstart guides come before other documentation.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-02 10:46:28 -05:00
3fc72038c5
New navigation for 1.10 release
...
Updating with Joffrey's comments
Signed-off-by: Mary Anthony <mary@docker.com>
2016-01-27 12:05:56 -08:00
8c250e220c
Merge pull request #2754 from aanand/upgrading-improvements
...
Improvements to upgrade guide and script
2016-01-27 13:48:23 +00:00
d3a1cea170
Remove outdated warnings about links from docs
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-27 02:34:59 +00:00
650b0cec38
Remove ability to join bridge network + user-defined networks
...
Containers connected to the bridge network can't have aliases, so it's
simpler to rule that they can *either* be connected to the bridge
network (via `network_mode: bridge`) *or* be connected to user-defined
networks (via `networks` or the default network).
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-27 00:42:09 +00:00
b84da7c78b
Fix trailing whitespace in docker-compose.md
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-26 23:22:21 +00:00
bacc2b730e
Merge pull request #2748 from schmunk42/master
...
fixed documentation about traversing yml files
2016-01-26 17:20:40 +00:00
c39d5a3f06
Add note about named volumes to upgrade guide
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-26 15:51:09 +00:00
e566a4dc1c
Implement network_mode in v2
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-25 23:24:55 +00:00
5fe0b57e5c
fixed documentation about traversing yml files
...
Signed-off-by: Tobias Munk <schmunk@usrbin.de>
2016-01-25 19:33:39 +01:00
3a72edb906
Network fields schema validation
...
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
2016-01-22 16:42:10 +02:00
963ec1ceda
Merge pull request #2707 from dnephin/add_stop_signal_to_docs
...
Add stop signal to the docs
2016-01-21 18:41:28 -05:00
fec8cc9f80
Update documentation for `external` param
...
Signed-off-by: Joffrey F <joffrey@docker.com>
Conflicts:
docs/compose-file.md
2016-01-21 18:51:28 +00:00
59493dd7aa
Add links to networks key references
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-21 18:51:28 +00:00
2f41f3aa7e
Update documentation for links
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-21 18:51:28 +00:00
Ben Firshman
Aanand Prasad
Jon Lemmon
Joffrey F
Victoria
Victoria Bialas
Kalle Møller
Philip Walls
Joffrey F
Simon van der Veldt
Matt Daue
wenchma
Louis Tiao
Daniel Nephin
Stéphane Seguin
Daniel Nephin
Tomas Tomecek
moxiegirl
Manuel Kaufmann
Spencer Rinehart
Yohan Graterol
Loïc Bistuer
Tobias Munk
Dimitar Bonev