Use the mirror in China for Azure China environment #27005

lizzha · 2016-09-29T06:30:08Z

We've set up a mirror of docker installation packages in Azure China, which syncs with docker repo every day, to mitigate the pain due to connection issues from China to docker official repo.
A new parameter is added in this change. If '-e AzureChinaCloud' is specified, the script will use the packages from the mirror in Azure China.

thaJeztah · 2016-09-29T07:43:17Z

Thank you for your contribution! I think this may need some extra eyes, as I don't know if there's objections against referring to a third-party mirror

ping @kencochrane @tianon @tibor

lizzha · 2016-09-29T08:24:52Z

@thaJeztah Thank you for the comment, we had some previous communication and agreement with Docker about this mirror.
@friism as FYI

friism · 2016-09-29T16:50:50Z

Thanks for the PR! Confirming that this was discussed previously and agree that there were no major objections raised. This should still go through the regular review process.

thaJeztah

LGTM

tianon

Overall, the idea sounds sane (and thanks to GPG, should be generally as safe as install.sh ever is), just some minor style comments. 👍

tianon · 2016-09-29T18:08:54Z

hack/install.sh

+if [ ! -z "$environment" ] && [ $environment = "AzureChinaCloud" ]; then
+	apt_url="https://mirror.azure.cn/docker-engine/apt"
+	yum_url="https://mirror.azure.cn/docker-engine/yum"
+fi


I think it'd make sense to move this whole block up closer to the initial setting of these variables (so we keep our constants all in one place, especially including the new args to the script this introduces).

tianon · 2016-09-29T18:10:50Z

hack/install.sh

+	esac
+done
+
+if [ ! -z "$environment" ] && [ $environment = "AzureChinaCloud" ]; then


$environment should be quoted here, and it might actually make sense to convert this to a case for simplicity, ie:

case "$environment" in AzureChinaCloud) .... ;; esac

tianon · 2016-09-29T18:12:10Z

hack/install.sh

+while getopts "e:" opt; do
+	case $opt in
+		e)
+			environment=$OPTARG


This variable ought to be initialized before this loop starts to ensure we don't get side effects from the enclosing shell, ie environment= on a line by itself right before the while starts.

lizzha · 2016-09-30T05:30:44Z

Thank you for reviewing. Comments addressed.

thaJeztah · 2016-09-30T07:59:02Z

hack/install.sh

+environment=''
+while getopts "e:" opt; do
+        case $opt in
+                e)


I wonder if the option should have a more descriptive name (for example, -mirror?) @tianon wdyt?

@thaJeztah can we use --mirror | -m ?

tianon · 2016-10-08T17:27:14Z

Yeah, "--mirror" sounds good to me! 👍

lizzha · 2016-10-11T02:08:06Z

Please let me know if you have more comments, thanks.

thaJeztah · 2016-10-11T09:02:04Z

@lizzha can you squash Your commits so that there's only a single commit in this PR?

Signed-off-by: Liz Zhang <[email protected]> Use the mirror in China for Azure China environment Signed-off-by: Liz Zhang <[email protected]> Update option name to --mirror Signed-off-by: Liz Zhang <[email protected]> Update indent and change variable name Signed-off-by: Liz Zhang <[email protected]>

lizzha · 2016-10-11T10:08:40Z

Done :)

thaJeztah · 2016-10-11T10:13:43Z

ping @tianon for final review / merge

tianon · 2016-10-11T20:03:55Z

LGTM

lizzha · 2016-10-12T01:52:02Z

Thank you! When will https://get.docker.com/ get refreshed with this change?

thaJeztah · 2016-10-12T04:04:39Z

@lizzha usually that script is updated with each release, and this just missed the 1.12.2 release; in exceptional cases we can update the script manually, but I'll have to ask if that applies here.

twang2218 · 2016-11-14T04:30:54Z

I have 2 questions:

May I ask how to use this `--mirror` argument with `https://get.docker.com` if it's been updated? Is there any documentation about it?

Currently I use curl -sSL https://get.docker.com/ | sh to install the docker, I'm not quite sure how to add --mirror to it.

This PR is using the hardcoded Azure mirror, is there a way to use other mirror?

To avoid GFW issue, there are several mirrors in China provided by various cloud providers, such as:

Is there a way to use those mirror? or Azure mirror is an official Docker mirror in China?

lizzha · 2016-11-16T03:25:59Z

@twang2218 once https://get.docker.com gets updated, you could use "curl -sSL https://get.docker.com/ | sh -s -- --mirror AzureChinaCloud" to install docker in China
The mirror is hosted in AzureChinaCloud and maintained by Microsoft. We have the agreement that the mirrored docker installation packages and script are exactly the same as the official ones.

ushuz · 2016-11-26T17:25:30Z

I recall there's a co-op between Docker Inc. and Alibaba Cloud to bring Docker Hub on Alibaba Cloud for China Mainland, how's that going?

thaJeztah · 2016-11-26T19:00:24Z

@ushuz this repo is for the open source "docker" project, I don't have additional information about that

twang2218 · 2016-11-26T20:02:00Z

Created a PR #28858 to add Alibaba Cloud Docker apt/yum mirror support to 'hack/install.sh'

GordonTheTurtle added status/0-triage dco/no Automatically set by a bot when one of the commits lacks proper signature labels Sep 29, 2016

lizzha force-pushed the azurechina branch from 0ce262f to 094f3ed Compare September 29, 2016 06:47

GordonTheTurtle removed the dco/no Automatically set by a bot when one of the commits lacks proper signature label Sep 29, 2016

thaJeztah added status/1-design-review and removed status/0-triage labels Sep 29, 2016

thaJeztah added status/2-code-review and removed status/1-design-review labels Sep 29, 2016

thaJeztah approved these changes Sep 29, 2016

View reviewed changes

tianon requested changes Sep 29, 2016

View reviewed changes

thaJeztah reviewed Sep 30, 2016

View reviewed changes

GordonTheTurtle added the dco/no Automatically set by a bot when one of the commits lacks proper signature label Oct 11, 2016

lizzha force-pushed the azurechina branch from 3ef6160 to 451979a Compare October 11, 2016 09:59

GordonTheTurtle removed the dco/no Automatically set by a bot when one of the commits lacks proper signature label Oct 11, 2016

thaJeztah added the impact/changelog label Oct 11, 2016

tianon approved these changes Oct 11, 2016

View reviewed changes

tianon merged commit 8d6e9f0 into moby:master Oct 11, 2016

thaJeztah added this to the 1.13.0 milestone Nov 9, 2016

thaJeztah mentioned this pull request Feb 13, 2017

'https://apt.dockerproject.org/repo ubuntu-xenial Release' does not have a Release file #30957

Closed

twang2218 mentioned this pull request Aug 3, 2017

Updates for 17.07.0-ce-rc1 docker/docker-install#18

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use the mirror in China for Azure China environment #27005

Use the mirror in China for Azure China environment #27005

lizzha commented Sep 29, 2016

thaJeztah commented Sep 29, 2016

lizzha commented Sep 29, 2016

friism commented Sep 29, 2016

thaJeztah left a comment

tianon left a comment

tianon Sep 29, 2016

tianon Sep 29, 2016

tianon Sep 29, 2016

lizzha commented Sep 30, 2016

thaJeztah Sep 30, 2016

lizzha Oct 8, 2016

tianon commented Oct 8, 2016 via email

lizzha commented Oct 11, 2016

thaJeztah commented Oct 11, 2016

lizzha commented Oct 11, 2016

thaJeztah commented Oct 11, 2016

tianon commented Oct 11, 2016

lizzha commented Oct 12, 2016

thaJeztah commented Oct 12, 2016

twang2218 commented Nov 14, 2016

lizzha commented Nov 16, 2016

ushuz commented Nov 26, 2016 •

edited

Loading

thaJeztah commented Nov 26, 2016

twang2218 commented Nov 26, 2016

Use the mirror in China for Azure China environment #27005

Use the mirror in China for Azure China environment #27005

Conversation

lizzha commented Sep 29, 2016

thaJeztah commented Sep 29, 2016

lizzha commented Sep 29, 2016

friism commented Sep 29, 2016

thaJeztah left a comment

Choose a reason for hiding this comment

tianon left a comment

Choose a reason for hiding this comment

tianon Sep 29, 2016

Choose a reason for hiding this comment

tianon Sep 29, 2016

Choose a reason for hiding this comment

tianon Sep 29, 2016

Choose a reason for hiding this comment

lizzha commented Sep 30, 2016

thaJeztah Sep 30, 2016

Choose a reason for hiding this comment

lizzha Oct 8, 2016

Choose a reason for hiding this comment

tianon commented Oct 8, 2016 via email

lizzha commented Oct 11, 2016

thaJeztah commented Oct 11, 2016

lizzha commented Oct 11, 2016

thaJeztah commented Oct 11, 2016

tianon commented Oct 11, 2016

lizzha commented Oct 12, 2016

thaJeztah commented Oct 12, 2016

twang2218 commented Nov 14, 2016

May I ask how to use this --mirror argument with https://get.docker.com if it's been updated? Is there any documentation about it?

This PR is using the hardcoded Azure mirror, is there a way to use other mirror?

lizzha commented Nov 16, 2016

ushuz commented Nov 26, 2016 • edited Loading

thaJeztah commented Nov 26, 2016

twang2218 commented Nov 26, 2016

May I ask how to use this `--mirror` argument with `https://get.docker.com` if it's been updated? Is there any documentation about it?

ushuz commented Nov 26, 2016 •

edited

Loading