github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #4526 from dokku/4515-docker-options-parsing

Browse Source 
Do not cut off builder arguments that have a 'v-' substring
This commit is contained in:
Jose Diaz-Gonzalez
2021-03-30 22:53:39 -04:00
committed by GitHub
parent 7f38a80bb8 5a0823baed
commit c5c3b3928e
2 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/builder-dockerfile/builder-build
View File

@@ -29,7 +29,7 @@ trigger-builder-dockerfile-builder-build() {
DOCKER_ARGS+=$(: | plugn trigger docker-args-process-build "$APP" "$BUILDER_TYPE")
# strip --volume and -v args from DOCKER_ARGS
local DOCKER_ARGS=$(sed -e "s/--volume=[[:graph:]]\+[[:blank:]]\?//g" -e "s/-v[[:blank:]]\?[[:graph:]]\+[[:blank:]]\?//g" <<<"$DOCKER_ARGS")
local DOCKER_ARGS=$(sed -e "s/^--volume=[[:graph:]]\+[[:blank:]]\?//g" -e "s/^-v[[:blank:]]\?[[:graph:]]\+[[:blank:]]\?//g" <<<"$DOCKER_ARGS")
declare -a ARG_ARRAY
eval "ARG_ARRAY=($DOCKER_ARGS)"