From f2ece3727eb3b5d6f55a131f99c88f2688d2e257 Mon Sep 17 00:00:00 2001
From: Nathan Genetzky <nathan@genetzky.us>
Date: Fri, 26 Jun 2020 22:37:25 -0500
Subject: [PATCH] base: Use 'common.dockcross' to install gosu and dockcross
 scripts

---
 Dockerfile.in |  2 ++
 common.debian | 11 +----------
 common.docker |  1 -
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/Dockerfile.in b/Dockerfile.in
index 2ae59c8..53ae7e8 100644
--- a/Dockerfile.in
+++ b/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
diff --git a/common.debian b/common.debian
index 8c99205..95c5309 100644
--- a/common.debian
+++ b/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 && \
-  /buildscripts/install-gosu-binary.sh && \
-  /buildscripts/install-gosu-binary-wrapper.sh && \
-  rm -rf /buildscripts
+  apt-get clean --yes
diff --git a/common.docker b/common.docker
index 78c4a4b..d9c92a4 100644
--- a/common.docker
+++ b/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/