mirror of
https://github.com/bensuperpc/dockcross.git
synced 2025-01-22 06:05:36 +01:00
base: Use 'common.dockcross' to install gosu and dockcross scripts
This commit is contained in:
parent
7e638cf35b
commit
f2ece3727e
@ -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
|
||||
|
@ -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
|
||||
|
@ -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/
|
||||
|
Loading…
x
Reference in New Issue
Block a user