386d6dc6f7
Fix missing database user for Wordpress service ( #2824 )
...
* Fix missing database user for Wordpress service
It defaults to root if not specified. https://hub.docker.com/_/wordpress/
* Change root password to avoid confusion.
2017-04-18 13:03:08 -07:00
8820cfa6ff
New 6-page "Get Started" ( #2296 )
...
* Create index.md
* Create part2.md
* Create part3.md
* Create part4.md
* Create part5.md
* Rewrite step 2
* Update part2.md
* Update part2.md
* Update part2.md
* Update part2.md
* Update part2.md
* Update part2.md
* Update index.md
* Rewrite of part 3
* Tabs-based swarm instructions, pass 1
* Rewrite of parts 3 and 4, tabs implementation
* Navigation, rewrites, part 4 completion
* Part 5 w/Redis
* Part 5, compelte Redis, rename part 6
* TOC/redirect implementation
* Update part6.md
* Changing links to point to new tutorial
* Rewrites and asciinemas
* Fix overview
* Label diagrams
* Fix button
* Fix link to where Stacks are covered
* Fix typo
* s/file/directory
* Reformat paragraph
* Shorten tabs
* Typos
* Release DTR 2.2.4, 2.1.6
* Go back to small /edge (#2736 )
* Go back to small /edge
* Update site front page
Add info about Editions
Reorganize components
Update headings
* Move logic of fetching content to a script
* Add v1.28 API
* Add info about versioned API
* Fix a few 404s (#2785 )
* Fix typo
* Propose use of another word (#2791 )
I think that interested is better than invested, in this case.
* Update secrets.md (#2780 )
remove correct secret
* Change mount syntax on windows from //c/ to c:\ (#2761 )
LGTM
* Update hackathon.md (#2773 )
* nodes.md grammar correction (#2802 )
* Grammar and formatting check (#2797 )
* Wrong article
If the first word starts with a vowel sound you use an. If the first word has a consonant sound use a.
* Making the text bold
Removing backticks because probably the text needs to be bold and not marked as code.
* Update overview.md (#2805 )
It should say 'predecessors', not 'successors'. Otherwise the sentence and the subsequent example don't make sense.
* shrink some big images (#2798 )
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
* #2627 (#2804 )
- Fix right sidebar overflow on rescale
* Update hackathon.md
* change pre-build to pre_build to remove confusion (#2813 )
* change pre-build to pre_build to remove confusion
* clarify that pre_build hook refers to a file
* Update TOC to sentence case (#2790 )
* add more info about DTR on the overview page (#2794 )
fix #1904
* Update glossary.yaml (#2807 )
Fix #2575 .
* fix imports since docker api pkg migration, fix example repository name to be canonical (#2806 )
* tweak: code format for filename (#2829 )
* tweak: code format for filename
slight reword, so as to avoid confusion w/filename
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* small changes just to kick build again
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
* Update hackathon.md
* fix broken links (#2808 )
* fix broken link (#2809 )
* [CONTRIBUTING] update broken link (#2826 )
* [Debian] add gnupg2 requirement for stretch (#2823 )
* TOC/redirect implementation
* Changing links to point to new tutorial
* Rewrites and asciinemas
* Fix bad merge
* Metadata, formatting
* Front page formatting, link instrumentation
2017-04-18 03:32:37 -05:00
fabedfbc8b
Update overview.md ( #2805 )
...
It should say 'predecessors', not 'successors'. Otherwise the sentence and the subsequent example don't make sense.
2017-04-16 17:00:39 -07:00
add2f680e8
Default highlight.js off, dockerfile > conf highlighting, pygments ( #2757 )
...
* Default highlight.js off, dockerfile > conf highlighting, pygments
* Address feedback, style changes, markdownify reductions
* Getting rid of more markdownify
* Fix for right-hand nav spacing
2017-04-13 17:10:29 -07:00
fe5b942a0f
Adding ASP.NET Core + SQL Server Compose Tutorial ( #1536 )
...
Adding Docker Compose sample for getting started with an ASP.NET Core
web application running SQL Server on Linux in the backend. This sample
can be used in Docker for Linux, Windows and Mac using Docker-Engine.
Note: This sample doesn't use Windows Containers.
2017-04-12 12:26:40 -07:00
a8a33c1d07
Update compose-file-v2.md ( #2702 )
...
fix wrong link
2017-04-10 12:40:09 -07:00
49c5bd7b6e
updates for Compose group_add example ( #2684 )
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-04-07 12:45:19 -07:00
61aa60d039
clarified relationship btwn scale and replicas ( #2683 )
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-04-07 11:38:21 -07:00
1654a09c72
Fix broken samples link ( #2682 )
...
Replaced missing samples link with links to Getting Started and GitHub example files
2017-04-07 10:22:44 -07:00
8316c1d0be
There is a colon omitted in this section. ( #2631 )
2017-04-06 15:33:20 -07:00
5f14289a3f
added note re: VitualBox bug and Compose example ( #2652 )
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-04-06 13:41:12 -07:00
2f4355c22a
Fix compose links ( #2624 )
2017-04-04 15:03:50 -07:00
4fd4685ec5
Fix 404 ( #2622 )
2017-04-04 15:03:02 -07:00
3833596740
Adjust heading level ( #2620 )
2017-04-04 14:26:45 -07:00
75d5a853e2
Update production.md ( #2590 )
...
* Update production.md
* Update production.md
2017-04-03 15:23:03 -07:00
d2974a5d3b
Update startup-order.md ( #2591 )
2017-03-31 23:42:38 -07:00
a3417b8126
Update install.md ( #2574 )
2017-03-31 15:31:02 -07:00
a5502b4235
Update gettingstarted.md ( #2576 )
2017-03-31 14:22:01 -07:00
15924442bb
Update install.md ( #2577 )
2017-03-31 14:20:56 -07:00
2b009778e3
Update overview.md ( #2578 )
2017-03-31 14:20:30 -07:00
fd5090abb4
Update envvars.md ( #2579 )
2017-03-31 14:16:58 -07:00
0078fcb96b
Update overview.md ( #2554 )
2017-03-30 16:56:47 -07:00
c6aca8acee
Improve bootstrap tabs ( #2546 )
...
Use data-target instead of href
Move tab-syncing code into site-wide JS so everyone can use it
Add example for syncing tab groups on the same page
2017-03-30 12:57:37 -07:00
669b51a889
Fix broken links ( #2521 )
2017-03-28 16:42:44 -07:00
93bab5a66f
Vnext compose ( #2509 )
...
* Adds documentation about the `--ignore-override` option
For PR https://github.com/docker/compose/pull/4543
When option `--ignore-override` is provided the `docker-compose.override.yml`
file, if it exists, will not be considered for any command. This option
has no effect when the `-f` option is used as that explicitly lists the
set of files to be considered.
Signed-off-by: Dennis Gove <dpgove@gmail.com>
* Compose 1.12.0 additions (#2472 )
* Add mem_reservation to list of v2 options
Signed-off-by: Joffrey F <joffrey@docker.com>
* Add dns_opt to v2 service configuration
Signed-off-by: Joffrey F <joffrey@docker.com>
* Add pids_limit to service configurations
Signed-off-by: Joffrey F <joffrey@docker.com>
* Update list of options for docker-compose rm
Signed-off-by: Joffrey F <joffrey@docker.com>
* Update list of options for docker-compose config
Signed-off-by: Joffrey F <joffrey@docker.com>
* Add --exit-code-from to docker-compose up documentation
Signed-off-by: Joffrey F <joffrey@docker.com>
* Add --parallel to docker-compose pull reference
Signed-off-by: Joffrey F <joffrey@docker.com>
* Add build-args to docker-compose build reference
Signed-off-by: Joffrey F <joffrey@docker.com>
* Add --volume to docker-compose run reference
Signed-off-by: Joffrey F <joffrey@docker.com>
* Add --project-directory to list of docker-compose options
Signed-off-by: Joffrey F <joffrey@docker.com>
* Add reference docs for images command
Signed-off-by: Joffrey F <joffrey@docker.com>
* Add documentation for COMPOSE_PATH_SEPARATOR
Signed-off-by: Joffrey F <joffrey@docker.com>
* Add documentation for cache_from option
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-28 10:50:44 -07:00
add1325878
Add ports and volumes long form syntax to compose-file reference ( #2283 )
...
* Add long form for ports.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
* Remove volume_driver from v3 reference.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
* Add docs for expanded mount syntax.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-03-27 20:49:00 -07:00
2f14b6ea51
added compose file example in accordion ( #2477 )
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-24 19:48:19 -07:00
f6c62c3934
Typo in compose overview page ( #2445 )
...
Add missing space.
2017-03-22 17:53:32 -07:00
92523b274e
Fix external links from compose file docs ( #2401 )
...
Compose file v1 and v2 docs had relative links to some non-existing pages (especially about extending services). It was probably introduced when `compose-file.md` was detached into directory with single file per compose file version.
2017-03-21 11:55:35 -07:00
5591401a2d
clarified Compose file topic structure, and file examples ( #2322 )
...
copyedits, rewrite
fixed some links
simplified/shortened this topic
tweaked description of key, option, value
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-15 10:13:11 -07:00
330ed3d24a
fixup compose-file/index.md link ( #2347 )
2017-03-15 09:56:17 -07:00
fb7c73908b
Update the styleguide ( #2332 )
...
* Update the styleguide
Also normalize admonition titles with the colon outside the bold.
2017-03-15 09:46:30 -07:00
9e244bbb9c
added links to example of using overlay network in swarm mode ( #2331 )
...
added more links re: overlay networks
provided more links to networking topics, restructured the section
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-14 18:46:44 -07:00
37333c8fe8
Fix depends_on in Compose file v3 reference ( #2278 )
...
* docker swarm does not respect depends_on
Swarmkit does not seem to have the concept of starting services in a particular order.
Tested with docker 1.13.1. Also, `docker-compose bundle` warns us about depends_on being unsupported.
* Remove condition form of depends_on from the V3 compose file docs.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-03-14 17:38:59 -07:00
d784ad5c1f
added more detail for Compose env ( #2310 )
...
incorporated Joffrey's comment
fixed heading levels
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-14 14:30:35 -07:00
f9d7107499
update to docker-compose rm reference per Compose v3 ( #2288 )
...
corrected docs to reflect docker-compose version update
updates per Joffrey's comments
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-13 15:53:19 -07:00
4b9493d276
fleshed out Machine scp command description, fixed Compose file notes ( #2265 )
...
copyedit to fix typo
wrapped text properly
replaced original example with Nathan's
added a better sub-title
specifically mentioned not using relative paths
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-10 16:30:26 -08:00
a1ce533207
Update tail docs to match built-in docs ( #2253 )
...
Default value for tail helps me remember it's not a switch, but requires a value. This change makes it match the built-in docs.
2017-03-10 11:56:24 -08:00
66d905032a
Merge pull request #2239 from londoncalling/compose-startup-order-waitforit
...
clarified scripts logic for compose startup order
2017-03-09 17:10:54 -08:00
d1723bfe1f
copyedit
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-09 16:59:17 -08:00
a9bac844a5
Merge pull request #2160 from endlos/patch-2
...
Update rails.md
2017-03-09 15:45:09 -08:00
ec7774f46c
clarified scripts logic for compose startup order
...
changed 'note' to 'tip'
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-09 12:04:26 -08:00
a020b82489
fixed link to Compose v2 restart
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-08 18:26:52 -08:00
7b83cfebab
Update rails.md
2017-03-06 20:01:57 -05:00
b582d52d94
update v1.11.1 to v1.11.2 ( #2102 )
2017-03-06 12:06:06 -08:00
00d60e3054
Merge pull request #1979 from flemzord/patch-1
...
Change version for docker-compose
2017-03-02 15:34:02 -08:00
09c432495f
clarified docker stack deploy and bundles
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-03-01 18:30:48 -08:00
b93760bea5
merge other changes, fix typo
2017-03-01 15:01:26 -08:00
32e4923e32
Merge branch 'master' into patch-1
2017-03-01 15:00:00 -08:00
963e6b5e6c
mem_swappiness for current version and v1
2017-03-01 14:56:18 -08:00
5c87ba4009
Add documentation for mem_swappiness
2017-03-01 14:48:19 -08:00
a3b95e3f0c
Merge pull request #1803 from mtoothman/patch-1
...
Update run.md
2017-03-01 14:24:53 -08:00
1b05f61663
Added "related topics" section
2017-03-01 13:47:13 -08:00
d53941fa43
Update run.md
...
Address PR feedback.
2017-02-28 21:30:53 -05:00
28b1897289
Update install.md
2017-02-25 21:12:12 +01:00
4d93d1790b
Fixes #1887
2017-02-22 13:56:50 -08:00
4576e1a6b7
Merge pull request #1921 from docker/fix-secrets-mode-doc
...
Fix error about permissions in secrets doc
2017-02-22 10:39:22 -08:00
93709c2b12
Merge pull request #1900 from shin-/missing_options_composefileref
...
Updated miscellaneous list of options for each format
2017-02-22 10:13:39 -08:00
33857cfe29
Tweaks
2017-02-22 09:49:09 -08:00
85bcea8ac1
Fix error about permissions in secrets doc
...
Also link to a resource for figuring out the right mode, since not all our readers are UNIX gurus.
2017-02-22 09:45:56 -08:00
9578525701
Merge pull request #1853 from knaperek/patch-1
...
Clarify compatibility of "networks" with more recent versions of compose.
2017-02-22 09:35:06 -08:00
3e4005c360
Updated miscellaneous list of options for each format
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-21 13:11:37 -08:00
ef4671f75e
Document secrets in compose file reference
2017-02-21 09:09:32 -08:00
edfcf0c485
fix broken links in composer-file/index.md ( #1857 )
...
Signed-off-by: mapk0y <mapk0y@gmail.com>
2017-02-20 02:48:33 -08:00
3083031907
Update networking.md
...
Clarify compatibility of "networks" with more recent versions of compose.
2017-02-18 20:16:35 +01:00
4a70dd4cb2
removed on-page topic menu from ref pages
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-17 18:02:58 -08:00
a6eb34f018
added x-ref from scale reference to replicas in v3 Compose
...
incorporated Joffrey's comments
surface h1's in left menu on Compose file refs, fix liquid issue
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-17 17:23:52 -08:00
5160f1cf0b
Remove 1.10.0 references from install.md
...
These were missed from PR #1819 so also needed updating to 1.11.1.
2017-02-17 14:30:45 -08:00
d9e2d542ca
Merge pull request #1831 from londoncalling/compose-restart-link
...
fixed link in Compose file, modified on-page TOC
2017-02-17 14:18:57 -08:00
f36ad2fa3a
fixed link in Compose file, expanded on-page TOC's to show more subtopics
...
fixed a link to variable substition in Compose v.3
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-17 14:07:32 -08:00
a09e279035
Update install.md to refer to version 1.11.1
2017-02-17 13:11:25 -08:00
fb0f9d56bc
Update run.md
...
Minor grammar cleanup.
2017-02-16 22:20:42 -05:00
40f912237b
Merge pull request #1802 from londoncalling/Compose-extends-update
...
edit per Joffrey re: PR #1763
2017-02-16 18:37:30 -08:00
49323a1137
edit per Joffrey re: PR #1763
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-16 18:20:09 -08:00
e845620aaf
fixed nav menus to surface Compose file reference, changed links to several manuals to overviews
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-16 18:06:05 -08:00
0396353b08
Merge pull request #1763 from Electron-libre/master
...
fix(compose:extends): not supported from version 3
2017-02-16 16:35:21 -08:00
d8d822adff
Added a bit more detail to restart.md ( #1668 )
...
This killed me for a while, I expected that since environment variables were set after the build process that they would be reloaded on restart.
2017-02-16 16:00:24 -08:00
be682d4f42
Fix startup-order.md link ( #1769 )
2017-02-16 14:48:46 -08:00
03464b70cb
changed `version 3` to `version 3.x` per Joffrey
2017-02-16 14:37:03 -08:00
989b3a7113
Update compose-versioning.md
2017-02-16 11:54:32 -08:00
0f4a08f916
fix(compose:extends): not supported from version 3
2017-02-16 19:39:23 +01:00
06583c91d9
Changed the `rails` command to `rake`
...
changed `rails db:create` to `rake db:create`
2017-02-15 22:14:18 +05:30
73662f59cb
Fix broken links
...
Fix the broken links at the bottom of https://docs.docker.com/compose/compose-file/ page
2017-02-14 10:47:06 -08:00
404fa2295a
Merge pull request #1608 from joaquincasares/patch-1
...
Update index.md
2017-02-13 16:51:44 -08:00
4e9553176f
Merge pull request #1630 from ifraixedes/patch-1
...
Fix yml file in compose alias example
2017-02-13 16:44:07 -08:00
6cbbf69ca0
Merge pull request #1636 from shin-/v3-network-config
...
Remove unsupported IPAM config entries in v3
2017-02-13 16:41:58 -08:00
d5f60821fd
Correct misspelling
2017-02-13 12:37:17 -08:00
11f7db62e5
Remove unsupported IPAM config entries in v3
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-13 12:14:50 -08:00
e7f6f5ab36
Fix yml file in compose alias example
2017-02-13 16:21:37 +01:00
483d318528
Update index.md
2017-02-10 19:16:53 -06:00
b9f6524a28
Merge pull request #1603 from londoncalling/compose-and-docker-run
...
compose copyedit
2017-02-10 14:54:31 -08:00
1db710d8f3
compose copyedit
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-10 14:18:32 -08:00
9abc9e9f41
Add documentation for new top command ( #1534 ) ( #1601 )
...
Update command lists to include recent additions
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-10 13:59:06 -08:00
19b5b6ad9e
clarified getting started Compose topics based on user feedback
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-10 11:49:52 -08:00
107be08421
Small documentation fix
...
There are four files (`Dockerfile`, `Gemfile`, `Gemfile.lock`, `docker-compose.yml`) described for the setup.
2017-02-10 12:29:47 +01:00
b7dfc2921e
re-wording, copy-edit
2017-02-09 22:43:37 -08:00
2b7c238b0c
copyedits and improvements to Compose reference
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-09 19:40:27 -08:00
55b004036a
added drafts of versioned compose reference files
...
pruning Compose file v2 reference
updated Compose v1, v2, v3 files, still WIP
added includes for compatibility matrix, fixed TOC menu
new topic organziation Compose reference, split two 3 files plus versioning
Daniel's comments, fixed links, added more to versioning details
fixed volumes_from example per Daniel's comments for v1
simplified links to version references
copyedits and improved/surfaced links to versioning/upgrade docs
removed for version specific content re: volume_drivers from various files
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-09 17:39:08 -08:00
be447bf1b5
Fix markdown rendering of example configuration ( #1544 )
...
* fix code block formatting after list
add comment between code block and list to fix markdown rendering
* Update compose-file.md
* Update compose-file.md
2017-02-08 15:49:14 -08:00
91cc808b23
Fix link ( #1392 )
2017-01-26 14:12:28 -08:00
2fb946b8f0
fix anchors ( #1381 )
...
signed-off by Michael Friis <friism@gmail.com>
2017-01-26 02:58:54 -08:00
bfbfbeeec5
added missing descriptions for update_config options
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-25 14:31:07 -08:00
ef95a915eb
Fixing broken links
...
Formatting improvements along the way
2017-01-25 11:51:14 -08:00
2f472446a1
Add udp ports example ( #1098 )
2017-01-24 15:49:44 -08:00
bb81ccb937
Update envvars.md ( #1008 )
...
* Update envvars.md
Update envvars.md to reflect the supported values of COMPOSE_CONVERT_WINDOWS_PATHS
* Update envvars.md
2017-01-24 15:37:06 -08:00
cf42e71f2e
update compose install to 1.10.0 ( #1314 )
2017-01-24 14:48:37 -08:00
8b1117ad58
Update django.md
...
Fixed typo
2017-01-23 09:21:17 -05:00
ebe778b906
Update imports to work properly ( #1221 )
...
Update imports to work properly
2017-01-20 09:58:54 -08:00
3b314c12db
draft 3 voting app sample updates
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-19 22:14:44 -08:00
7063c5e921
Add notice for unsupported Compose file option when deploying stack.
2017-01-19 21:33:45 -08:00
1e6b46b700
Add notice for ignored Compose file options when deploying a stack.
2017-01-19 21:33:45 -08:00
19777ec0b9
Add new depends_on syntax documentation ( #1031 )
...
Miscellaneous fixes
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-19 21:25:03 -08:00
5eb55e8414
Add sysctls option documentation
...
Describe the sysctls compose-file option.
2017-01-19 21:25:03 -08:00
6c9616177e
Update Compose file reference for version 3
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2017-01-19 21:24:59 -08:00
8c458d4d82
Add documentation for service `userns_mode` key
2017-01-19 21:24:05 -08:00
3af3a8b7a2
Merge pull request #1146 from shin-/ipv6_networks_compose
...
Update instructions for IPv6-enabled networks
2017-01-18 15:28:22 -08:00
749701f7d9
minor copyedits ( #1148 )
...
* minor copyedits
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-01-18 15:27:27 -08:00
ec839d5bf8
Merge pull request #1007 from NickvdMeij/patch-2
...
Update overview.md
2017-01-17 23:23:32 -08:00
efb8c5e492
Update instructions for IPv6-enabled networks
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-17 15:43:52 -08:00
a3a53fc3ff
more more link link fixes fixes
...
Signed-off-by: LRubin <lrubin@docker.com>
2017-01-11 15:02:28 -08:00
fde978afc5
more link fixes
...
Signed-off-by: LRubin <lrubin@docker.com>
2017-01-11 14:43:52 -08:00
e5e2b2d34a
Update overview.md
...
Update overview.md to reference possible issues regarding windows to unix path convert issues
2016-12-30 21:46:29 +01:00
0d7778af0c
Merge pull request #991 from sergei-solomonov/patch-1
...
typo fixed
2016-12-29 14:28:10 -08:00
b6a8bfc1ac
Excess '>' symbol deleted
2016-12-29 00:31:29 +07:00
b0ccda058e
typo fixed
2016-12-28 23:06:39 +07:00
5919563eb8
Lossless Image optimization ( #959 )
...
* re-compress jpg images losslessly using jpegoptim
* re-compress png images losslessly using zopflipng
2016-12-21 11:12:13 -08:00
36ac04c1fa
Add a note to `env_file` option ( #932 )
...
* Add a note to `env_file` option
2016-12-19 15:02:42 -08:00
dc22bdd7e8
Merge pull request #879 from buuren/patch-2
...
Update environment-variables.md
2016-12-19 14:22:17 -08:00
3275110fb1
Update environment-variables.md
...
Anchor #env-file does not exist. Correct anchor is #envfile
2016-12-14 12:18:37 +02:00
d3bec385f1
Update index.md
2016-12-13 12:06:37 -05:00
1939c2cd19
Merge pull request #684 from aanand/update-compose-getting-started
...
Updates to Compose getting started guide
2016-12-08 17:15:51 -08:00
855e532435
Update db:create to use latest recommended format ( #787 )
...
Latest best practice is use `rails` vice `rake`.
http://guides.rubyonrails.org/command_line.html#db
2016-12-08 12:21:46 -08:00
7ce29c9a76
Merge pull request #817 from londoncalling/banner-for-old-swarm-docs
...
added advisory banner to legacy swarm docs w/links to swarm mode
2016-12-06 23:08:17 -08:00
59c5544d8b
added advisory banner to legacy swarm docs w/links to swarm mode
...
copyedit
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-12-06 17:03:45 -08:00
d9efcc4df1
Add note about .env file to variable substitution docs ( #801 )
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-12-06 16:41:21 -08:00
9407f9ef05
Update docs around entrypoint option ( #712 )
...
- Clarify that setting `entrypoint` overrides both the entrypoint and
the command on the image
- Fix the incorrect examples in the doc on startup order, which assumed
that the default command would not be overridden
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-12-06 16:40:12 -08:00
88154eacbe
fix error on swarm constraint exemple ( #749 )
...
Constraints for Swarm scheduling are defined as an **environment** option, according to the example in the section *Manual scheduling*, and not as a **label** option
2016-11-30 11:40:05 -08:00
d9a5c2666a
update to 1.9.0 version ( #699 )
2016-11-29 13:55:06 -08:00
53da48206b
Update to Rails 5, Ruby 2.3.3, remove therubyracer ( #718 )
...
* Update to Rails 5, Ruby 2.3.3, remove therubyracer
Update packages to latest versions. The actual nodejs is installed on line 18. Changed to a general comment regarding the need to rebuild images when adding gems.
* update rails welcome screenshot to 5.0.0.1
2016-11-29 13:52:16 -08:00
a086af7a8b
rails.md: change the database.yml in the example ( #701 )
...
In this example, database.yml uses the default value of `postgres` for the `database` key.
The database postgres is normally not used for user data, but for administrative purposes. This means people following this example will not be able to drop the database, and in general it's just not a great idea.
2016-11-29 13:50:01 -08:00
39f87cbc6a
Fix access denied
2016-11-29 12:17:52 +03:00
2d813e26fd
Fix link to link_local_ips
2016-11-28 13:40:17 -08:00
756f4d974c
Fix some doubled words
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-28 11:32:17 -08:00
07fdd239c7
Update extends.md
...
Just corrected a missing 'and'
2016-11-22 20:12:14 +00:00
b08c014fd8
Updates to Compose getting started guide
...
- Some wording and formatting tweaks
- Use Python 3.4, because it's 2016
- Use Alpine-based images for faster downloads and less disk space usage
- Use the list form of `CMD` in the Dockerfile, so it's not wrapped in
sh
- Remove the `depends_on` from `docker-compose.yml`, as it's not really
needed - the web app connects to Redis when it's visited, not on
startup
- Add a section on updating the app and seeing the changes, because
that's the point of mounting the code in!
- Add a note about `docker-compose down`
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-22 16:33:43 +00:00
a259f45166
clarified use of .yml and .yaml for Compose file, both can be used
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-11-18 12:21:51 -08:00
0b71b84ad4
Merge pull request #550 from davidwilliamson/patch-1
...
Update compose example to work better with swarm
2016-11-17 17:30:14 -08:00
7caec61ef4
Merge pull request #573 from alternatekev/patch-1
...
Update wordpress.md
2016-11-17 15:27:46 -08:00
7da6a0bd21
add 'none' cue to large screentext block
...
...to prevent weird syntax highlighting.
2016-11-17 09:31:06 -08:00
b2eb693d00
Merge remote-tracking branch 'upstream/master' into vnext-compose-1.9.0-merge
2016-11-16 12:03:45 -08:00
9a39f03cb7
Merge pull request #595 from ankon/patch-1
...
Use curl's -o to specify the output
2016-11-16 11:42:48 -08:00
698f8d26f4
Merge pull request #593 from jefferybradberry/patch-1
...
There are two differences
2016-11-16 11:34:18 -08:00
1249d35fca
added troubleshooting info about shared drives/files and volume mounting
...
added more changes
updated per Nathan's comments on properly documenting directories formats for all platforms
incorporated Daniel's review comments, and added a clarification re: users' dir
copyedits
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-11-16 11:02:04 -08:00
f07aa9e026
Use curl's -o to specify the output
...
This makes it easier to fix up the command by just prepending a `sudo` if something goes wrong.
2016-11-16 13:05:30 +01:00
b68ad3aced
There are two differences
...
Add missing word.
2016-11-16 04:43:22 -05:00
c4d4069279
Update wordpress.md
...
capital_P_dangit()
2016-11-15 09:47:54 -07:00
186dfbb336
Update compose example to work better with swarm
...
Update the compose example:
* Remove the `links` directive. This allows swarm to distribute containers across available nodes. (with the `links` directive, swarm will be forced to run both containers on the same node.) Note that the `depends_on` directive is sufficient to ensure correct container start up sequence.
* Use a docker volume instead of bind mounting a local directory.
* Give docker-compose commands for shutting down the Wordpress app, showing how to preserve or remove the persisted data in the volume.
Verified proposed change works correctly in both a swarm and a non-swarm environment.
2016-11-11 14:24:39 -08:00
4d83c1bb08
Add missing dollar-sign / consistent shell style ( #426 )
...
* Add missing dollar-sign
* Remove dollar-sign for single commands without output
2016-11-10 14:54:49 -08:00
2ea564166d
fix type of keywords entry in frontmatter (in /compose/ dir) ( #481 )
...
keywords should be a string, not an array containing one string
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-07 13:18:56 -08:00
949a89e6ea
Merge pull request #152 from mstanleyjones/redirect_from
...
Change 'alias:' to 'redirect_from:' so aliases work again
2016-11-04 17:34:27 -07:00
f4b0ec85ff
Merge pull request #339 from dave-pollock/patch-1
...
Update swarm.md
2016-11-04 17:11:40 -07:00
eb5c8670bc
Change instances of alias: to redirect_from:
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-04 17:07:02 -07:00
558314bf56
Converges titles to imperative-form, front-matter based, and sentence-case ( #438 )
...
Multiple title fixes, consistency fixes, convergence into metadata-based titles.
2016-11-04 15:38:40 -07:00
ac0cef5d0f
Merging master into vnext-compose
...
includes conflict resolution
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-11-04 15:25:34 -07:00
1a193d749b
Revert "Merge pull request #437 from gdevillele/fix_keywords_format"
...
This reverts commit 13ddc1350e7a11f05943
2016-11-04 13:33:29 -07:00
33d3d067d0
Revert "fix some frontmatter keywords values"
2016-11-04 13:30:04 -07:00
0827ba283c
Revert "fix frontmatter keywords values in compose/reference/ files"
2016-11-04 13:28:43 -07:00
13ddc1350e
Merge pull request #437 from gdevillele/fix_keywords_format
...
fix some frontmatter keywords values
2016-11-04 10:50:53 -07:00
8bb4d6226a
fix more frontmatter keywords values ( #439 )
...
* fix format of frontmatter keyword entry in some .md files
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-04 10:48:38 -07:00
4c3cf8e7fd
Update docs to mention new additions in Compose 1.9.0
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-03 15:05:24 -07:00
7a11f05943
fix some frontmatter keywords values
...
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-03 10:22:12 -07:00
bb4f3be02e
fix frontmatter keywords values in compose/reference/ files
...
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-03 10:13:21 -07:00
8fa5f3a5de
absolute links to docs.docker.com are now relative links
...
Signed-off-by: Adrien Duermael <adrien@duermael.com>
2016-11-01 17:01:41 -07:00
980956ef9d
incorporated misty's comments
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-10-31 12:43:52 -07:00
870abe59b4
added a filename above the custom script
...
Added a filename above the custom script to distinguish it from the wait-for-it.sh script.
2016-10-26 21:24:36 -04:00
9c5319211d
Fixing note formatting
...
Changing note format back to the way it was to match the rest of the notes in this section.
2016-10-26 16:58:24 -07:00
568cded2a5
finishing touches on Wordpress example in Compose docs per pr#129
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-10-26 13:46:53 -07:00
be3e860fa1
Merge pull request #328 from alexandair/patch-1
...
Update index.md
2016-10-25 14:25:52 -07:00
7fd5e20337
Update ps.md
2016-10-25 11:38:33 -07:00
e65a98ef9f
Update install.md
2016-10-25 11:24:45 -07:00
50d7898fe4
Update gettingstarted.md
2016-10-25 11:22:30 -07:00
100a82043a
Update gettingstarted.md
2016-10-25 11:18:39 -07:00
1967bd2603
Update swarm.md
...
Scheduling filters should be configured in the environment section of compose files - NOT labels.
2016-10-25 14:57:00 +01:00
1de1d10073
At paragraph "links", fixed anchor-link to "depends-on"
2016-10-24 12:01:00 +02:00
18499881e5
Update index.md
...
Fix typo.
2016-10-23 20:12:47 +02:00
bce5d70ce6
Updates compose install to 1.8.1
...
Signed-off-by: Joao Fernandes <joao.fernandes@docker.com>
2016-10-19 15:57:43 -07:00
673523ee9a
Update django.md
...
As of Django 1.10 the database backend django.db.backends.postgresql_psycopg2 is called django.db.backends.postgresql .
See https://docs.djangoproject.com/en/1.10/ref/settings/#engine
2016-10-19 17:07:49 +02:00
5d9e15dcad
Merge pull request #174 from IRus/patch-1
...
This guide used legacy backticks.
2016-10-18 16:35:17 -07:00
83ec5da00d
Merge pull request #196 from ezeeetm/patch-1
...
update 'environment' to 'labels'
2016-10-18 16:13:16 -07:00
3c41a34fd6
Typo in cd command
...
Fixes typo in command.
(If you named your directory `my_wordpress`, then you should cd into `my_wordpress`, not `my-wordpress`)
2016-10-18 20:44:36 +02:00
3129564e3d
Merge pull request #251 from liubin/master
...
remove redundant back slash
2016-10-18 11:37:04 -07:00
01910ab6d9
Update branding for macOS
...
Apple has changed their branding guidelines from 'OS X' to 'macOS'
so we should update ours to be within trademark / branding
guidelines. See http://www.apple.com/macos/sierra/
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-10-18 09:21:09 -07:00
c8b449e7e0
remove redundant back slash
...
I think this is a redundant back slash, should be removed.
2016-10-18 22:31:25 +08:00
91b9a38864
update 'environment' to 'labels'
...
according to @aanandPrasad
constraining containers in swarm with compose is now done with 'labels' as of Swarm 0.3 and Compose 1.3
https://groups.google.com/forum/#!topic/docker-dev/Uzcies21qPo
2016-10-13 14:40:17 -07:00
bb7661a926
Document Compose's syntax for variable defaults
...
This feature was not supported previously, but
was added in https://github.com/docker/compose/pull/3108
2016-10-12 09:50:40 -07:00
0778af3d17
This guide used legacy backticks.
...
https://github.com/koalaman/shellcheck/wiki/SC2006
https://github.com/koalaman/shellcheck/wiki/SC2046
2016-10-12 14:19:24 +03:00
c98a6d8902
example pls
2016-10-08 23:35:37 +04:00
8ea375e1d7
Fix for list in compose-file, CSS fixes for blockquotes
2016-10-07 13:48:23 -07:00
1b8729c5be
remove prefix space
...
strange space on ALL code block on https://docs.docker.com/compose/gettingstarted/
but github clear it on preview .md
2016-10-07 23:18:45 +04:00
9a2be62bf8
Update compose-file.md
...
Document that the journald logging driver allows docker-compose logs to work.
2016-10-05 11:40:42 -05:00
0133cb646d
Merge pull request #21 from pborreli/typos
...
Fixed typos
2016-09-30 11:51:42 -07:00
066b78bf86
Content rendering fixes
2016-09-30 01:51:56 -07:00
0ad083ff1f
Delete Makefile
2016-09-29 23:40:58 -07:00
d8b7717467
Delete Dockerfile
2016-09-29 23:40:48 -07:00
99bab305bd
Removing merge detritus
2016-09-29 23:38:12 -07:00
6cd3fe8bd2
Fixed typos
2016-09-30 01:52:12 +01:00
d53c6798c9
Convert TOML to YAML, tweaks to work with Jekyll
2016-09-29 17:16:03 -07:00
9f31bb790d
Put back inadvertently deleted compose directory
2016-09-29 12:13:47 -07:00
701f170a21
Move docker-hub docs to docker-hub subdirectory
2016-09-29 10:38:52 -07:00
7629f462d5
Moved compose docs to compose subdirectory
2016-09-28 14:52:24 -07:00
f3628c7a5e
Bump 1.8.0
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-07-27 11:57:23 -07:00
e115eaf6fc
Fix error message for unrecognised TLS version
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 11:57:23 -07:00
cefa239c2e
Bump 1.8.0-rc3
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 17:46:13 +01:00
35ed189981
Copy experimental bundle docs into Compose docs so URL is stable
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 16:27:05 +01:00
c392acc56b
Show a warning when engine is in swarm mode
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 16:27:05 +01:00
cd267d5121
Add user agent to API calls
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-07-27 16:27:05 +01:00
cb076a57b9
Suggest to run Docker for Mac if it isn't running
...
Instead of suggesting docker-machine.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-07-27 16:27:05 +01:00
0488dd3709
Rename --fetch-digests to --push-images and remove auto-pull
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 16:27:05 +01:00
b72f911ccf
Fix timeout value in error message
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 16:27:05 +01:00
f9c5816ab8
Stop checking the deprecated DOCKER_CLIENT_TIMEOUT variable
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 16:27:05 +01:00
2ecbf25445
Fix bugs with entrypoint/command in docker-compose run
...
- When no command is passed but `--entrypoint` is, set Cmd to `[]`
- When command is a single empty string, set Cmd to `[""]`
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-27 16:27:05 +01:00
e1b7510e4a
service: detailed error messages for create and start
...
Fixes : #3355
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2016-07-27 16:27:05 +01:00
c72c966abc
Bump 1.8.0-rc2
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-06 18:05:11 -07:00
217f762a60
Post-merge fix - restore Environment import in main.py
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-06 16:20:18 -07:00
70da16103a
Unset env vars behavior in 'run' mirroring engine
...
Unset env vars passed to `run` via command line options take the
value of the system's var with the same name.
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-07-06 16:20:17 -07:00
72849d99c0
Update bundle extension
...
It's now .dab, for Distributed Application Bundle
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-06 16:20:17 -07:00
a7fc3e2220
Add an acceptance test for bundle.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-06 16:20:16 -07:00
db02c9f537
Add some unit tests for new bundle and push commands.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-07-06 16:20:16 -07:00
33cc601176
Warn on missing digests, don't push/pull by default
...
Add a --fetch-digests flag to automatically push/pull
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-07-06 16:20:16 -07:00
9bf6bc6dbd
Bump 1.8.0-rc1
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-14 12:35:46 -07:00
0fe82614a6
Merge pull request #3595 from dnephin/add-push-and-bundle
...
Add docker-compose push and docker-compose bundle
2016-06-14 10:57:32 -07:00
8f8c17bf66
Merge pull request #3549 from shin-/KalleDK-master
...
Add support for COMPOSE_TLS_VERSION config option
2016-06-14 10:57:12 -07:00
9b7bd69cfc
Support entrypoint, labels, and user in the bundle.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-06-14 13:00:12 -04:00
1ea9dda1d3
Implement 'docker-compose push' and 'docker-compose bundle'
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-06-14 12:06:14 -04:00
21f20cbc9b
Merge pull request #3449 from Andrey9kin/ready/3281
...
Fix #3281 : Unexpected result when using build args with default values
2016-06-14 08:05:07 -07:00
2123906586
Merge pull request #3577 from sanmai-NL/3576-byte_str_fix
...
Fix byte/str typing error
2016-06-14 01:58:27 +01:00
60f7e021ad
Fix split_path_mapping behavior when mounting "/"
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-13 15:32:10 -07:00
61324ef308
Fix byte/str typing error
...
Signed-off-by: Sander Maijers <S.N.Maijers@gmail.com>
2016-06-10 16:30:46 +02:00
e502417df2
Merge pull request #3475 from shin-/3429-networks-config-serialize
...
Output valid config in config command
2016-06-07 18:01:39 +02:00
ea640f3821
Remove external_name from serialized config output
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-03 12:10:09 -07:00
e7a8b2fed5
Update TLS version configuration code. Tests.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-03 11:45:22 -07:00
a67ba5536d
Fix #3281 : Unexpected result when using build args with default values
...
Fix the issue when build arg is set to None instead of empty string. Usecase:
cat docker-compose.yml
.... args:
- http_proxy
- https_proxy
- no_proxy
If http_proxy, https_proxy, no_proxy environment variables are not defined then http_proxy,
https_proxy, no_proxy build args will be set to string None which breaks all downloads
With this change undefined build args will be set to empty string instead of string None
Signed-off-by: Andrey Devyatkin <andrey.a.devyatkin@gmail.com>
2016-05-28 11:39:41 +02:00
c148849f0e
Fix #3281 : Unexpected result when using build args with default values
...
Fix the issue when build arg is set to None instead of empty string. Usecase:
cat docker-compose.yml
.... args:
- http_proxy
- https_proxy
- no_proxy
If http_proxy, https_proxy, no_proxy environment variables are not defined then http_proxy,
https_proxy, no_proxy build args will be set to string None which breaks all downloads
With this change undefined build args will be set to empty string instead of string None
Signed-off-by: Andrey Devyatkin <andrey.a.devyatkin@gmail.com>
2016-05-27 20:16:52 +02:00
e3e8a619cc
Fix #3281 : Unexpected result when using build args with default values
...
Fix the issue when build arg is set to None instead of empty string.
Usecase:
cat docker-compose.yml
....
args:
- http_proxy
- https_proxy
- no_proxy
If http_proxy, https_proxy, no_proxy environment variables are not defined
then http_proxy, https_proxy, no_proxy build args will be set to string None which breaks all downloads
With this change build args will not passed to docker engine if they are equal to string None
Signed-off-by: Andrey Devyatkin <andrey.a.devyatkin@gmail.com>
2016-05-27 07:48:13 +02:00
c4229b469a
Improve merging for several service config attributes
...
All uniqueItems lists in the config now receive the same treatment removing
duplicates.
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-05-20 15:29:04 -07:00
842e372258
Eliminate duplicates when merging port mappings from config files
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-05-20 15:28:35 -07:00
7763122ecb
Merge pull request #3459 from shin-/2487-split-volume-path
...
Always use the Windows version of splitdrive when parsing volume mappings
2016-05-20 11:42:43 +01:00
9a39208741
Merge pull request #3482 from aanand/fix-prompt-buffering
...
Fix bug where confirmation prompt doesn't show due to line buffering
2016-05-19 08:52:34 -07:00
0c8aeb9e05
Fix bug where confirmation prompt doesn't show due to line buffering
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-05-19 15:44:17 +01:00
db0a6cf2bb
Always use the Windows version of splitdrive when parsing volume mappings
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-05-17 16:33:59 -07:00
844b7d463f
Update rm command to always remove one-off containers.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-05-16 14:59:33 -07:00
e5645595e3
Fail gracefully when -d is not provided for exec command on Win32
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-05-12 14:00:54 -07:00
72f6a5c8d3
Merge pull request #3433 from anton44eg/issue_3432
...
add msg attribute to ProjectError class
2016-05-12 16:55:11 +01:00
dc88e54010
Merge pull request #3399 from yorkedork/fix/env-file-validation
...
Adds additional validation to 'env_vars_from_file'.
2016-05-12 08:53:25 -07:00
4b01f6dcd6
add msg attribute to ProjectError class
...
Signed-off-by: Anton Simernia <anton.simernya@gmail.com>
2016-05-09 18:26:20 +07:00
310b3d9441
Properly handle APIError failures in Project.up
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-05-02 13:42:05 -07:00
28fb91b344
Adds additional validation to 'env_vars_from_file'.
...
The 'env_file' directive and feature precludes the use of the name
'.env' in the path shared with 'docker-config.yml', regardless of
whether or not it is enabled.
This change adds an additional validation to allow the use of this
path provided it is not a file.
Signed-off-by: Thom Linton <thom.linton@gmail.com>
2016-04-29 17:53:31 -07:00
fe17e0f948
Skip event objects that don't contain a status field
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-04-29 16:39:42 -07:00
bd7ec24e25
Merge pull request #3384 from shin-/3264-shorthand-host-support
...
Support combination of shorthand flag and equal sign for host option
2016-04-29 16:39:16 -07:00
8cc7d68a00
Merge pull request #3390 from aronahl/master
...
Add missing log event filter when using docker-compose logs.
2016-04-28 12:53:04 -07:00
0b24883cef
Support combination of shorthand flag and equal sign for host option
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-04-28 12:52:00 -07:00
2efcec776c
Add missing log event filter when using docker-compose logs.
...
Signed-off-by: Aaron Nall <aronahl@hotmail.com>
2016-04-28 15:14:44 +00:00
61794ba97c
Merge pull request #3377 from shin-/3372-windowserror
...
Define WindowsError on non-win32 platforms
2016-04-28 10:33:18 -04:00
d3e645488a
Define WindowsError on non-win32 platforms
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-04-26 11:40:31 -07:00
756ef14edc
Fix format of 'restart' option in 'config' output
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-26 19:21:03 +01:00
6064d200f9
Fix output of 'config' for v1 files
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-26 19:21:03 +01:00
b67f110620
Explain the explanation about file versions
...
This explanation looked like it was part of the error. Added an
extra new line and a bit of copy to explain the explanation.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-04-20 16:40:16 -07:00
27628f8655
Make validation error less robotic
...
"ERROR: Validation failed in file './docker-compose.yml', reason(s):"
is now:
"ERROR: The Compose file './docker-compose.yml' is invalid because:"
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-04-20 16:38:09 -07:00
cafe1315b2
Merge pull request #3334 from werehuman/fix-config-hash-change
...
Fix #3248 : Accidental config_hash change
2016-04-19 12:42:19 +01:00
984f839d33
Merge pull request #3263 from twitherspoon/3191_2_help_cli_feature
...
Added code to support no argument help command
2016-04-19 12:14:24 +01:00
d21e1c5a30
Merge pull request #3335 from johnharris85/master
...
Fix CLI docstring to reflect Docopt behaviour.
2016-04-19 12:13:20 +01:00
52fa010ac7
Merge pull request #3337 from dnephin/check_for_short_id_alias
...
Check for short id alias, and don't disconnect if it already exists
2016-04-19 12:12:43 +01:00
6d2805917c
Account for aliased links
...
Fix failing tests
Signed-off-by: John Harris <john@johnharris.io>
2016-04-17 15:25:06 -04:00
68272b0216
Config now catches undefined service links
...
Fixes issue #2922
Signed-off-by: John Harris <john@johnharris.io>
2016-04-17 14:00:07 -04:00
56c6e29819
Unit test for skipping network disconnect.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-15 16:28:59 -04:00
4702703615
Fix #3248 : Accidental config_hash change
...
Signed-off-by: Vladimir Lagunov <lagunov.vladimir@gmail.com>
2016-04-15 15:34:30 +03:00
ad306f0479
Fix CLI docstring to reflect Docopt behaviour.
...
Signed-off-by: John Harris <john@johnharris.io>
2016-04-15 13:30:13 +01:00
e1356e1f6f
Set networking_config when creating a container.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-14 18:09:06 -04:00
abb5ae7fe4
Only disconnect if we don't already have the short id alias.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-14 16:05:14 -04:00
e2cb7b0237
Merge pull request #3299 from dannyprout/2096-only-show-port-clash-warning-when-starting-multiple-containers
...
Only show port clash warning if multiple containers are about to be started
2016-04-14 10:40:02 +01:00
50287722f2
Update release notes and set version to 1.8.0dev
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-13 13:27:18 -04:00
339ebc0483
Fixes #2096 : Only show multiple port clash warning if multiple containers
...
are about to be started.
Signed-off-by: Danyal Prout <me@dany.al>
2016-04-12 20:58:21 +01:00
3d3f331404
Merge pull request #3303 from aanand/clarify-rm-and-down
...
Clarify behaviour of rm and down
2016-04-12 11:31:22 +01:00
7cfb5e7bc9
Fix race condition
...
If processing of all objects finishes before the queue is drained,
parallel_execute_iter() returns prematurely.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-11 17:05:52 +01:00
3722bb38c6
Clarify behaviour of rm and down
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-11 16:31:27 +01:00
15c5bc2e6c
Rename a couple of functions in parallel.py
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-11 13:05:30 +01:00
0671b8b8c3
Document parallel helper functions
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-11 12:51:27 +01:00
0e3db185cf
Small refactor to feed_queue()
...
Put the event tuple into the results queue rather than yielding it from
the function.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-11 12:37:00 +01:00
83df95d511
Remove extra ensure_image_exists() which causes duplicate builds.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-08 15:21:12 -04:00
be27e266da
Reduce queue timeout
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-08 19:07:40 +01:00
5450a67c2d
Hold state in an object
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-08 19:06:07 +01:00
54b6fc4219
Refactor so there's only one queue
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-08 18:54:02 +01:00
af9526fb82
Move queue logic out of parallel_execute()
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-08 18:30:28 +01:00
141b96bb31
Abort operations if their dependencies fail
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-08 17:51:09 +01:00
bcdf541c8c
Refactor setup_queue()
...
- Stop sharing set objects across threads
- Use a second queue to signal when producer threads are done
- Use a single consumer thread to check dependencies and kick off new
producers
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-04-08 16:24:29 +01:00
9f47e43b5c
Merge branch 'master' into 3191_2_help_cli_feature
2016-04-07 12:43:34 -04:00
b33d7b3dd8
Prevent unnecessary inspection of containers when created from an inspect.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-04-06 11:14:42 -04:00
129fb5b356
Added code to output the top level command options if docker-compose help with no command options provided
...
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
2016-04-04 13:15:28 -04:00
78a8be07ad
Re-enabling assert_hostname when instantiating docker_client from the
...
environment.
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-30 11:11:19 -07:00
71c86acaa4
Update docker-py version to include match_hostname fix
...
Removed unnecessary assert_hostname computation in tls_config_from_options
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-29 18:01:27 -07:00
7116aefe43
Fix assert_hostname logic in tls_config_from_options
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-28 17:39:20 -07:00
12ad3ff301
Injecting os.environ in Environment instance happens outside of init method
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:28 -07:00
1506f997de
Better windows support for Environment class
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:28 -07: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
c7afe16419
Account for case-insensitive env on windows platform
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
36f1b4589c
Limit occurrences of creating an environment object.
...
.env file is always read from the project_dir
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
0ff53d9668
Less verbose environment invocation
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
f48da96e8b
Test get_project_name from env file
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
1801f83bb8
Environment class cleanup
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
b9ca5188a2
Remove Environment singleton, instead carry instance during config processing
...
Project name and compose file detection also updated
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
c69d8a3bd2
Implement environment singleton to be accessed throughout the code
...
Load and parse environment file from working dir
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
c3eca82749
Merge pull request #3128 from dnephin/add_network_settings_to_config_hash
...
Include network settings as part of the service config hash.
2016-03-23 17:01:32 +00:00
2cc87555cb
tls_config_from_options unit tests
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-22 11:57:45 -07:00
442dff72b4
Improve assert_hostname setting in tls_config_from_options
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-22 11:47:53 -07:00
26f3861791
Specifying --tls no longer overrides all other TLS options
...
Add an option to skip hostname verification
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-22 11:47:53 -07:00
7166408d2a
Fixed typos + simplified TLSConfig creation process.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-22 11:47:53 -07:00
1ac33ea7e5
Add support for TLS config command-line options
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-22 11:47:53 -07:00
4f5123bda9
Merge pull request #3168 from dnephin/fix_tty_timeout
...
Handle all timeout errors consistently
2016-03-22 10:14:52 +00:00
aaa7b09369
Merge pull request #3181 from dnephin/fix_partial_change_test_failure
...
Fix flaky partial_change state test
2016-03-22 10:14:28 +00: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
5c968f9e15
Fix flaky partial_change state test.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-21 19:07:50 -04:00
be1476f24b
Only allow tmpfs on v2.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-21 14:41:28 -04:00
2bf5e46857
Stop and remove still-running one-off containers in 'down'
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-21 18:08:07 +00:00
a2317dfac2
Remove one-off containers in 'docker-compose down'
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-21 16:15:49 +00:00
81f6d86ad9
Warn when --all is not passed to rm
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-21 15:14:31 +00:00
1bc9469674
Don't allow boolean values for one_off in Project methods
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-21 14:42:57 +00:00
5826a2147b
Use enum to represent 3 possible states of the one_off filter
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-21 12:12:52 +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
089ec66522
Include network settings as part of the service config hash.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-18 18:20:03 -04: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
f1dce50b3d
Handle all timeout errors consistently.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-18 18:19:35 -04:00
72ed4d3f97
Merge pull request #3152 from aanand/update-mac-install-url
...
Update Mac Engine install URL in error message
2016-03-17 17:56:34 +00:00
20bf05a6e3
Fix TypeError in Exception handling
...
Traceback (most recent call last):
File "/tmp/tmp.02tgGaAGtW/docker-compose/bin/docker-compose", line 11, in <module>
sys.exit(main())
File "/tmp/tmp.02tgGaAGtW/docker-compose/lib/python3.4/site-packages/compose/cli/main.py", line 68, in main
log_api_error(e)
File "/tmp/tmp.02tgGaAGtW/docker-compose/lib/python3.4/site-packages/compose/cli/main.py", line 89, in log_api_error
if 'client is newer than server' in e.explanation:
TypeError: 'str' does not support the buffer interface
Signed-off-by: Thomas Grainger <tagrain@gmail.com>
2016-03-17 15:13:01 +00:00
92d69b0cb6
Update Mac Engine install URL in error message
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-03-17 09:56:44 +00:00
371ea479f5
Merge pull request #3075 from dnephin/reactive_logs
...
Display logs for new containers started after the command is run
2016-03-16 21:03:25 +00:00
abddabfb0a
Merge pull request #3135 from dnephin/fix_down_idempotency
...
Make down idempotent, continue to remove resources if one is missing
2016-03-16 20:26:18 +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
52b791a264
Split off build_container_options() to reduce the complexity of run
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-15 15:29:24 -04: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
bf96edfe11
Reduce the args of some functions by including presenters as part of the thread_args.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-15 15:15:00 -04:00
e5529a89e1
Make down idempotent, continue to remove resources if one is missing.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-15 13:26:29 -04:00
e8a93821d4
Fix race condition where a container stopping and starting again would cause logs to miss logs.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-15 13:17:11 -04:00
3f7e5bf768
Filter logs by service names.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-15 13:17:10 -04:00
48ed68eeaa
Fix geneartors for python3.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-15 13:17:10 -04:00
4cad2a0c5f
Handle events for removed containers.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-15 13:17:10 -04:00
44c1747127
Add tests for reactive log printing.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-15 13:17:10 -04:00
65797558f8
Refactor log printing to support containers that are started later.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-03-15 13:17:10 -04:00
34de1f0a4c
Removed unused parallel.parallel_stop
...
Signed-off-by: Ilya Skriblovsky <IlyaSkriblovsky@gmail.com>
2016-03-14 22:56:58 +03:00
Bhavin Gandhi
John Mulhausen
padoo
Luis Bosquez
xufei100
Victoria Bialas
Jim Galasyn
mrfly
Misty Stanley-Jones
Wang Jie
Daniel Nephin
Joffrey F
Mateusz Kurek
Derek Bender
Ryan Sanford
Victoria Bialas
Hugo
Piyush Maurya
Joe Meissler
Joe Meissler
Matt
Maxence Maireaux
Joffrey F
Misty Stanley-Jones
mapk0y
Jozef
Andy Bulford
Dirk
Roque Pinel
Cedric Brancourt
Tarun Chinmai
Devis Lucato
Josh Wyatt
Ivan Fraixedes
Joaquin Casares
Marko Schulz
pedep
Juan Eugenio Abadie
Michael Friis
Nick van der Meij
Zhe Zhang
Alex Urquhart
Tim Smid
Jari Takkala
Aanand Prasad
Yong Wen Chua
LRubin
Sergei
Peter Dave Hello
Dan Keder
buuren
Dan Shumaker
Adam Stevenson
Aurelien HAVET
Bo-Yi Wu
Ryan Ore
Varentsov
Rares Vernica
Joe Lemmer
Andreas Kohn
Jeffery Bradberry
Kevin Conboy
David Williamson
Jonas Friedmann
Gaetan
Adrien Duermael
michael-wise
dave-pollock
Markus Schulte
Aleksandar Nikolić
Joao Fernandes
DavidRabel-b1
Ivan Perez
Bin Liu
ezeeetm
nVitius
Ibragimov Ruslan
BSCheshir
sixcorners
Pascal Borreli
Ben Firshman
Tomas Tomecek
Daniel Nephin
Sander Maijers
Andrey Devyatkin
Anton Simernia
Thom Linton
Aaron Nall
johnharris85
Vladimir Lagunov
Danyal Prout
twitherspoon
Tony Witherspoon
Kalle Møller
Philip Walls
Thomas Grainger
Simon van der Veldt
Ilya Skriblovsky