Browse code

Merge pull request #8673 from SvenDowideit/whats-docker-version

DOCKER_VERSION and docker-version havn't been implemented.

Sven Dowideit authored on 2014/10/23 11:03:54
Showing 7 changed files
... ...
@@ -23,7 +23,6 @@
23 23
 # the case. Therefore, you don't have to disable it anymore.
24 24
 #
25 25
 
26
-docker-version	0.6.1
27 26
 FROM	ubuntu:14.04
28 27
 MAINTAINER	Tianon Gravi <admwiggin@gmail.com> (@tianon)
29 28
 
... ...
@@ -23,7 +23,6 @@
23 23
 # the case. Therefore, you don't have to disable it anymore.
24 24
 #
25 25
 
26
-docker-version	0.6.1
27 26
 FROM	ubuntu:14.04
28 27
 MAINTAINER	Tianon Gravi <admwiggin@gmail.com> (@tianon)
29 28
 
... ...
@@ -1,4 +1,3 @@
1
-(docker-version)
2 1
 (from "ubuntu:14.04")
3 2
 (maintainer "Tianon Gravi <admwiggin@gmail.com> (@tianon)")
4 3
 (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")
... ...
@@ -20,8 +20,6 @@
20 20
 #   docker run --volumes-from chromium-data -v /tmp/.X11-unix:/tmp/.X11-unix \
21 21
 #   -e DISPLAY=unix$DISPLAY chromium
22 22
 
23
-DOCKER_VERSION 1.3
24
-
25 23
 # Base docker image
26 24
 FROM debian:jessie
27 25
 MAINTAINER Jessica Frazelle <jess@docker.com>
... ...
@@ -17,8 +17,6 @@
17 17
 #     -e DISPLAY=unix$DISPLAY gparted
18 18
 #
19 19
 
20
-DOCKER-VERSION 1.3
21
-
22 20
 # Base docker image
23 21
 FROM debian:jessie
24 22
 MAINTAINER Jessica Frazelle <jess@docker.com>
... ...
@@ -2,8 +2,6 @@
2 2
 # This Dockerfile will create an image that allows to generate upstart and
3 3
 # systemd scripts (more to come)
4 4
 #
5
-# docker-version 0.6.2
6
-#
7 5
 
8 6
 FROM		ubuntu:12.10
9 7
 MAINTAINER	Guillaume J. Charmes <guillaume@docker.com>
... ...
@@ -59,12 +59,8 @@ Create an empty file called `Dockerfile`:
59 59
     touch Dockerfile
60 60
 
61 61
 Open the `Dockerfile` in your favorite text editor
62
-and add the following line that defines the version of Docker the image
63
-requires to build (this example uses Docker 0.3.4):
64 62
 
65
-    # DOCKER-VERSION 0.3.4
66
-
67
-Next, define the parent image you want to use to build your own image on
63
+Define the parent image you want to use to build your own image on
68 64
 top of. Here, we'll use
69 65
 [CentOS](https://registry.hub.docker.com/_/centos/) (tag: `centos6`)
70 66
 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`
108 108
 
109 109
 Your `Dockerfile` should now look like this:
110 110
 
111
-    # DOCKER-VERSION 0.3.4
112 111
     FROM    centos:centos6
113 112
 
114 113
     # Enable EPEL for Node.js