Commit Graph

51795 Commits

Author SHA1 Message Date
paigehargrave eaac6b9d3e
New custom-template 2019-03-26 17:00:58 -04:00
paigehargrave 6899b412e1
Consolidated architecture info 2019-03-26 16:58:09 -04:00
paigehargrave eefac1241b
TOC info 2019-03-26 16:44:20 -04:00
Maria Bermudez f532a54c98 Merge branch 'master' of github.com:docker/docker.github.io 2019-03-26 10:55:30 -07:00
Maria Bermudez 16bfdbd2a2
Merge pull request #8527 from scjane/patch-121
Update seccomp.md
2019-03-25 14:31:50 -04:00
Maria Bermudez 787f9a90b9
Merge pull request #8479 from dockerpac/patch-1
Change default http port
2019-03-25 14:25:51 -04:00
Maria Bermudez 6a4cbd9216
Merge pull request #8523 from jpreese/patch-1
Add missing bold markup
2019-03-25 13:27:02 -04:00
Wang Jie 8a8ea7d666
Update seccomp.md 2019-03-25 09:35:26 +08:00
John Reese 0331c00bf5 Add missing bold markup 2019-03-22 21:52:40 -04:00
Maria Bermudez 461e6dd57c Merge branch 'master' of github.com:docker/docker.github.io 2019-03-22 17:42:17 -07:00
Maria Bermudez cb25367101
Merge pull request #8516 from usha-mandya/8349-format-fixes
fix formatting issues in completion.md file
2019-03-22 13:00:15 -04:00
Maria Bermudez 4331e12c10
Merge pull request #8519 from ekitagawa/patch-20
Fixing download location
2019-03-22 12:58:17 -04:00
Maria Bermudez 9123031825
Added note 2019-03-22 12:53:09 -04:00
Maria Bermudez bc0e8ddc33
Merge pull request #8412 from thaJeztah/split_out_windows_server
Compose: put Windows Server in its own tab for installation
2019-03-22 12:43:51 -04:00
Eiichi Kitagawa 0540ee39dd
Fixing download location
Download command below points to a dir that doesn't exist
```
Invoke-WebRequest "https://github.com/docker/compose/releases/download/1.23.2/docker-compose-Windows-x86_64.exe" -UseBasicParsing -OutFile $Env:ProgramFiles\Docker\Docker\resources\bin\docker-compose.exe
```
On Windows Server 2019 (and probably on 2016), other exe files are under "$Env:ProgramFiles\Docker\" so that should be a good place to put the compose's executable.  This directory is also registered in "PATH" of the system, so users can call out `docker-compose --version` command on the next step without additional configuration.
2019-03-22 09:19:38 -07:00
usha-mandya ed87d31a00 fix formatting issues in completion.md file 2019-03-22 10:48:33 +00:00
Maria Bermudez 87be333941
Merge pull request #8485 from ollypom/azureinstallpatch
Patch UCP Azure instructions
2019-03-21 19:27:15 -04:00
paigehargrave 127331a085
Update install-on-azure.md 2019-03-21 19:25:39 -04:00
Maria Bermudez 552f043f07
Merge pull request #8508 from dnadares/patch-1
Update index.md
2019-03-21 19:24:45 -04:00
Maria Bermudez f9f993a73f
Capitalize product name 2019-03-21 16:24:24 -07:00
Maria Bermudez fb315084f0
Merge pull request #8511 from zeniri/patch-2
Update index.md [Sample applications table]
2019-03-21 18:26:21 -04:00
paigehargrave 7d52184345
Merge pull request #8512 from docker/compose-to-kube
Minor fixes
2019-03-21 16:16:44 -04:00
Maria Bermudez 0e6a7a16b9
Minor fixes 2019-03-21 11:45:56 -07:00
Maria Bermudez 41d7ae3986
Merge pull request #8510 from zeniri/revert-8495-patch-119
Revert "Update overview.md"
2019-03-21 14:40:07 -04:00
Shubh 7720a2f9d8
Update index.md [Sample applications table]
Providing entry to dockerize .Net Core application from the left navigation panel into the "Sample applications" table
2019-03-22 00:01:26 +05:30
Shubh a62197261f
Revert "Update overview.md" 2019-03-21 23:26:47 +05:30
Maria Bermudez 3bf5bee26d
Merge pull request #8509 from docker/revert-8496-patch-120
Revert "Update index.md"
2019-03-21 13:34:04 -04:00
Maria Bermudez e6983fd73e
Revert "Update index.md" 2019-03-21 10:31:10 -07:00
Maria Bermudez 44aa128dfa
Merge pull request #8496 from scjane/patch-120
Update index.md
2019-03-21 13:30:29 -04:00
Maria Bermudez 7230ec2378
Merge pull request #8495 from scjane/patch-119
Update overview.md
2019-03-21 13:30:03 -04:00
Maria Bermudez 9b31b9f23f
Merge pull request #8505 from ollypom/removerbachtml
Removed HTML folder found in UCP RBAC Directory
2019-03-21 13:28:20 -04:00
dnadares 968300a506
Update index.md
Open parenthesis in the wrong place
2019-03-21 10:36:03 -03:00
paigehargrave e695e9ec12
Merge pull request #8504 from ollypom/removekuberbacmigrate
Removed reference to migrate Kube RBAC Roles to UCP RBAC Roles
2019-03-21 08:53:59 -04:00
ollypom fb291b1ea2
Remove stale _site html 2019-03-21 08:51:30 +00:00
ollypom a49b24f892
Removed reference to Migrating Kubernetes RBAC Roles to UCP RBAC Roles 2019-03-21 08:35:40 +00:00
Maria Bermudez d6d02ad695
Merge pull request #8389 from docker/sample-compose-to-kube
Update info for deploy with compose.md
2019-03-20 21:10:07 -04:00
Maria Bermudez 092b3c84b3
Update cloud info 2019-03-20 18:09:52 -07:00
Maria Bermudez 8f337c7eae Update app instructions and screenshots 2019-03-20 18:06:10 -07:00
Justin I. Nevill 77f3357364
Merge pull request #8452 from thaJeztah/remove_obsolete_cs_docs
Remove obsolete CS Engine docs
2019-03-20 19:44:36 -04:00
Maria Bermudez bb0dd0683e
Merge pull request #8494 from scjane/patch-118
Update journald.md
2019-03-20 19:31:30 -04:00
Maria Bermudez 7ddb16f25e
Merge pull request #8492 from scjane/patch-117
Update trust_sandbox.md
2019-03-20 19:30:42 -04:00
Maria Bermudez d4bc0df73c
Merge pull request #8491 from scjane/patch-116
Update trust_key_mng.md
2019-03-20 19:30:08 -04:00
Maria Bermudez 97abe99850
Merge pull request #8490 from scjane/patch-115
Update trust_automation.md
2019-03-20 19:29:30 -04:00
Maria Bermudez b06b6a4657
Merge pull request #8489 from scjane/patch-114
Update content_trust.md
2019-03-20 19:27:29 -04:00
Maria Bermudez 3037e4c665
Merge pull request #8499 from ollypom/quicktrustpatch
Docker Trust with Remote UCP - Added the full error message
2019-03-20 19:25:54 -04:00
ollypom f56f262899
Incorporating dockerpac's feedback, to call out appropriately sized vnets in the Pre-reqs section 2019-03-20 21:46:16 +00:00
ollypom f621f0c614 Added the full error message 2019-03-20 21:07:36 +00:00
Wang Jie 46bc26536f
Update index.md 2019-03-20 15:23:52 +08:00
Wang Jie 8d583cc562
Update overview.md 2019-03-20 14:51:33 +08:00
Wang Jie 9dd27b0431
Update journald.md 2019-03-20 13:48:44 +08:00