Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase vnext-compose (less a couple commits) onto master #1196

Merged
merged 666 commits into from
Jan 19, 2017
Merged

Rebase vnext-compose (less a couple commits) onto master #1196

Changes from 1 commit
Commits
Show all changes
666 commits
Select commit Hold shift + click to select a range
f75e978
fix punctuation typos (#949)
luojie233 Dec 21, 2016
7da9ea3
fix the error of handing a and an (#953)
SRaddict Dec 21, 2016
4a947c9
delete error asterisk (#947)
tim-zju Dec 21, 2016
cdbcb5d
fix the grammer in aws.md (#948)
SRaddict Dec 21, 2016
f1598ca
modify the user name (#946)
gbzhu Dec 21, 2016
8cdcd42
Update create-swarm.md (#954)
Dec 21, 2016
c0baaec
Add release notes for DTR 2.1.3
Dec 21, 2016
44ce76d
Merge pull request #956 from joaofnfernandes/dtr-2.1.3
joaofnfernandes Dec 21, 2016
c29815f
spell errors: misusing a and an
tim-zju Dec 21, 2016
b73db26
Merge pull request #958 from tim-zju/spellError3
joaofnfernandes Dec 21, 2016
e735294
duplicated the (#957)
luojie233 Dec 21, 2016
5919563
Lossless Image optimization (#959)
PeterDaveHello Dec 21, 2016
3ff8e4c
Add release notes for 1.12.5-cs
cpuguy83 Dec 21, 2016
28ef624
Fix wrong entry for DTR in robots.txt
Dec 21, 2016
ab96097
Merge pull request #962 from cpuguy83/1.12.5-cs
joaofnfernandes Dec 22, 2016
e7e93b3
Update step_four.md
tanertopal Dec 22, 2016
2b2b871
fix typo
alexbaumgertner Dec 22, 2016
532c497
Replace dtr-load-balancer by dtr-external-url
Dec 22, 2016
45c1206
explained how to pin whale to taskbar
Dec 22, 2016
0a1f100
Merge pull request #964 from londoncalling/d4win-taskbar-description
londoncalling Dec 22, 2016
181641f
updated d4mac release notes re: hotfix
Dec 22, 2016
9fb1227
Merge pull request #970 from londoncalling/d4mac-beta34.1
londoncalling Dec 22, 2016
c4da322
Clean up some big, old files
Dec 22, 2016
b72b9d3
Merge pull request #972 from mstanleyjones/cleanup_old_files
Dec 22, 2016
6e5b375
Fix typo on engine/getstarted/step_four.md
ashishg-qburst Dec 23, 2016
3ba01d7
Update gcs.md
etki Dec 24, 2016
68ca279
Use armhf/hello-world for Raspbian tutorial
StefanScherer Dec 26, 2016
464ce98
added test for absolute links to docs.docker.com
aduermael Dec 7, 2016
5b3cbf7
made absolute links to docs.docker.com relative
aduermael Dec 7, 2016
f9dad1a
fixed absolute link in engin/installation/binaries
aduermael Dec 8, 2016
80381c9
changes in Jenkinsfile
aduermael Dec 12, 2016
15e07d6
look for href and src attributes in a and img tags
aduermael Dec 12, 2016
39ea6e4
look for absolute links to docs.docker.com
aduermael Dec 13, 2016
f708add
forgotten absolute links in Dockerfile
aduermael Dec 13, 2016
da5c4d2
updated docs.docker.com absolute links test
aduermael Dec 13, 2016
09d4a6f
Revert "forgotten absolute links in Dockerfile"
aduermael Dec 14, 2016
4cbff2c
exclude archives when testing urls for now
aduermael Dec 14, 2016
bb6a13b
CI: don’t build jekyll redirects for now
aduermael Dec 14, 2016
ed9b3f4
Updated format for comments in Jenkinsfile
aduermael Dec 14, 2016
7cf627c
tests: Go deps are now vendored as submodules
aduermael Dec 20, 2016
dc8d5ed
Jenkinsfile: init submodules
aduermael Dec 20, 2016
6c9d099
fixed submodules
aduermael Dec 21, 2016
5e3fbb8
made absolute links to docs.docker.com relative
aduermael Dec 21, 2016
8f1bc38
missing “target=_blank”
aduermael Dec 27, 2016
51df23e
links to md files
aduermael Dec 27, 2016
b0ccda0
typo fixed
sly-x86 Dec 28, 2016
7dd8315
Update host_integration.md
davidmichaelkarr Dec 28, 2016
b6a8bfc
Excess '>' symbol deleted
sly-x86 Dec 28, 2016
9899a40
Sometime the disk can become full and you can't rebalance. Adding th…
charlescva Dec 21, 2016
8477a63
added user question in FAQ re: shared drives and Docker Machine nodes
Dec 28, 2016
9d479bc
Merge pull request #996 from londoncalling/d4win-faq-machine
londoncalling Dec 28, 2016
d536881
Standardize formatting and content, add logging examples
Dec 29, 2016
88d41de
Merge pull request #960 from charlescva/patch-1
Dec 29, 2016
9111c8b
Update index.md
BSWANG Dec 29, 2016
4982496
Update deploy-to-cloud-btn.md
kizbitz Dec 29, 2016
ae629e5
Merge pull request #849 from aduermael/check-links
Dec 29, 2016
73ccbfe
fixed note formatting
Dec 29, 2016
d24ff8e
Merge pull request #1001 from londoncalling/d4mac-win-formatting
londoncalling Dec 29, 2016
797950d
Merge pull request #999 from wbsTrash/master
Dec 29, 2016
96a9511
Merge pull request #993 from sergei-solomonov/patch-2
Dec 29, 2016
197e1e8
Merge pull request #992 from davidmichaelkarr/patch-1
Dec 29, 2016
0d7778a
Merge pull request #991 from sergei-solomonov/patch-1
Dec 29, 2016
7b1f290
Merge pull request #984 from StefanScherer/fix-raspbian-hello-world-e…
Dec 29, 2016
97b91d3
Merge pull request #975 from etki/patch-1
Dec 29, 2016
4c28810
Merge pull request #973 from ashishg-qburst/step_four
Dec 29, 2016
6905a68
Merge pull request #966 from alexbaumgertner/patch-1
Dec 29, 2016
fc5ea8e
Merge pull request #965 from tanertopal/patch-1
Dec 29, 2016
a5bfc21
Merge pull request #963 from joaofnfernandes/update-robots-txt
Dec 29, 2016
50d0838
update d4mac, d4win intros, add better feedback topics
Dec 30, 2016
3f1d96b
Merge pull request #1005 from londoncalling/d4mac-win-improve-intro
londoncalling Dec 30, 2016
1ea868e
Merge pull request #985 from yuexiao-wang/fix-window-console
londoncalling Dec 30, 2016
ccb4c6e
Replace bash shell to powershell in docker for windows
yuexiao-wang Dec 27, 2016
ea991eb
Merge branch 'master' into fix-window-console
londoncalling Dec 30, 2016
e5e2b2d
Update overview.md
NickvdMeij Dec 30, 2016
01eac74
Update ubuntulinux.md
johndmulhausen Dec 31, 2016
984b8bd
Improved description for Hello-World
ScottFred Jan 2, 2017
c06c4eb
Update services.md
TAGC Jan 3, 2017
2162c97
Correct wrong default value
Jan 3, 2017
41c6a45
Merge pull request #1015 from TAGC/patch-1
Jan 3, 2017
75a267a
Merge pull request #969 from joaofnfernandes/dtr-external-url
joaofnfernandes Jan 3, 2017
00ac7f4
Merge pull request #1016 from mastertinner/patch-1
joaofnfernandes Jan 3, 2017
d6b4c82
fixes #1014 by adding flag
Jan 4, 2017
e2be02a
Merge pull request #1022 from sanscontext/issue-1014
Jan 4, 2017
5bf6bdb
small clarifications
Jan 4, 2017
9b7b256
Merge pull request #1028 from sanscontext/installcli
Jan 4, 2017
665ac6d
update swarm worker node concept description
Jan 4, 2017
7ad2f37
Merge pull request #1023 from londoncalling/swarm-terms-feedback
londoncalling Jan 4, 2017
ae036ae
Update to usingdocker.md
dougalrm Jan 4, 2017
b7acfed
Updating dockervolumes.md for Windows mounting
josephmosby Jan 4, 2017
c6e05af
using github url for yaml.v2 submodule (#1034)
Jan 5, 2017
c2fa76a
clarify docker-cloud install
Jan 5, 2017
5a70ee3
Merge pull request #1035 from londoncalling/docker-cloud-cli-install
londoncalling Jan 5, 2017
b687e93
Add flag to ucp 2.0 restore instructions
Jan 5, 2017
53f24f7
Add flag to ucp 2.0 restore instructions
Jan 5, 2017
5343497
update Docker machine install instructions per user feedback
Jan 6, 2017
b80e160
Typo in ubuntulinux.md (#1041)
alberto Jan 6, 2017
3f68896
version changed to 1.12.3 (#1036)
saarwexler Jan 6, 2017
d49d1e3
update the version in the code snnipt (#1037)
saarwexler Jan 6, 2017
7a5c3dd
docker upgrade command fix (#1044)
protometa Jan 6, 2017
bc37048
accross -> across
ralphtheninja Jan 6, 2017
c12c12b
Merge pull request #1043 from londoncalling/machine-install-ubuntu
londoncalling Jan 6, 2017
c07a621
beta 35 release notes d4mac, d4win
Jan 6, 2017
f111cb7
Merge pull request #1050 from londoncalling/d4d-beta35
londoncalling Jan 6, 2017
52525d6
Merge pull request #1040 from joaofnfernandes/1.1-backup-restore
joaofnfernandes Jan 6, 2017
d143fa4
Remove duplicate 'for details'
donovan Jan 6, 2017
dbbdb4b
Merge pull request #1049 from ralphtheninja/master
Jan 6, 2017
9b96144
Merge pull request #1051 from donovan/patch-1
Jan 7, 2017
3563214
Update automated-testing.md
pkennedyr Jan 9, 2017
3129d07
Add prereqs to AUFS configuration steps
Jan 9, 2017
75cde9c
Merge pull request #1066 from pkennedyr/patch-2
Jan 9, 2017
a49449e
Add the info about the linux-image-extra packages
Jan 9, 2017
6c04d6b
Fix typo (are -> area) (#1058)
clekstro Jan 9, 2017
9880cc4
Fix title (#1056)
whoan Jan 9, 2017
fc8bd3e
Fix small typo in step_four.md. (#1053)
grahammadden Jan 9, 2017
4cf873e
Fix DDC broken links reported on #1068
Jan 9, 2017
0805c82
Merge pull request #1071 from joaofnfernandes/broken-links
joaofnfernandes Jan 9, 2017
8decaf2
Update networkingcontainers.md
saarwexler Jan 10, 2017
443d84e
Change title (#1073)
Jan 10, 2017
333fe83
urls (#1074)
Jan 10, 2017
cf6fc37
fixed links in /apidocs/docker-cloud/includes
aduermael Jan 11, 2017
b193b00
cf6fc379 fix had to be made in /apidocs/cloud-api-source
aduermael Jan 11, 2017
613d448
Merge pull request #1087 from aduermael/absolute-urls-in-includes
Jan 11, 2017
e059b65
url fixes for #1068
Jan 11, 2017
ae80059
Merge pull request #1088 from sanscontext/fix-cloud-links
Jan 11, 2017
6f19cd1
Fixes #1086
johndmulhausen Jan 11, 2017
fde978a
more link fixes
Jan 11, 2017
1ef7132
exclude /apidocs/cloud-api-source when building
aduermael Jan 11, 2017
a3a53fc
more more link link fixes fixes
Jan 11, 2017
78ddec6
Merge pull request #1093 from aduermael/exclude-cloud-api-source
Jan 11, 2017
32f0406
Merge pull request #1092 from sanscontext/fix-cloud-links
Jan 11, 2017
e223f81
docker is no longer optional in this tutorial
Jan 12, 2017
d5a6d29
Merge pull request #1000 from kizbitz/patch-1
Jan 12, 2017
9157ec8
Merge pull request #1094 from sanscontext/issue-1013
Jan 12, 2017
64559ac
format fix and light rewording
Jan 12, 2017
3b50331
Always use sudo on Debian installation
sathieu Jan 12, 2017
b9df8fd
docker-for-mac: add a FAQ about reducing the qcow2 size
djs55 Jan 12, 2017
fdef92c
Update instructions for systemd drop-ins
thaJeztah Jan 12, 2017
8a8bcde
Merge pull request #1095 from sanscontext/fix-note
Jan 12, 2017
1648228
Add cs-engine 1.12.6-cs6 release notes
cpuguy83 Jan 11, 2017
3bcfe97
Merge pull request #1080 from cpuguy83/1.12.6-cs
joaofnfernandes Jan 12, 2017
c3ac3b3
Add new redirect for DTR install
Jan 12, 2017
144abc4
Add 1.11.2-cs6 release notes
cpuguy83 Jan 12, 2017
f7a33dc
Updates broken links for #1068
Jan 12, 2017
6dfd8e9
added links to Toolbox installer downloads via Releases page
Jan 12, 2017
9c87f82
Merge pull request #1110 from joaofnfernandes/broken-links
joaofnfernandes Jan 12, 2017
a0d625b
Merge pull request #1109 from cpuguy83/1.11.2-cs6
joaofnfernandes Jan 12, 2017
33ec8e4
Merge pull request #1108 from joaofnfernandes/redirect-dtr-install
joaofnfernandes Jan 12, 2017
4afdfa1
Merge pull request #1096 from londoncalling/toolbox-install-links-web…
londoncalling Jan 12, 2017
5008e56
Update links to DTR
Jan 12, 2017
4dc2cd7
Merge pull request #1113 from joaofnfernandes/broken-links
joaofnfernandes Jan 13, 2017
01562d5
tag images and containers with JOB_BASE_NAME + BUILD_NUMBER
aduermael Jan 13, 2017
0c474ad
Add release notes for 1.10.3-cs4
cpuguy83 Jan 13, 2017
1b213f5
Merge pull request #1114 from cpuguy83/1.10.3-cs4
joaofnfernandes Jan 13, 2017
69a9da9
added direct installer links, re-worked Toolbox intro pages
Jan 13, 2017
d9d150f
Merge pull request #1115 from londoncalling/toolbox-install-direct-links
londoncalling Jan 13, 2017
a577949
Remove reference to legacy container links (#1057)
josketres Jan 13, 2017
a647690
Removes duplicate canonical urls
Jan 13, 2017
bbd5c27
Fix root_ca, json structure (#1079)
riyazdf Jan 13, 2017
155fcee
Correction of the Install-Module command (#1102)
Clorr Jan 13, 2017
486278c
linked to related GitHub issue, slight re-ordering of topics
Jan 13, 2017
6f512f6
Merge pull request #1112 from aduermael/jenkins-cleanup
joaofnfernandes Jan 13, 2017
979fcb5
Merge pull request #1117 from joaofnfernandes/canonical-urls
joaofnfernandes Jan 13, 2017
54055db
Merge pull request #1100 from djs55/docker-for-mac-trim
londoncalling Jan 13, 2017
4e007da
Update PULL_REQUEST_TEMPLATE.md (#1106)
snesneros Jan 13, 2017
9afc52c
Add alternative keyservers due to #13555 (#1048)
renkun-ken Jan 13, 2017
581de75
Update step_six.md (#1105)
snesneros Jan 13, 2017
3dbad61
Update get-started-macvlan.md
susanna8930 Jan 13, 2017
4038b1a
added beta 36 relnotes, and minor wording updates to Docker.qcow2 que…
Jan 13, 2017
2568ee4
Merge pull request #1119 from londoncalling/d4mac-d4win-beta36
londoncalling Jan 13, 2017
a894de2
clarify Toolbox install per Nathan's comments
Jan 13, 2017
0d827b0
Merge pull request #1120 from londoncalling/toolbox-clarify-uninstall
londoncalling Jan 13, 2017
6dc089e
Merge pull request #1099 from sathieu/debian-sudo
Jan 13, 2017
3e51451
Fixed more broken links
Jan 13, 2017
c06c398
fix typo in get-started-macvlan.md (#1121)
BSWANG Jan 13, 2017
b8b25dd
Merge pull request #1125 from joaofnfernandes/broken-links
joaofnfernandes Jan 13, 2017
627132d
added Linux Kernel upgrade to relnotes
Jan 13, 2017
4d93b73
Update get-started-overlay.md (#1082)
glensc Jan 13, 2017
cd1b0c1
Merge pull request #1124 from londoncalling/d4mac-win-beta36-update
londoncalling Jan 13, 2017
d3be283
Remove 'edit this page' button when there's no source file
Jan 13, 2017
f1f9d2a
Adds dynamically-generated redirect_from.csv to root for nginx consum…
johndmulhausen Jan 14, 2017
60dae8f
Correct typo
Jan 15, 2017
347902d
Update hyper-v.md
jingsam Jan 15, 2017
3c39861
correct some spelling mistake
kevinetc123 Jan 17, 2017
cb3d925
fix typo in swarm tutorial
susanna8930 Jan 17, 2017
f6c629d
Correct Python application port for local browsing
benjamintoussaint Jan 17, 2017
7115495
Merge pull request #1139 from susanna8930/patch-1
joaofnfernandes Jan 17, 2017
46b8c31
Merge pull request #1130 from albert9000/patch-1
joaofnfernandes Jan 17, 2017
df68f49
Merge pull request #1127 from joaofnfernandes/edit-button
joaofnfernandes Jan 17, 2017
3fe7d66
Merge pull request #1138 from stkevintan/patch
joaofnfernandes Jan 17, 2017
50d3263
Merge pull request #1141 from patoobe/container-port-vs-local-port
joaofnfernandes Jan 17, 2017
3fff447
Updates allpagelinks.md to use full paths (#1143)
joaofnfernandes Jan 17, 2017
5fb142c
Fix documentation regarding protocol 50 (ESP) (#1144)
Intellicode Jan 17, 2017
4272c6b
Update mongodb.md (#1122)
KonradKlimczak Jan 17, 2017
41cdf33
CI - added tests for relative links [DO NOT MERGE] (#1052)
Jan 17, 2017
1f9d01a
Add release notes for DTR 2.1.4
Jan 17, 2017
6d45991
Fix offline DDC install
Jan 11, 2017
8815957
Add offline tarfile for DTR 2.1.4
Jan 17, 2017
63b9dff
Merge pull request #1145 from joaofnfernandes/dtr-2.1.4
joaofnfernandes Jan 17, 2017
efb8c5e
Update instructions for IPv6-enabled networks
shin- Jan 17, 2017
89ea7cd
Fix searches not running on Enter, CS Release notes
johndmulhausen Jan 18, 2017
ec839d5
Merge pull request #1007 from NickvdMeij/patch-2
londoncalling Jan 18, 2017
0fc8134
Restart the docker daemon after group changes
stephenconnolly1 Jan 18, 2017
acdf055
Remove quotation marks
sardjv Jan 18, 2017
92e3eea
optimize selectadriver.md
BSWANG Jan 18, 2017
f443c4c
Permission Levels Full Control Warning (UCP 2.0)
vsaraswat Jan 18, 2017
58c6517
Full Control Users Warning (UCP 1.1)
vsaraswat Jan 18, 2017
be4ad50
improve readability of note
Jan 18, 2017
0f02295
Update release notes for UCP 2.0.2
vsaraswat Jan 18, 2017
122da2a
Release notes for UCP 1.1.6
vsaraswat Jan 18, 2017
ddfc106
Merge pull request #1156 from vsaraswat/patch-8
joaofnfernandes Jan 18, 2017
47cd038
Merge pull request #1157 from vsaraswat/patch-9
joaofnfernandes Jan 18, 2017
c61839e
Merge pull request #1154 from vsaraswat/patch-6
joaofnfernandes Jan 18, 2017
f8d2ab2
Merge pull request #1155 from vsaraswat/patch-7
joaofnfernandes Jan 18, 2017
9177561
replaces edit from #979
Jan 18, 2017
d291254
Update 2_set_up.md
Jan 18, 2017
2de5bdc
Merge pull request #1161 from sanscontext/979-replacement
Jan 18, 2017
3d35ff0
Merge pull request #1152 from sardjv/patch-1
Jan 18, 2017
e3a5311
Merge pull request #1158 from sanscontext/1151-again
Jan 18, 2017
09423b8
adds more info about valid docker ID
Jan 18, 2017
0499687
fix typo
Jan 18, 2017
6b3a6fe
Merge pull request #1164 from ry4nz/a
Jan 18, 2017
6d4d7d0
Update 'usingdocker' tutorial to name the container
Jan 18, 2017
611206f
Merge pull request #1103 from thaJeztah/fix-systemd-instructions
Jan 18, 2017
6ffb8d7
swarm beta docs for limited publish
Jan 18, 2017
642fa44
Merge pull request #1162 from sanscontext/1104-dockerid
Jan 18, 2017
41fb313
Merge pull request #1166 from sanscontext/swarm-beta
Jan 18, 2017
20fab8c
Merge pull request #1165 from mstanleyjones/tutorial_explain_naming
Jan 18, 2017
5893769
Merge pull request #1153 from BSWANG/patch-1
Jan 18, 2017
388ac08
Merge pull request #1150 from stephenconnolly1/patch-1
Jan 18, 2017
956f77d
Clarify the command only for docker-machine (#1149)
hvnsweeting Jan 18, 2017
749701f
minor copyedits (#1148)
londoncalling Jan 18, 2017
3af3a8b
Merge pull request #1146 from shin-/ipv6_networks_compose
Jan 18, 2017
adf2b60
Revert "Restart the docker daemon after group changes"
Jan 18, 2017
8b73709
Merge pull request #1169 from docker/revert-1150-patch-1
Jan 18, 2017
6b2c7c8
Merge pull request #1131 from jingsam/patch-1
Jan 18, 2017
fb0aff7
Merge pull request #1118 from ljing-organizaiton/master
Jan 18, 2017
e637373
Merge pull request #1076 from saarwexler/patch-3
Jan 18, 2017
5720fbb
Merge pull request #1067 from docker/1061_aufs_prereqs
Jan 18, 2017
ae500f9
Merge pull request #1039 from dougalrm/patch-1
Jan 18, 2017
6db5538
Merge pull request #1032 from josephmosby/patch-1
Jan 18, 2017
a28e62e
Merge pull request #1012 from ScottFred/patch-1
Jan 18, 2017
e341bee
Merge pull request #997 from mstanleyjones/254_improve_logging_topic
Jan 19, 2017
0658ba7
Merge pull request #622 from mstanleyjones/add_info_about_docker_log
Jan 19, 2017
748f6fc
take a stab at fixing a broken link
Jan 19, 2017
0894595
Merge pull request #1184 from sanscontext/fixlink
Jan 19, 2017
00763da
Release Engine 1.13 documentation (#1187)
Jan 19, 2017
ea94cca
Merge branch 'vnext-compose' into master
johndmulhausen Jan 19, 2017
3e0a201
Nav fixes
johndmulhausen Jan 19, 2017
8c22f3f
Merge branch 'vnext-compose' of https://github.com/docker/docker.gith…
johndmulhausen Jan 19, 2017
a32d6dc
Merge conflict resolution
johndmulhausen Jan 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add new redirect for DTR install
  • Loading branch information
Joao Fernandes committed Jan 12, 2017
commit c3ac3b3247349cbde82deae2af8a136b80729af5
1 change: 1 addition & 0 deletions datacenter/dtr/2.0/install/index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ redirect_from:
- /docker-trusted-registry/install/dtr-ami-bds-launch/
- /docker-trusted-registry/install/dtr-vhd-azure/
- /docker-trusted-registry/install/install-dtr/
- /docker-trusted-registry/install/
title: Install Docker Trusted Registry
---

Expand Down