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: Split into Dockerfile.in and common.docker

Browse Source 
So common.docker can be re-used in other images that are not built FROM base.
This commit is contained in:
Matt McCormick
2016-09-20 00:35:37 -04:00
parent 59ba030070
commit 755f45b412
5 changed files with 84 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -71,6 +71,13 @@ linux-ppc64le.test: linux-ppc64le test/run.py
$(DOCKER) run --rm dockcross/linux-ppc64le > $(BIN)/dockcross-linux-ppc64le && chmod +x $(BIN)/dockcross-linux-ppc64le
$(BIN)/dockcross-linux-ppc64le python test/run.py --languages C
manylinux-x64: base manylinux-x64/Dockerfile
$(DOCKER) build -t $(ORG)/manylinux-x64 manylinux-x64
manylinux-x64.test: manylinux-x64 test/run.py
$(DOCKER) run --rm dockcross/manylinux-x64 > $(BIN)/dockcross-manylinux-x64 && chmod +x $(BIN)/dockcross-manylinux-x64
$(BIN)/dockcross-manylinux-x64 python test/run.py
windows-x86: base windows-x86/Dockerfile windows-x86/settings.mk
$(DOCKER) build -t $(ORG)/windows-x86 windows-x86
@ -85,6 +92,9 @@ windows-x64.test: windows-x64 test/run.py
$(DOCKER) run --rm dockcross/windows-x64 > $(BIN)/dockcross-windows-x64 && chmod +x $(BIN)/dockcross-windows-x64
$(BIN)/dockcross-windows-x64 python test/run.py --exe-suffix ".exe"
Dockerfile: Dockerfile.in common.docker
cpp -o Dockerfile Dockerfile.in
base: Dockerfile
$(DOCKER) build -t $(ORG)/base .