Commit Graph

51519 Commits

Author SHA1 Message Date
Alastair Smith e31204c841 update Jenkinsfile 2019-03-05 17:13:05 -06:00
Alastair Smith e95d016a01 Merge branch 'master' of https://github.com/docker/docs-private 2019-03-05 14:29:27 -06:00
Alastair Smith 8e153c0b53 add temporary Jenkinsfile
- Jenkinsfile only contains branch logic and comments
- docker commands will be activated once beta-stage service has been added to docs swarm stack
2019-03-05 14:27:46 -06:00
Paige Hargrave 4b5fbbdbc9 Revert "Merge branch 'master' of github.com:docker/docker.github.io"
This reverts commit 813f45bdd7, reversing
changes made to 2349c62566.
2019-02-28 13:11:13 -05:00
Paige Hargrave 813f45bdd7 Merge branch 'master' of github.com:docker/docker.github.io 2019-02-28 12:49:21 -05:00
paigehargrave 2349c62566
Merge pull request #968 from docker/relnotes-02-2019
February 2019 release notes
2019-02-28 12:44:01 -05:00
paigehargrave f6e56efde6
Update release-notes.md 2019-02-28 11:13:00 -05:00
paigehargrave fa1c4bf5e4
Update release-notes.md 2019-02-28 07:18:57 -05:00
paigehargrave 6176be5f53
Merge pull request #8373 from docker/windows-port-limitations
Fixes Windows container limitations
2019-02-27 17:57:42 -05:00
Maria Bermudez 4f3b609a78
Fixes Windows container limitations 2019-02-27 14:56:49 -08:00
paigehargrave 7b96aa2dbf
Merge pull request #8168 from docker/kube-ingress-updates
Kube ingress updates and updates for EE 2.1
2019-02-27 17:29:21 -05:00
paigehargrave 61f89bd0d4
Merge branch 'master' into kube-ingress-updates 2019-02-27 17:22:43 -05:00
Maria Bermudez 9d40556f63
Merge pull request #8362 from docker/published
Sync master with published
2019-02-27 02:14:59 +00:00
paigehargrave 4c0baea75b
Update release-notes.md 2019-02-26 19:53:09 -05:00
Maria Bermudez e375840d69
Merge pull request #8361 from binman-docker/master
Add Docker Engineering blog
2019-02-27 00:16:20 +00:00
Brett Inman 67e4a6e695 Add Engineering blog 2019-02-26 14:37:50 -08:00
L-Hudson 30715906df
Merge pull request #7011 from sharechiwai/patch-1
To update Dockerfile config to run .Net core 2.1
2019-02-26 16:38:00 -05:00
paigehargrave ce56e905c4
Update release-notes.md 2019-02-26 15:35:49 -05:00
paigehargrave 80455d7009
Update release-notes.md 2019-02-26 15:32:06 -05:00
Maria Bermudez f84459d34c
Merge pull request #8333 from ollypom/ucpdctwithci
Found an old 'DCT with CI' page in the latest UCP Docs
2019-02-26 18:39:15 +00:00
Maria Bermudez 7be5b6b5e9
Merge pull request #8360 from bermudezmt/bermudezmt-ucp-backport
UCP backport
2019-02-26 18:26:17 +00:00
Maria Bermudez 46b8b5a1bc
Merge pull request #8174 from docker/compose-legacy-option
Thank you, @seemethere !
2019-02-26 18:21:29 +00:00
Maria Bermudez c0abe9f712 Fix broken links and remove redirects 2019-02-26 10:06:36 -08:00
L-Hudson 024db9b99e
Merge pull request #8356 from docker/link-get-started-info
Link get started info to Ocean example info
2019-02-26 09:26:33 -05:00
paigehargrave 369ebf7e30
Update ocean.md 2019-02-26 08:13:31 -05:00
paigehargrave 99b474bdf9
Update part2.md 2019-02-26 08:04:35 -05:00
L-Hudson 30807046cd
Merge pull request #7416 from artdgn/master
Clarifying some confusing explanations for limiting cpus resource.
2019-02-26 07:53:36 -05:00
L-Hudson a0a24c77cd
Merge pull request #8291 from docker/windows-server-update
Windows server update
2019-02-26 07:32:03 -05:00
L-Hudson 2234622d5f
Merge pull request #8195 from ollypom/trustwithremoteucp
Added Using DTR Trust Data with a Remote UCP
2019-02-26 07:29:42 -05:00
L-Hudson 4550c92924
Update trust-with-remote-ucp.md
minor edit
2019-02-26 07:28:05 -05:00
Maria Bermudez cc7d45e586 Merge branch 'ucp-backport' of git://github.com/bermudezmt/docker.github.io into bermudezmt-ucp-backport 2019-02-25 21:25:37 -08:00
paigehargrave 8a5fc288bc
Merge pull request #8351 from docker/master
Sync published with master
2019-02-25 18:34:55 -05:00
paigehargrave a6a8f07273
Merge pull request #8350 from docker/layer7-fix
Update layer-7-routing.md
2019-02-25 18:33:28 -05:00
paigehargrave d2b5d6cdbb
Update layer-7-routing.md 2019-02-25 18:32:44 -05:00
L-Hudson 3367a96037
Merge pull request #8207 from toph/log-json-file-example-format
Add an example json-file log line to the documentation.
2019-02-25 08:46:46 -05:00
L-Hudson ce585dad2a
Merge pull request #8311 from mmoser18/patch-1
Update part4.md
2019-02-25 08:39:52 -05:00
Joe Abbey 068382112d Update release-notes.md 2019-02-24 15:43:53 -05:00
Joe Abbey d5796939fb Update release-notes.md 2019-02-24 15:43:53 -05:00
Joe Abbey ce03b2f49f Update release-notes.md 2019-02-24 15:43:53 -05:00
Joe Abbey aa98938d21 Update release-notes.md 2019-02-24 15:43:53 -05:00
Joe Abbey 3b3d8dc294
Update release-notes.md 2019-02-24 15:24:05 -05:00
Joe Abbey 2e024a1ace
Update release-notes.md 2019-02-24 15:22:31 -05:00
Joe Abbey c3c915db1b
Update release-notes.md 2019-02-24 15:24:36 -05:00
Joe Abbey aac6d8ed53
Update release-notes.md 2019-02-24 15:16:55 -05:00
paigehargrave a5a41b7a13
Merge pull request #8347 from docker/master
Sync published with master
2019-02-22 18:06:09 -05:00
paigehargrave a89ba775a6
Merge pull request #8346 from docker/ha-nginx-controller
Ha nginx controller updates
2019-02-22 17:10:21 -05:00
paigehargrave 235cb3194f
Updates per feedback 2019-02-22 15:03:09 -05:00
paigehargrave 63c10ff020
Merge pull request #8345 from trapier/patch-4
ee engine rn: correct EE version in dm deprecation
2019-02-22 14:11:58 -05:00
paigehargrave 703a9fb314
Update layer-7-routing.md 2019-02-22 13:46:44 -05:00
paigehargrave d9fc359655
Update image path 2019-02-22 13:45:42 -05:00