github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix App tls has not been deployed error

Browse Source
This commit is contained in:
Justin Clark
2015-11-13 16:40:22 -08:00
parent 6af8811912
commit ef7d49bafc
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/00_dokku-standard/commands
View File

@@ -106,11 +106,11 @@ case "$1" in
;; ;;
ls) ls)
dokku_apps=$(ls -d $DOKKU_ROOT/*/ 2>/dev/null) || (dokku_log_fail "You haven't deployed any applications yet") installed_apps=$(dokku_apps)
dokku_col_log_info1_quiet "App Name" "Container Type" "Container Id" "Status" dokku_col_log_info1_quiet "App Name" "Container Type" "Container Id" "Status"
for dokku_app in $dokku_apps; do for dokku_app in $installed_apps; do
APP=$(basename $dokku_app) APP=$(basename $dokku_app)
DOKKU_APP_CIDS=$(get_app_container_ids $APP) DOKKU_APP_CIDS=$(get_app_container_ids $APP)
DOCKER_RUNNING_CONTAINERS=$(docker ps -q --no-trunc) DOCKER_RUNNING_CONTAINERS=$(docker ps -q --no-trunc)

5
plugins/common/functions
View File

@@ -9,6 +9,11 @@ has_tty() {
fi fi
} }
dokku_apps() {
local INSTALLED_APPS=$(find $DOKKU_ROOT -maxdepth 1 -mindepth 1 -type d ! -name 'tls' ! -name '.*' -printf "%f\n") || (dokku_log_fail "You haven't deployed any applications yet")
[[ $INSTALLED_APPS ]] && echo $INSTALLED_APPS
}
dokku_log_info1() { dokku_log_info1() {
echo "-----> $*" echo "-----> $*"
} }

22
plugins/ps/commands
View File

@@ -56,10 +56,8 @@ case "$1" in
ps:rebuildall) ps:rebuildall)
shopt -s nullglob shopt -s nullglob
for app in $DOKKU_ROOT/*; do for app in $(dokku_apps); do
[[ ! -d $app ]] && continue is_deployed $app && dokku ps:rebuild $app
APP=$(basename $app)
is_deployed $APP && dokku ps:rebuild $APP
done done
shopt -u nullglob shopt -u nullglob
;; ;;
@@ -76,23 +74,19 @@ case "$1" in
ps:restartall) ps:restartall)
shopt -s nullglob shopt -s nullglob
for app in $DOKKU_ROOT/*; do for app in $(dokku_apps); do
[[ ! -d $app ]] && continue dokku ps:restart $app
APP=$(basename $app)
dokku ps:restart $APP
done done
shopt -u nullglob shopt -u nullglob
;; ;;
ps:restore) ps:restore)
shopt -s nullglob shopt -s nullglob
for app in $DOKKU_ROOT/*; do for app in $(dokku_apps); do
[[ ! -d $app ]] && continue DOKKU_APP_RESTORE=$(dokku config:get $app DOKKU_APP_RESTORE || true)
APP=$(basename $app)
DOKKU_APP_RESTORE=$(dokku config:get $APP DOKKU_APP_RESTORE || true)
if [[ $DOKKU_APP_RESTORE != 0 ]]; then if [[ $DOKKU_APP_RESTORE != 0 ]]; then
echo "Restoring app $APP ..." echo "Restoring app $app ..."
dokku ps:start $APP dokku ps:start $app
fi fi
done done
shopt -u nullglob shopt -u nullglob