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 <SvenDowideit@docker.com> (github: SvenDowideit)
This commit is contained in:
parent
a10876d355
commit
6ed610fb80
|
@ -23,7 +23,6 @@
|
||||||
# the case. Therefore, you don't have to disable it anymore.
|
# the case. Therefore, you don't have to disable it anymore.
|
||||||
#
|
#
|
||||||
|
|
||||||
docker-version 0.6.1
|
|
||||||
FROM ubuntu:14.04
|
FROM ubuntu:14.04
|
||||||
MAINTAINER Tianon Gravi <admwiggin@gmail.com> (@tianon)
|
MAINTAINER Tianon Gravi <admwiggin@gmail.com> (@tianon)
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,6 @@
|
||||||
# the case. Therefore, you don't have to disable it anymore.
|
# the case. Therefore, you don't have to disable it anymore.
|
||||||
#
|
#
|
||||||
|
|
||||||
docker-version 0.6.1
|
|
||||||
FROM ubuntu:14.04
|
FROM ubuntu:14.04
|
||||||
MAINTAINER Tianon Gravi <admwiggin@gmail.com> (@tianon)
|
MAINTAINER Tianon Gravi <admwiggin@gmail.com> (@tianon)
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
(docker-version)
|
|
||||||
(from "ubuntu:14.04")
|
(from "ubuntu:14.04")
|
||||||
(maintainer "Tianon Gravi <admwiggin@gmail.com> (@tianon)")
|
(maintainer "Tianon Gravi <admwiggin@gmail.com> (@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")
|
(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 @@
|
||||||
# docker run --volumes-from chromium-data -v /tmp/.X11-unix:/tmp/.X11-unix \
|
# docker run --volumes-from chromium-data -v /tmp/.X11-unix:/tmp/.X11-unix \
|
||||||
# -e DISPLAY=unix$DISPLAY chromium
|
# -e DISPLAY=unix$DISPLAY chromium
|
||||||
|
|
||||||
DOCKER_VERSION 1.3
|
|
||||||
|
|
||||||
# Base docker image
|
# Base docker image
|
||||||
FROM debian:jessie
|
FROM debian:jessie
|
||||||
MAINTAINER Jessica Frazelle <jess@docker.com>
|
MAINTAINER Jessica Frazelle <jess@docker.com>
|
||||||
|
|
|
@ -17,8 +17,6 @@
|
||||||
# -e DISPLAY=unix$DISPLAY gparted
|
# -e DISPLAY=unix$DISPLAY gparted
|
||||||
#
|
#
|
||||||
|
|
||||||
DOCKER-VERSION 1.3
|
|
||||||
|
|
||||||
# Base docker image
|
# Base docker image
|
||||||
FROM debian:jessie
|
FROM debian:jessie
|
||||||
MAINTAINER Jessica Frazelle <jess@docker.com>
|
MAINTAINER Jessica Frazelle <jess@docker.com>
|
||||||
|
|
|
@ -2,8 +2,6 @@
|
||||||
# This Dockerfile will create an image that allows to generate upstart and
|
# This Dockerfile will create an image that allows to generate upstart and
|
||||||
# systemd scripts (more to come)
|
# systemd scripts (more to come)
|
||||||
#
|
#
|
||||||
# docker-version 0.6.2
|
|
||||||
#
|
|
||||||
|
|
||||||
FROM ubuntu:12.10
|
FROM ubuntu:12.10
|
||||||
MAINTAINER Guillaume J. Charmes <guillaume@docker.com>
|
MAINTAINER Guillaume J. Charmes <guillaume@docker.com>
|
||||||
|
|
|
@ -59,12 +59,8 @@ Create an empty file called `Dockerfile`:
|
||||||
touch Dockerfile
|
touch Dockerfile
|
||||||
|
|
||||||
Open the `Dockerfile` in your favorite text editor
|
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
|
Define the parent image you want to use to build your own image on
|
||||||
|
|
||||||
Next, define the parent image you want to use to build your own image on
|
|
||||||
top of. Here, we'll use
|
top of. Here, we'll use
|
||||||
[CentOS](https://registry.hub.docker.com/_/centos/) (tag: `centos6`)
|
[CentOS](https://registry.hub.docker.com/_/centos/) (tag: `centos6`)
|
||||||
available on the [Docker Hub](https://hub.docker.com/):
|
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:
|
Your `Dockerfile` should now look like this:
|
||||||
|
|
||||||
# DOCKER-VERSION 0.3.4
|
|
||||||
FROM centos:centos6
|
FROM centos:centos6
|
||||||
|
|
||||||
# Enable EPEL for Node.js
|
# Enable EPEL for Node.js
|
||||||
|
|
Loading…
Reference in New Issue