From 754e3500bddbab4009f9c0122521179c01a6ebc3 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 16 May 2016 00:23:09 -0400 Subject: [PATCH] Remove remaining direct dokku calls --- functions | 50 ++++++++++++++++++++++++++++++++++++++++++++++ subcommands/clone | 4 ++-- subcommands/create | 21 +------------------ subcommands/export | 10 +--------- subcommands/import | 10 +--------- 5 files changed, 55 insertions(+), 40 deletions(-) diff --git a/functions b/functions index 6fb8a9c..62b8a64 100755 --- a/functions +++ b/functions @@ -38,6 +38,19 @@ service_alias() { echo "$SERVICE_NAME" | tr ._ - } +service_export() { + local SERVICE="$1" + local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE" + local SERVICE_NAME="$(get_service_name "$SERVICE")" + + [[ -n $SSH_TTY ]] && stty -opost + docker exec "$SERVICE_NAME" bash -c "echo SAVE | redis-cli" > /dev/null 2>&1 + docker exec "$SERVICE_NAME" cat /data/dump.rdb + status=$? + [[ -n $SSH_TTY ]] && stty opost + exit $status +} + service_info() { local SERVICE="$1" local SERVICE_URL=$(service_url "$SERVICE") @@ -45,6 +58,19 @@ service_info() { echo " DSN: $SERVICE_URL" } +service_import() { + local SERVICE="$1" + SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE" + SERVICE_NAME="$(get_service_name "$SERVICE")" + + if [[ -t 0 ]]; then + dokku_log_fail "No data provided on stdin." + fi + dokku "$PLUGIN_COMMAND_PREFIX:stop" "$SERVICE" > /dev/null 2>&1 + docker run --rm -i -v "$SERVICE_ROOT/data:/data" "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" bash -c "cat > /data/dump.rdb && chown redis: /data/dump.rdb" + dokku "$PLUGIN_COMMAND_PREFIX:start" "$SERVICE" > /dev/null 2>&1 +} + service_list() { local SERVICES=$(ls "$PLUGIN_DATA_ROOT" 2> /dev/null) if [[ -z $SERVICES ]]; then @@ -251,6 +277,30 @@ service_start() { fi } +service_create() { + local SERVICE="$1" + [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" + [[ ! -d "$PLUGIN_DATA_ROOT/$SERVICE" ]] || dokku_log_fail "$PLUGIN_SERVICE service $SERVICE already exists" + SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"; LINKS_FILE="$SERVICE_ROOT/LINKS" + + if ! docker images | grep -e "^$PLUGIN_IMAGE " | grep -q " $PLUGIN_IMAGE_VERSION " ; then + docker pull "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" || dokku_log_fail "$PLUGIN_SERVICE image $PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION pull failed" + fi + + mkdir -p "$SERVICE_ROOT" || dokku_log_fail "Unable to create service directory" + mkdir -p "$SERVICE_ROOT/data" || dokku_log_fail "Unable to create service data directory" + mkdir -p "$SERVICE_ROOT/config" || dokku_log_fail "Unable to create service config directory" + curl "https://raw.githubusercontent.com/antirez/redis/${REDIS_IMAGE_VERSION:0:3}/redis.conf" > "$SERVICE_ROOT/config/redis.conf" || dokku_log_fail "Unable to download the default redis.conf to the config directory" + touch "$LINKS_FILE" + + if [[ -n $REDIS_CUSTOM_ENV ]]; then + echo "$REDIS_CUSTOM_ENV" | tr ';' "\n" > "$SERVICE_ROOT/ENV" + else + echo "" > "$SERVICE_ROOT/ENV" + fi + service_create_container "$SERVICE" +} + service_create_container() { local SERVICE="$1" local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE" diff --git a/subcommands/clone b/subcommands/clone index 0d04403..af1fdcc 100755 --- a/subcommands/clone +++ b/subcommands/clone @@ -13,9 +13,9 @@ redis-clone-cmd() { [[ -z "$NEW_SERVICE" ]] && dokku_log_fail "Please specify a name for the new service" verify_service_name "$SERVICE" - dokku "$PLUGIN_COMMAND_PREFIX:create" "$NEW_SERVICE" + service_create "$NEW_SERVICE" dokku_log_info1 "Copying data from $SERVICE to $NEW_SERVICE" - dokku "$PLUGIN_COMMAND_PREFIX:export" "$SERVICE" | dokku "$PLUGIN_COMMAND_PREFIX:import" "$NEW_SERVICE" > /dev/null 2>&1 || true + service_export "$SERVICE" | service_import "$NEW_SERVICE" > /dev/null 2>&1 || true dokku_log_info1 "Done" } diff --git a/subcommands/create b/subcommands/create index 0d8b50f..1082e39 100755 --- a/subcommands/create +++ b/subcommands/create @@ -9,26 +9,7 @@ redis-create-cmd() { local cmd="$PLUGIN_COMMAND_PREFIX:create" argv=("$@"); [[ ${argv[0]} == "$cmd" ]] && shift 1 declare SERVICE="$1" - [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" - [[ ! -d "$PLUGIN_DATA_ROOT/$SERVICE" ]] || dokku_log_fail "$PLUGIN_SERVICE service $2 already exists" - SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"; LINKS_FILE="$SERVICE_ROOT/LINKS" - - if ! docker images | grep -e "^$PLUGIN_IMAGE " | grep -q " $PLUGIN_IMAGE_VERSION " ; then - docker pull "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" || dokku_log_fail "$PLUGIN_SERVICE image $PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION pull failed" - fi - - mkdir -p "$SERVICE_ROOT" || dokku_log_fail "Unable to create service directory" - mkdir -p "$SERVICE_ROOT/data" || dokku_log_fail "Unable to create service data directory" - mkdir -p "$SERVICE_ROOT/config" || dokku_log_fail "Unable to create service config directory" - curl "https://raw.githubusercontent.com/antirez/redis/${REDIS_IMAGE_VERSION:0:3}/redis.conf" > "$SERVICE_ROOT/config/redis.conf" || dokku_log_fail "Unable to download the default redis.conf to the config directory" - touch "$LINKS_FILE" - - if [[ -n $REDIS_CUSTOM_ENV ]]; then - echo "$REDIS_CUSTOM_ENV" | tr ';' "\n" > "$SERVICE_ROOT/ENV" - else - echo "" > "$SERVICE_ROOT/ENV" - fi - service_create_container "$SERVICE" + service_create "$SERVICE" } redis-create-cmd "$@" diff --git a/subcommands/export b/subcommands/export index bc6f70b..d3183b5 100755 --- a/subcommands/export +++ b/subcommands/export @@ -11,15 +11,7 @@ redis-export-cmd() { [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" verify_service_name "$SERVICE" - SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE" - SERVICE_NAME="$(get_service_name "$SERVICE")" - - [[ -n $SSH_TTY ]] && stty -opost - docker exec "$SERVICE_NAME" bash -c "echo SAVE | redis-cli" > /dev/null 2>&1 - docker exec "$SERVICE_NAME" cat /data/dump.rdb - status=$? - [[ -n $SSH_TTY ]] && stty opost - exit $status + service_export "$SERVICE" } redis-export-cmd "$@" diff --git a/subcommands/import b/subcommands/import index 4a28fc5..dad993f 100755 --- a/subcommands/import +++ b/subcommands/import @@ -11,15 +11,7 @@ redis-import-cmd() { [[ -z "$SERVICE" ]] && dokku_log_fail "Please specify a name for the service" verify_service_name "$SERVICE" - SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE" - SERVICE_NAME="$(get_service_name "$SERVICE")" - - if [[ -t 0 ]]; then - dokku_log_fail "No data provided on stdin." - fi - dokku "$PLUGIN_COMMAND_PREFIX:stop" "$SERVICE" > /dev/null 2>&1 - docker run --rm -i -v "$SERVICE_ROOT/data:/data" "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION" bash -c "cat > /data/dump.rdb && chown redis: /data/dump.rdb" - dokku "$PLUGIN_COMMAND_PREFIX:start" "$SERVICE" > /dev/null 2>&1 + service_import "$SERVICE" } redis-import-cmd "$@"