Merge pull request #925 from progrium/mh-ps-rebuild
implement rebuild command that reuses git_archive_all
This commit is contained in:
@@ -18,9 +18,8 @@ dependencies:
|
|||||||
- sudo -E make -e setup-deploy-tests
|
- sudo -E make -e setup-deploy-tests
|
||||||
post:
|
post:
|
||||||
- sudo -E make -e lint
|
- sudo -E make -e lint
|
||||||
test:
|
|
||||||
pre:
|
|
||||||
- sudo -E make -e unit-tests
|
- sudo -E make -e unit-tests
|
||||||
|
test:
|
||||||
override:
|
override:
|
||||||
### deploy tests (against buildstep release) ####
|
### deploy tests (against buildstep release) ####
|
||||||
- sudo -E make -e deploy-tests: { timeout: 1800 }
|
- sudo -E make -e deploy-tests: { timeout: 1800 }
|
||||||
|
|||||||
@@ -6,14 +6,13 @@ 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 -q $DOKKU_ROOT/$APP $TMP_WORK_DIR &> /dev/null
|
|
||||||
pushd $TMP_WORK_DIR > /dev/null
|
pushd $TMP_WORK_DIR > /dev/null
|
||||||
|
git clone -q $DOKKU_ROOT/$APP $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
|
||||||
git submodule update --init --recursive &> /dev/null
|
git submodule update --init --recursive &> /dev/null
|
||||||
find -name .git -prune -exec rm -rf {} \; > /dev/null
|
find -name .git -prune -exec rm -rf {} \; > /dev/null
|
||||||
tar c .
|
tar c .
|
||||||
popd > /dev/null
|
|
||||||
rm -rf $TMP_WORK_DIR > /dev/null
|
rm -rf $TMP_WORK_DIR > /dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -26,7 +25,7 @@ case "$1" in
|
|||||||
# Only run this script for the master branch. You can remove this
|
# Only run this script for the master branch. You can remove this
|
||||||
# if block if you wish to run it for others as well.
|
# if block if you wish to run it for others as well.
|
||||||
if [[ $refname = "refs/heads/master" ]] ; then
|
if [[ $refname = "refs/heads/master" ]] ; then
|
||||||
git_archive_all $APP $newrev | dokku receive $APP | sed -u "s/^/"$'\e[1G'"/"
|
dokku git-build $APP $newrev
|
||||||
else
|
else
|
||||||
echo $'\e[1G\e[K'"-----> WARNING: deploy did not complete, you must push to master."
|
echo $'\e[1G\e[K'"-----> WARNING: deploy did not complete, you must push to master."
|
||||||
echo $'\e[1G\e[K'"-----> for example, try 'git push <dokku> ${refname/refs\/heads\/}:master'"
|
echo $'\e[1G\e[K'"-----> for example, try 'git push <dokku> ${refname/refs\/heads\/}:master'"
|
||||||
@@ -41,6 +40,25 @@ case "$1" in
|
|||||||
pluginhook git-post-pull $APP
|
pluginhook git-post-pull $APP
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
git-build)
|
||||||
|
APP="$2"; APP_BUILD_LOCK="$DOKKU_ROOT/$APP/.build.lock"
|
||||||
|
APP_BUILD_LOCK_MSG="$APP is currently being deployed or locked. Waiting..."
|
||||||
|
[[ $(flock -n "$APP_BUILD_LOCK" true &>/dev/null ; echo $?) -ne 0 ]] && echo "$APP_BUILD_LOCK_MSG"
|
||||||
|
|
||||||
|
shift 1
|
||||||
|
flock -o "$APP_BUILD_LOCK" dokku git-build-locked "$@"
|
||||||
|
;;
|
||||||
|
|
||||||
|
git-build-locked)
|
||||||
|
APP="$2"
|
||||||
|
if [[ $# -ge 3 ]];then
|
||||||
|
REF="$3"
|
||||||
|
else
|
||||||
|
REF=$(< "$DOKKU_ROOT/$APP/refs/heads/master")
|
||||||
|
fi
|
||||||
|
git_archive_all $APP $REF | dokku receive $APP | sed -u "s/^/"$'\e[1G'"/"
|
||||||
|
;;
|
||||||
|
|
||||||
git-*)
|
git-*)
|
||||||
APP="$(echo $2 | perl -pe 's/(?<!\\)'\''//g' | sed 's/\\'\''/'\''/g')"
|
APP="$(echo $2 | perl -pe 's/(?<!\\)'\''//g' | sed 's/\\'\''/'\''/g')"
|
||||||
APP_PATH=$DOKKU_ROOT/$APP
|
APP_PATH=$DOKKU_ROOT/$APP
|
||||||
|
|||||||
@@ -56,6 +56,22 @@ case "$1" in
|
|||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
ps:rebuild)
|
||||||
|
[[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
|
||||||
|
[[ ! -d "$DOKKU_ROOT/$2" ]] && echo "App $2 does not exist" && exit 1
|
||||||
|
APP="$2"
|
||||||
|
|
||||||
|
dokku git-build $APP
|
||||||
|
;;
|
||||||
|
|
||||||
|
ps:rebuildall)
|
||||||
|
shopt -s nullglob
|
||||||
|
for app in $DOKKU_ROOT/*/CONTAINER; do
|
||||||
|
APP=$(basename "$(dirname $app)");
|
||||||
|
dokku ps:rebuild $APP
|
||||||
|
done
|
||||||
|
;;
|
||||||
|
|
||||||
ps:restart)
|
ps:restart)
|
||||||
[[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
|
[[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
|
||||||
[[ ! -d "$DOKKU_ROOT/$2" ]] && echo "App $2 does not exist" && exit 1
|
[[ ! -d "$DOKKU_ROOT/$2" ]] && echo "App $2 does not exist" && exit 1
|
||||||
@@ -79,6 +95,8 @@ case "$1" in
|
|||||||
ps <app> List processes running in app container(s)
|
ps <app> List processes running in app container(s)
|
||||||
ps:start <app> Start app container(s)
|
ps:start <app> Start app container(s)
|
||||||
ps:stop <app> Stop app container(s)
|
ps:stop <app> Stop app container(s)
|
||||||
|
ps:rebuild <app> Rebuild an app
|
||||||
|
ps:rebuildall Rebuild all apps
|
||||||
ps:restart <app> Restart app container(s)
|
ps:restart <app> Restart app container(s)
|
||||||
ps:restartall Restart all deployed app containers
|
ps:restartall Restart all deployed app containers
|
||||||
EOF
|
EOF
|
||||||
|
|||||||
@@ -57,3 +57,14 @@ teardown() {
|
|||||||
echo "status: "$status
|
echo "status: "$status
|
||||||
assert_success
|
assert_success
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@test "ps:rebuild" {
|
||||||
|
run bash -c "dokku ps:rebuild $TEST_APP"
|
||||||
|
echo "output: "$output
|
||||||
|
echo "status: "$status
|
||||||
|
assert_success
|
||||||
|
run bash -c "docker ps -q --no-trunc | grep -q $(< $DOKKU_ROOT/$TEST_APP/CONTAINER)"
|
||||||
|
echo "output: "$output
|
||||||
|
echo "status: "$status
|
||||||
|
assert_success
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user