Bläddra i källkod

Tianon made a micro-image (sub one meg?) that we can use as a very fast to download 'yes, your docker can download and run an image' test

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Sven Dowideit 11 år sedan
förälder
incheckning
6ae07e2410

+ 4 - 2
docs/sources/installation/google.md

@@ -27,8 +27,10 @@ page_keywords: Docker, Docker documentation, installation, google, Google Comput
 4. Connect to the instance using SSH:
 4. Connect to the instance using SSH:
 
 
         $ gcloud compute ssh --zone us-central1-a docker-playground
         $ gcloud compute ssh --zone us-central1-a docker-playground
-        docker-playground:~$ sudo docker run busybox echo 'docker on GCE \o/'
-        docker on GCE \o/
+        $$ docker-playground:~$ sudo docker run hello-world
+	Hello from Docker.
+	This message shows that your installation appears to be working correctly.
+	...
 
 
 Read more about [deploying Containers on Google Cloud Platform][5].
 Read more about [deploying Containers on Google Cloud Platform][5].
 
 

+ 3 - 3
docs/sources/installation/mac.md

@@ -56,12 +56,12 @@ and `boot2docker start`.
 
 
 ## Running Docker
 ## Running Docker
 
 
-From your terminal, you can test that Docker is running with a “hello world” example.
+From your terminal, you can test that Docker is running with the small `hello-world` example image.
 Start the vm and then run:
 Start the vm and then run:
 
 
-    $ docker run ubuntu echo hello world
+    $ docker run hello-world
 
 
-This should download the `ubuntu` image and print `hello world`.
+This should download the very small `hello-world` image and print a `Hello from Docker.` message.
 
 
 ## Container port redirection
 ## Container port redirection
 
 

+ 3 - 3
docs/sources/installation/windows.md

@@ -51,11 +51,11 @@ and the Boot2Docker management tool.
 
 
 Boot2Docker will log you in automatically so you can start using Docker right away.
 Boot2Docker will log you in automatically so you can start using Docker right away.
 
 
-Let's try the “hello world” example. Run
+Let's try the `hello-world` example image. Run
 
 
-    $ docker run busybox echo hello world
+    $ docker run hello-world
 
 
-This will download the small busybox image and print "hello world".
+This should download the very small `hello-world` image and print a `Hello from Docker.` message.
 
 
 
 
 # Further Details
 # Further Details

+ 2 - 2
hack/install.sh

@@ -85,7 +85,7 @@ case "$lsb_dist" in
 		if command_exists docker && [ -e /var/run/docker.sock ]; then
 		if command_exists docker && [ -e /var/run/docker.sock ]; then
 			(
 			(
 				set -x
 				set -x
-				$sh_c 'docker run busybox echo "Docker has been successfully installed!"'
+				$sh_c 'docker run hello-world'
 			) || true
 			) || true
 		fi
 		fi
 		your_user=your-user
 		your_user=your-user
@@ -150,7 +150,7 @@ case "$lsb_dist" in
 		if command_exists docker && [ -e /var/run/docker.sock ]; then
 		if command_exists docker && [ -e /var/run/docker.sock ]; then
 			(
 			(
 				set -x
 				set -x
-				$sh_c 'docker run busybox echo "Docker has been successfully installed!"'
+				$sh_c 'docker run hello-world'
 			) || true
 			) || true
 		fi
 		fi
 		your_user=your-user
 		your_user=your-user