docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
46,452 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

300 Commits

Author SHA1 Message Date
Joao Fernandes d05bb7ca40 DTR 2.2.2 (#2022) 2017-02-28 11:12:42 -08:00
Misty Stanley-Jones d991127866 Merge pull request #1983 from mstanleyjones/add_cs_links 
Add CS Engine package links and offline install instructions
 2017-02-27 10:45:36 -08:00
Misty Stanley-Jones 154d4e374e Add CS Engine package links and offline install instructions 2017-02-27 10:38:01 -08:00
Alexandros Mavrogiannis a152a8b270 Extend and rewrite ucp troubleshooting (#1843) 
* Extend and rewrite ucp troubleshooting

Signed-off-by: Alex Mavrogiannis <alex.mavrogiannis@docker.com>

* Clean and add images to UCP troubleshoot
 2017-02-27 08:58:25 -08:00
Misty Stanley-Jones 6b0a5f9be4 Revert "re-organize docker cloud topics, public intro to swarm mode" 2017-02-23 11:44:11 -08:00
Victoria Bialas dc699e8558 WIP: re-organize docker cloud topics, public intro to swarm mode 
edited screen snap

breaking out topics for Docker Cloud swarm mode

added another where-to-next link

added more where-to-next links

added back in on-page TOC for create swarm topic

incorporated Ryan's review comments on first draft

more Ryan's review comments, sweep thru all for consistency, notoc on short pages, etc.

removed duplicate link to 'create a new swarm in docker cloud'

Laura's comments incorporated

re-organized Cloud topics, added in Swarm Mode

Ryan's review comments on Cloud, added new type of advisory for Beta previews

more review comments, manage infrastructure --> standard mode

fixing image

testing cloud images

updates to Cloud welcome page for Swarm, non-Swarm descriptions

add new cloud repository image

retake of corrupted image

fixed the other instance of corrupted image by referencing the retake

fixing corrupted image on GitHub

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-02-23 10:58:36 -08:00
Victoria Bialas 1d21dea18e voting app graceful shutdown, d4win compatibility 
fixed tips and links

copy-edits and re-wording finishing touches

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-02-22 21:27:33 -08:00
Arun Gupta aa4e3f0b0e Fixing a typo (#1914) 
* Fixing a typo

Instructions says to list name but the format lists container id

* Updating command output based upon the request

* Update docker_stats.yaml

Fixing the column name
 2017-02-22 13:21:21 -08:00
Masafumi Noguchi 839e56255a Add blank line 2017-02-23 00:10:08 +09:00
John Mulhausen 81c71d67a1
Add Related topics... buttons 2017-02-21 18:45:07 -08:00
John Mulhausen eda0c811a4 First pass: Get YAML version of Glossary running 2017-02-21 16:55:41 -08:00
Tony Holdstock-Brown cda96b5b61 Add GC guide to DTR (#1767) 
* Add GC guide to DTR

* Add border to images
 2017-02-17 17:10:39 -08:00
Ken Cochrane fec6553dca Added updates and Release notes for Docker for AWS Beta 18 (#1782) 
* Added updates and Release notes for Docker for AWS Beta 18

Signed-off-by: Ken Cochrane <KenCochrane@gmail.com>
 2017-02-17 16:58:06 -08:00
Wayne Song f3bf3f1a63 Create add-sans-to-cluster.md 2017-02-17 14:35:52 -08:00
Victoria Bialas 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
John Mulhausen b513ecde18 Tabs-based organization (#1420) 
* First pass of tabs-based organization

* Improvements

* Second pass at tabs org

* Move tab highlighting to Liquid instead of JS

* Adding forwarding links for in-product TOCs

* Move to pre-rendered left-navs instead of post-load JS for TOC sync

* Optimizations and nosync-ing the Reference section

* Optimizations, fix Cloud YAML

* Make a "Sample applications" node

* Tabs CSS fixes and 12-factor reposition

* Fix auto-complete left-padding

* Fix auto-complete right-padding (for symmetry)

* Fix for no left-nav on Compose file

* Fix weird wrapping on smaller screens for tabs

* reorganized d4mac, d4win per tabs structure, split out install guides

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* Update reference urls to latest DDC version

* Reintroduces changes ebe778b..9abc9e to TOC

* Update allpagelinks.md

* hid the on-page TOC's for d4mac d4win topics as needed

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* Add a Hopscotch tour of the new navigation
 2017-02-15 17:23:45 -08:00
French Ben 7c894d5fb1 Updated example to examples in yaml 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-02-14 15:04:51 -08:00
French Ben a1933d276b New CLI added 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-02-14 14:30:56 -08:00
John Mulhausen a3dd8ff96e Switch to auto-building source of docs-base 2017-02-11 02:55:53 -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 03550be339 Merge pull request #1600 from londoncalling/clarify-list-images-feedback 
clarified getting started Compose topics based on user feedback
 2017-02-10 12:02:31 -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
Misty Stanley-Jones afef955a13 Linux installation improvements (#1560) 2017-02-10 11:31:50 -08:00
Jeremy Yallop 25c110d1b2 Remove a stray 'not' 
Signed-off-by: Jeremy Yallop <yallop@docker.com>
 2017-02-10 14:08:42 +00:00
Joao Fernandes 19dbb59ff2 Release DTR 2.2.1 2017-02-09 19:55:05 -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
John Mulhausen 161fb51b1c Update nginx.conf 2017-02-09 18:28:28 -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
John Mulhausen 69f622bb70 Move to GHP 112, nginx-based server, docs-base (#1515) 
* Moves to GHP 112, nginx-based server

* Import official nginx instructions per @thaJeztah

* Reordering of commands per @thaJeztah

* Reordering of commands per @thaJeztah

* Make sure that at the end of each layer we only keep the one directory

* Forgot to use md_source when resolving conflicts

* Update Dockerfile

* Use base image, clean up cruft from docsarchive folder

* Update docs-base to be self-browseable, conf source of truth
 2017-02-09 17:17:07 -08:00
Ying Li a1a1f93345 Fix the 1.13.1-cs1 release notes to include changes from 1.13 and 1.13.1 (#1582) 
* Update the 1.13.1-cs1 release notes to include changes from 1.13 and 1.13.1, and
remove the "Beta" modifier from the CS-engine 1.13 section.

Signed-off-by: cyli <ying.li@docker.com>
 2017-02-09 14:31:23 -08:00
Joao Fernandes ae7ada9ee3 Squashes DTR beta release notes for GA 2017-02-08 21:02:33 -08:00
Joao Fernandes 73dca901e7 Update install images for DDC 2017-02-08 21:02:33 -08:00
Joao Fernandes 0e5bd6473c Review IA of content trust in DDC 2017-02-08 21:02:33 -08:00
Joao Fernandes 0cc8361d80 Fix broken links 2017-02-08 21:02:33 -08:00
Joao Fernandes 636b846f65 Refactor DTR image management 2017-02-08 21:02:33 -08:00
Joao Fernandes 7e7ff27c7b Move DTR user management to admin 2017-02-08 21:02:33 -08:00
Joao Fernandes b62ae9304c Add user article for choosing cache 2017-02-08 21:02:33 -08:00
Joao Fernandes 69fed5226d Add use a load balancer for DTR 2017-02-08 21:02:33 -08:00
Joao Fernandes bdd0225694 Revamp DTR IA 2017-02-08 21:02:33 -08:00
Joao Fernandes 9e7cf05327 Bump DDC beta to latest on TOC 2017-02-08 21:02:33 -08:00
Joao Fernandes b826b36b14 Add use hostnames to acess your service 2017-02-08 21:02:32 -08:00
Joao Fernandes b7a5698641 Add deploy a service to UCP 2017-02-08 21:02:32 -08:00
Joao Fernandes 2b7412d72b Updates all DDC links 2017-02-08 21:02:32 -08:00
Joao Fernandes e79f8530bb Add recover password 2017-02-08 21:02:32 -08:00
Joao Fernandes 7a3e97c41f Add restrict services to worker nodes 2017-02-08 21:02:32 -08:00
Joao Fernandes f40f7f29ce Review UCP information architecture 2017-02-08 21:02:32 -08:00
Joao Fernandes 2ce9813fd9 Fix typo on DDC offline tar files 2017-02-08 21:02:32 -08:00
Joao Fernandes 2a7ee54aea Move HRM upgrade instructions to its own article 2017-02-08 21:02:32 -08:00
Joao Fernandes ff13e42130 Add tar files for DDC beta 2 2017-02-08 21:02:32 -08:00
Joao Fernandes ac1996ae1a Fix offline DDC install 2017-02-08 21:02:31 -08:00
Joao Fernandes ed842d659d Adds docs for CSE 1.13-rc1 2017-02-08 21:02:31 -08:00
Joao Fernandes 726bc35de3 Update UCP 2.1 docs 2017-02-08 21:02:31 -08:00
Joao Fernandes e0e27a4ee1 Review ucp 2.1 docs 2017-02-08 21:02:31 -08:00
Joao Fernandes 46e4e522c3 Introduce webhooks in DTR 2017-02-08 21:02:31 -08:00
Joao Fernandes 8b6e00387f Introduce content caching in DTR 2017-02-08 21:02:31 -08:00
LRubin 3a3730bd45 ucp 2.1 reorg to normalize with dtr 
Signed-off-by: LRubin <lrubin@docker.com>
 2017-02-08 21:02:31 -08:00
Joao Fernandes 4a66834262 Fix broken images and toc from DTR article reshuffle 2017-02-08 21:02:31 -08:00
Joao Fernandes ccc1bb7215 Add UCP secrets docs 2017-02-08 21:02:31 -08:00
Joao Fernandes 53b6a0d8a0 Add UCP 2.1, update left nav 2017-02-08 21:02:30 -08:00
LRubin 2c19a4ec31 update toc 
Signed-off-by: LRubin <lrubin@docker.com>
 2017-02-08 21:02:29 -08:00
LRubin d703f91f26 major refactor 
Signed-off-by: LRubin <lrubin@docker.com>
 2017-02-08 21:02:29 -08:00
Joao Fernandes 64041b7224 Add DTR 2.2 beta scaffold 2017-02-08 21:02:29 -08:00
Joao Fernandes 7cbeadc5fb Merge pull request #1561 from joaofnfernandes/ucp-2.0.3 
UCP 2.0.3
 2017-02-08 16:08:08 -08:00
Joao Fernandes 2b1733bdf0 UCP 2.0.3 2017-02-08 15:49:24 -08:00
John Mulhausen 8219725f59
More explicit topic naming for Engine API docs 2017-02-08 13:55:05 -08:00
Victor Vieux 80fa030ffd bump engine API to 1.26 (#1553) 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2017-02-08 13:18:24 -08:00
gpflaum a737c9046c fix title for "volume prune" in TOC 2017-02-05 15:16:54 -05:00
John Mulhausen b547d91606
Publish v1.12 archive 2017-02-01 15:56:44 -08:00
John Mulhausen b4f92362b6 Fix for Swarm CLI docs 2017-01-31 18:39:27 -08:00
Misty Stanley-Jones ba231c7559 Merge pull request #1364 from nathanleclaire/why_d4a 
Add 'Why Docker for AWS/Azure' doc
 2017-01-31 16:29:54 -08:00
French Ben 52d42c3ce4 Include example from latest docker docs (#1441) 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-01-31 16:28:10 -08:00
Nathan LeClaire 2b7dd30419 Add 'Why Docker for AWS/Azure' doc 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2017-01-31 15:24:39 -08:00
Victoria Bialas 709b054239 removed duplicate install instructions from under Docker Engine 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-01-28 16:53:30 -08:00
French Ben 230940f7f0 Added aliases to CLI (#1412) 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-01-27 11:58:46 -08:00
French Ben 1edc5d3d29 Restored navigation issue (#1402) 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-01-27 11:57:11 -08:00
Joao Fernandes ba90557995 Merge pull request #1372 from joaofnfernandes/ddc-offline 
Add links for offline UCP install
 2017-01-27 10:39:32 -08:00
Misty Stanley-Jones 9e29d0e03d Fix more broken links and images 2017-01-26 11:36:27 -08:00
Victoria Bialas 9adbe01bda getting started button format update, voting app services topic intro 
added more concept definitions to intro topics

copy edit to clarify something

changed topic title

updated topic title in TOC as well

text formatting, re-push for new Jenkins

fixed installer download buttons in Getting Startd to specify a button type

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-01-25 15:10:01 -08:00
Misty Stanley-Jones ef95a915eb Fixing broken links 
Formatting improvements along the way
 2017-01-25 11:51:14 -08:00
Joao Fernandes 0ce675678c Add links for offline UCP install 
Versions 1.1.6, 2.0.2
 2017-01-25 11:13:27 -08:00
John Mulhausen 3ff3b7cf42 Update dockerd.yaml 2017-01-25 10:57:38 -08:00
John Mulhausen 3bbdef8094 Import Daemon Metrics from docker/docker for dockerd 2017-01-25 10:54:39 -08:00
Vasily Upornikov 761f46cea9 Fixed a typo (#1323) 2017-01-24 14:32:10 -08:00
Misty Stanley-Jones 979cdc7186 Add several redirects (#1332) 2017-01-24 14:31:41 -08:00
Misty Stanley-Jones dc42fddb45 Document swarm locking 2017-01-23 14:33:40 -08:00
John Mulhausen dd736c5c78 Fix to point to correct branch 2017-01-22 16:11:57 -08:00
Misty Stanley-Jones 524692c7ad Add stack_ps to the TOC 2017-01-20 16:57:40 -08:00
Adrien Duermael 366fb5b964 Link fixes (#1291) 
* fixed links in toc.yaml

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* removed backslashed spaces in Dockerfile

Signed-off-by: Adrien Duermael <adrien@duermael.com>
 2017-01-20 14:00:33 -08:00
John Mulhausen ebe778b906 Update imports to work properly (#1221) 
Update imports to work properly
 2017-01-20 09:58:54 -08:00
Misty Stanley-Jones f7115867f1 Merge pull request #1201 from mstanleyjones/fix_postinstall_toc 
Fix broken link to linux postinstall
 2017-01-19 23:50:26 -08:00
Misty Stanley-Jones d137e8a245 Fix a couple more instances of SUSE.md (#1223) 2017-01-19 23:50:12 -08:00
Misty Stanley-Jones e3aa91a5c9 Fix broken link to linux postinstall 2017-01-19 23:24:57 -08:00
Victoria Bialas a2092986e4 Merge pull request #1203 from londoncalling/toolbox-put-under-get-docker 
move Toolbox under Get Docker, init cap Get Started
 2017-01-19 21:42:11 -08:00
John Mulhausen 83c9ced110 Get Started section 2017-01-19 21:33:19 -08:00
John Mulhausen 14ba192a5c Get Started section 2017-01-19 21:32:15 -08:00
Victoria Bialas 0d31b7e17c complete first draft example, add new files and images 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-01-19 21:25:05 -08:00
Victoria Bialas 08df6cea16 added node setup, create swarm, deploy topics to voting app example 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-01-19 21:25:04 -08:00
French Ben 2da8713bc3 Updated docs to remove beta and stable link (#1160) 
* Updated docs to remove beta and stable link
 2017-01-19 11:27:37 -08:00
Misty Stanley-Jones 50e75ff936 Rewrite and reorganize Linux install instructions 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2017-01-19 11:27:32 -08:00
Misty Stanley-Jones f4a28b31ec Document Docker secrets 
Fixes #529

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2017-01-19 11:18:18 -08:00
John Mulhausen 5b2842922c Fix for blank node 2017-01-19 11:12:59 -08:00
John Mulhausen 84c02e10a2 Add 'docker' label to commands 2017-01-19 11:12:59 -08:00
John Mulhausen 35898701eb YAML-sourced CLI refdocs 2017-01-19 11:12:55 -08:00
John Mulhausen 50de4479a1 Restructure navigation for Editions 2017-01-19 11:04:55 -08:00
French Ben 132f33de6f Added latest docs from Editions AWS & Azure (#887) 
* Added Docker for AWS and Azure and moved navigation

Signed-off-by: French Ben <frenchben@docker.com>

* Fixed image links

Signed-off-by: French Ben <frenchben@docker.com>
 2017-01-19 10:52:33 -08:00
French Ben 5ed83f4c64 Updated Yaml files (#922) 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-01-19 10:51:53 -08:00
Ben Firshman c3ec389a72 Add full documentation for APIs and SDKs 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2017-01-19 10:51:52 -08:00
Ben Firshman f8dac1b53c Add automatically generated Engine API docs 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2017-01-19 10:45:07 -08:00
Ben Firshman 2f3218c2c4 Rename Remote API to Engine API 
See https://github.com/docker/docker/issues/28319

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2017-01-19 10:43:43 -08:00
Ben Firshman 3344f16999 Move accounts API docs to Docker ID section 
Makes more sense here instead of the Engine reference. It is
only consumed by the Engine.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2017-01-19 10:43:43 -08:00
French Ben d612188de0 Initial dump of CLI in yaml (#737) 
Signed-off-by: French Ben <frenchben@docker.com>
 2017-01-19 10:38:49 -08:00
Carlos Alexandro Becker 4b631d8025 Create logentries.md (#244) 
* Create logentries.md

Signed-off-by: Carlos Alexandro Becker <caarlos0@gmail.com>
 2017-01-19 10:16:52 -08:00
Misty Stanley-Jones 0658ba7292 Merge pull request #622 from mstanleyjones/add_info_about_docker_log 
Add info about using docker logs
 2017-01-18 16:04:26 -08:00
Joao Fernandes 88159573de Add offline tarfile for DTR 2.1.4 2017-01-17 13:51:53 -08:00
Joao Fernandes 6d45991776 Fix offline DDC install 2017-01-17 13:47:07 -08:00
Adrien Duermael 41cdf339f6 CI - added tests for relative links [DO NOT MERGE] (#1052) 
* CI - added tests for relative links

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* fixes to check relative links properly

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* /engine/extend/plugins/ -> /engine/extend/legacy_plugins/

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* do not build /tests folder with Jekyll…

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* list all problematic urls in each file

don’t stop at first error encountered

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* removed “stack tasks” from menu (toc.yaml)

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* fixed broken links

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* fixed broken link in docker-for-mac/osxfs.md

Signed-off-by: Adrien Duermael <adrien@duermael.com>

* fixed broken links in /index.html

Signed-off-by: Adrien Duermael <adrien@duermael.com>
 2017-01-17 13:11:15 -08:00
Joao Fernandes c0baaec1b3 Add release notes for DTR 2.1.3 2016-12-20 17:43:39 -08:00
LRubin 6c87ab9af5 improved combined Cloud landing/info pages 
Signed-off-by: LRubin <lrubin@docker.com>
 2016-12-15 17:58:05 -08:00
Joao Fernandes 07fd6f5bc0 Merge pull request #844 from joaofnfernandes/list-offline-tars 
Automate display of urls for DDC offline install
 2016-12-12 13:42:14 -08:00
Misty Stanley-Jones 733bf29cd8 Merge pull request #731 from mstanleyjones/distribution_docs_from_upstream 
Pull distribution reference docs from upstream repo
 2016-12-12 11:53:33 -08:00
Joao Fernandes 5e73d6295d Automate display of urls for DDC offline install 2016-12-12 09:43:44 -08:00
Joao Fernandes 8eb6722639 How to use UCP/DCT for CI/CD 2016-12-09 10:20:21 -08:00
Victoria Bialas f788509332 re-formatted advisory blockquote, and added advisories to Toolbox docs 
added kitematic advisories, and updated getting started instructions

incorporated Laura's comments apps --> applications

removed gradient on advisory blockquote because Netlify doesn't like it :-(

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-12-08 16:44:32 -08:00
Joao Fernandes ee316885c7 Make DDC versions more obvious 2016-12-07 15:28:32 -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
Misty Stanley-Jones f2857417d1 Merge remote-tracking branch 'upstream/master' into distribution_docs_from_upstream 2016-11-30 10:23:11 -08:00
Joao Fernandes c73ccec06a Updates DDC for AWS docs 2016-11-29 13:58:50 -08:00
Joao Fernandes 01eca2e2f1 Merge pull request #735 from joaofnfernandes/dtr-remove 
Improve instructions to uninstall DTR
 2016-11-28 17:04:17 -08:00
Joao Fernandes 1894591d43 Improve instructions to uninstall DTR 2016-11-28 16:59:01 -08:00
Misty Stanley-Jones d74f9153b9 Merge pull request #412 from mstanleyjones/troubleshooting_volume_errors.md 
Add topic about troubleshooting volume problems
 2016-11-28 16:15:54 -08:00
John Mulhausen a5bf14e5f9 Merge pull request #334 from mstanleyjones/run_reference_reorg 
Add topic about limiting container resources
 2016-11-28 14:37:10 -08:00
Misty Stanley-Jones 554b2c9967 Pull distribution reference docs from upstream 2016-11-28 13:51:52 -08:00
LRubin c23aa3a813 remove some unneeded text with new Docker ID topic 
Signed-off-by: LRubin <lrubin@docker.com>
 2016-11-23 11:13:44 -08:00
John Mulhausen 0060ef460a merge conflict fixes 2016-11-18 18:58:26 -08:00
John Mulhausen 9aadd420ba Merge branch 'master' into auto-issue-assign 2016-11-18 18:55:10 -08:00
John Mulhausen 99c9555130 Adding 1.12.x specific links 2016-11-18 18:51:05 -08:00
John Mulhausen 30772c6703 Merge pull request #511 from mstanleyjones/pull_docker_refs_from_git 
Pull docker refs from git
 2016-11-18 16:09:37 -08:00
Misty Stanley-Jones 97d8ab167d Add topic about limiting container resources 
Moved from upstream PR https://github.com/docker/docker/pull/26791

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 0a924369dc086a19bb0484ca2a53fb485ed99801)
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-18 12:02:35 -08:00
LRubin 93ebd10872 stub for meta Docker ID topic 
Signed-off-by: LRubin <lrubin@docker.com>
 2016-11-17 17:36:50 -08:00
Misty Stanley-Jones cdf97a8755 Merge pull request #630 from mstanleyjones/197_swarm_ingress_toc 
Add swarm routing mesh topic to TOC
 2016-11-17 14:48:16 -08:00
Misty Stanley-Jones 645e572146 Add swarm routing mesh topic to TOC 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-17 14:39:59 -08:00
Misty Stanley-Jones 7d099ea4b0 Add info about using docker logs 
Fixes #293

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-17 09:15:00 -08:00
Joao Fernandes 5a99cb7699 Add DTR NFS support 2016-11-16 18:15:28 -08:00
Misty Stanley-Jones 2a82508963 Change Dockerfile to fetch engine refs from docker/docker 1.12.x branch 
Update Dockerfile and NOT_EDITED_HERE manifest

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-16 15:50:24 -08:00
Joao Fernandes 11e4fdc84e Add DDC trial 2016-11-15 15:36:35 -08:00
Joao Fernandes 821d1566cd Merge remote-tracking branch 'docs-private/vnext-datacenter' into vnext-datacenter 2016-11-11 11:39:43 -08:00
John Mulhausen bcb14821d5 Update not_edited_here.yaml 2016-11-11 00:47:29 -08:00
John Mulhausen bc0cad8727 Edit this page should be overridden in some cases 2016-11-10 18:28:54 -08:00
Victoria Bialas 84ab8f8b1c Init cap Exoscale in Machine driver docs side menu 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-11-10 14:45:22 -08:00
Joao Fernandes 9622d27531 Refactor DTR urls 2016-11-09 20:29:30 -08:00