Commit Graph

50374 Commits

Author SHA1 Message Date
Maria Bermudez 500c265a09
Merge branch 'master' into patch-1 2018-12-18 13:27:43 -08:00
Maria Bermudez 5a2b960bc6
Merge pull request #7699 from stshow/master
Added `demo_` prefix to interlock label
2018-12-18 12:36:09 -08:00
Maria Bermudez a35c2f77f2
Incorporate feedback from Steven 2018-12-18 12:34:23 -08:00
Maria Bermudez b7da511f1a
Change service to stack 2018-12-18 12:16:30 -08:00
Maria Bermudez c7fa3238dd
Update index.md 2018-12-18 11:17:25 -08:00
Maria Bermudez e4d921e762
Merge pull request #7873 from evertramos/patch-1
Small typo
2018-12-17 14:09:35 -08:00
Anne Henmi 66d29c9ba6
Merge pull request #7372 from hestellez/patch-1
Propose an alternative ssh command
2018-12-17 14:07:03 -07:00
Evert Ramos a4e4d3a9fa
Small typo
fix typo in docs
2018-12-17 16:03:45 -02:00
Maria Bermudez 218d9371fa Merge branch 'master' of github.com:docker/docker.github.io 2018-12-17 08:57:05 -08:00
Anne Henmi 47f4b7d231 Changed misleading statement to "Added functionality for the docker logs command to include the output of multiple logging drivers." 2018-12-17 07:50:46 -07:00
Jamin Wong d891eb2337
Remove space between 'web hook' in title 2018-12-16 20:41:00 -08:00
Anne Henmi 6ce462d71c
Merge pull request #7245 from VokaMut/changed-the-keys-for-the-ssh-add
Update ssh-add-keys-to-agent.md
2018-12-16 20:46:11 -07:00
Ryan Haskell-Glatz bcd571efff
use port 4000 instead of 80 on host 2018-12-16 18:28:43 -06:00
nast88 28fece6e53
Update part3.md
You have an error in the yml file, it should be set to local port 4000 according to the rest of the tutorial
2018-12-15 14:42:33 +02:00
gobold1979 92cfec0600
Numbers were confused
In the tutorial, you connect to alpine1 (ONE!), do some stuff, can't ping alpine2 and I guess the author was confused at this point because immediately after not being able to ping alpine2 comes detaching from the one you're connected to and that's alpine1.
2018-12-14 22:55:12 +01:00
ollypom a2562a278b Added 3.1.1 value
Signed-off-by: ollypom <oppomeroy@gmail.com>
2018-12-14 12:21:41 +00:00
gabrielmcg 530076c6f7
Update collect-cluster-metrics.md
need extra whitespace before replicas: 2  or else invalid yaml
2018-12-14 10:03:55 +00:00
Maria Bermudez 1014a965ed Merge branch 'master' of github.com:docker/docker.github.io 2018-12-13 16:12:00 -08:00
Jie Min Wong 81e7e46fab re-add section on adding web hook 2018-12-13 15:43:04 -08:00
L-Hudson d4277a5065
Merge pull request #7853 from ollypom/azureremoveswarmport
Azure Docs - Removed Swarm Port
2018-12-13 14:25:37 -05:00
Maria Bermudez be13b49abc
Merge pull request #7698 from thaim/patch-1
fix missing symbol to indicate start of command
2018-12-13 10:42:34 -08:00
ollypom 86ac0adccc Removed Swarm Port
Signed-off-by: ollypom <oppomeroy@gmail.com>
2018-12-13 18:41:33 +00:00
Maria Bermudez f96ef308bb
Merge pull request #7726 from shagohead/patch-1
fixed small typo in runmetrics.md
2018-12-13 10:39:52 -08:00
L-Hudson b4065aac7e
Merge pull request #7849 from jackfruhecolab/patch-1
HIt to visit kitematic github page for kitematic
2018-12-13 09:21:35 -05:00
jackfruhecolab d4797df255
HIt to visit kitematic github page for kitematic 2018-12-12 20:45:51 -06:00
Maria Bermudez 61abb720a2 Merge branch 'master' of github.com:docker/docker.github.io 2018-12-12 17:01:23 -08:00
Maria Bermudez 957f6ce16c
Merge pull request #7831 from abhinanduN/patch-1
Update navigation.css
2018-12-12 17:00:01 -08:00
Maria Bermudez 0a360151e4
Update _navigation.scss 2018-12-12 16:49:08 -08:00
Maria Bermudez fc6969b03e
Move update to sidebar section 2018-12-12 16:46:23 -08:00
Maria Bermudez 47084cb592
Merge pull request #7834 from bermudezmt/dtr-deploy-caches
Add note around deploying DTR caches to avoid synchronicity issues
2018-12-12 13:04:58 -08:00
Maria Bermudez a20ccb4e5f Merge branch 'master' of github.com:docker/docker.github.io 2018-12-12 12:38:09 -08:00
Maria Bermudez e0a665eb48 Fixed syntax and incorporated editorial feedback 2018-12-12 12:36:11 -08:00
L-Hudson 734b58f258
Merge pull request #7840 from sujaypillai/patch-3
404 for existing link to Expose Intro
2018-12-12 15:21:19 -05:00
Maria Bermudez 22d79a200c Merge branch 'master' of github.com:docker/docker.github.io 2018-12-12 11:39:19 -08:00
Sujay Pillai 49b1c2b8f3
404 for existing link to Expose Intro
The current link - https://v1-8.docs.kubernetes.io/docs/tutorials/kubernetes-basics/expose-intro/ to the expose intro is broken (Gives 404 not found) and hence updated it to - https://kubernetes.io/docs/tutorials/kubernetes-basics/expose/expose-intro/
2018-12-12 12:35:54 +08:00
L-Hudson f7b1182fde
Merge pull request #7839 from jmorganca/update-hub-builds-classic-links
Fix Docker Hub automated builds links
2018-12-11 17:50:04 -05:00
Jeffrey Morgan 24bd80a008 Use .md notation in hashtag links 2018-12-11 17:40:49 -05:00
Jeffrey Morgan 939c7d33c9 Dont use index.md when using hashtag links 2018-12-11 17:04:55 -05:00
Jeffrey Morgan 0a21710622 Fix broken docs links for hub builds 2018-12-11 17:01:51 -05:00
Jeffrey Morgan e7dce04e36 Fix classic hub docs url 2018-12-11 16:42:18 -05:00
Maria Bermudez 322fc587a4
Merge pull request #3 from docker/master
Merge public:master site into my personal fork
2018-12-11 12:41:00 -08:00
Maria Bermudez 114baa4c13 Merge branch 'master' of github.com:docker/docker.github.io 2018-12-11 12:23:20 -08:00
L-Hudson bb5c8e413a
Merge pull request #7837 from JoeWrightss/patch-3
Typo fixed: "Virtualbox" to "VirtualBox".
2018-12-11 13:38:48 -05:00
JoeWrightss 186dc9dc2b Fix some typos
Signed-off-by: JoeWrightss <zhoulin.xie@daocloud.io>
2018-12-11 22:34:42 +08:00
L-Hudson a955b4a7a2
Merge pull request #7836 from dimaqq/master
Document consistency flag in mounts
2018-12-11 08:29:30 -05:00
Dima Tisnek 6dd9fa00e9 Document consistency flag in mounts 2018-12-11 12:46:25 +09:00
L-Hudson 5254404567
Merge pull request #7832 from bensonarokiadoss/master
update mgr and agent image location to pull from dockerhub
2018-12-10 16:28:09 -05:00
Maria Bermudez 4bdcbf8ae9 Merge branch 'master' of github.com:docker/docker.github.io 2018-12-10 12:41:24 -08:00
Maria Bermudez 13cb09d30d
Merge pull request #911 from docker/fix-classic-url
Fix classic hub docs url
2018-12-10 12:34:25 -08:00
Jeffrey Morgan 88318a94fc Fix classic hub docs url 2018-12-10 15:27:01 -05:00