common: Introduce "common.debian"

This will facilitate the configuration of other images based on debian
but *NOT* depending on the dockcross/base image.
This commit is contained in:
Jean-Christophe Fillion-Robin 2016-11-25 15:21:53 -05:00
parent 8077008a10
commit 46cef1a33a
No known key found for this signature in database
GPG Key ID: 15C1A2812F958BD3
3 changed files with 32 additions and 31 deletions

View File

@ -1,35 +1,7 @@
FROM debian:jessie
MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
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
#include "common.debian"
#include "common.docker"

View File

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

29
common.debian Normal file
View File

@ -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