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

44881 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Misty Stanley-Jones
a178b5437f Merge pull request #1635 from joaofnfernandes/broken-link 
Fix broken link
 2017-02-13 16:43:13 -08:00
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
Misty Stanley-Jones
80449c6bdd Merge pull request #1637 from joshwyatt/patch-1 
Correct misspelling
 2017-02-13 16:41:19 -08:00
sarahlynnpark
f0ed4d860d Add links to video overviews 2017-02-13 15:52:46 -08:00
Joao Fernandes
a5d10942b4 Fix broken link 2017-02-13 15:42:50 -08:00
Nicola Kabar
45efe11bd4 updating template parameters and cli command 
updating template parameters and launch cli to match D4AWS
 2017-02-13 15:24:48 -08:00
Josh Hawn
322d9e667e [datacenter/ucp] Document RethinkDB Configuration 
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
 2017-02-13 14:47:40 -08:00
Misty Stanley-Jones
3b6477ac4d Merge pull request #1640 from programmerq/patch-3 
differentiate trusty and xenial in this step
 2017-02-13 13:31:01 -08:00
Misty Stanley-Jones
828b415405 Merge pull request #1639 from docker/mstanleyjones-patch-1 
Fix a typo
 2017-02-13 13:17:20 -08:00
Misty Stanley-Jones
141c2696c7 Fix a typo 2017-02-13 12:59:16 -08:00
Jeff Anderson
d9014406af differentiate trusty and xenial in this step 2017-02-13 13:52:23 -07: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
Sebastiaan van Stijn
0ddf0d781a Merge pull request #1613 from Nilz11/patch-1 
Update debian.md
 2017-02-11 18:21:37 -08:00
Nilz11
c1e6b41b47 Update debian.md 
Fix for command
 2017-02-11 15:46:05 +01:00
John Mulhausen
a3dd8ff96e Switch to auto-building source of docs-base 2017-02-11 02:55:53 -08:00
Victoria Bialas
c8770049b1 Merge pull request #1609 from londoncalling/sample-app-diagram-reskin 
updated diagram to match Design provided colours and shapes
 2017-02-10 18:00:24 -08:00
Victoria Bialas
1f4fb56733 updated diagram to match Design provided colours and shapes 
updated diagram to soften connectors in diagram to lighter grey

modified db boxes on diagram

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-02-10 17:49:47 -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
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
Joao Fernandes
0c480bbce3 Add item to DTR 2.2.1 release notes 2017-02-10 11:51:35 -08:00
Joao Fernandes
71571d0db4 Update cse 1.13 2017-02-10 11:51:22 -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
Victoria Bialas
81d21e9352 Merge pull request #1587 from londoncalling/d4mac-win-1-13-1 
d4mac, d4win stable 1.13.1 release notes
 2017-02-10 11:17:53 -08:00
Victoria Bialas
7b5eca08d9 review comments from Misty 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-02-10 10:59:53 -08:00
Victoria Bialas
d0ad358471 d4mac, d4win stable 1.13.1 release notes 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2017-02-10 10:56:18 -08:00
Misty Stanley-Jones
277a98f962 Merge pull request #1592 from datenreisender/patch-1 
Small documentation fix
 2017-02-10 09:29:03 -08:00
Misty Stanley-Jones
2b14ddd6cb Merge pull request #1595 from pascalandy/patch-1 
Fix an issue with CMD docker exec
 2017-02-10 09:28:26 -08:00
Misty Stanley-Jones
391adb4c5b Merge pull request #1594 from yallop/dne 
Remove a stray 'not'
 2017-02-10 09:27:38 -08:00
Pascal Andy
adf14bbba3 Fix and issue with CMD docker exec 
docker exec $(docker ps --filter name=redis -q)

not docker exec $(docker ps --filter --name=redis -q)

Cheers!
 2017-02-10 11:13:12 -05:00
Jeremy Yallop
25c110d1b2 Remove a stray 'not' 
Signed-off-by: Jeremy Yallop <yallop@docker.com>
 2017-02-10 14:08:42 +00: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
John Mulhausen
d416168b31 Update index.md 2017-02-09 23:50:15 -08:00
Victoria Bialas
d75167e789 Merge pull request #1590 from docker/londoncalling-patch-1 
re-wording, copy-edit
 2017-02-09 23:07:50 -08:00
Victoria Bialas
b7dfc2921e re-wording, copy-edit 2017-02-09 22:43:37 -08:00
Joao Fernandes
19dbb59ff2 Release DTR 2.2.1 2017-02-09 19:55:05 -08:00
Victoria Bialas
c1566d9b57 Merge pull request #1588 from londoncalling/compose-reference-tweaks 
copyedits and improvements to Compose reference
 2017-02-09 19:52:08 -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
72b3860e50 Merge pull request #1485 from londoncalling/compose-versions 
WIP: added drafts of versioned compose reference files
 2017-02-09 17:56:07 -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
Misty Stanley-Jones
e322b5974c Merge pull request #1586 from pdevine/patch-2 
Fix typo
 2017-02-09 17:32:34 -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
Patrick Devine
ba8d210013 Fix typo 2017-02-09 16:30:06 -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
Nicola Kabar
925c21a77f Update aws.md (#1578) 
* Update aws.md
* Fix url in DDC for AWS
ucp2.1.0-dtr2.2.0 		2017-02-09 13:35:09 -08:00
Sarah Park
6365c9e110 Update contact method for getting offline DB file (#1579) 
Temporary fix until we get to #4075
 2017-02-09 12:21:43 -08:00