diff --git a/CHANGELOG.md b/CHANGELOG.md index 262a177..527053d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,10 @@ - Add built-in documentation using `abra help ...`, see ([#50](https://git.autonomic.zone/coop-cloud/abra/issues/50)) - `version` subcommand ([e6b24fe](https://git.autonomic.zone/coop-cloud/abra/commit/e6b24fe)) - Use `# length=x` comments to generate passwords with `pwgen` and drop `KEY`/`PASSWORD` logic ([#68](https://git.autonomic.zone/coop-cloud/abra/issues/68)) +- Global `--skip-update` / `--skip-check` options to make things quicker, + [37e8b00](https://git.autonomic.zone/coop-cloud/abra/commit/37e8b00) +- `app backup` and `app restore` commands; requires per-app definition -- see + [#70](https://git.autonomic.zone/coop-cloud/abra/issues/70) # abra 0.4.1 (2020-12-24) diff --git a/abra b/abra index 17916c3..030fd77 100755 --- a/abra +++ b/abra @@ -12,20 +12,23 @@ DOC=" The cooperative cloud utility belt 🎩🐇 Usage: - abra [options] app new [--server=] [--domain=] [--app-name=] [--pass] [--secrets] abra [options] app (list|ls) [--status] [--server=] - abra [options] app deploy [--skip-check] - abra [options] app undeploy - abra [options] app config - abra [options] app (delete|rm) [--force] - abra [options] app logs [] - abra [options] app cp + abra [options] app new [--server=] [--domain=] [--app-name=] [--pass] [--secrets] + abra [options] app backup (|--all) + abra [options] app deploy abra [options] app check + abra [options] app config + abra [options] app cp + abra [options] app logs [] abra [options] app ps + abra [options] app restore (|--all) + abra [options] app (rm|delete) [--force] + abra [options] app restore [] abra [options] app run [--no-tty] [--user=] ... abra [options] app secret generate ( |--all) [] [--pass] abra [options] app secret insert [--pass] - abra [options] app secret (delete|rm) (|--all) [--pass] [--force] + abra [options] app secret (rm|delete) (|--all) [--pass] [--force] + abra [options] app undeploy abra [options] app [...] abra [options] server add [] [] abra [options] server (list|ls) @@ -40,6 +43,8 @@ Options: -e, --env= Environment variables to load -h, --help Show this message and exit -s, --stack= Name of the target stack + -C, --skip-check Don't verify app variables + -U, --skip-update Don't pull latest app definitions See 'abra help ...' to read about a specific subcommand. " @@ -143,98 +148,107 @@ eval "var_$1+=($value)"; else eval "var_$1=$value"; fi; return 0; fi; done return 1; }; stdout() { printf -- "cat <<'EOM'\n%s\nEOM\n" "$1"; }; stderr() { printf -- "cat <<'EOM' >&2\n%s\nEOM\n" "$1"; }; error() { [[ -n $1 ]] && stderr "$1"; stderr "$usage"; _return 1; }; _return() { -printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:1440} -usage=${DOC:40:1169}; digest=3ce63 -shorts=(-h -s -e '' '' '' '' '' '' '' '' '' '' '') -longs=(--help --stack --env --server --domain --app-name --pass --secrets --status --skip-check --force --no-tty --user --all) -argcounts=(0 1 1 1 1 1 0 0 0 0 0 0 1 0); node_0(){ switch __help 0; }; node_1(){ -value __stack 1; }; node_2(){ value __env 2; }; node_3(){ value __server 3; } -node_4(){ value __domain 4; }; node_5(){ value __app_name 5; }; node_6(){ -switch __pass 6; }; node_7(){ switch __secrets 7; }; node_8(){ switch __status 8 -}; node_9(){ switch __skip_check 9; }; node_10(){ switch __force 10; } -node_11(){ switch __no_tty 11; }; node_12(){ value __user 12; }; node_13(){ -switch __all 13; }; node_14(){ value _type_ a; }; node_15(){ value _app_ a; } -node_16(){ value _service_ a; }; node_17(){ value _src_ a; }; node_18(){ -value _dst_ a; }; node_19(){ value _args_ a true; }; node_20(){ value _secret_ a -}; node_21(){ value _version_ a; }; node_22(){ value _cmd_ a; }; node_23(){ -value _data_ a; }; node_24(){ value _command_ a; }; node_25(){ value _host_ a; } -node_26(){ value _user_ a; }; node_27(){ value _port_ a; }; node_28(){ -value _subcommands_ a true; }; node_29(){ _command app; }; node_30(){ -_command new; }; node_31(){ _command list; }; node_32(){ _command ls; } -node_33(){ _command deploy; }; node_34(){ _command undeploy; }; node_35(){ -_command config; }; node_36(){ _command delete; }; node_37(){ _command rm; } -node_38(){ _command logs; }; node_39(){ _command cp; }; node_40(){ -_command check; }; node_41(){ _command ps; }; node_42(){ _command run; } -node_43(){ _command secret; }; node_44(){ _command generate; }; node_45(){ -_command insert; }; node_46(){ _command server; }; node_47(){ _command add; } -node_48(){ _command init; }; node_49(){ _command apps; }; node_50(){ -_command upgrade; }; node_51(){ _command version; }; node_52(){ _command help; } -node_53(){ optional 0 1 2; }; node_54(){ optional 53; }; node_55(){ optional 3 -}; node_56(){ optional 4; }; node_57(){ optional 5; }; node_58(){ optional 6; } -node_59(){ optional 7; }; node_60(){ required 54 29 30 55 56 57 58 59 14; } -node_61(){ either 31 32; }; node_62(){ required 61; }; node_63(){ optional 8; } -node_64(){ required 54 29 62 63 55; }; node_65(){ optional 9; }; node_66(){ -required 54 29 15 33 65; }; node_67(){ required 54 29 15 34; }; node_68(){ -required 54 29 15 35; }; node_69(){ either 36 37; }; node_70(){ required 69; } -node_71(){ optional 10; }; node_72(){ required 54 29 15 70 71; }; node_73(){ -optional 16; }; node_74(){ required 54 29 15 38 73; }; node_75(){ -required 54 29 15 39 17 18; }; node_76(){ required 54 29 15 40; }; node_77(){ -required 54 29 15 41; }; node_78(){ optional 11; }; node_79(){ optional 12; } -node_80(){ oneormore 19; }; node_81(){ required 54 29 15 42 78 79 16 80; } -node_82(){ required 20 21; }; node_83(){ either 82 13; }; node_84(){ required 83 -}; node_85(){ optional 22; }; node_86(){ required 54 29 15 43 44 84 85 58; } -node_87(){ required 54 29 15 43 45 20 21 23 58; }; node_88(){ either 20 13; } -node_89(){ required 88; }; node_90(){ required 54 29 15 43 70 89 58 71; } -node_91(){ optional 80; }; node_92(){ required 54 29 15 24 91; }; node_93(){ -optional 26; }; node_94(){ optional 27; }; node_95(){ required 54 46 47 25 93 94 -}; node_96(){ required 54 46 62; }; node_97(){ required 54 46 25 37; } -node_98(){ required 54 46 25 48; }; node_99(){ required 54 46 25 49 63; } -node_100(){ required 54 50; }; node_101(){ required 54 51; }; node_102(){ -oneormore 28; }; node_103(){ optional 102; }; node_104(){ required 54 52 103; } -node_105(){ -either 60 64 66 67 68 72 74 75 76 77 81 86 87 90 92 95 96 97 98 99 100 101 104 -}; node_106(){ required 105; }; cat <<<' docopt_exit() { -[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1169}" >&2 -exit 1; }'; unset var___help var___stack var___env var___server var___domain \ -var___app_name var___pass var___secrets var___status var___skip_check \ -var___force var___no_tty var___user var___all var__type_ var__app_ \ -var__service_ var__src_ var__dst_ var__args_ var__secret_ var__version_ \ -var__cmd_ var__data_ var__command_ var__host_ var__user_ var__port_ \ -var__subcommands_ var_app var_new var_list var_ls var_deploy var_undeploy \ -var_config var_delete var_rm var_logs var_cp var_check var_ps var_run \ -var_secret var_generate var_insert var_server var_add var_init var_apps \ -var_upgrade var_version var_help; parse 106 "$@" -local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__help" "${prefix}__stack" \ -"${prefix}__env" "${prefix}__server" "${prefix}__domain" "${prefix}__app_name" \ -"${prefix}__pass" "${prefix}__secrets" "${prefix}__status" \ -"${prefix}__skip_check" "${prefix}__force" "${prefix}__no_tty" \ -"${prefix}__user" "${prefix}__all" "${prefix}_type_" "${prefix}_app_" \ -"${prefix}_service_" "${prefix}_src_" "${prefix}_dst_" "${prefix}_args_" \ -"${prefix}_secret_" "${prefix}_version_" "${prefix}_cmd_" "${prefix}_data_" \ -"${prefix}_command_" "${prefix}_host_" "${prefix}_user_" "${prefix}_port_" \ -"${prefix}_subcommands_" "${prefix}app" "${prefix}new" "${prefix}list" \ -"${prefix}ls" "${prefix}deploy" "${prefix}undeploy" "${prefix}config" \ -"${prefix}delete" "${prefix}rm" "${prefix}logs" "${prefix}cp" "${prefix}check" \ -"${prefix}ps" "${prefix}run" "${prefix}secret" "${prefix}generate" \ -"${prefix}insert" "${prefix}server" "${prefix}add" "${prefix}init" \ -"${prefix}apps" "${prefix}upgrade" "${prefix}version" "${prefix}help" -eval "${prefix}"'__help=${var___help:-false}' +printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:1696} +usage=${DOC:40:1320}; digest=563d5 +shorts=(-h -s -e -U -C '' '' '' '' '' '' '' '' '' '') +longs=(--help --stack --env --skip-update --skip-check --status --server --domain --app-name --pass --secrets --all --force --no-tty --user) +argcounts=(0 1 1 0 0 0 1 1 1 0 0 0 0 0 1); node_0(){ switch __help 0; } +node_1(){ value __stack 1; }; node_2(){ value __env 2; }; node_3(){ +switch __skip_update 3; }; node_4(){ switch __skip_check 4; }; node_5(){ +switch __status 5; }; node_6(){ value __server 6; }; node_7(){ value __domain 7 +}; node_8(){ value __app_name 8; }; node_9(){ switch __pass 9; }; node_10(){ +switch __secrets 10; }; node_11(){ switch __all 11; }; node_12(){ +switch __force 12; }; node_13(){ switch __no_tty 13; }; node_14(){ +value __user 14; }; node_15(){ value _type_ a; }; node_16(){ value _app_ a; } +node_17(){ value _service_ a; }; node_18(){ value _src_ a; }; node_19(){ +value _dst_ a; }; node_20(){ value _backup_file_ a; }; node_21(){ +value _args_ a true; }; node_22(){ value _secret_ a; }; node_23(){ +value _version_ a; }; node_24(){ value _cmd_ a; }; node_25(){ value _data_ a; } +node_26(){ value _command_ a; }; node_27(){ value _host_ a; }; node_28(){ +value _user_ a; }; node_29(){ value _port_ a; }; node_30(){ +value _subcommands_ a true; }; node_31(){ _command app; }; node_32(){ +_command list; }; node_33(){ _command ls; }; node_34(){ _command new; } +node_35(){ _command backup; }; node_36(){ _command deploy; }; node_37(){ +_command check; }; node_38(){ _command config; }; node_39(){ _command cp; } +node_40(){ _command logs; }; node_41(){ _command ps; }; node_42(){ +_command restore; }; node_43(){ _command rm; }; node_44(){ _command delete; } +node_45(){ _command run; }; node_46(){ _command secret; }; node_47(){ +_command generate; }; node_48(){ _command insert; }; node_49(){ +_command undeploy; }; node_50(){ _command server; }; node_51(){ _command add; } +node_52(){ _command init; }; node_53(){ _command apps; }; node_54(){ +_command upgrade; }; node_55(){ _command version; }; node_56(){ _command help; } +node_57(){ optional 0 1 2 3 4; }; node_58(){ optional 57; }; node_59(){ +either 32 33; }; node_60(){ required 59; }; node_61(){ optional 5; }; node_62(){ +optional 6; }; node_63(){ required 58 31 60 61 62; }; node_64(){ optional 7; } +node_65(){ optional 8; }; node_66(){ optional 9; }; node_67(){ optional 10; } +node_68(){ required 58 31 34 62 64 65 66 67 15; }; node_69(){ either 17 11; } +node_70(){ required 69; }; node_71(){ required 58 31 16 35 70; }; node_72(){ +required 58 31 16 36; }; node_73(){ required 58 31 16 37; }; node_74(){ +required 58 31 16 38; }; node_75(){ required 58 31 16 39 18 19; }; node_76(){ +optional 17; }; node_77(){ required 58 31 16 40 76; }; node_78(){ +required 58 31 16 41; }; node_79(){ required 58 31 16 42 70; }; node_80(){ +either 43 44; }; node_81(){ required 80; }; node_82(){ optional 12; } +node_83(){ required 58 31 16 81 82; }; node_84(){ optional 20; }; node_85(){ +required 58 31 16 42 17 84; }; node_86(){ optional 13; }; node_87(){ optional 14 +}; node_88(){ oneormore 21; }; node_89(){ required 58 31 16 45 86 87 17 88; } +node_90(){ required 22 23; }; node_91(){ either 90 11; }; node_92(){ required 91 +}; node_93(){ optional 24; }; node_94(){ required 58 31 16 46 47 92 93 66; } +node_95(){ required 58 31 16 46 48 22 23 25 66; }; node_96(){ either 22 11; } +node_97(){ required 96; }; node_98(){ required 58 31 16 46 81 97 66 82; } +node_99(){ required 58 31 16 49; }; node_100(){ optional 88; }; node_101(){ +required 58 31 16 26 100; }; node_102(){ optional 28; }; node_103(){ optional 29 +}; node_104(){ required 58 50 51 27 102 103; }; node_105(){ required 58 50 60; } +node_106(){ required 58 50 27 43; }; node_107(){ required 58 50 27 52; } +node_108(){ required 58 50 27 53 61; }; node_109(){ required 58 54; } +node_110(){ required 58 55; }; node_111(){ oneormore 30; }; node_112(){ +optional 111; }; node_113(){ required 58 56 112; }; node_114(){ +either 63 68 71 72 73 74 75 77 78 79 83 85 89 94 95 98 99 101 104 105 106 107 108 109 110 113 +}; node_115(){ required 114; }; cat <<<' docopt_exit() { +[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1320}" >&2 +exit 1; }'; unset var___help var___stack var___env var___skip_update \ +var___skip_check var___status var___server var___domain var___app_name \ +var___pass var___secrets var___all var___force var___no_tty var___user \ +var__type_ var__app_ var__service_ var__src_ var__dst_ var__backup_file_ \ +var__args_ var__secret_ var__version_ var__cmd_ var__data_ var__command_ \ +var__host_ var__user_ var__port_ var__subcommands_ var_app var_list var_ls \ +var_new var_backup var_deploy var_check var_config var_cp var_logs var_ps \ +var_restore var_rm var_delete var_run var_secret var_generate var_insert \ +var_undeploy var_server var_add var_init var_apps var_upgrade var_version \ +var_help; parse 115 "$@"; local prefix=${DOCOPT_PREFIX:-''} +unset "${prefix}__help" "${prefix}__stack" "${prefix}__env" \ +"${prefix}__skip_update" "${prefix}__skip_check" "${prefix}__status" \ +"${prefix}__server" "${prefix}__domain" "${prefix}__app_name" \ +"${prefix}__pass" "${prefix}__secrets" "${prefix}__all" "${prefix}__force" \ +"${prefix}__no_tty" "${prefix}__user" "${prefix}_type_" "${prefix}_app_" \ +"${prefix}_service_" "${prefix}_src_" "${prefix}_dst_" \ +"${prefix}_backup_file_" "${prefix}_args_" "${prefix}_secret_" \ +"${prefix}_version_" "${prefix}_cmd_" "${prefix}_data_" "${prefix}_command_" \ +"${prefix}_host_" "${prefix}_user_" "${prefix}_port_" "${prefix}_subcommands_" \ +"${prefix}app" "${prefix}list" "${prefix}ls" "${prefix}new" "${prefix}backup" \ +"${prefix}deploy" "${prefix}check" "${prefix}config" "${prefix}cp" \ +"${prefix}logs" "${prefix}ps" "${prefix}restore" "${prefix}rm" \ +"${prefix}delete" "${prefix}run" "${prefix}secret" "${prefix}generate" \ +"${prefix}insert" "${prefix}undeploy" "${prefix}server" "${prefix}add" \ +"${prefix}init" "${prefix}apps" "${prefix}upgrade" "${prefix}version" \ +"${prefix}help"; eval "${prefix}"'__help=${var___help:-false}' eval "${prefix}"'__stack=${var___stack:-}' eval "${prefix}"'__env=${var___env:-}' +eval "${prefix}"'__skip_update=${var___skip_update:-false}' +eval "${prefix}"'__skip_check=${var___skip_check:-false}' +eval "${prefix}"'__status=${var___status:-false}' eval "${prefix}"'__server=${var___server:-}' eval "${prefix}"'__domain=${var___domain:-}' eval "${prefix}"'__app_name=${var___app_name:-}' eval "${prefix}"'__pass=${var___pass:-false}' eval "${prefix}"'__secrets=${var___secrets:-false}' -eval "${prefix}"'__status=${var___status:-false}' -eval "${prefix}"'__skip_check=${var___skip_check:-false}' +eval "${prefix}"'__all=${var___all:-false}' eval "${prefix}"'__force=${var___force:-false}' eval "${prefix}"'__no_tty=${var___no_tty:-false}' eval "${prefix}"'__user=${var___user:-}' -eval "${prefix}"'__all=${var___all:-false}' eval "${prefix}"'_type_=${var__type_:-}'; eval "${prefix}"'_app_=${var__app_:-}' eval "${prefix}"'_service_=${var__service_:-}' eval "${prefix}"'_src_=${var__src_:-}'; eval "${prefix}"'_dst_=${var__dst_:-}' +eval "${prefix}"'_backup_file_=${var__backup_file_:-}' if declare -p var__args_ >/dev/null 2>&1; then eval "${prefix}"'_args_=("${var__args_[@]}")'; else eval "${prefix}"'_args_=()' fi; eval "${prefix}"'_secret_=${var__secret_:-}' @@ -247,19 +261,22 @@ eval "${prefix}"'_port_=${var__port_:-}' if declare -p var__subcommands_ >/dev/null 2>&1; then eval "${prefix}"'_subcommands_=("${var__subcommands_[@]}")'; else eval "${prefix}"'_subcommands_=()'; fi; eval "${prefix}"'app=${var_app:-false}' -eval "${prefix}"'new=${var_new:-false}' eval "${prefix}"'list=${var_list:-false}'; eval "${prefix}"'ls=${var_ls:-false}' +eval "${prefix}"'new=${var_new:-false}' +eval "${prefix}"'backup=${var_backup:-false}' eval "${prefix}"'deploy=${var_deploy:-false}' -eval "${prefix}"'undeploy=${var_undeploy:-false}' -eval "${prefix}"'config=${var_config:-false}' -eval "${prefix}"'delete=${var_delete:-false}' -eval "${prefix}"'rm=${var_rm:-false}'; eval "${prefix}"'logs=${var_logs:-false}' -eval "${prefix}"'cp=${var_cp:-false}' eval "${prefix}"'check=${var_check:-false}' -eval "${prefix}"'ps=${var_ps:-false}'; eval "${prefix}"'run=${var_run:-false}' +eval "${prefix}"'config=${var_config:-false}' +eval "${prefix}"'cp=${var_cp:-false}'; eval "${prefix}"'logs=${var_logs:-false}' +eval "${prefix}"'ps=${var_ps:-false}' +eval "${prefix}"'restore=${var_restore:-false}' +eval "${prefix}"'rm=${var_rm:-false}' +eval "${prefix}"'delete=${var_delete:-false}' +eval "${prefix}"'run=${var_run:-false}' eval "${prefix}"'secret=${var_secret:-false}' eval "${prefix}"'generate=${var_generate:-false}' eval "${prefix}"'insert=${var_insert:-false}' +eval "${prefix}"'undeploy=${var_undeploy:-false}' eval "${prefix}"'server=${var_server:-false}' eval "${prefix}"'add=${var_add:-false}' eval "${prefix}"'init=${var_init:-false}' @@ -269,19 +286,21 @@ eval "${prefix}"'version=${var_version:-false}' eval "${prefix}"'help=${var_help:-false}'; local docopt_i=1 [[ $BASH_VERSION =~ ^4.3 ]] && docopt_i=2; for ((;docopt_i>0;docopt_i--)); do declare -p "${prefix}__help" "${prefix}__stack" "${prefix}__env" \ +"${prefix}__skip_update" "${prefix}__skip_check" "${prefix}__status" \ "${prefix}__server" "${prefix}__domain" "${prefix}__app_name" \ -"${prefix}__pass" "${prefix}__secrets" "${prefix}__status" \ -"${prefix}__skip_check" "${prefix}__force" "${prefix}__no_tty" \ -"${prefix}__user" "${prefix}__all" "${prefix}_type_" "${prefix}_app_" \ -"${prefix}_service_" "${prefix}_src_" "${prefix}_dst_" "${prefix}_args_" \ -"${prefix}_secret_" "${prefix}_version_" "${prefix}_cmd_" "${prefix}_data_" \ -"${prefix}_command_" "${prefix}_host_" "${prefix}_user_" "${prefix}_port_" \ -"${prefix}_subcommands_" "${prefix}app" "${prefix}new" "${prefix}list" \ -"${prefix}ls" "${prefix}deploy" "${prefix}undeploy" "${prefix}config" \ -"${prefix}delete" "${prefix}rm" "${prefix}logs" "${prefix}cp" "${prefix}check" \ -"${prefix}ps" "${prefix}run" "${prefix}secret" "${prefix}generate" \ -"${prefix}insert" "${prefix}server" "${prefix}add" "${prefix}init" \ -"${prefix}apps" "${prefix}upgrade" "${prefix}version" "${prefix}help"; done; } +"${prefix}__pass" "${prefix}__secrets" "${prefix}__all" "${prefix}__force" \ +"${prefix}__no_tty" "${prefix}__user" "${prefix}_type_" "${prefix}_app_" \ +"${prefix}_service_" "${prefix}_src_" "${prefix}_dst_" \ +"${prefix}_backup_file_" "${prefix}_args_" "${prefix}_secret_" \ +"${prefix}_version_" "${prefix}_cmd_" "${prefix}_data_" "${prefix}_command_" \ +"${prefix}_host_" "${prefix}_user_" "${prefix}_port_" "${prefix}_subcommands_" \ +"${prefix}app" "${prefix}list" "${prefix}ls" "${prefix}new" "${prefix}backup" \ +"${prefix}deploy" "${prefix}check" "${prefix}config" "${prefix}cp" \ +"${prefix}logs" "${prefix}ps" "${prefix}restore" "${prefix}rm" \ +"${prefix}delete" "${prefix}run" "${prefix}secret" "${prefix}generate" \ +"${prefix}insert" "${prefix}undeploy" "${prefix}server" "${prefix}add" \ +"${prefix}init" "${prefix}apps" "${prefix}upgrade" "${prefix}version" \ +"${prefix}help"; done; } # docopt parser above, complete command for generating this parser is `docopt.sh abra` PROGRAM_NAME=$(basename "$0") @@ -347,7 +366,9 @@ require_app_latest() { success "Fetched app configuration via Git" fi - cd "$APP_DIR" && git pull > /dev/null 2>&1 + if [ "$abra___skip_update" = "false" ]; then + cd "$APP_DIR" && git pull > /dev/null 2>&1 + fi } # FIXME 3wc: update or remove @@ -670,15 +691,49 @@ sub_app_new (){ echo " abra app $APP_NAME deploy$(tput sgr0)" } +###### .. app backup +sub_app_backup (){ + load_instance + load_instance_env + + require_app_latest "$TYPE" + + # Add _ if it's defined + FUNCTION="abra_backup${abra__service_:+_}$abra__service_" + + if ! type "$FUNCTION" > /dev/null 2>&1; then + error "'$TYPE' doesn't know how to do ${abra__service_}${abra__service_:+ }backups."\ + "See $GIT_URL$TYPE/issues/" + fi + + mkdir -p "$ABRA_DIR/backups" + + $FUNCTION +} + +###### .. app restore +sub_app_restore (){ + load_instance + load_instance_env + + require_app_latest "$TYPE" + + FUNCTION="abra_restore_$abra__service_" + + if ! type "$FUNCTION" > /dev/null 2>&1; then + error "'$TYPE' doesn't know how to restore '${abra__service_}' backups."\ + "See $GIT_URL$TYPE/issues/" + fi + + $FUNCTION "$abra__backup_file_" +} + ###### .. app deploy help_app_deploy (){ echo "abra [options] app deploy [--skip-check] Deploy app to the configured server. -OPTIONS - --skip-check Don't check whether app definition is up-to-date first - POWERED BY docker stack deploy -c compose.yml " } @@ -689,10 +744,6 @@ sub_app_deploy (){ require_app_latest "$TYPE" - if [ "$abra___skip_check" == "false" ]; then - sub_app_check - fi - echo "About to deploy:" echo " Server: $(tput setaf 4)${SERVER}$(tput sgr0)" if [ "${COMPOSE_FILE/:/}" == "${COMPOSE_FILE}" ]; then @@ -795,12 +846,14 @@ Make sure that all an app's required variables are set." } sub_app_check (){ + if [ "$abra___skip_check" = "true" ]; then + return 0 + fi + load_instance load_instance_env - #APP_ENV=$(grep -v '^#' "$ENV_FILE" | sed 's/^.* \([^=]\+\)=.*/\1/' | sort) APP_ENV=$(grep -v '^#' "$ENV_FILE" | cut -d' ' -f2 | cut -d'=' -f1 | sort) - #STACK_ENV=$(grep -v '^#' "$APP_DIR/.env.sample" | sed 's/^.* \([^=]\+\)=.*/\1/' | sort) STACK_ENV=$(grep -v '^#' "$APP_DIR/.env.sample" | cut -d' ' -f2 | cut -d'=' -f1 | sort) # Only show "1", items in STACK_ENV which aren't in APP_ENV @@ -1348,8 +1401,9 @@ abra() { abra__secret_ abra__version_ abra__data_ abra___user abra__host_ \ abra__type_ abra__port_ abra__user_ abra__service_ abra__src_ abra__dst_ \ abra___server abra___domain abra___force abra___pass \ - abra___secrets abra___status abra___no_tty abra___skip_check \ - abra__subcommands_ abra___app_name + abra___secrets abra___status abra___no_tty abra___app_name \ + abra__subcommands_ abra___skip_update abra___skip_check \ + abra__backup_file_ if ! type tput > /dev/null 2>&1; then tput() {