From 6ed610fb8014d500e001bb0677f0e1af0dc9312d Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Tue, 21 Oct 2014 15:59:23 +1000 Subject: [PATCH] DOCKER_VERSION and docker-version havn't been implemented. So far, it looks like the declarations are not used, and so its safer not to confuse people into thinking they do something. Docker-DCO-1.1-Signed-off-by: Sven Dowideit (github: SvenDowideit) --- Dockerfile | 1 - builder/parser/testfiles/docker/Dockerfile | 1 - builder/parser/testfiles/docker/result | 1 - contrib/desktop-integration/chromium/Dockerfile | 2 -- contrib/desktop-integration/gparted/Dockerfile | 2 -- contrib/host-integration/Dockerfile.dev | 2 -- docs/sources/examples/nodejs_web_app.md | 7 +------ 7 files changed, 1 insertion(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 34b0460c07..9fffa63f30 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,6 @@ # the case. Therefore, you don't have to disable it anymore. # -docker-version 0.6.1 FROM ubuntu:14.04 MAINTAINER Tianon Gravi (@tianon) diff --git a/builder/parser/testfiles/docker/Dockerfile b/builder/parser/testfiles/docker/Dockerfile index 68f8f0b78b..1c173126ae 100644 --- a/builder/parser/testfiles/docker/Dockerfile +++ b/builder/parser/testfiles/docker/Dockerfile @@ -23,7 +23,6 @@ # the case. Therefore, you don't have to disable it anymore. # -docker-version 0.6.1 FROM ubuntu:14.04 MAINTAINER Tianon Gravi (@tianon) diff --git a/builder/parser/testfiles/docker/result b/builder/parser/testfiles/docker/result index 915e2ef17b..3ab006ec40 100644 --- a/builder/parser/testfiles/docker/result +++ b/builder/parser/testfiles/docker/result @@ -1,4 +1,3 @@ -(docker-version) (from "ubuntu:14.04") (maintainer "Tianon Gravi (@tianon)") (run "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq apt-utils aufs-tools automake btrfs-tools build-essential curl dpkg-sig git iptables libapparmor-dev libcap-dev libsqlite3-dev lxc=1.0* mercurial pandoc parallel reprepro ruby1.9.1 ruby1.9.1-dev s3cmd=1.1.0* --no-install-recommends") diff --git a/contrib/desktop-integration/chromium/Dockerfile b/contrib/desktop-integration/chromium/Dockerfile index 0e0a7ce90e..5cacd1f999 100644 --- a/contrib/desktop-integration/chromium/Dockerfile +++ b/contrib/desktop-integration/chromium/Dockerfile @@ -20,8 +20,6 @@ # docker run --volumes-from chromium-data -v /tmp/.X11-unix:/tmp/.X11-unix \ # -e DISPLAY=unix$DISPLAY chromium -DOCKER_VERSION 1.3 - # Base docker image FROM debian:jessie MAINTAINER Jessica Frazelle diff --git a/contrib/desktop-integration/gparted/Dockerfile b/contrib/desktop-integration/gparted/Dockerfile index 6db1d24098..e76e658973 100644 --- a/contrib/desktop-integration/gparted/Dockerfile +++ b/contrib/desktop-integration/gparted/Dockerfile @@ -17,8 +17,6 @@ # -e DISPLAY=unix$DISPLAY gparted # -DOCKER-VERSION 1.3 - # Base docker image FROM debian:jessie MAINTAINER Jessica Frazelle diff --git a/contrib/host-integration/Dockerfile.dev b/contrib/host-integration/Dockerfile.dev index 1c0fbd8323..c8df852899 100644 --- a/contrib/host-integration/Dockerfile.dev +++ b/contrib/host-integration/Dockerfile.dev @@ -2,8 +2,6 @@ # This Dockerfile will create an image that allows to generate upstart and # systemd scripts (more to come) # -# docker-version 0.6.2 -# FROM ubuntu:12.10 MAINTAINER Guillaume J. Charmes diff --git a/docs/sources/examples/nodejs_web_app.md b/docs/sources/examples/nodejs_web_app.md index d634251fb8..3a9183e325 100644 --- a/docs/sources/examples/nodejs_web_app.md +++ b/docs/sources/examples/nodejs_web_app.md @@ -59,12 +59,8 @@ Create an empty file called `Dockerfile`: touch Dockerfile Open the `Dockerfile` in your favorite text editor -and add the following line that defines the version of Docker the image -requires to build (this example uses Docker 0.3.4): - # DOCKER-VERSION 0.3.4 - -Next, define the parent image you want to use to build your own image on +Define the parent image you want to use to build your own image on top of. Here, we'll use [CentOS](https://registry.hub.docker.com/_/centos/) (tag: `centos6`) available on the [Docker Hub](https://hub.docker.com/): @@ -108,7 +104,6 @@ defines your runtime, i.e. `node`, and the path to our app, i.e. `src/index.js` Your `Dockerfile` should now look like this: - # DOCKER-VERSION 0.3.4 FROM centos:centos6 # Enable EPEL for Node.js