common: Introduce "common.debian"

This will facilitate the configuration of other images based on debian
but *NOT* depending on the dockcross/base image.

Dockerfile.in

@@ -1,35 +1,7 @@
 FROM debian:jessie
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
-RUN REPO=http://cdn-fastly.deb.debian.org && \
+#include "common.debian"
-  echo "deb $REPO/debian jessie main\ndeb $REPO/debian jessie-updates main\ndeb $REPO/debian-security jessie/updates main" > /etc/apt/sources.list
-
-RUN apt-get update && apt-get -y install \
-  automake \
-  autogen \
-  bash \
-  build-essential \
-  bzip2 \
-  ca-certificates \
-  curl \
-  file \
-  git \
-  gzip \
-  make \
-  ncurses-dev \
-  pkg-config \
-  libtool \
-  python \
-  rsync \
-  sed \
-  bison \
-  flex \
-  tar \
-  vim \
-  wget \
-  runit \
-  xz-utils && \
-  apt-get -y clean
 
 #include "common.docker"
 

Makefile

@@ -101,8 +101,8 @@ manylinux-x86.test: manylinux-x86
 #
 # base
 #
-Dockerfile: Dockerfile.in common.docker
+Dockerfile: Dockerfile.in common.docker common.debian
-	sed '/common.docker/ r common.docker' Dockerfile.in > Dockerfile
+	sed -e '/common.docker/ r common.docker' -e '/common.debian/ r common.debian' Dockerfile.in > Dockerfile
 
 base: Dockerfile imagefiles/
 	$(DOCKER) build -t $(ORG)/base \

common.debian

@@ -0,0 +1,29 @@
+RUN REPO=http://cdn-fastly.deb.debian.org && \
+  echo "deb $REPO/debian jessie main\ndeb $REPO/debian jessie-updates main\ndeb $REPO/debian-security jessie/updates main" > /etc/apt/sources.list
+
+RUN apt-get update && apt-get -y install \
+  automake \
+  autogen \
+  bash \
+  build-essential \
+  bzip2 \
+  ca-certificates \
+  curl \
+  file \
+  git \
+  gzip \
+  make \
+  ncurses-dev \
+  pkg-config \
+  libtool \
+  python \
+  rsync \
+  sed \
+  bison \
+  flex \
+  tar \
+  vim \
+  wget \
+  runit \
+  xz-utils && \
+  apt-get -y clean