Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-06-10 21:19:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

base,manylinux-x64: Use sed for Dockerfile composition

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -72,7 +72,7 @@ linux-ppc64le.test: linux-ppc64le test/run.py
$(BIN)/dockcross-linux-ppc64le python test/run.py --languages C
manylinux-x64/Dockerfile: manylinux-x64/Dockerfile.in common.docker
cpp -o manylinux-x64/Dockerfile -I$(shell pwd) manylinux-x64/Dockerfile.in
sed '/common.docker/ r common.docker' manylinux-x64/Dockerfile.in > manylinux-x64/Dockerfile
manylinux-x64: manylinux-x64/Dockerfile
$(DOCKER) build -t $(ORG)/manylinux-x64 -f manylinux-x64/Dockerfile .
@ -96,7 +96,7 @@ windows-x64.test: windows-x64 test/run.py
$(BIN)/dockcross-windows-x64 python test/run.py --exe-suffix ".exe"
Dockerfile: Dockerfile.in common.docker
cpp -o Dockerfile Dockerfile.in
sed '/common.docker/ r common.docker' Dockerfile.in > Dockerfile
base: Dockerfile
$(DOCKER) build -t $(ORG)/base .