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

Update functions

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2018-04-10 14:12:10 -04:00
committed by GitHub
parent 9b72c93a57
commit 9c5cb7d0f0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/common/functions
View File

@@ -434,7 +434,7 @@ dokku_build() {
verify_app_name "$APP" verify_app_name "$APP"
local DOKKU_APP_CACHE_DIR="$DOKKU_ROOT/$APP/cache" local DOKKU_APP_CACHE_DIR="$DOKKU_ROOT/$APP/cache"
local DOKKU_APP_CACHE_DIR_ON_HOST="$DOKKU_ROOT_ON_HOST/$APP/cache" local DOKKU_APP_HOST_CACHE_DIR="$DOKKU_HOST_ROOT/$APP/cache"
eval "$(config_export app "$APP")" eval "$(config_export app "$APP")"
pushd "$TMP_WORK_DIR" &> /dev/null pushd "$TMP_WORK_DIR" &> /dev/null
@@ -453,7 +453,7 @@ dokku_build() {
declare -a ARG_ARRAY declare -a ARG_ARRAY
eval "ARG_ARRAY=($DOCKER_ARGS)" eval "ARG_ARRAY=($DOCKER_ARGS)"
# shellcheck disable=SC2086 # shellcheck disable=SC2086
cid=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d -v $DOKKU_APP_CACHE_DIR_ON_HOST:/cache -e CACHE_PATH=/cache "${ARG_ARRAY[@]}" $IMAGE /build) cid=$(docker run $DOKKU_GLOBAL_RUN_ARGS -d -v $DOKKU_APP_HOST_CACHE_DIR:/cache -e CACHE_PATH=/cache "${ARG_ARRAY[@]}" $IMAGE /build)
docker attach "$cid" docker attach "$cid"
test "$(docker wait "$cid")" -eq 0 test "$(docker wait "$cid")" -eq 0
docker commit "$cid" "$IMAGE" > /dev/null docker commit "$cid" "$IMAGE" > /dev/null