From 6724aad42c867426d00066b39aa52cfd44ccf7ce Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 14 May 2015 12:14:44 -0600 Subject: [PATCH 1/2] Update "scratch" and "hello-world" to be more complimentary --- hello-world/update.sh | 7 +++++++ scratch/README.md | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/hello-world/update.sh b/hello-world/update.sh index 4012394a..98755f97 100755 --- a/hello-world/update.sh +++ b/hello-world/update.sh @@ -18,3 +18,10 @@ echo echo echo '%%LOGO%%' + +echo +cat <<'EOF' +# How is this image created? + +This image is a prime example of using the [`scratch`](https://registry.hub.docker.com/_/scratch/) image effectively. See [`hello.asm`](%%GITHUB-REPO%%/blob/master/hello.asm) in %%GITHUB-REPO%% for the source code of the `hello` binary included in this image. +EOF diff --git a/scratch/README.md b/scratch/README.md index 66d5ea92..80c81ba8 100644 --- a/scratch/README.md +++ b/scratch/README.md @@ -1,5 +1,5 @@ # `FROM scratch` -This image is most useful in the context of building base images or super minimal images (such as images that contain only a single binary; see [`hello-world`](https://github.com/docker-library/hello-world) for an example). +This image is most useful in the context of building base images (such as [`debian`](https://registry.hub.docker.com/_/debian/) and [`busybox`](https://registry.hub.docker.com/_/busybox/)) or super minimal images (that contain only a single binary and whatever it requires, such as [`hello-world`](https://registry.hub.docker.com/_/hello-world/)). -As of Docker 1.5.0 (specifically, [`docker/docker#8827`](https://github.com/docker/docker/pull/8827)), `FROM scratch` is a no-op in the `Dockerfile`, and will not create an extra layer in your image (so a previously 2-layer image will now be a 1-layer image instead). +As of Docker 1.5.0 (specifically, [`docker/docker#8827`](https://github.com/docker/docker/pull/8827)), `FROM scratch` is a no-op in the `Dockerfile`, and will not create an extra layer in your image (so a previously 2-layer image will be a 1-layer image instead). From e827670a96bf4a623bcacd269895890db5f7f9e0 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Thu, 14 May 2015 12:25:12 -0600 Subject: [PATCH 2/2] Run update.sh --- hello-world/README.md | 4 ++++ hello-world/content.md | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/hello-world/README.md b/hello-world/README.md index a2760c7e..644f4b9a 100644 --- a/hello-world/README.md +++ b/hello-world/README.md @@ -31,6 +31,10 @@ For more information about this image and its history, please see the [relevant ![logo](https://raw.githubusercontent.com/docker-library/docs/master/hello-world/logo.png) +# How is this image created? + +This image is a prime example of using the [`scratch`](https://registry.hub.docker.com/_/scratch/) image effectively. See [`hello.asm`](https://github.com/docker-library/hello-world/blob/master/hello.asm) in https://github.com/docker-library/hello-world for the source code of the `hello` binary included in this image. + # Supported Docker versions This image is officially supported on Docker version 1.6.2. diff --git a/hello-world/content.md b/hello-world/content.md index b73af148..fa7fe7ad 100644 --- a/hello-world/content.md +++ b/hello-world/content.md @@ -24,3 +24,7 @@ hello-world latest 91c95931e552 910 B %%LOGO%% + +# How is this image created? + +This image is a prime example of using the [`scratch`](https://registry.hub.docker.com/_/scratch/) image effectively. See [`hello.asm`](%%GITHUB-REPO%%/blob/master/hello.asm) in %%GITHUB-REPO%% for the source code of the `hello` binary included in this image.