Commit Graph

50471 Commits

Author SHA1 Message Date
L-Hudson b476eed7d6
Update store-logs-in-an-external-system.md
edits
2018-12-20 08:37:11 -05:00
L-Hudson f7466fc9f5
Merge pull request #7897 from adamancini/patch-11
Update device-mapper-driver.md
2018-12-20 08:35:10 -05:00
L-Hudson 1771581c1b
Merge pull request #7859 from ollypom/missed3.1.1value
Added 3.1.1 value to ee/ucp pages
2018-12-20 08:18:11 -05:00
L-Hudson 0674d5919d
Merge pull request #7857 from gabrielmcg/patch-1
Update collect-cluster-metrics.md
2018-12-20 08:14:23 -05:00
L-Hudson 5c6c583d81
Merge pull request #7865 from nast88/patch-1
Update part3.md
2018-12-20 08:13:27 -05:00
L-Hudson 1e11814f8f
Merge pull request #7867 from ryannhg/patch-2
use port 4000 instead of 80 on host
2018-12-20 08:07:29 -05:00
Maria Bermudez 8697faf695
Merge pull request #7898 from docker/windows-redirect
Add redirect for deleted Windows install page
2018-12-19 16:53:18 -08:00
Maria Bermudez 8651ca1d14
Add redirect for deleted Windows install page 2018-12-19 16:46:03 -08:00
Maria Bermudez 83a3e4a415
Merge pull request #7892 from ollypom/remove1709preview
Removed Windows 17.09 engine preview
2018-12-19 16:20:59 -08:00
Maria Bermudez ff6e1a359a
Merge pull request #7896 from docker/Fix-logging-driver-error
Update configure.md to fix logging driver formatting error
2018-12-19 14:35:01 -08:00
ada mancini ce588a5df4
Update device-mapper-driver.md
callout json-file functionality when using devicemapper - json-file logs to docker dataroot not devicemapper volumes
2018-12-19 17:29:51 -05:00
Anne Henmi 7790911368
Update configure.md 2018-12-19 15:25:25 -07:00
Anne Henmi d3bebc2b6f Revert "Update configure.md"
This reverts commit 3a6dcf3323.
2018-12-19 15:23:59 -07:00
Anne Henmi 3a6dcf3323
Update configure.md 2018-12-19 15:22:08 -07:00
ada mancini 5bdad0eb5b
Update store-logs-in-an-external-system.md
call out DEBUG level logging generates lots messages
2018-12-19 17:20:45 -05:00
Maria Bermudez 4bc6a27713
Merge pull request #7879 from docker/align-rel-ver-in-eng-893
Explain aligned release and versioning in Engine
2018-12-19 14:12:32 -08:00
Anne Henmi aa63746990
Update release-notes.md 2018-12-19 15:10:16 -07:00
Anne Henmi f629a75157
Update release-notes.md
Fixed redirect_from: for jekyll so it'll stop complaining.
2018-12-19 15:05:46 -07:00
ollypom e50dc8a8ed Update Offline Zip for Windows 18.09
Signed-off-by: ollypom <oppomeroy@gmail.com>
2018-12-19 15:32:08 +00:00
ollypom e4d7ba6115 Removed 17.09 preview
Signed-off-by: ollypom <oppomeroy@gmail.com>
2018-12-19 14:23:52 +00:00
Anne Henmi cfa3d4f185
Merge pull request #7882 from bermudezmt/site-redirects
Site redirects
2018-12-18 16:39:43 -07:00
Maria Bermudez 663ea14a3c Address broken links issue after archiving previous versions of UCP and DTR 2018-12-18 15:22:37 -08:00
Tomáš Linhart af39365ffa
Add note about using correct network in Virtual Switch Manager 2018-12-19 00:07:29 +01:00
Maria Bermudez 6c26ee56a5 Merge branch 'master' of github.com:docker/docker.github.io 2018-12-18 14:59:28 -08:00
Maria Bermudez d7a5d39b42 Merge branch 'master' of github.com:docker/docs-private 2018-12-18 14:47:15 -08:00
Anne Henmi 42a5608c16 Initial draft. 2018-12-18 15:18:39 -07:00
Maria Bermudez 3a1117d5cd
Merge pull request #916 from jmwong/jmwong_hub_github_webhook
Re-add section on adding Github webhook on Docker Hub
2018-12-18 14:09:20 -08:00
Maria Bermudez 913cb80a2c
Update image paths 2018-12-18 14:08:44 -08:00
Maria Bermudez d2b791bfac
Merge pull request #6138 from msgeissler/patch-1
Add shutdown order information for depends_on
2018-12-18 13:30:36 -08:00
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
Maria Bermudez 80458fe5d4 Add intermediate certs update to 2.3 and 2.4 CLI pages 2018-12-17 10:08:43 -08:00
Maria Bermudez 46aa2e0a18 Clarify need for intermediate certs on relevant CLI pages for 2.5 and
2.6
2018-12-17 10:04:43 -08: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
Maria Bermudez d38a5c70df
Update instructions 2018-12-14 08:58:41 -08: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 7ed4cfd4fe Update screenshots, wording for DTR installation, remove redirect 2018-12-13 23:00:53 -08:00