Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-01-22 06:05:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

base: Use 'common.dockcross' to install gosu and dockcross scripts

Browse Source
This commit is contained in:
Nathan Genetzky 2020-06-26 22:37:25 -05:00
parent 7e638cf35b
commit f2ece3727e
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile.in
View File

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

11
common.debian
View File

@ -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 DEBIAN_FRONTEND=noninteractive
ARG REPO=http://cdn-fastly.deb.debian.org ARG REPO=http://cdn-fastly.deb.debian.org
@ -48,7 +42,4 @@ RUN \
zip \ zip \
zlib1g-dev \ zlib1g-dev \
&& \ && \
apt-get clean --yes && \ apt-get clean --yes
/buildscripts/install-gosu-binary.sh && \
/buildscripts/install-gosu-binary-wrapper.sh && \
rm -rf /buildscripts

1
common.docker
View File

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