Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-12-23 00:54:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

manylinux: Consolidate common content into common.manylinux

Browse Source
This commit is contained in:
Matt McCormick 2016-11-03 21:33:24 -04:00 committed by Jean-Christophe Fillion-Robin
parent d41d7f919e
commit 26c5447d29
No known key found for this signature in database
GPG Key ID: 15C1A2812F958BD3
4 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -56,8 +56,8 @@ browser-asmjs.test: browser-asmjs
# #
# manylinux-x64 # manylinux-x64
# #
manylinux-x64/Dockerfile: manylinux-x64/Dockerfile.in common.docker manylinux-x64/Dockerfile: manylinux-x64/Dockerfile.in common.docker common.manylinux
sed '/common.docker/ r common.docker' manylinux-x64/Dockerfile.in > manylinux-x64/Dockerfile sed -e '/common.docker/ r common.docker' -e '/common.manylinux/ r common.manylinux' manylinux-x64/Dockerfile.in > manylinux-x64/Dockerfile
manylinux-x64: manylinux-x64/Dockerfile manylinux-x64: manylinux-x64/Dockerfile
$(DOCKER) build -t $(ORG)/manylinux-x64 \ $(DOCKER) build -t $(ORG)/manylinux-x64 \
@ -74,8 +74,8 @@ manylinux-x64.test: manylinux-x64
# #
# manylinux-x86 # manylinux-x86
# #
manylinux-x86/Dockerfile: manylinux-x86/Dockerfile.in common.docker manylinux-x86/Dockerfile: manylinux-x86/Dockerfile.in common.docker common.manylinux
sed '/common.docker/ r common.docker' manylinux-x86/Dockerfile.in > manylinux-x86/Dockerfile sed -e '/common.docker/ r common.docker' -e '/common.manylinux/ r common.manylinux' manylinux-x86/Dockerfile.in > manylinux-x86/Dockerfile
manylinux-x86: manylinux-x86/Dockerfile manylinux-x86: manylinux-x86/Dockerfile
$(DOCKER) build -t $(ORG)/manylinux-x86 \ $(DOCKER) build -t $(ORG)/manylinux-x86 \

10
common.manylinux Normal file
View File

@ -0,0 +1,10 @@
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-common/install-python-packages.sh /usr/local/bin
RUN /usr/local/bin/install-python-packages.sh
RUN yum -y install sudo

11
manylinux-x64/Dockerfile.in
View File

@ -3,16 +3,7 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
#include "common.docker" #include "common.docker"
RUN cd /opt && \ #include "common.manylinux"
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-common/install-python-packages.sh /usr/local/bin
RUN /usr/local/bin/install-python-packages.sh
RUN yum -y install sudo
ENV CROSS_TRIPLE x86_64-linux-gnu ENV CROSS_TRIPLE x86_64-linux-gnu
ENV CROSS_ROOT /opt/rh/devtoolset-2/root/usr/bin ENV CROSS_ROOT /opt/rh/devtoolset-2/root/usr/bin

11
manylinux-x86/Dockerfile.in
View File

@ -3,16 +3,7 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
#include "common.docker" #include "common.docker"
RUN cd /opt && \ #include "common.manylinux"
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-common/install-python-packages.sh /usr/local/bin
RUN /usr/local/bin/install-python-packages.sh
RUN yum -y install sudo
ENV CROSS_TRIPLE i686-linux-gnu ENV CROSS_TRIPLE i686-linux-gnu
ENV CROSS_ROOT /opt/rh/devtoolset-2/root/usr/bin ENV CROSS_ROOT /opt/rh/devtoolset-2/root/usr/bin