Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-06-10 21:19:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

dockcross: make the default image specific to each compiler

Browse Source
This commit is contained in:
Matt McCormick
2016-07-04 00:10:36 -04:00
parent aa06b9af2c
commit fdb18671e3
15 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
imagefiles/dockcross
View File

@ -1,5 +1,7 @@
#!/bin/bash
DEFAULT_DOCKCROSS_IMAGE=thewtex/cross-compiler-base
#------------------------------------------------------------------------------
# Helpers
#
@ -123,14 +125,13 @@ done
# 3. defaults
# Source the config file if it exists
DEFAULT_CONFIG=~/.dockcross
FINAL_CONFIG=${ARG_CONFIG-${DOCKCROSS_CONFIG-$DEFAULT_CONFIG}}
DEFAULT_DOCKCROSS_CONFIG=~/.dockcross
FINAL_CONFIG=${ARG_CONFIG-${DOCKCROSS_CONFIG-$DEFAULT_DOCKCROSS_CONFIG}}
[[ -f "$FINAL_CONFIG" ]] && source "$FINAL_CONFIG"
# Set the docker image
DEFAULT_IMAGE=thewtex/cross-compiler-base
FINAL_IMAGE=${ARG_IMAGE-${DOCKCROSS_IMAGE-$DEFAULT_IMAGE}}
FINAL_IMAGE=${ARG_IMAGE-${DOCKCROSS_IMAGE-$DEFAULT_DOCKCROSS_IMAGE}}
# Set the docker run extra args (if any)
FINAL_ARGS=${ARG_ARGS-${DOCKCROSS_ARGS}}
@ -178,11 +179,12 @@ docker run -i -t --rm \
#
# This image is not intended to be run manually.
#
# To install the dockcross helper, run the following commands:
# To create a dockcross helper script for the
# thewtex/cross-compiler-linux-armv7 image, run:
#
# docker run thewtex/cross-compiler-linux-armv7 > dockcross
# docker run --rm thewtex/cross-compiler-linux-armv7 > dockcross
# chmod +x dockcross
#
# You may then wish to move dockcross to somewhere in your path.
# You may then wish to move the dockcross script to somewhere in your path.
#
################################################################################

11
imagefiles/entrypoint.sh
View File

@ -4,8 +4,15 @@
# container at runtime.
if [[ $# == 0 ]]; then
# Presumably the image has been run directly, so help the user get started.
cat /dockcross/dockcross
# Presumably the image has been run directly, so help the user get
# started by outputting the dockcross script
if [[ -n $DEFAULT_DOCKCROSS_IMAGE ]]; then
head -n 2 /dockcross/dockcross
echo "DEFAULT_DOCKCROSS_IMAGE=$DEFAULT_DOCKCROSS_IMAGE"
tail -n +4 /dockcross/dockcross
else
cat /dockcross/dockcross
fi
exit 0
fi