From a62f9146464291436ba9a4a2d732657722542cf9 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 1 Sep 2015 00:13:29 -0400 Subject: [PATCH] Remove the need for temp files --- plugins/00_dokku-standard/commands | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/plugins/00_dokku-standard/commands b/plugins/00_dokku-standard/commands index d2fd4736b..8816bb176 100755 --- a/plugins/00_dokku-standard/commands +++ b/plugins/00_dokku-standard/commands @@ -67,20 +67,12 @@ case "$1" in pluginhook pre-release-buildstep "$APP" pluginhook pre-release-buildpack "$APP" if [[ -n $(config_export global) ]]; then - mkdir -p "$DOKKU_ROOT/$APP/.dokku/tmp" - TMPFILE=$(mktemp $DOKKU_ROOT/$APP/.dokku/tmp/.XXXXXX) || dokku_log_fail "Cannot create temp file using mktemp in /tmp dir" - trap 'rm -rf "$TMPFILE" > /dev/null' INT TERM EXIT - config_export global > $TMPFILE - id=$(docker run -i -a stdin $IMAGE /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/00-global-env.sh" < "$TMPFILE") + id=$(config_export global | docker run -i -a stdin $IMAGE /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/00-global-env.sh") test "$(docker wait $id)" -eq 0 docker commit $id $IMAGE > /dev/null fi if [[ -n $(config_export app $APP) ]]; then - mkdir -p "$DOKKU_ROOT/$APP/.dokku/tmp" - TMPFILE=$(mktemp $DOKKU_ROOT/$APP/.dokku/tmp/XXXXXX) || dokku_log_fail "Cannot create temp file using mktemp in /tmp dir" - trap 'rm -rf "$TMPFILE" > /dev/null' INT TERM EXIT - config_export app $APP > $TMPFILE - id=$(docker run -i -a stdin $IMAGE /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/01-app-env.sh" < "$TMPFILE") + id=$(config_export app $APP | docker run -i -a stdin $IMAGE /bin/bash -c "mkdir -p /app/.profile.d && cat > /app/.profile.d/01-app-env.sh") test "$(docker wait $id)" -eq 0 docker commit $id $IMAGE > /dev/null fi