Update Dockerfile to use stackbrew/ubuntu (until it graduates), update Dockerfile MAINTAINER line, coalesce all apt-get installs into one invocation (including s3cmd by bringing in backports)
This commit is contained in:
Tianon Gravi
parent
efaf2cac5c
commit
484a75f354
1 changed files with 39 additions and 39 deletions
78
Dockerfile
78
Dockerfile
|
|
@ -24,49 +24,32 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
docker-version 0.6.1
|
docker-version 0.6.1
|
||||||
FROM ubuntu:12.04
|
FROM stackbrew/ubuntu:12.04
|
||||||
MAINTAINER Solomon Hykes <solomon@dotcloud.com>
|
MAINTAINER Tianon Gravi <admwiggin@gmail.com> (@tianon)
|
||||||
|
|
||||||
# Prevent apt-get install from trying to prompt for stuff
|
# Add precise-backports to get s3cmd >= 1.1.0 (so we get ENV variable support in our .s3cfg)
|
||||||
ENV DEBIAN_FRONTEND noninteractive
|
RUN echo 'deb http://archive.ubuntu.com/ubuntu precise-backports main universe' > /etc/apt/sources.list.d/backports.list
|
||||||
|
|
||||||
# Build dependencies
|
# Packaged dependencies
|
||||||
RUN echo 'deb http://archive.ubuntu.com/ubuntu precise main universe' > /etc/apt/sources.list
|
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq \
|
||||||
RUN apt-get update
|
apt-utils \
|
||||||
RUN apt-get install -y -q apt-utils
|
aufs-tools \
|
||||||
RUN apt-get install -y -q curl
|
build-essential \
|
||||||
RUN apt-get install -y -q git
|
curl \
|
||||||
RUN apt-get install -y -q mercurial
|
dpkg-sig \
|
||||||
RUN apt-get install -y -q build-essential libsqlite3-dev
|
git \
|
||||||
|
iptables \
|
||||||
# Install Go
|
libsqlite3-dev \
|
||||||
RUN curl -s https://go.googlecode.com/files/go1.2.src.tar.gz | tar -v -C /usr/local -xz
|
lxc \
|
||||||
ENV PATH /usr/local/go/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin
|
mercurial \
|
||||||
ENV GOPATH /go:/go/src/github.com/dotcloud/docker/vendor
|
reprepro \
|
||||||
RUN cd /usr/local/go/src && ./make.bash --no-clean 2>&1
|
ruby1.9.1 \
|
||||||
|
ruby1.9.1-dev \
|
||||||
# Cross compilation
|
s3cmd=1.1.0* \
|
||||||
ENV DOCKER_CROSSPLATFORMS darwin/amd64 darwin/386
|
--no-install-recommends
|
||||||
# TODO add linux/386 and linux/arm
|
|
||||||
RUN cd /usr/local/go/src && bash -xc 'for platform in $DOCKER_CROSSPLATFORMS; do GOOS=${platform%/*} GOARCH=${platform##*/} ./make.bash --no-clean 2>&1; done'
|
|
||||||
|
|
||||||
# Ubuntu stuff
|
|
||||||
RUN apt-get install -y -q ruby1.9.3 rubygems libffi-dev
|
|
||||||
RUN gem install --no-rdoc --no-ri fpm
|
|
||||||
RUN apt-get install -y -q reprepro dpkg-sig
|
|
||||||
|
|
||||||
RUN apt-get install -y -q python-pip
|
|
||||||
RUN pip install s3cmd==1.1.0-beta3
|
|
||||||
RUN pip install python-magic==0.4.6
|
|
||||||
RUN /bin/echo -e '[default]\naccess_key=$AWS_ACCESS_KEY\nsecret_key=$AWS_SECRET_KEY\n' > /.s3cfg
|
|
||||||
|
|
||||||
# Runtime dependencies
|
|
||||||
RUN apt-get install -y -q iptables
|
|
||||||
RUN apt-get install -y -q lxc
|
|
||||||
RUN apt-get install -y -q aufs-tools
|
|
||||||
|
|
||||||
# Get lvm2 source for compiling statically
|
# Get lvm2 source for compiling statically
|
||||||
RUN git clone https://git.fedorahosted.org/git/lvm2.git /usr/local/lvm2 && cd /usr/local/lvm2 && git checkout v2_02_103
|
RUN git clone https://git.fedorahosted.org/git/lvm2.git /usr/local/lvm2 && cd /usr/local/lvm2 && git checkout -q v2_02_103
|
||||||
# see https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags
|
# see https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags
|
||||||
# note: we can't use "git clone -b" above because it requires at least git 1.7.10 to be able to use that on a tag instead of a branch and we only have 1.7.9.5
|
# note: we can't use "git clone -b" above because it requires at least git 1.7.10 to be able to use that on a tag instead of a branch and we only have 1.7.9.5
|
||||||
|
|
||||||
|
|
@ -74,9 +57,26 @@ RUN git clone https://git.fedorahosted.org/git/lvm2.git /usr/local/lvm2 && cd /u
|
||||||
RUN cd /usr/local/lvm2 && ./configure --enable-static_link && make device-mapper && make install_device-mapper
|
RUN cd /usr/local/lvm2 && ./configure --enable-static_link && make device-mapper && make install_device-mapper
|
||||||
# see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL
|
# see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL
|
||||||
|
|
||||||
|
# Install Go
|
||||||
|
RUN curl -s https://go.googlecode.com/files/go1.2.src.tar.gz | tar -v -C /usr/local -xz
|
||||||
|
ENV PATH /usr/local/go/bin:$PATH
|
||||||
|
ENV GOPATH /go:/go/src/github.com/dotcloud/docker/vendor
|
||||||
|
RUN cd /usr/local/go/src && ./make.bash --no-clean 2>&1
|
||||||
|
|
||||||
|
# Compile Go for cross compilation
|
||||||
|
ENV DOCKER_CROSSPLATFORMS darwin/amd64 darwin/386
|
||||||
|
# TODO add linux/386 and linux/arm
|
||||||
|
RUN cd /usr/local/go/src && bash -xc 'for platform in $DOCKER_CROSSPLATFORMS; do GOOS=${platform%/*} GOARCH=${platform##*/} ./make.bash --no-clean 2>&1; done'
|
||||||
|
|
||||||
# Grab Go's cover tool for dead-simple code coverage testing
|
# Grab Go's cover tool for dead-simple code coverage testing
|
||||||
RUN go get code.google.com/p/go.tools/cmd/cover
|
RUN go get code.google.com/p/go.tools/cmd/cover
|
||||||
|
|
||||||
|
# TODO replace FPM with some very minimal debhelper stuff
|
||||||
|
RUN gem install --no-rdoc --no-ri fpm
|
||||||
|
|
||||||
|
# Setup s3cmd config
|
||||||
|
RUN /bin/echo -e '[default]\naccess_key=$AWS_ACCESS_KEY\nsecret_key=$AWS_SECRET_KEY' > /.s3cfg
|
||||||
|
|
||||||
VOLUME /var/lib/docker
|
VOLUME /var/lib/docker
|
||||||
WORKDIR /go/src/github.com/dotcloud/docker
|
WORKDIR /go/src/github.com/dotcloud/docker
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue