centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-12 06:19:22 +07:00
Code Issues Packages Projects Releases Wiki Activity
51,546 Commits 57 Branches 28 Tags
178c8a4d3b63a52b50f0123e7497a6b8b90c51bb
Commit Graph

51546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ally Smith
178c8a4d3b make Jenkinsfile serve private and public docs 
After a couple of Jenkins-based mix-ups it became obvious we needed a Jenkinsfile that would serve both public and private projects, that we could move between repos without worry. This Jenkinsfile knows which images to build and push and which swarm services to update because of the use of git_url and branch conditions.
 2019-04-03 13:55:44 -05:00
Ally Smith
df4abbfc66 Merge pull request #1035 from usha-mandya/desktop-ent-docs 
Fix the DDE Overview ToC
 2019-04-02 12:11:20 -05:00
usha-mandya
91626c752f Fix the DDE Overview ToC 2019-04-02 17:52:36 +01:00
Alastair Smith
493b5e1e9e update Jenkinsfile 2019-04-02 11:43:18 -05:00
Usha Mandya
6476d5963a Merge pull request #1033 from usha-mandya/desktop-ent-docs 
1010, 1011 - Update user instructions, add new screenshot
 2019-04-01 16:44:36 +01:00
usha-mandya
30aa5078c1 1010, 1011 - Update user instructions, add new screenshot 2019-04-01 16:26:12 +01:00
Usha Mandya
40915b94e5 Merge pull request #1032 from usha-mandya/desktop-ent-docs 
1013 - Fix ToC indentation, missing images
 2019-04-01 11:42:29 +01:00
usha-mandya
3047e6ea89 1013 - Fix ToC indentation, missing images 2019-04-01 11:28:37 +01:00
Alastair Smith
3eac7ba387 fix yaml spacing error 2019-03-29 13:58:55 -05:00
Maria Bermudez
1a6bbf3046 Merge pull request #1031 from usha-mandya/desktop-ent-docs 
1013: Move desktop ent content to docs-private
 2019-03-29 14:18:19 -04:00
usha-mandya
5fc14e85e5 1013: Move desktop ent content to docs-private 2019-03-29 18:11:40 +00:00
Maria Bermudez
1b6c264762 Fix indentation issue 2019-03-18 10:00:04 -07:00
Maria Bermudez
cc4643bf75 Merge pull request #992 from docker/interlock-update 
Interlock update
 2019-03-18 09:20:13 -07:00
Maria Bermudez
d18703bf7c Incorporate Euan's changes 
Add examples for sticky_session_cookie and redirects
 2019-03-18 09:18:07 -07:00
paigehargrave
03621d8f89 Moved to interlock-vip info 2019-03-11 16:51:50 -04:00
paigehargrave
1566c5488d Merge default-backend info here 2019-03-11 16:50:51 -04:00
paigehargrave
4fac6fff57 Raw content addition 2019-03-08 10:17:36 -08:00
Alastair Smith
6590678af0 Merge branch 'published' 2019-03-05 17:26:01 -06:00
Alastair Smith
a7f5b34e65 update Jenkinsfile 
- echo shell commands removed
- file's now complete for our current needs
 2019-03-05 17:24:53 -06:00
Alastair Smith
e31204c841 update Jenkinsfile 2019-03-05 17:13:05 -06:00
Alastair Smith
4d3fe4e346 update Jenkinsfile 2019-03-05 17:12:41 -06:00
Alastair Smith
5c4b11a636 update Jenkinsfile 2019-03-05 16:53:30 -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
Alastair Smith
7c55e0b685 update Jenkinsfile 2019-03-04 12:03:18 -06:00
Alastair Smith
5054af7c53 update Jenkinsfile 2019-03-04 12:02:43 -06:00
Alastair Smith
c69a30ac0a update Jenkinsfile 2019-03-04 12:01:30 -06:00
Alastair Smith
3064785bea update Jenkinsfile 2019-03-04 11:58:48 -06:00
Alastair Smith
9630e72df9 update Jenkinsfile 2019-03-04 11:56:53 -06:00
Alastair Smith
aee0abf88c update Jenkinsfile 2019-03-04 11:24:47 -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