diff --git a/plugins/app-json/internal-functions b/plugins/app-json/internal-functions index dbb723b9b..72cee342c 100755 --- a/plugins/app-json/internal-functions +++ b/plugins/app-json/internal-functions @@ -8,7 +8,7 @@ source "$PLUGIN_AVAILABLE_PATH/ps/functions" get_phase_script() { declare desc="extracts app.json from app image and returns the appropriate json key/value" declare IMAGE_TAG="$1" PHASE_SCRIPT_KEY="$2" - local GET_PHASE_SCRIPT_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_get_phase_script.XXXX") + local GET_PHASE_SCRIPT_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${FUNCNAME[0]}.XXXX") local APP_JSON_FILE="$GET_PHASE_SCRIPT_TMP_WORK_DIR/app.json" trap "rm -rf '$GET_PHASE_SCRIPT_TMP_WORK_DIR' >/dev/null" RETURN INT TERM diff --git a/plugins/certs/subcommands/add b/plugins/certs/subcommands/add index cb24c69cc..03f43f950 100755 --- a/plugins/certs/subcommands/add +++ b/plugins/certs/subcommands/add @@ -42,7 +42,7 @@ certs_set() { # importing from file true elif is_tar_import; then - local CERTS_SET_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_certs_set.XXXX") + local CERTS_SET_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${FUNCNAME[0]}.XXXX") pushd "$CERTS_SET_TMP_WORK_DIR" &>/dev/null trap "popd &>/dev/null || true; rm -rf '$CERTS_SET_TMP_WORK_DIR' >/dev/null" RETURN tar xvf - <&0 diff --git a/plugins/certs/subcommands/generate b/plugins/certs/subcommands/generate index a35ef408f..7456481b1 100755 --- a/plugins/certs/subcommands/generate +++ b/plugins/certs/subcommands/generate @@ -13,7 +13,7 @@ certs_generate_cmd() { local APP_SSL_PATH="$DOKKU_ROOT/$APP/tls" if [[ ! -f "$APP_SSL_PATH/server.key" ]] && [[ ! -f "$APP_SSL_PATH/server.crt" ]]; then - local CERTS_GENERATE_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_certs.XXXXXXXXX") + local CERTS_GENERATE_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${FUNCNAME[0]}.XXXX") pushd "$CERTS_GENERATE_TMP_WORK_DIR" >/dev/null trap "popd &>/dev/null || true; rm -rf '$CERTS_GENERATE_TMP_WORK_DIR' >/dev/null" INT TERM EXIT diff --git a/plugins/common/functions b/plugins/common/functions index 94e167534..08d921071 100755 --- a/plugins/common/functions +++ b/plugins/common/functions @@ -1079,7 +1079,7 @@ release_advisory_lock() { suppress_output() { declare desc="suppress all output from a given command unless there is an error" local TMP_COMMAND_OUTPUT - TMP_COMMAND_OUTPUT=$(mktemp "/tmp/${FUNCNAME[0]}.XXXX") + TMP_COMMAND_OUTPUT=$(mktemp "/tmp/dokku-${FUNCNAME[0]}.XXXX") trap "rm -rf '$TMP_COMMAND_OUTPUT' >/dev/null" RETURN "$@" >"$TMP_COMMAND_OUTPUT" 2>&1 || { diff --git a/plugins/git/functions b/plugins/git/functions index b46971030..163e0f1bc 100755 --- a/plugins/git/functions +++ b/plugins/git/functions @@ -31,7 +31,7 @@ git_build_app_repo() { verify_app_name "$APP" # clean up after ourselves - local GIT_BUILD_APP_REPO_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_git.XXXX") + local GIT_BUILD_APP_REPO_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${FUNCNAME[0]}.XXXX") trap "rm -rf '$GIT_BUILD_APP_REPO_TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT local TMP_TAG="dokku/$REV" diff --git a/plugins/nginx-vhosts/functions b/plugins/nginx-vhosts/functions index 0c41d6093..6de04743f 100755 --- a/plugins/nginx-vhosts/functions +++ b/plugins/nginx-vhosts/functions @@ -300,8 +300,8 @@ nginx_build_config() { done local PROXY_UPSTREAM_PORTS="$(echo "$PROXY_UPSTREAM_PORTS" | xargs)" - local NGINX_BUILD_CONFIG_TMP_WORK_DIR=$(mktemp -d /tmp/dokku_nginx_template.XXXXX) - local NGINX_CONF=$(mktemp --tmpdir="${NGINX_BUILD_CONFIG_TMP_WORK_DIR}" "nginx.conf.XXXXXX") + local NGINX_BUILD_CONFIG_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${FUNCNAME[0]}.XXXX") + local NGINX_CONF=$(mktemp --tmpdir="${NGINX_BUILD_CONFIG_TMP_WORK_DIR}" "nginx.conf.XXXX") local CUSTOM_NGINX_TEMPLATE="$NGINX_BUILD_CONFIG_TMP_WORK_DIR/$NGINX_TEMPLATE_NAME" # shellcheck disable=SC2086 trap "rm -rf '$NGINX_CONF' '$NGINX_BUILD_CONFIG_TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT diff --git a/plugins/nginx-vhosts/internal-functions b/plugins/nginx-vhosts/internal-functions index ff4fa6e1a..587a2722f 100755 --- a/plugins/nginx-vhosts/internal-functions +++ b/plugins/nginx-vhosts/internal-functions @@ -27,7 +27,7 @@ nginx_vhosts_is_valid_nginx_config_func() { declare desc="checks if an app has a valid nginx config" declare APP="$1" local VALIDATE_TEMPLATE="$PLUGIN_AVAILABLE_PATH/nginx-vhosts/templates/validate.conf.sigil" - local TMP_OUTPUT=$(mktemp "/tmp/${FUNCNAME[0]}.XXXX") + local TMP_OUTPUT=$(mktemp "/tmp/dokku-${FUNCNAME[0]}.XXXX") trap "rm -rf '$TMP_OUTPUT' >/dev/null" RETURN INT TERM EXIT sigil -f "$VALIDATE_TEMPLATE" NGINX_CONF="$DOKKU_ROOT/$APP/nginx.conf" | cat -s >"$TMP_OUTPUT" diff --git a/plugins/ps/functions b/plugins/ps/functions index b7f4dacb3..627c2343c 100755 --- a/plugins/ps/functions +++ b/plugins/ps/functions @@ -71,7 +71,7 @@ generate_scale_file() { if [[ ! -f $DOKKU_SCALE_FILE ]]; then dokku_log_info1_quiet "DOKKU_SCALE file not found in app image. Generating one based on Procfile..." - local GENERATE_SCALE_FILE_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_scale.XXXX") + local GENERATE_SCALE_FILE_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${FUNCNAME[0]}.XXXX") trap "rm -rf '$GENERATE_SCALE_FILE_TMP_WORK_DIR' >/dev/null" RETURN if [[ -f $DOKKU_PROCFILE ]]; then diff --git a/plugins/scheduler-docker-local/check-deploy b/plugins/scheduler-docker-local/check-deploy index 41cb4fe10..721d9c0e6 100755 --- a/plugins/scheduler-docker-local/check-deploy +++ b/plugins/scheduler-docker-local/check-deploy @@ -84,7 +84,7 @@ scheduler-docker-local-check-deploy() { # docker cp exits with status 1 when run as non-root user when it tries to chown the file # after successfully copying the file. Thus, we suppress stderr. # ref: https://github.com/dotcloud/docker/issues/3986 - local CHECK_DEPLOY_TMP_WORK_DIR=$(mktemp -d /tmp/dokku_CHECKS.XXXXX) + local CHECK_DEPLOY_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${FUNCNAME[0]}.XXXX") docker cp "$DOKKU_APP_CONTAINER_ID:/app/CHECKS" "$CHECK_DEPLOY_TMP_WORK_DIR" 2>/dev/null || true local FILENAME=${CHECK_DEPLOY_TMP_WORK_DIR}/CHECKS diff --git a/plugins/scheduler-docker-local/scheduler-inspect b/plugins/scheduler-docker-local/scheduler-inspect index 4bfa05c13..1a4eb6719 100755 --- a/plugins/scheduler-docker-local/scheduler-inspect +++ b/plugins/scheduler-docker-local/scheduler-inspect @@ -13,7 +13,7 @@ scheduler-docker-local-scheduler-inspect() { return fi - local TMP_INSPECT_CMD=$(mktemp "/tmp/${FUNCNAME[0]}.XXXX") + local TMP_INSPECT_CMD=$(mktemp "/tmp/dokku-${FUNCNAME[0]}.XXXX") trap "rm -rf '$TMP_INSPECT_CMD' >/dev/null" RETURN INT TERM EXIT cat >"$TMP_INSPECT_CMD" </dev/null" RETURN INT TERM EXIT while read -r key; do diff --git a/plugins/ssh-keys/subcommands/add b/plugins/ssh-keys/subcommands/add index b533a611c..dd3ba7afc 100755 --- a/plugins/ssh-keys/subcommands/add +++ b/plugins/ssh-keys/subcommands/add @@ -10,7 +10,7 @@ add_keys() { [[ "$1" == "$cmd" ]] && shift 1 declare NAME="$1" KEY_FILE="$2" local TMP_KEY_FILE - TMP_KEY_FILE=$(mktemp "/tmp/${FUNCNAME[0]}.XXXX") + TMP_KEY_FILE=$(mktemp "/tmp/dokku-${FUNCNAME[0]}.XXXX") trap "rm -rf '$TMP_KEY_FILE' >/dev/null" RETURN INT TERM EXIT if [[ -n "$KEY_FILE" ]]; then diff --git a/plugins/tar/functions b/plugins/tar/functions index a38f46633..c399ecc52 100755 --- a/plugins/tar/functions +++ b/plugins/tar/functions @@ -11,7 +11,7 @@ tar_build() { shift 1 # clean up after ourselves - local TAR_BUILD_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku_tar.XXXX") + local TAR_BUILD_TMP_WORK_DIR=$(mktemp -d "/tmp/dokku-${FUNCNAME[0]}.XXXX") trap "rm -rf '$TAR_BUILD_TMP_WORK_DIR' >/dev/null" RETURN INT TERM EXIT # extract tar file