Merge pull request #722 from wrboyce-git-pull
This commit is contained in:
7
dokku
7
dokku
@@ -38,6 +38,13 @@ case "$1" in
|
|||||||
echo
|
echo
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
git-upload-pack)
|
||||||
|
APP=${2//"'"/} # strip single quotes from the app name: 'app_name' -> app_name
|
||||||
|
pluginhook pre-pull $APP
|
||||||
|
cat | git-upload-pack "$DOKKU_ROOT/$APP"
|
||||||
|
pluginhook post-pull $APP
|
||||||
|
;;
|
||||||
|
|
||||||
build)
|
build)
|
||||||
APP="$2"; IMAGE="dokku/$APP"; CACHE_DIR="$DOKKU_ROOT/$APP/cache"
|
APP="$2"; IMAGE="dokku/$APP"; CACHE_DIR="$DOKKU_ROOT/$APP/cache"
|
||||||
id=$(cat | docker run -i -a stdin $DOKKU_DISTRO /bin/bash -c "mkdir -p /app && tar -xC /app")
|
id=$(cat | docker run -i -a stdin $DOKKU_DISTRO /bin/bash -c "mkdir -p /app && tar -xC /app")
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ git_archive_all() {
|
|||||||
TMP_WORK_DIR=$(mktemp -d)
|
TMP_WORK_DIR=$(mktemp -d)
|
||||||
chmod 755 $TMP_WORK_DIR
|
chmod 755 $TMP_WORK_DIR
|
||||||
unset GIT_DIR GIT_WORK_TREE
|
unset GIT_DIR GIT_WORK_TREE
|
||||||
git clone $DOKKU_ROOT/$APP $TMP_WORK_DIR &> /dev/null
|
git clone -q $DOKKU_ROOT/$APP $TMP_WORK_DIR &> /dev/null
|
||||||
pushd $TMP_WORK_DIR > /dev/null
|
pushd $TMP_WORK_DIR > /dev/null
|
||||||
git config advice.detachedHead false
|
git config advice.detachedHead false
|
||||||
git checkout $REV &> /dev/null
|
git checkout $REV &> /dev/null
|
||||||
|
|||||||
Reference in New Issue
Block a user