Replace get.docker.io -> get.docker.com and test.docker.io -> test.docker.com
| ... | ... |
@@ -45,7 +45,7 @@ The Docker installation configuration is equivalent to running: |
| 45 | 45 |
``` |
| 46 | 46 |
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys\ |
| 47 | 47 |
36A1D7869245C8950F966E92D8576A8BA88D21E9 |
| 48 |
-sh -c "echo deb https://get.docker.io/ubuntu docker main\ |
|
| 48 |
+sh -c "echo deb https://get.docker.com/ubuntu docker main\ |
|
| 49 | 49 |
> /etc/apt/sources.list.d/docker.list" |
| 50 | 50 |
apt-get update |
| 51 | 51 |
apt-get install lxc-docker |
| ... | ... |
@@ -164,4 +164,4 @@ container: |
| 164 | 164 |
```powershell |
| 165 | 165 |
$containerProps = @{Name="web"; Image="node:latest"; Port="80:80"; `
|
| 166 | 166 |
Env="PORT=80"; Link="db:db"; Command="grunt"} |
| 167 |
-``` |
|
| 168 | 167 |
\ No newline at end of file |
| 168 |
+``` |
| ... | ... |
@@ -32,7 +32,7 @@ course.** |
| 32 | 32 |
- When you're on the "Configure Instance Details" step, expand the |
| 33 | 33 |
"Advanced Details" section. |
| 34 | 34 |
- Under "User data", select "As text". |
| 35 |
- - Enter `#include https://get.docker.io` into |
|
| 35 |
+ - Enter `#include https://get.docker.com` into |
|
| 36 | 36 |
the instance *User Data*. |
| 37 | 37 |
[CloudInit](https://help.ubuntu.com/community/CloudInit) is part |
| 38 | 38 |
of the Ubuntu image you chose; it will bootstrap Docker by |
| ... | ... |
@@ -46,7 +46,7 @@ Security Group to allow SSH.** By default all incoming ports to your new |
| 46 | 46 |
instance will be blocked by the AWS Security Group, so you might just |
| 47 | 47 |
get timeouts when you try to connect. |
| 48 | 48 |
|
| 49 |
-Installing with `get.docker.io` (as above) will |
|
| 49 |
+Installing with `get.docker.com` (as above) will |
|
| 50 | 50 |
create a service named `lxc-docker`. It will also |
| 51 | 51 |
set up a [*docker group*](../binaries/#dockergroup) and you may want to |
| 52 | 52 |
add the *ubuntu* user to it so that you don't have to use |
| ... | ... |
@@ -46,14 +46,14 @@ Linux kernel (it even builds on OS X!). |
| 46 | 46 |
|
| 47 | 47 |
## Get the docker binary: |
| 48 | 48 |
|
| 49 |
- $ wget https://get.docker.io/builds/Linux/x86_64/docker-latest -O docker |
|
| 49 |
+ $ wget https://get.docker.com/builds/Linux/x86_64/docker-latest -O docker |
|
| 50 | 50 |
$ chmod +x docker |
| 51 | 51 |
|
| 52 | 52 |
> **Note**: |
| 53 | 53 |
> If you have trouble downloading the binary, you can also get the smaller |
| 54 | 54 |
> compressed release file: |
| 55 |
-> [https://get.docker.io/builds/Linux/x86_64/docker-latest.tgz]( |
|
| 56 |
-> https://get.docker.io/builds/Linux/x86_64/docker-latest.tgz) |
|
| 55 |
+> [https://get.docker.com/builds/Linux/x86_64/docker-latest.tgz]( |
|
| 56 |
+> https://get.docker.com/builds/Linux/x86_64/docker-latest.tgz) |
|
| 57 | 57 |
|
| 58 | 58 |
## Run the docker daemon |
| 59 | 59 |
|
| ... | ... |
@@ -59,9 +59,9 @@ which is officially supported by Docker. |
| 59 | 59 |
$ sudo apt-get update |
| 60 | 60 |
$ sudo apt-get install -t wheezy-backports linux-image-amd64 |
| 61 | 61 |
|
| 62 |
-2. Install Docker using the get.docker.io script: |
|
| 62 |
+2. Install Docker using the get.docker.com script: |
|
| 63 | 63 |
|
| 64 |
- `curl -sSL https://get.docker.io/ | sh` |
|
| 64 |
+ `curl -sSL https://get.docker.com/ | sh` |
|
| 65 | 65 |
|
| 66 | 66 |
## Giving non-root access |
| 67 | 67 |
|
| ... | ... |
@@ -54,7 +54,7 @@ the `lxc-docker` package. |
| 54 | 54 |
*You may receive a warning that the package isn't trusted. Answer yes to |
| 55 | 55 |
continue installation.* |
| 56 | 56 |
|
| 57 |
- $ sudo sh -c "echo deb https://get.docker.io/ubuntu docker main\ |
|
| 57 |
+ $ sudo sh -c "echo deb https://get.docker.com/ubuntu docker main\ |
|
| 58 | 58 |
> /etc/apt/sources.list.d/docker.list" |
| 59 | 59 |
$ sudo apt-get update |
| 60 | 60 |
$ sudo apt-get install lxc-docker |
| ... | ... |
@@ -63,7 +63,7 @@ continue installation.* |
| 63 | 63 |
> |
| 64 | 64 |
> There is also a simple `curl` script available to help with this process. |
| 65 | 65 |
> |
| 66 |
-> $ curl -sSL https://get.docker.io/ubuntu/ | sudo sh |
|
| 66 |
+> $ curl -sSL https://get.docker.com/ubuntu/ | sudo sh |
|
| 67 | 67 |
|
| 68 | 68 |
To verify that everything has worked as expected: |
| 69 | 69 |
|
| ... | ... |
@@ -134,7 +134,7 @@ the `lxc-docker` package. |
| 134 | 134 |
*You may receive a warning that the package isn't trusted. Answer yes to |
| 135 | 135 |
continue installation.* |
| 136 | 136 |
|
| 137 |
- $ sudo sh -c "echo deb https://get.docker.io/ubuntu docker main\ |
|
| 137 |
+ $ sudo sh -c "echo deb https://get.docker.com/ubuntu docker main\ |
|
| 138 | 138 |
> /etc/apt/sources.list.d/docker.list" |
| 139 | 139 |
$ sudo apt-get update |
| 140 | 140 |
$ sudo apt-get install lxc-docker |
| ... | ... |
@@ -143,7 +143,7 @@ continue installation.* |
| 143 | 143 |
> |
| 144 | 144 |
> There is also a simple `curl` script available to help with this process. |
| 145 | 145 |
> |
| 146 |
-> $ curl -sSL https://get.docker.io/ubuntu/ | sudo sh |
|
| 146 |
+> $ curl -sSL https://get.docker.com/ubuntu/ | sudo sh |
|
| 147 | 147 |
|
| 148 | 148 |
Now verify that the installation has worked by downloading the |
| 149 | 149 |
`ubuntu` image and launching a container. |
| ... | ... |
@@ -187,7 +187,7 @@ First add the Docker repository key to your local keychain. |
| 187 | 187 |
Add the Docker repository to your apt sources list, update and install |
| 188 | 188 |
the `lxc-docker` package. |
| 189 | 189 |
|
| 190 |
- $ sudo sh -c "echo deb http://get.docker.io/ubuntu docker main\ |
|
| 190 |
+ $ sudo sh -c "echo deb http://get.docker.com/ubuntu docker main\ |
|
| 191 | 191 |
> /etc/apt/sources.list.d/docker.list" |
| 192 | 192 |
$ sudo apt-get update |
| 193 | 193 |
$ sudo apt-get install lxc-docker |
| ... | ... |
@@ -356,7 +356,7 @@ NetworkManager and Docker need to be restarted afterwards: |
| 356 | 356 |
|
| 357 | 357 |
## Mirrors |
| 358 | 358 |
|
| 359 |
-You should `ping get.docker.io` and compare the |
|
| 359 |
+You should `ping get.docker.com` and compare the |
|
| 360 | 360 |
latency to the following mirrors, and pick whichever one is best for |
| 361 | 361 |
you. |
| 362 | 362 |
|
| ... | ... |
@@ -365,7 +365,7 @@ you. |
| 365 | 365 |
[Yandex](http://yandex.ru/) in Russia is mirroring the Docker Debian |
| 366 | 366 |
packages, updating every 6 hours. |
| 367 | 367 |
Substitute `http://mirror.yandex.ru/mirrors/docker/` for |
| 368 |
-`http://get.docker.io/ubuntu` in the instructions above. |
|
| 368 |
+`http://get.docker.com/ubuntu` in the instructions above. |
|
| 369 | 369 |
For example: |
| 370 | 370 |
|
| 371 | 371 |
$ sudo sh -c "echo deb http://mirror.yandex.ru/mirrors/docker/ docker main\ |
| ... | ... |
@@ -1191,8 +1191,8 @@ folder before starting your container. |
| 1191 | 1191 |
$ sudo docker run -t -i -v /var/run/docker.sock:/var/run/docker.sock -v ./static-docker:/usr/bin/docker busybox sh |
| 1192 | 1192 |
|
| 1193 | 1193 |
By bind-mounting the docker unix socket and statically linked docker |
| 1194 |
-binary (such as that provided by [https://get.docker.io]( |
|
| 1195 |
-https://get.docker.io)), you give the container the full access to create and |
|
| 1194 |
+binary (such as that provided by [https://get.docker.com]( |
|
| 1195 |
+https://get.docker.com)), you give the container the full access to create and |
|
| 1196 | 1196 |
manipulate the host's docker daemon. |
| 1197 | 1197 |
|
| 1198 | 1198 |
$ sudo docker run -p 127.0.0.1:80:8080 ubuntu bash |
| ... | ... |
@@ -173,7 +173,7 @@ Replace "..." with the respective credentials: |
| 173 | 173 |
```bash |
| 174 | 174 |
docker build -t docker . |
| 175 | 175 |
docker run \ |
| 176 |
- -e AWS_S3_BUCKET=test.docker.io \ |
|
| 176 |
+ -e AWS_S3_BUCKET=test.docker.com \ |
|
| 177 | 177 |
-e AWS_ACCESS_KEY="..." \ |
| 178 | 178 |
-e AWS_SECRET_KEY="..." \ |
| 179 | 179 |
-e GPG_PASSPHRASE="..." \ |
| ... | ... |
@@ -183,11 +183,11 @@ docker run \ |
| 183 | 183 |
``` |
| 184 | 184 |
|
| 185 | 185 |
It will run the test suite, build the binaries and packages, |
| 186 |
-and upload to the specified bucket (you should use test.docker.io for |
|
| 187 |
-general testing, and once everything is fine, switch to get.docker.io as |
|
| 186 |
+and upload to the specified bucket (you should use test.docker.com for |
|
| 187 |
+general testing, and once everything is fine, switch to get.docker.com as |
|
| 188 | 188 |
noted below). |
| 189 | 189 |
|
| 190 |
-After the binaries and packages are uploaded to test.docker.io, make sure |
|
| 190 |
+After the binaries and packages are uploaded to test.docker.com, make sure |
|
| 191 | 191 |
they get tested in both Ubuntu and Debian for any obvious installation |
| 192 | 192 |
issues or runtime issues. |
| 193 | 193 |
|
| ... | ... |
@@ -195,19 +195,19 @@ Announcing on IRC in both `#docker` and `#docker-dev` is a great way to get |
| 195 | 195 |
help testing! An easy way to get some useful links for sharing: |
| 196 | 196 |
|
| 197 | 197 |
```bash |
| 198 |
-echo "Ubuntu/Debian: https://test.docker.io/ubuntu or curl -sSL https://test.docker.io/ | sh" |
|
| 199 |
-echo "Linux 64bit binary: https://test.docker.io/builds/Linux/x86_64/docker-${VERSION#v}"
|
|
| 200 |
-echo "Darwin/OSX 64bit client binary: https://test.docker.io/builds/Darwin/x86_64/docker-${VERSION#v}"
|
|
| 201 |
-echo "Darwin/OSX 32bit client binary: https://test.docker.io/builds/Darwin/i386/docker-${VERSION#v}"
|
|
| 202 |
-echo "Linux 64bit tgz: https://test.docker.io/builds/Linux/x86_64/docker-${VERSION#v}.tgz"
|
|
| 198 |
+echo "Ubuntu/Debian: https://test.docker.com/ubuntu or curl -sSL https://test.docker.com/ | sh" |
|
| 199 |
+echo "Linux 64bit binary: https://test.docker.com/builds/Linux/x86_64/docker-${VERSION#v}"
|
|
| 200 |
+echo "Darwin/OSX 64bit client binary: https://test.docker.com/builds/Darwin/x86_64/docker-${VERSION#v}"
|
|
| 201 |
+echo "Darwin/OSX 32bit client binary: https://test.docker.com/builds/Darwin/i386/docker-${VERSION#v}"
|
|
| 202 |
+echo "Linux 64bit tgz: https://test.docker.com/builds/Linux/x86_64/docker-${VERSION#v}.tgz"
|
|
| 203 | 203 |
``` |
| 204 | 204 |
|
| 205 | 205 |
Once they're tested and reasonably believed to be working, run against |
| 206 |
-get.docker.io: |
|
| 206 |
+get.docker.com: |
|
| 207 | 207 |
|
| 208 | 208 |
```bash |
| 209 | 209 |
docker run \ |
| 210 |
- -e AWS_S3_BUCKET=get.docker.io \ |
|
| 210 |
+ -e AWS_S3_BUCKET=get.docker.com \ |
|
| 211 | 211 |
-e AWS_ACCESS_KEY="..." \ |
| 212 | 212 |
-e AWS_SECRET_KEY="..." \ |
| 213 | 213 |
-e GPG_PASSPHRASE="..." \ |
| ... | ... |
@@ -235,7 +235,7 @@ documented and give appropriate warnings. |
| 235 | 235 |
### 9. Apply tag |
| 236 | 236 |
|
| 237 | 237 |
It's very important that we don't make the tag until after the official |
| 238 |
-release is uploaded to get.docker.io! |
|
| 238 |
+release is uploaded to get.docker.com! |
|
| 239 | 239 |
|
| 240 | 240 |
```bash |
| 241 | 241 |
git tag -a $VERSION -m $VERSION bump_$VERSION |
| ... | ... |
@@ -2,19 +2,19 @@ |
| 2 | 2 |
set -e |
| 3 | 3 |
# |
| 4 | 4 |
# This script is meant for quick & easy install via: |
| 5 |
-# 'curl -sSL https://get.docker.io/ | sh' |
|
| 5 |
+# 'curl -sSL https://get.docker.com/ | sh' |
|
| 6 | 6 |
# or: |
| 7 |
-# 'wget -qO- https://get.docker.io/ | sh' |
|
| 7 |
+# 'wget -qO- https://get.docker.com/ | sh' |
|
| 8 | 8 |
# |
| 9 | 9 |
# |
| 10 | 10 |
# Docker Maintainers: |
| 11 |
-# To update this script on https://get.docker.io, |
|
| 11 |
+# To update this script on https://get.docker.com, |
|
| 12 | 12 |
# use hack/release.sh during a normal release, |
| 13 | 13 |
# or the following one-liner for script hotfixes: |
| 14 |
-# s3cmd put --acl-public -P hack/install.sh s3://get.docker.io/index |
|
| 14 |
+# s3cmd put --acl-public -P hack/install.sh s3://get.docker.com/index |
|
| 15 | 15 |
# |
| 16 | 16 |
|
| 17 |
-url='https://get.docker.io/' |
|
| 17 |
+url='https://get.docker.com/' |
|
| 18 | 18 |
|
| 19 | 19 |
command_exists() {
|
| 20 | 20 |
command -v "$@" > /dev/null 2>&1 |
| ... | ... |
@@ -149,9 +149,9 @@ case "$lsb_dist" in |
| 149 | 149 |
fi |
| 150 | 150 |
( |
| 151 | 151 |
set -x |
| 152 |
- if [ "https://get.docker.io/" = "$url" ]; then |
|
| 152 |
+ if [ "https://get.docker.com/" = "$url" ]; then |
|
| 153 | 153 |
$sh_c "apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9" |
| 154 |
- elif [ "https://test.docker.io/" = "$url" ]; then |
|
| 154 |
+ elif [ "https://test.docker.com/" = "$url" ]; then |
|
| 155 | 155 |
$sh_c "apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 740B314AE3941731B942C66ADF4FD13717AAD7D6" |
| 156 | 156 |
else |
| 157 | 157 |
$sh_c "$curl ${url}gpg | apt-key add -"
|
| ... | ... |
@@ -179,7 +179,7 @@ case "$lsb_dist" in |
| 179 | 179 |
;; |
| 180 | 180 |
|
| 181 | 181 |
Gentoo) |
| 182 |
- if [ "$url" = "https://test.docker.io/" ]; then |
|
| 182 |
+ if [ "$url" = "https://test.docker.com/" ]; then |
|
| 183 | 183 |
echo >&2 |
| 184 | 184 |
echo >&2 ' You appear to be trying to install the latest nightly build in Gentoo.' |
| 185 | 185 |
echo >&2 ' The portage tree should contain the latest stable release of Docker, but' |
| ... | ... |
@@ -27,10 +27,10 @@ To run, I need: |
| 27 | 27 |
- a generous amount of good will and nice manners. |
| 28 | 28 |
The canonical way to run me is to run the image produced by the Dockerfile: e.g.:" |
| 29 | 29 |
|
| 30 |
-docker run -e AWS_S3_BUCKET=get-staging.docker.io \ |
|
| 31 |
- -e AWS_ACCESS_KEY=AKI1234... \ |
|
| 32 |
- -e AWS_SECRET_KEY=sEs4mE... \ |
|
| 33 |
- -e GPG_PASSPHRASE=m0resEs4mE... \ |
|
| 30 |
+docker run -e AWS_S3_BUCKET=test.docker.com \ |
|
| 31 |
+ -e AWS_ACCESS_KEY=... \ |
|
| 32 |
+ -e AWS_SECRET_KEY=... \ |
|
| 33 |
+ -e GPG_PASSPHRASE=... \ |
|
| 34 | 34 |
-i -t --privileged \ |
| 35 | 35 |
docker ./hack/release.sh |
| 36 | 36 |
EOF |
| ... | ... |
@@ -64,9 +64,9 @@ VERSION=$(cat VERSION) |
| 64 | 64 |
BUCKET=$AWS_S3_BUCKET |
| 65 | 65 |
|
| 66 | 66 |
# These are the 2 keys we've used to sign the deb's |
| 67 |
-# release (get.docker.io) |
|
| 67 |
+# release (get.docker.com) |
|
| 68 | 68 |
# GPG_KEY="36A1D7869245C8950F966E92D8576A8BA88D21E9" |
| 69 |
-# test (test.docker.io) |
|
| 69 |
+# test (test.docker.com) |
|
| 70 | 70 |
# GPG_KEY="740B314AE3941731B942C66ADF4FD13717AAD7D6" |
| 71 | 71 |
|
| 72 | 72 |
setup_s3() {
|
| ... | ... |
@@ -92,7 +92,7 @@ write_to_s3() {
|
| 92 | 92 |
|
| 93 | 93 |
s3_url() {
|
| 94 | 94 |
case "$BUCKET" in |
| 95 |
- get.docker.io|test.docker.io) |
|
| 95 |
+ get.docker.com|test.docker.com) |
|
| 96 | 96 |
echo "https://$BUCKET" |
| 97 | 97 |
;; |
| 98 | 98 |
*) |
| ... | ... |
@@ -344,7 +344,7 @@ EOF |
| 344 | 344 |
|
| 345 | 345 |
# Upload the index script |
| 346 | 346 |
release_index() {
|
| 347 |
- sed "s,url='https://get.docker.io/',url='$(s3_url)/'," hack/install.sh | write_to_s3 s3://$BUCKET/index |
|
| 347 |
+ sed "s,url='https://get.docker.com/',url='$(s3_url)/'," hack/install.sh | write_to_s3 s3://$BUCKET/index |
|
| 348 | 348 |
} |
| 349 | 349 |
|
| 350 | 350 |
release_test() {
|
| ... | ... |
@@ -243,14 +243,14 @@ func TestValidRepositoryName(t *testing.T) {
|
| 243 | 243 |
} |
| 244 | 244 |
|
| 245 | 245 |
func TestTrustedLocation(t *testing.T) {
|
| 246 |
- for _, url := range []string{"http://example.com", "https://example.com:7777", "http://docker.io", "http://test.docker.io", "https://fakedocker.com"} {
|
|
| 246 |
+ for _, url := range []string{"http://example.com", "https://example.com:7777", "http://docker.io", "http://test.docker.com", "https://fakedocker.com"} {
|
|
| 247 | 247 |
req, _ := http.NewRequest("GET", url, nil)
|
| 248 | 248 |
if trustedLocation(req) == true {
|
| 249 | 249 |
t.Fatalf("'%s' shouldn't be detected as a trusted location", url)
|
| 250 | 250 |
} |
| 251 | 251 |
} |
| 252 | 252 |
|
| 253 |
- for _, url := range []string{"https://docker.io", "https://test.docker.io:80"} {
|
|
| 253 |
+ for _, url := range []string{"https://docker.io", "https://test.docker.com:80"} {
|
|
| 254 | 254 |
req, _ := http.NewRequest("GET", url, nil)
|
| 255 | 255 |
if trustedLocation(req) == false {
|
| 256 | 256 |
t.Fatalf("'%s' should be detected as a trusted location", url)
|