From 920c4d50113e76c94f3864a04d8fc1a3804af51b Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Thu, 14 Jul 2016 14:24:44 -0700 Subject: [PATCH] use default privileged user in herokuish-0.3.17 --- deb.mk | 4 ++-- dokku | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deb.mk b/deb.mk index 04d767d94..47b63ee48 100644 --- a/deb.mk +++ b/deb.mk @@ -1,6 +1,6 @@ HEROKUISH_DESCRIPTION = 'Herokuish uses Docker and Buildpacks to build applications like Heroku' HEROKUISH_REPO_NAME ?= gliderlabs/herokuish -HEROKUISH_VERSION ?= 0.3.14 +HEROKUISH_VERSION ?= 0.3.17 HEROKUISH_ARCHITECTURE = amd64 HEROKUISH_PACKAGE_NAME = herokuish_$(HEROKUISH_VERSION)_$(HEROKUISH_ARCHITECTURE).deb @@ -95,7 +95,7 @@ deb-herokuish: @echo "sudo docker build -t gliderlabs/herokuish /var/lib/herokuish 1> /dev/null" >> /tmp/tmp/post-install @echo "-> Cloning repository" - git clone -q "https://github.com/$(HEROKUISH_REPO_NAME).git" /tmp/tmp/herokuish > /dev/null + git clone -q "https://github.com/$(HEROKUISH_REPO_NAME).git" --branch release /tmp/tmp/herokuish > /dev/null rm -rf /tmp/tmp/herokuish/.git /tmp/tmp/herokuish/.gitignore @echo "-> Copying files into place" diff --git a/dokku b/dokku index 4238b4f10..8a91f11c2 100755 --- a/dokku +++ b/dokku @@ -37,7 +37,7 @@ export DOKKU_LOGS_DIR=${DOKKU_LOGS_DIR:="/var/log/dokku"} export DOKKU_EVENTS_LOGFILE=${DOKKU_EVENTS_LOGFILE:="$DOKKU_LOGS_DIR/events.log"} export DOKKU_CONTAINER_LABEL=dokku -export DOKKU_GLOBAL_RUN_ARGS="--label=$DOKKU_CONTAINER_LABEL" +export DOKKU_GLOBAL_RUN_ARGS="--label=$DOKKU_CONTAINER_LABEL --env=USER=herokuishuser" source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"