Update Dockerfiles, add apt-get install of docker.io to script

ipcun · Apr 13, 2014 · 427162d · 427162d
1 parent bb58ff0
commit 427162d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/docker/cpppo/base/Dockerfile b/docker/cpppo/base/Dockerfile
@@ -28,4 +28,4 @@ RUN		echo 'Dir::Cache { srcpkgcache ""; pkgcache ""; }'	\
                   ) > /etc/dpkg/dpkg.cfg.d/01nodoc
 RUN		apt-get update						\
                     && apt-get -yu dist-upgrade				\
-                    && apt-get clean			# YYYY-MM-DD
+                    && apt-get clean			# 2014-04-13
diff --git a/docker/cpppo/cpppo/Dockerfile b/docker/cpppo/cpppo/Dockerfile
@@ -16,5 +16,6 @@
 #
 FROM		cpppo/base
 MAINTAINER	Perry Kundert "[email protected]"
-RUN		apt-get -y install python python-pip; apt-get clean
+RUN		apt-get -y install python python-pip			\
+		    && apt-get clean			# 2014-04-13
 RUN		pip install cpppo
diff --git a/docker/cpppo/mongrel2/Dockerfile b/docker/cpppo/mongrel2/Dockerfile
@@ -8,7 +8,7 @@
 FROM		cpppo/cpppo
 MAINTAINER	Perry Kundert "[email protected]"
 
-RUN		apt-get install -y git libtool autoconf automake	\
+RUN		apt-get -y install git libtool autoconf automake	\
 			  python-dev uuid-dev				\
 			  sqlite3 libsqlite3-dev build-essential	\
 		    && apt-get clean

diff --git a/vagrant/debian/script b/vagrant/debian/script
@@ -20,7 +20,7 @@ deb	http://security.debian.org/		jessie/updates	main contrib non-free\n"\
             apt-show-versions python-pip python-dev		\
             lxc wget bsdtar curl git aufs-tools bridge-utils	\
             emacs24-nox emacs24-el screen			\
-            multitail aspell zip				\
+            multitail aspell zip docker.io			\
         && apt-get install -y					\
             `apt-show-versions -a				\
                 | sed -ne \'s/^linux-image-\(\w\+\):\w*[[:space:]].*installed$/linux-headers-\1/p\'` \