filter incompatible docker option when building dockerfile vs herokuish apps. closes #1609

This commit is contained in:
Michael Hobbs
2015-11-24 11:13:50 -08:00
parent f188e6ff3d
commit 2c34a60a8d
4 changed files with 45 additions and 5 deletions

View File

@@ -2,7 +2,7 @@
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
STDIN=$(cat)
APP="$1"
APP="$1"; IMAGE_SOURCE_TYPE="$2"
case "$0" in
*docker-args-build)
@@ -34,7 +34,35 @@ if [[ -f "$PHASE_FILE_PATH" ]]; then
continue
;;
*)
output="$output $line"
case "$IMAGE_SOURCE_TYPE" in
dockerfile)
case "$line" in
--link*|-v*)
continue
;;
*)
output="$output $line"
;;
esac
;;
herokuish)
case "$line" in
--file*|--build-args*)
continue
;;
*)
output="$output $line"
;;
esac
;;
*)
output="$output $line"
;;
esac
;;
esac
done < $PHASE_FILE_PATH