John Mulhausen
d2908c8e80
Merge pull request #449 from stewx/patch-1
...
Grammar
2016-11-03 16:01:40 -07:00
Victoria Bialas
81bade988e
Merge pull request #450 from londoncalling/machine-driver-titles
...
update machine driver exoscale TOC entry
2016-11-03 14:10:54 -07:00
John Mulhausen
9995a39766
Merge branch 'master' of https://github.com/docker/docker.github.io
2016-11-03 14:07:24 -07:00
John Mulhausen
a680313594
Add clean to staging command
2016-11-03 14:07:13 -07:00
Victoria Bialas
817c91a898
update machine driver exoscale TOC entry
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-11-03 13:36:59 -07:00
LRubin
ebecc8b16c
Updated Cloud labels
...
"emergency" fix as this UI change went live and I wasn't notified.
2016-11-03 12:21:03 -07:00
Stewart Rand
c1e679a489
Grammar
...
Better grammar.
2016-11-03 15:13:09 -03:00
Gaetan de Villele
7a11f05943
fix some frontmatter keywords values
...
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-03 10:22:12 -07:00
Gaetan de Villele
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
Michał Czeraszkiewicz
81a9496d23
Fix broken link to docker-compose.yml
2016-11-03 08:49:37 +01:00
Victoria Bialas
40811a5c15
Merge pull request #441 from londoncalling/d4mac-win-beta29
...
added Beta 29.1, 29.2, 29.3 release notes for mac and windows
2016-11-02 18:37:22 -07:00
Victoria Bialas
b5b366a35a
added Beta 29.1, 29.2, 29.3 release notes for mac and windows
...
updated links to Docker labs to go directly to README's
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-11-02 18:16:34 -07:00
LRubin
2b39b2ed3e
Merge pull request #375 from sanscontext/build-envvars
...
Docker Cloud: clarify use case for different types of env vars
2016-11-02 16:51:31 -07:00
John Mulhausen
00801e0b49
Merge pull request #434 from mstanleyjones/fix_mongodb_dockerfile_url
...
Fixed URLs in examples
2016-11-02 14:35:16 -07:00
Victoria Bialas
e55be87a34
Merge pull request #416 from mstanleyjones/fix_machine_migration
...
Fix machine migration
2016-11-02 14:14:46 -07:00
Misty Stanley-Jones
c13359b741
Fixed URLs in examples
2016-11-02 13:36:02 -07:00
Joao Fernandes
a42c61a6ef
Merge pull request #419 from joaofnfernandes/ucp-1.1
...
Migrates UCP 1.1 docs with history
2016-11-02 11:43:23 -07:00
Joao Fernandes
f1102790e2
Remove merge conflict metadata from UCP docs
2016-11-02 11:41:48 -07:00
LRubin
936e228b3e
Merge pull request #403 from sanscontext/cloud-3129-hubcancel
...
CLOUD-3129 Docker Hub: update hub docs to include cancel button
2016-11-02 11:27:21 -07:00
LRubin
12f95ada26
clarify use case for different types of env vars
...
Signed-off-by: LRubin <lrubin@docker.com>
2016-11-02 11:26:52 -07:00
Joao Fernandes
4965b11a8d
Merge pull request #411 from joaofnfernandes/dtr-2.0
...
Migrates DTR 2.0 docs with history
2016-11-02 11:07:20 -07:00
John Mulhausen
7fc3bac4be
Merge pull request #422 from gokaygurcan/patch-1
...
fix: Add line breaks before and after code blocks
2016-11-02 10:57:28 -07:00
LRubin
f4ba4c600a
Merge pull request #421 from aureliojargas/patch-1
...
Fix regex capture groups syntax
2016-11-02 10:44:28 -07:00
Victoria Bialas
085537476b
Merge pull request #420 from londoncalling/d4win-server-2016
...
clarify how to use Windows containers and Windows Server 2016
2016-11-02 10:37:30 -07:00
Victoria Bialas
c92d0f3370
clarify how to use Windows containers and Windows Server 2016
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-11-02 10:15:54 -07:00
Misty Stanley-Jones
62a3473be4
Fix re-import of machine
2016-11-02 10:01:42 -07:00
Tino Breddin
69283150a5
FreeBSD: add build support
...
Signed-off-by: Tino Breddin <t@tolbrino.com>
2016-11-02 09:54:44 -07:00
Gordon Shankman
5b1e0121ec
Updated aws-sdk-go to 1.4.10 to support ECS credential loading.
...
Signed-off-by: Gordon Shankman <gshankman@gmail.com>
2016-11-02 09:54:44 -07:00
Victoria Bialas
94da750075
WIP: docs update for d4mac, d4win, Hyper-V driver and other virtualization factors, swarm mode
...
more updates to Machine docs for creating local VMsM
added details and example on using hyper-v driver, formatted headings for other driver docs
copyedits
incorporated Nathan's copyedits
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-11-02 09:54:44 -07:00
André Carvalho
42f78d0914
fakestore: add tests
2016-11-02 09:54:44 -07:00
André Carvalho
7c3f96c235
driverutil: removes unused err return
...
Signed-off-by: André Carvalho <andre.carvalho@corp.globo.com>
2016-11-02 09:54:44 -07:00
André Carvalho
716a8d133f
driverutil: uses SplitN to parse user input
...
Signed-off-by: André Carvalho <andre.carvalho@corp.globo.com>
2016-11-02 09:54:44 -07:00
André Carvalho
a171962328
driverutil: refactor splitPortProto to parse port as str
...
Signed-off-by: André Carvalho <andre.carvalho@corp.globo.com>
2016-11-02 09:54:44 -07:00
André Carvalho
e2e2395a3d
driver/util: rename util pkg to driverutil
...
Signed-off-by: André Carvalho <andre.carvalho@corp.globo.com>
2016-11-02 09:54:43 -07:00
André Carvalho
19de1c6ce6
drivers: extract splitPortProto to utility pkg
...
This commit extracts the function to a common method where
it will be able to be used accross multiple drivers.
Signed-off-by: André Carvalho <andre.carvalho@corp.globo.com>
2016-11-02 09:54:43 -07:00
Ben Bodenmiller
cfcdc63d52
document how to install registry custom CA
...
Signed-off-by: Ben Bodenmiller <bbodenmiller@hotmail.com>
2016-11-02 09:54:43 -07:00
Ben Bodenmiller
a6244f5ce3
Powershell -> PowerShell
...
Signed-off-by: Ben Bodenmiller <bbodenmiller@hotmail.com>
2016-11-02 09:16:46 -07:00
Chris Baumbauer
251f1e9eb6
Fix egoscale vendor dependencies
...
Signed-off-by: Chris Baumbauer <cab@cabnetworks.net>
2016-11-02 09:16:45 -07:00
Tao Wang
9ed0a15e56
Fix missing '--driver none' from get-start-cloud.md docs
...
Fixes #25485
Signed-off-by: Tao Wang <twang2218@gmail.com>
2016-11-02 09:16:45 -07:00
Misty Stanley-Jones
d6ef6d5bb9
added info about d4mac, d4win in preparation for v1.12 publish set
...
copy-edit to remove extra/repeated info not needed in both sections
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-11-02 09:16:45 -07:00
Gökay Gürcan
ba9ea84fee
fix: Add line breaks before and after code blocks
2016-11-02 11:20:02 +02:00
Aurelio Jargas
1f826f92c3
Fix regex capture groups syntax
2016-11-02 06:25:07 -02:00
Joao Fernandes
0ba114c2a9
Merge branch '1.1-docs' of ../orca/ into ucp-1.1
2016-11-01 18:38:19 -07:00
John Mulhausen
47de0e2073
Fix for hash links issue #413
2016-11-01 18:22:10 -07:00
John Mulhausen
27d00ce54a
Merge pull request #418 from aduermael/absolute-links
...
absolute links to docs.docker.com are now relative links
2016-11-01 17:41:16 -07:00
Joao Fernandes
e53bc30bf9
Move docs to ucp/
2016-11-01 17:18:37 -07:00
Joao Fernandes
63908b8a9c
More updates to release notes
...
(cherry picked from commit adaa077d3cecdfd71bcb640cef942086e4a42d9a)
2016-11-01 17:18:36 -07:00
Joao Fernandes
d20b4e7254
Fix typo in release notes
...
(cherry picked from commit 46cdf5a8b80791f6d1cb6462dd66e23266a06d33)
2016-11-01 17:18:36 -07:00
Joao Fernandes
6b958808d6
Add release notes for 1.1.4
...
(cherry picked from commit a71ab3fb85e09a389714490678ba4e94514c449a)
2016-11-01 17:18:36 -07:00
David Yu
44d5ad04bb
adding explicit instructions to use same engine version
...
(cherry picked from commit 5f5c931ff99968ee8adf420d43856b964f93e680)
2016-11-01 17:18:36 -07:00