windows-(x86|x64): Optimize images introducing "common.windows"

* Avoid duplication introducing common  script
* Optimize image size reducing the number of RUN instructions

windows-x86/Dockerfile

@@ -1,88 +0,0 @@
-FROM dockcross/base:latest
-MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
-
-# WINE is used as an emulator for try_run and tests with CMake.
-# Other dependencies are from the listed MXE requirements:
-#   http://mxe.cc/#requirements
-# 'cmake' is omitted because it is installed from source in the base image
-RUN apt-get update && apt-get -y --force-yes install \
-  autoconf \
-  automake \
-  autopoint \
-  bash \
-  bison \
-  bzip2 \
-  flex \
-  gettext \
-  git \
-  g++ \
-  g++-multilib \
-  gperf \
-  intltool \
-  libffi-dev \
-  libgdk-pixbuf2.0-dev \
-  libtool-bin \
-  libltdl-dev \
-  libssl-dev \
-  libxml-parser-perl \
-  libc6-dev-i386 \
-  make \
-  openssl \
-  p7zip-full \
-  patch \
-  perl \
-  pkg-config \
-  python \
-  ruby \
-  scons \
-  sed \
-  unzip \
-  wget \
-  wine \
-  xz-utils
-# Set up wine
-RUN dpkg --add-architecture i386 && \
-  apt-get update && \
-  apt-get install -y wine32
-ENV WINEARCH win32
-RUN wine hostname
-
-WORKDIR /usr/src
-# mxe master 2017-10-25
-RUN git clone https://github.com/mxe/mxe.git && \
-  cd mxe && \
-  git checkout 994ad47302e8811614b7eb49fc05234942b95b89
-WORKDIR /usr/src/mxe
-COPY settings.mk /usr/src/mxe/
-RUN make -j$(nproc)
-
-ENV PATH ${PATH}:/usr/src/mxe/usr/bin
-ENV CROSS_TRIPLE i686-w64-mingw32.static
-ENV AS=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-as \
-    AR=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-ar \
-    CC=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-gcc \
-    CPP=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-cpp \
-    CXX=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-g++ \
-    LD=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-ld \
-    FC=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-gfortran
-
-ENV DEFAULT_DOCKCROSS_IMAGE dockcross/windows-x86
-WORKDIR /work
-
-ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/i686-w64-mingw32.static/share/cmake/mxe-conf.cmake
-RUN echo 'set(CMAKE_CROSSCOMPILING_EMULATOR "/usr/bin/wine")' >> ${CMAKE_TOOLCHAIN_FILE}
-RUN cd /usr/local/bin \
-  && rm cmake \
-  && ln -s /usr/src/mxe/usr/bin/i686-w64-mingw32.static-cmake cmake \
-  && ln -s /usr/src/mxe/usr/bin/i686-w64-mingw32.static-cpack cpack
-
-# Build-time metadata as defined at http://label-schema.org
-ARG BUILD_DATE
-ARG IMAGE
-ARG VCS_REF
-ARG VCS_URL
-LABEL org.label-schema.build-date=$BUILD_DATE \
-      org.label-schema.name=$IMAGE \
-      org.label-schema.vcs-ref=$VCS_REF \
-      org.label-schema.vcs-url=$VCS_URL \
-      org.label-schema.schema-version="1.0"

windows-x86/Dockerfile.in

@@ -0,0 +1,21 @@
+FROM dockcross/base:latest
+MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
+
+ENV WINEARCH win32
+ARG MXE_TARGET_ARCH=i686
+
+#include "common.windows"
+
+ENV DEFAULT_DOCKCROSS_IMAGE dockcross/windows-x86
+WORKDIR /work
+
+# Build-time metadata as defined at http://label-schema.org
+ARG BUILD_DATE
+ARG IMAGE
+ARG VCS_REF
+ARG VCS_URL
+LABEL org.label-schema.build-date=$BUILD_DATE \
+      org.label-schema.name=$IMAGE \
+      org.label-schema.vcs-ref=$VCS_REF \
+      org.label-schema.vcs-url=$VCS_URL \
+      org.label-schema.schema-version="1.0"

windows-x86/settings.mk

@@ -1,4 +0,0 @@
-MXE_TARGETS := i686-w64-mingw32.static
-LOCAL_PKG_LIST := gcc
-.DEFAULT local-pkg-list:
-local-pkg-list: $(LOCAL_PKG_LIST)