From c9a7606f1f03c3dbdbfb7a55a37e415015a96891 Mon Sep 17 00:00:00 2001 From: Stanley F Date: Thu, 28 Feb 2019 09:28:54 +0100 Subject: [PATCH] add windows images with shared linking --- Makefile | 2 +- windows-shared-x64-posix/Dockerfile.in | 23 +++++++++++++++++++ windows-shared-x64/Dockerfile.in | 23 +++++++++++++++++++ windows-shared-x86/Dockerfile.in | 23 +++++++++++++++++++ .../Dockerfile.in | 2 +- .../Dockerfile.in | 2 +- .../Dockerfile.in | 4 +--- 7 files changed, 73 insertions(+), 6 deletions(-) create mode 100644 windows-shared-x64-posix/Dockerfile.in create mode 100644 windows-shared-x64/Dockerfile.in create mode 100644 windows-shared-x86/Dockerfile.in rename {windows-x64-posix => windows-static-x64-posix}/Dockerfile.in (93%) rename {windows-x64 => windows-static-x64}/Dockerfile.in (94%) rename {windows-x86 => windows-static-x86}/Dockerfile.in (93%) diff --git a/Makefile b/Makefile index ac8609d..f600d95 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ ORG = dockcross BIN = ./bin # These images are built using the "build implicit rule" -STANDARD_IMAGES = linux-s390x android-arm android-arm64 linux-x86 linux-x64 linux-arm64 linux-armv5 linux-armv6 linux-armv7 linux-mips linux-mipsel linux-ppc64le windows-x86 windows-x64 windows-x64-posix +STANDARD_IMAGES = linux-s390x android-arm android-arm64 linux-x86 linux-x64 linux-arm64 linux-armv5 linux-armv6 linux-armv7 linux-mips linux-mipsel linux-ppc64le windows-static-x86 windows-static-x64 windows-static-x64-posix windows-shared-x86 windows-shared-x64 windows-shared-x64-posix # Generated Dockerfiles. GEN_IMAGES = linux-s390x linux-mips manylinux-x86 manylinux-x64 web-wasm linux-arm64 windows-x86 windows-x64 windows-x64-posix linux-armv7 linux-armv5 diff --git a/windows-shared-x64-posix/Dockerfile.in b/windows-shared-x64-posix/Dockerfile.in new file mode 100644 index 0000000..817730d --- /dev/null +++ b/windows-shared-x64-posix/Dockerfile.in @@ -0,0 +1,23 @@ +FROM dockcross/base:latest +MAINTAINER Matt McCormick "matt.mccormick@kitware.com" + +ENV WINEARCH win64 +ARG MXE_TARGET_ARCH=x86_64 +ARG MXE_TARGET_THREAD=.posix +ARG MXE_TARGET_LINK=shared + +#include "common.windows" + +# Build-time metadata as defined at http://label-schema.org +ARG BUILD_DATE +ARG IMAGE=dockcross/windows-shared-x64-posix +ARG VERSION=latest +ARG VCS_REF +ARG VCS_URL +LABEL org.label-schema.build-date=$BUILD_DATE \ + org.label-schema.name=$IMAGE \ + org.label-schema.version=$VERSION \ + org.label-schema.vcs-ref=$VCS_REF \ + org.label-schema.vcs-url=$VCS_URL \ + org.label-schema.schema-version="1.0" +ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION} diff --git a/windows-shared-x64/Dockerfile.in b/windows-shared-x64/Dockerfile.in new file mode 100644 index 0000000..687564b --- /dev/null +++ b/windows-shared-x64/Dockerfile.in @@ -0,0 +1,23 @@ +FROM dockcross/base:latest +MAINTAINER Matt McCormick "matt.mccormick@kitware.com" + +ENV WINEARCH win64 +ARG MXE_TARGET_ARCH=x86_64 +ARG MXE_TARGET_THREAD= +ARG MXE_TARGET_LINK=shared + +#include "common.windows" + +# Build-time metadata as defined at http://label-schema.org +ARG BUILD_DATE +ARG IMAGE=dockcross/windows-shared-x64 +ARG VERSION=latest +ARG VCS_REF +ARG VCS_URL +LABEL org.label-schema.build-date=$BUILD_DATE \ + org.label-schema.name=$IMAGE \ + org.label-schema.version=$VERSION \ + org.label-schema.vcs-ref=$VCS_REF \ + org.label-schema.vcs-url=$VCS_URL \ + org.label-schema.schema-version="1.0" +ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION} diff --git a/windows-shared-x86/Dockerfile.in b/windows-shared-x86/Dockerfile.in new file mode 100644 index 0000000..af2c927 --- /dev/null +++ b/windows-shared-x86/Dockerfile.in @@ -0,0 +1,23 @@ +FROM dockcross/base:latest +MAINTAINER Matt McCormick "matt.mccormick@kitware.com" + +ENV WINEARCH win32 +ARG MXE_TARGET_ARCH=i686 +ARG MXE_TARGET_THREAD= +ARG MXE_TARGET_LINK=shared + +#include "common.windows" + +# Build-time metadata as defined at http://label-schema.org +ARG BUILD_DATE +ARG IMAGE=dockcross/windows-shared-x86 +ARG VERSION=latest +ARG VCS_REF +ARG VCS_URL +LABEL org.label-schema.build-date=$BUILD_DATE \ + org.label-schema.name=$IMAGE \ + org.label-schema.version=$VERSION \ + org.label-schema.vcs-ref=$VCS_REF \ + org.label-schema.vcs-url=$VCS_URL \ + org.label-schema.schema-version="1.0" +ENV DEFAULT_DOCKCROSS_IMAGE ${IMAGE}:${VERSION} diff --git a/windows-x64-posix/Dockerfile.in b/windows-static-x64-posix/Dockerfile.in similarity index 93% rename from windows-x64-posix/Dockerfile.in rename to windows-static-x64-posix/Dockerfile.in index a51f911..0b7c029 100644 --- a/windows-x64-posix/Dockerfile.in +++ b/windows-static-x64-posix/Dockerfile.in @@ -10,7 +10,7 @@ ARG MXE_TARGET_LINK=static # Build-time metadata as defined at http://label-schema.org ARG BUILD_DATE -ARG IMAGE=dockcross/windows-x64-posix +ARG IMAGE=dockcross/windows-static-x64-posix ARG VERSION=latest ARG VCS_REF ARG VCS_URL diff --git a/windows-x64/Dockerfile.in b/windows-static-x64/Dockerfile.in similarity index 94% rename from windows-x64/Dockerfile.in rename to windows-static-x64/Dockerfile.in index ad55d3e..1bd677d 100644 --- a/windows-x64/Dockerfile.in +++ b/windows-static-x64/Dockerfile.in @@ -10,7 +10,7 @@ ARG MXE_TARGET_LINK=static # Build-time metadata as defined at http://label-schema.org ARG BUILD_DATE -ARG IMAGE=dockcross/windows-x64 +ARG IMAGE=dockcross/windows-static-x64 ARG VERSION=latest ARG VCS_REF ARG VCS_URL diff --git a/windows-x86/Dockerfile.in b/windows-static-x86/Dockerfile.in similarity index 93% rename from windows-x86/Dockerfile.in rename to windows-static-x86/Dockerfile.in index 94bbec9..3e59fe5 100644 --- a/windows-x86/Dockerfile.in +++ b/windows-static-x86/Dockerfile.in @@ -8,11 +8,9 @@ ARG MXE_TARGET_LINK=static #include "common.windows" -WORKDIR /work - # Build-time metadata as defined at http://label-schema.org ARG BUILD_DATE -ARG IMAGE=dockcross/windows-x86 +ARG IMAGE=dockcross/windows-static-x86 ARG VERSION=latest ARG VCS_REF ARG VCS_URL