Merge pull request #424 from NGenetzky/ngenetzky/common-dockcross-gosu

Split "dockcross" script and it's dependencies to separate include

Dockerfile.in

@@ -3,6 +3,8 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 #include "common.debian"
 
+#include "common.dockcross"
+
 #include "common.docker"
 
 # Build-time metadata as defined at http://label-schema.org

Makefile

@@ -22,7 +22,7 @@ GEN_IMAGE_DOCKERFILES = $(addsuffix /Dockerfile,$(GEN_IMAGES))
 # These images are expected to have explicit rules for *both* build and testing
 NON_STANDARD_IMAGES = web-wasm manylinux1-x64 manylinux1-x86 manylinux2010-x64 manylinux2010-x86 manylinux2014-x64 manylinux2014-aarch64
 
-DOCKER_COMPOSITE_SOURCES = common.docker common.debian common.manylinux common.crosstool common.windows common-manylinux.crosstool
+DOCKER_COMPOSITE_SOURCES = common.docker common.debian common.manylinux common.crosstool common.windows common-manylinux.crosstool common.dockcross
 
 # This list all available images
 IMAGES = $(STANDARD_IMAGES) $(NON_STANDARD_IMAGES)
@@ -68,6 +68,7 @@ $(GEN_IMAGE_DOCKERFILES) Dockerfile: %Dockerfile: %Dockerfile.in $(DOCKER_COMPOS
 		-e '/common.crosstool/ r common.crosstool' \
 		-e '/common-manylinux.crosstool/ r common-manylinux.crosstool' \
 		-e '/common.windows/ r common.windows' \
+		-e '/common.dockcross/ r common.dockcross' \
 		$< > $@
 
 #

common.debian

@@ -1,9 +1,3 @@
-# Image build scripts
-COPY \
-  imagefiles/install-gosu-binary.sh \
-  imagefiles/install-gosu-binary-wrapper.sh \
-  /buildscripts/
-
 ARG DEBIAN_FRONTEND=noninteractive
 ARG REPO=http://cdn-fastly.deb.debian.org
 
@@ -48,7 +42,4 @@ RUN \
     zip \
     zlib1g-dev \
   && \
-  apt-get clean --yes && \
+  apt-get clean --yes
-  /buildscripts/install-gosu-binary.sh && \
-  /buildscripts/install-gosu-binary-wrapper.sh && \
-  rm -rf /buildscripts

common.dockcross

@@ -0,0 +1,16 @@
+WORKDIR /usr/src
+
+# Image build scripts
+COPY \
+  imagefiles/install-gosu-binary.sh \
+  imagefiles/install-gosu-binary-wrapper.sh \
+  /buildscripts/
+
+RUN \
+  set -x && \
+  /buildscripts/install-gosu-binary.sh && \
+  /buildscripts/install-gosu-binary-wrapper.sh && \
+  rm -rf /buildscripts
+
+# Runtime scripts
+COPY imagefiles/entrypoint.sh imagefiles/dockcross /dockcross/

common.docker

@@ -37,4 +37,3 @@ ENTRYPOINT ["/dockcross/entrypoint.sh"]
 # Runtime scripts
 COPY imagefiles/cmake.sh /usr/local/bin/cmake
 COPY imagefiles/ccmake.sh /usr/local/bin/ccmake
-COPY imagefiles/entrypoint.sh imagefiles/dockcross /dockcross/

common.manylinux

@@ -1,7 +1,5 @@
 # Image build scripts
 COPY \
-  imagefiles/install-gosu-binary.sh \
-  imagefiles/install-gosu-binary-wrapper.sh \
   manylinux-common/install-python-packages.sh \
   /buildscripts/
 
@@ -18,8 +16,6 @@ RUN \
     zip \
   && \
   yum clean all && \
-  /buildscripts/install-gosu-binary.sh && \
-  /buildscripts/install-gosu-binary-wrapper.sh && \
   # Remove sudo provided by devtoolset since it doesn't work with
   # our sudo wrapper calling gosu.
   rm -f /opt/rh/devtoolset-2/root/usr/bin/sudo && \

manylinux1-x64/Dockerfile.in

@@ -5,6 +5,8 @@ ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux1-x64
 
 #include "common.manylinux"
 
+#include "common.dockcross"
+
 #include "common.docker"
 
 ENV CROSS_TRIPLE x86_64-linux-gnu

manylinux1-x86/Dockerfile.in

@@ -5,6 +5,8 @@ ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux1-x86
 
 #include "common.manylinux"
 
+#include "common.dockcross"
+
 #include "common.docker"
 
 ENV CROSS_TRIPLE i686-linux-gnu

manylinux2010-x64/Dockerfile.in

@@ -5,6 +5,8 @@ ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux2010-x64
 
 #include "common.manylinux"
 
+#include "common.dockcross"
+
 #include "common.docker"
 
 # Override yum to work around the problem with newly built libcurl.so.4

manylinux2010-x86/Dockerfile.in

@@ -5,6 +5,8 @@ ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux2010-x86
 
 #include "common.manylinux"
 
+#include "common.dockcross"
+
 #include "common.docker"
 
 # Override yum to work around the problem with newly built libcurl.so.4

manylinux2014-x64/Dockerfile.in

@@ -6,6 +6,8 @@ ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux2014-x64
 
 #include "common.manylinux"
 
+#include "common.dockcross"
+
 #include "common.docker"
 
 # Override yum to work around the problem with newly built libcurl.so.4

web-wasm/Dockerfile.in

@@ -5,8 +5,6 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 # See https://github.com/asRIA/emscripten-docker/blob/master/Dockerfile.in#L4
 RUN rm /bin/sh && ln -s /bin/dash /bin/sh
 
-COPY imagefiles/install-gosu-binary-wrapper.sh /buildscripts/
-
 ARG DEBIAN_FRONTEND=noninteractive
 ARG REPO=http://cdn-fastly.deb.debian.org
 
@@ -51,9 +49,9 @@ RUN \
     xz-utils \
     zlib1g-dev \
   && \
-  apt-get clean --yes && \
+  apt-get clean --yes
-  /buildscripts/install-gosu-binary-wrapper.sh && \
+
-  rm -rf /buildscripts
+#include "common.dockcross"
 
 #include "common.docker"