centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-29 15:28:51 +07:00
Code Issues Packages Projects Releases Wiki Activity
44,881 Commits 54 Branches 28 Tags
a178b5437f8d39b2eda593a80fa8aaf2bfec55e9
Commit Graph

980 Commits

Author SHA1 Message Date
Misty Stanley-Jones
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
Josh Wyatt
d5f60821fd Correct misspelling 2017-02-13 12:37:17 -08:00
Joffrey F
11f7db62e5 Remove unsupported IPAM config entries in v3 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-02-13 12:14:50 -08:00
Victoria Bialas
b9f6524a28 Merge pull request #1603 from londoncalling/compose-and-docker-run 
compose copyedit
 2017-02-10 14:54:31 -08:00
Victoria Bialas
1db710d8f3 compose copyedit 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-02-10 14:18:32 -08:00
John Mulhausen
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
Victoria Bialas
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
Marko Schulz
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
Victoria Bialas
b7dfc2921e re-wording, copy-edit 2017-02-09 22:43:37 -08:00
Victoria Bialas
2b7c238b0c copyedits and improvements to Compose reference 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-02-09 19:40:27 -08:00
Victoria Bialas
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
pedep
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
Juan Eugenio Abadie
91cc808b23 Fix link (#1392) 2017-01-26 14:12:28 -08:00
Michael Friis
2fb946b8f0 fix anchors (#1381) 
signed-off by Michael Friis <friism@gmail.com>
 2017-01-26 02:58:54 -08:00
Victoria Bialas
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
Misty Stanley-Jones
ef95a915eb Fixing broken links 
Formatting improvements along the way
 2017-01-25 11:51:14 -08:00
Juan Eugenio Abadie
2f472446a1 Add udp ports example (#1098) 2017-01-24 15:49:44 -08:00
Nick van der Meij
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
Zhe Zhang
cf42e71f2e update compose install to 1.10.0 (#1314) 2017-01-24 14:48:37 -08:00
Alex Urquhart
8b1117ad58 Update django.md 
Fixed typo
 2017-01-23 09:21:17 -05:00
John Mulhausen
ebe778b906 Update imports to work properly (#1221) 
Update imports to work properly
 2017-01-20 09:58:54 -08:00
Victoria Bialas
3b314c12db draft 3 voting app sample updates 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-01-19 22:14:44 -08:00
Tim Smid
7063c5e921 Add notice for unsupported Compose file option when deploying stack. 2017-01-19 21:33:45 -08:00
Tim Smid
1e6b46b700 Add notice for ignored Compose file options when deploying a stack. 2017-01-19 21:33:45 -08:00
Joffrey F
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
Jari Takkala
5eb55e8414 Add sysctls option documentation 
Describe the sysctls compose-file option.
 2017-01-19 21:25:03 -08:00
Aanand Prasad
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
Yong Wen Chua
8c458d4d82 Add documentation for service userns_mode key 2017-01-19 21:24:05 -08:00
Misty Stanley-Jones
3af3a8b7a2 Merge pull request #1146 from shin-/ipv6_networks_compose 
Update instructions for IPv6-enabled networks
 2017-01-18 15:28:22 -08:00
Victoria Bialas
749701f7d9 minor copyedits (#1148) 
* minor copyedits

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-01-18 15:27:27 -08:00
Victoria Bialas
ec839d5bf8 Merge pull request #1007 from NickvdMeij/patch-2 
Update overview.md
 2017-01-17 23:23:32 -08:00
Joffrey F
efb8c5e492 Update instructions for IPv6-enabled networks 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-01-17 15:43:52 -08:00
LRubin
a3a53fc3ff more more link link fixes fixes 
Signed-off-by: LRubin <lrubin@docker.com>
 2017-01-11 15:02:28 -08:00
LRubin
fde978afc5 more link fixes 
Signed-off-by: LRubin <lrubin@docker.com>
 2017-01-11 14:43:52 -08:00
Nick van der Meij
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
Misty Stanley-Jones
0d7778af0c Merge pull request #991 from sergei-solomonov/patch-1 
typo fixed
 2016-12-29 14:28:10 -08:00
Sergei
b6a8bfc1ac Excess '>' symbol deleted 2016-12-29 00:31:29 +07:00
Sergei
b0ccda058e typo fixed 2016-12-28 23:06:39 +07:00
Peter Dave Hello
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
Dan Keder
36ac04c1fa Add a note to env_file option (#932) 
* Add a note to `env_file` option
 2016-12-19 15:02:42 -08:00
Misty Stanley-Jones
dc22bdd7e8 Merge pull request #879 from buuren/patch-2 
Update environment-variables.md
 2016-12-19 14:22:17 -08:00
buuren
3275110fb1 Update environment-variables.md 
Anchor #env-file does not exist. Correct anchor is #envfile
 2016-12-14 12:18:37 +02:00
Dan Shumaker
d3bec385f1 Update index.md 2016-12-13 12:06:37 -05:00
Victoria Bialas
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
Adam Stevenson
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
Victoria Bialas
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
Victoria Bialas
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
Aanand Prasad
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
Aanand Prasad
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
Aurelien HAVET
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