base,manylinux-x64: Use sed for Dockerfile composition

Suggested-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
This commit is contained in:
Matt McCormick
2016-09-20 13:17:15 -04:00
parent ed2ae68b7b
commit b596ca6cd8
4 changed files with 60 additions and 64 deletions

View File

@ -3,10 +3,10 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
#include "common.docker"
RUN cd /opt && \\
wget "http://smarden.org/runit/runit-2.1.2.tar.gz" && \\
tar xvzf runit-2.1.2.tar.gz && \\
cd admin/runit-2.1.2 && \\
RUN cd /opt && \
wget "http://smarden.org/runit/runit-2.1.2.tar.gz" && \
tar xvzf runit-2.1.2.tar.gz && \
cd admin/runit-2.1.2 && \
./package/install
COPY manylinux-x64/install-skbuild.sh /usr/local/bin
@ -14,11 +14,11 @@ RUN /usr/local/bin/install-skbuild.sh
ENV CROSS_TRIPLE x86_64-linux-gnu
ENV CROSS_ROOT /opt/rh/devtoolset-2/root/usr/bin
ENV AS=${CROSS_ROOT}/as \\
AR=${CROSS_ROOT}/ar \\
CC=${CROSS_ROOT}/gcc \\
CPP=${CROSS_ROOT}/cpp \\
CXX=${CROSS_ROOT}/g++ \\
ENV AS=${CROSS_ROOT}/as \
AR=${CROSS_ROOT}/ar \
CC=${CROSS_ROOT}/gcc \
CPP=${CROSS_ROOT}/cpp \
CXX=${CROSS_ROOT}/g++ \
LD=${CROSS_ROOT}/ld
COPY linux-x64/${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop