Merge pull request #663 from opdemand/dockerfile-makefile-cleanup

mboersma · mboersma · commit b6531ce7f803 · 2014-03-25T10:04:22.000-06:00
Dockerfile cleanup
diff --git a/builder/Dockerfile b/builder/Dockerfile
@@ -16,10 +16,9 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 36A1D7869245C8950F9
 RUN apt-get update -q
 RUN apt-get install -yq lxc-docker-0.8.0
 
-# install latest pip
-RUN wget -q https://raw.github.com/pypa/pip/1.5.4/contrib/get-pip.py && \
-    python get-pip.py && \
-    rm get-pip.py
+# install recent pip
+RUN wget -qO- https://raw.github.com/pypa/pip/1.5.4/contrib/get-pip.py | python -
+
 # install hook dependencies
 RUN pip install pyyaml requests
 
@@ -51,6 +50,7 @@ RUN chown -R root:root /app
 
 # define the execution environment
 VOLUME /var/lib/docker
+WORKDIR /app
 ENTRYPOINT ["/app/bin/entry"]
 CMD ["/app/bin/boot"]
 EXPOSE 22
diff --git a/cache/Dockerfile b/cache/Dockerfile
@@ -11,5 +11,6 @@ RUN apt-get install -yq redis-server
 ADD . /app
 
 # define the execution environment
+WORKDIR /app
 CMD ["/app/bin/boot"]
 EXPOSE 6379
diff --git a/contrib/digitalocean/prepare-controller-image.sh b/contrib/digitalocean/prepare-controller-image.sh
@@ -24,10 +24,9 @@ echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/dock
 apt-get update
 apt-get upgrade -yq
 
-# install latest pip
-wget -q https://raw.github.com/pypa/pip/1.5.4/contrib/get-pip.py && \
-    python get-pip.py && \
-    rm get-pip.py
+# install recent pip
+wget -qO- https://raw.github.com/pypa/pip/1.5.4/contrib/get-pip.py | python -
+
 # install required packages
 apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make -yq
 
diff --git a/contrib/digitalocean/prepare-node-image.sh b/contrib/digitalocean/prepare-node-image.sh
@@ -24,10 +24,9 @@ echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/dock
 apt-get update
 apt-get upgrade -yq
 
-# install latest pip
-wget -q https://raw.github.com/pypa/pip/1.5.4/contrib/get-pip.py && \
-    python get-pip.py && \
-    rm get-pip.py
+# install recent pip
+wget -qO- https://raw.github.com/pypa/pip/1.5.4/contrib/get-pip.py | python -
+
 # install required packages
 apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make -yq
 
diff --git a/contrib/ec2/prepare-controller-ami.sh b/contrib/ec2/prepare-controller-ami.sh
@@ -29,10 +29,9 @@ echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/dock
 apt-get update
 apt-get dist-upgrade -yq
 
-# install latest pip
-wget -q https://raw.github.com/pypa/pip/1.5.4/contrib/get-pip.py && \
-    python get-pip.py && \
-    rm get-pip.py
+# install recent pip
+wget -qO- https://raw.github.com/pypa/pip/1.5.4/contrib/get-pip.py | python -
+
 # install required packages
 apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make -yq
 
diff --git a/contrib/ec2/prepare-node-ami.sh b/contrib/ec2/prepare-node-ami.sh
@@ -29,10 +29,9 @@ echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/dock
 apt-get update
 apt-get dist-upgrade -yq
 
-# install latest pip
-wget -q https://raw.github.com/pypa/pip/1.5.4/contrib/get-pip.py && \
-    python get-pip.py && \
-    rm get-pip.py
+# install recent pip
+wget -qO- https://raw.github.com/pypa/pip/1.5.4/contrib/get-pip.py | python -
+
 # install required packages
 apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make -yq
 
diff --git a/contrib/rackspace/prepare-node-image.sh b/contrib/rackspace/prepare-node-image.sh
@@ -30,10 +30,9 @@ echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/dock
 apt-get update
 apt-get dist-upgrade -yq
 
-# install latest pip
-wget -q https://raw.github.com/pypa/pip/1.5.4/contrib/get-pip.py && \
-    python get-pip.py && \
-    rm get-pip.py
+# install recent pip
+wget -qO- https://raw.github.com/pypa/pip/1.5.4/contrib/get-pip.py | python -
+
 # install required packages
 apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make -yq
 
diff --git a/contrib/vagrant/prepare-ubuntu-box.sh b/contrib/vagrant/prepare-ubuntu-box.sh
@@ -31,10 +31,9 @@ echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/dock
 apt-get update
 apt-get dist-upgrade -yq
 
-# install latest pip
-wget -q https://raw.github.com/pypa/pip/1.5.4/contrib/get-pip.py && \
-    python get-pip.py && \
-    rm get-pip.py
+# install recent pip
+wget -qO- https://raw.github.com/pypa/pip/1.5.4/contrib/get-pip.py | python -
+
 # install required packages
 apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make -yq
 
diff --git a/controller/Dockerfile b/controller/Dockerfile
@@ -9,7 +9,7 @@ RUN apt-get update && \
 RUN apt-get install -yq ruby1.9.1 rubygems
 RUN gem install --no-ri --no-rdoc chef
 
-# install latest pip
+# install recent pip
 RUN wget -qO- https://raw.github.com/pypa/pip/1.5.4/contrib/get-pip.py | python -
 
 # install requirements before ADD to cache layer and speed build
diff --git a/database/Dockerfile b/database/Dockerfile
@@ -13,5 +13,6 @@ ADD . /app
 
 # define the execution environment
 VOLUME ["/var/lib/postgresql"]
+WORKDIR /app
 CMD ["/app/bin/boot"]
 EXPOSE 5432
diff --git a/logger/Dockerfile b/logger/Dockerfile
@@ -15,5 +15,6 @@ RUN mkdir -p /var/log/deis
 ADD . /app
 
 # prepare execution environment
+WORKDIR /app
 CMD ["/app/bin/boot"]
 EXPOSE 514
diff --git a/registry/Dockerfile b/registry/Dockerfile
@@ -5,10 +5,9 @@ MAINTAINER Gabriel Monroy <gabriel@opdemand.com>
 RUN sed -i 's/main$/main universe/' /etc/apt/sources.list && apt-get update
 RUN apt-get install -y git-core build-essential python-dev \
     libevent-dev python-openssl liblzma-dev wget
-# install latest pip
-RUN wget -q https://raw.github.com/pypa/pip/1.5.4/contrib/get-pip.py && \
-    python get-pip.py && \
-    rm get-pip.py
+
+# install recent pip
+RUN wget -qO- https://raw.github.com/pypa/pip/1.5.4/contrib/get-pip.py | python -
 
 # create a registry user
 RUN useradd -s /bin/bash registry
@@ -31,5 +30,6 @@ VOLUME /data
 ADD . /app
 
 # define the execution environment
+WORKDIR /app
 CMD ["/app/bin/boot"]
 EXPOSE 5000
