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

Move alias, link, unlink and logs commands into functions

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2015-08-29 03:19:44 -04:00
parent 46e4f6f4c8
commit 5a4a87c62f
2 changed files with 61 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
commands
View File

@@ -21,11 +21,7 @@ case "$1" in
[[ -z $2 ]] && dokku_log_fail "Please specify a name for the service" [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
[[ -z $3 ]] && dokku_log_fail "Please specify an alias for the service" [[ -z $3 ]] && dokku_log_fail "Please specify an alias for the service"
verify_service_name "$2" verify_service_name "$2"
SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"; ALIAS_FILE="$SERVICE_ROOT/ALIAS" service_set_alias "$2" "$3"
mkdir -p "$SERVICE_ROOT" || dokku_log_fail "Unable to create service directory"
touch "$ALIAS_FILE"
echo "$3" > "$ALIAS_FILE"
;; ;;
$PLUGIN_COMMAND_PREFIX:create) $PLUGIN_COMMAND_PREFIX:create)
@@ -110,15 +106,7 @@ case "$1" in
[[ -z $3 ]] && dokku_log_fail "Please specify an app to run the command on" [[ -z $3 ]] && dokku_log_fail "Please specify an app to run the command on"
verify_app_name "$3" verify_app_name "$3"
verify_service_name "$2" verify_service_name "$2"
APP="$3"; SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"; LINKS_FILE="$SERVICE_ROOT/LINKS" service_link "$2" "$3"
mkdir -p "$SERVICE_ROOT" || dokku_log_fail "Unable to create service directory"
touch "$LINKS_FILE"
echo "$APP" >> "$LINKS_FILE"
sort "$LINKS_FILE" -u -o "$LINKS_FILE"
dokku_log_info1 "Restarting app $APP"
dokku ps:restart "$APP"
;; ;;
$PLUGIN_COMMAND_PREFIX:unlink) $PLUGIN_COMMAND_PREFIX:unlink)
@@ -126,15 +114,7 @@ case "$1" in
[[ -z $3 ]] && dokku_log_fail "Please specify an app to run the command on" [[ -z $3 ]] && dokku_log_fail "Please specify an app to run the command on"
verify_app_name "$3" verify_app_name "$3"
verify_service_name "$2" verify_service_name "$2"
APP="$3"; SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"; LINKS_FILE="$SERVICE_ROOT/LINKS" service_unlink "$2" "$3"
mkdir -p "$SERVICE_ROOT" || dokku_log_fail "Unable to create service directory"
touch "$LINKS_FILE"
sed -i "/^$3\$/d" "$LINKS_FILE"
sort "$LINKS_FILE" -u -o "$LINKS_FILE"
dokku_log_info1 "Restarting app $APP"
dokku ps:restart "$APP"
;; ;;
$PLUGIN_COMMAND_PREFIX:export) $PLUGIN_COMMAND_PREFIX:export)
@@ -159,17 +139,7 @@ case "$1" in
$PLUGIN_COMMAND_PREFIX:logs) $PLUGIN_COMMAND_PREFIX:logs)
[[ -z $2 ]] && dokku_log_fail "Please specify a name for the service" [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
verify_service_name "$2" verify_service_name "$2"
SERVICE="$2"; SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE" service_logs "$2" "$3"
ID=$(cat "$SERVICE_ROOT/ID")
if [[ $3 == "-t" ]]; then
DOKKU_LOGS_ARGS="--follow"
else
DOKKU_LOGS_ARGS="--tail 100"
fi
docker logs $DOKKU_LOGS_ARGS "$ID"
;; ;;
$PLUGIN_COMMAND_PREFIX:restart) $PLUGIN_COMMAND_PREFIX:restart)

60
functions
View File

@@ -41,7 +41,7 @@ service_alias() {
} }
service_info() { service_info() {
local SERVICE="$1"; local SERVICE="$1"
local SERVICE_URL=$(service_url "$SERVICE") local SERVICE_URL=$(service_url "$SERVICE")
echo " DSN: $SERVICE_URL" echo " DSN: $SERVICE_URL"
@@ -59,8 +59,47 @@ service_list() {
fi fi
} }
service_link() {
local APP="$2"
local SERVICE="$1"
local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
local LINKS_FILE="$SERVICE_ROOT/LINKS"
mkdir -p "$SERVICE_ROOT" || dokku_log_fail "Unable to create service directory"
touch "$LINKS_FILE"
echo "$APP" >> "$LINKS_FILE"
sort "$LINKS_FILE" -u -o "$LINKS_FILE"
dokku_log_info1 "Restarting app $APP"
dokku ps:restart "$APP"
}
service_logs() {
local SERVICE="$1"
local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
local ID=$(cat "$SERVICE_ROOT/ID")
if [[ $2 == "-t" ]]; then
DOKKU_LOGS_ARGS="--follow"
else
DOKKU_LOGS_ARGS="--tail 100"
fi
docker logs $DOKKU_LOGS_ARGS "$ID"
}
service_set_alias() {
local SERVICE="$1"
local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
local ALIAS_FILE="$SERVICE_ROOT/ALIAS"
mkdir -p "$SERVICE_ROOT" || dokku_log_fail "Unable to create service directory"
touch "$ALIAS_FILE"
echo "$2" > "$ALIAS_FILE"
}
service_status() { service_status() {
local SERVICE="$1"; local SERVICE="$1"
local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE" local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
local ID="$(cat "$SERVICE_ROOT/ID")" local ID="$(cat "$SERVICE_ROOT/ID")"
@@ -72,8 +111,23 @@ service_status() {
echo "(stopped)" && return 0 echo "(stopped)" && return 0
} }
service_unlink() {
local APP="$2"
local SERVICE="$1"
local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
local LINKS_FILE="$SERVICE_ROOT/LINKS"
mkdir -p "$SERVICE_ROOT" || dokku_log_fail "Unable to create service directory"
touch "$LINKS_FILE"
sed -i "/^$APP\$/d" "$LINKS_FILE"
sort "$LINKS_FILE" -u -o "$LINKS_FILE"
dokku_log_info1 "Restarting app $APP"
dokku ps:restart "$APP"
}
service_url() { service_url() {
local SERVICE="$1"; local SERVICE="$1"
local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE" local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
local ID="$(cat "$SERVICE_ROOT/ID")" local ID="$(cat "$SERVICE_ROOT/ID")"