Add --bump release logic
continuous-integration/drone/pr Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
Closes https://git.autonomic.zone/coop-cloud/abra/issues/173.
This commit is contained in:
decentral1se
parent
f6bdf596f5
commit
0655c03434
|
|
@ -9,6 +9,8 @@
|
|||
|
||||
# abra x.x.x (UNRELEASED)
|
||||
|
||||
- Add `--bump` to `deploy` command to allow packagers to make minor package related releases ([#173](https://git.autonomic.zone/coop-cloud/abra/issues/173))
|
||||
|
||||
# abra 9.0.0 (2021-06-10)
|
||||
|
||||
- Add Docker image for `abra` ([64d578cf91](https://git.autonomic.zone/coop-cloud/abra/commit/64d578cf914bd2bad378ea4ef375747d10b33191))
|
||||
|
|
|
|||
243
abra
243
abra
|
|
@ -40,7 +40,7 @@ Usage:
|
|||
abra [options] app <app> <command> [<args>...]
|
||||
abra [options] recipe ls
|
||||
abra [options] recipe create <recipe>
|
||||
abra [options] recipe <recipe> release [--force]
|
||||
abra [options] recipe <recipe> release [--force] [--bump]
|
||||
abra [options] recipe <recipe> versions
|
||||
abra [options] server add <host> [<user>] [<port>]
|
||||
abra [options] server new <provider> -- <args>
|
||||
|
|
@ -167,111 +167,112 @@ 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:2502}
|
||||
usage=${DOC:40:1893}; digest=580ee
|
||||
shorts=(-U -s -v -b -h -d -e -n -C '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
|
||||
longs=(--skip-update --stack --verbose --branch --help --debug --env --no-prompt --skip-check --status --server --type --domain --app-name --pass --secrets --all --update --force --fast --skip-version-check --no-domain-poll --no-state-poll --chaos --volumes --no-tty --user --dev)
|
||||
argcounts=(0 1 0 1 0 0 1 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0); node_0(){
|
||||
switch __skip_update 0; }; node_1(){ value __stack 1; }; node_2(){
|
||||
switch __verbose 2; }; node_3(){ value __branch 3; }; node_4(){ switch __help 4
|
||||
}; node_5(){ switch __debug 5; }; node_6(){ value __env 6; }; node_7(){
|
||||
switch __no_prompt 7; }; node_8(){ switch __skip_check 8; }; node_9(){
|
||||
switch __status 9; }; node_10(){ value __server 10; }; node_11(){
|
||||
value __type 11; }; node_12(){ value __domain 12; }; node_13(){
|
||||
printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:2511}
|
||||
usage=${DOC:40:1902}; digest=145c2
|
||||
shorts=(-s -d -U -b -h -C -n -v -e '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
|
||||
longs=(--stack --debug --skip-update --branch --help --skip-check --no-prompt --verbose --env --status --server --type --domain --app-name --pass --secrets --all --update --force --fast --skip-version-check --no-domain-poll --no-state-poll --chaos --volumes --no-tty --user --bump --dev)
|
||||
argcounts=(1 0 0 1 0 0 0 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0); node_0(){
|
||||
value __stack 0; }; node_1(){ switch __debug 1; }; node_2(){
|
||||
switch __skip_update 2; }; node_3(){ value __branch 3; }; node_4(){
|
||||
switch __help 4; }; node_5(){ switch __skip_check 5; }; node_6(){
|
||||
switch __no_prompt 6; }; node_7(){ switch __verbose 7; }; node_8(){
|
||||
value __env 8; }; node_9(){ switch __status 9; }; node_10(){ value __server 10
|
||||
}; node_11(){ value __type 11; }; node_12(){ value __domain 12; }; node_13(){
|
||||
value __app_name 13; }; node_14(){ switch __pass 14; }; node_15(){
|
||||
switch __secrets 15; }; node_16(){ switch __all 16; }; node_17(){
|
||||
switch __update 17; }; node_18(){ switch __force 18; }; node_19(){
|
||||
switch __fast 19; }; node_20(){ switch __skip_version_check 20; }; node_21(){
|
||||
switch __no_domain_poll 21; }; node_22(){ switch __no_state_poll 22; }
|
||||
node_23(){ switch __chaos 23; }; node_24(){ switch __volumes 24; }; node_25(){
|
||||
switch __no_tty 25; }; node_26(){ value __user 26; }; node_27(){ switch __dev 27
|
||||
}; node_28(){ value _type_ a; }; node_29(){ value _app_ a; }; node_30(){
|
||||
value _service_ a; }; node_31(){ value _version_ a; }; node_32(){ value _src_ a
|
||||
}; node_33(){ value _dst_ a; }; node_34(){ value _backup_file_ a; }; node_35(){
|
||||
value _args_ a true; }; node_36(){ value _secret_ a; }; node_37(){ value _cmd_ a
|
||||
}; node_38(){ value _data_ a; }; node_39(){ value _volume_ a; }; node_40(){
|
||||
value _command_ a; }; node_41(){ value _recipe_ a; }; node_42(){ value _host_ a
|
||||
}; node_43(){ value _user_ a; }; node_44(){ value _port_ a; }; node_45(){
|
||||
value _provider_ a; }; node_46(){ value _subcommands_ a true; }; node_47(){
|
||||
_command app; }; node_48(){ _command list; }; node_49(){ _command ls; }
|
||||
node_50(){ _command new; }; node_51(){ _command backup; }; node_52(){
|
||||
_command deploy; }; node_53(){ _command check; }; node_54(){ _command version; }
|
||||
node_55(){ _command config; }; node_56(){ _command cp; }; node_57(){
|
||||
_command logs; }; node_58(){ _command ps; }; node_59(){ _command restore; }
|
||||
node_60(){ _command rm; }; node_61(){ _command delete; }; node_62(){
|
||||
_command run; }; node_63(){ _command rollback; }; node_64(){ _command secret; }
|
||||
node_65(){ _command generate; }; node_66(){ _command insert; }; node_67(){
|
||||
_command undeploy; }; node_68(){ _command volume; }; node_69(){ _command recipe
|
||||
}; node_70(){ _command create; }; node_71(){ _command release; }; node_72(){
|
||||
_command versions; }; node_73(){ _command server; }; node_74(){ _command add; }
|
||||
node_75(){ _command __ --; }; node_76(){ _command init; }; node_77(){
|
||||
_command apps; }; node_78(){ _command upgrade; }; node_79(){ _command doctor; }
|
||||
node_80(){ _command help; }; node_81(){ optional 0 1 2 3 4 5 6 7 8; }
|
||||
node_82(){ optional 81; }; node_83(){ either 48 49; }; node_84(){ required 83; }
|
||||
node_85(){ optional 9; }; node_86(){ optional 10; }; node_87(){ optional 11; }
|
||||
node_88(){ required 82 47 84 85 86 87; }; node_89(){ optional 12; }; node_90(){
|
||||
optional 13; }; node_91(){ optional 14; }; node_92(){ optional 15; }; node_93(){
|
||||
required 82 47 50 86 89 90 91 92 28; }; node_94(){ either 30 16; }; node_95(){
|
||||
required 94; }; node_96(){ required 82 47 29 51 95; }; node_97(){ optional 17; }
|
||||
node_98(){ optional 18; }; node_99(){ optional 19; }; node_100(){ optional 20; }
|
||||
node_101(){ optional 21; }; node_102(){ optional 22; }; node_103(){ optional 23
|
||||
}; node_104(){ optional 31; }; node_105(){
|
||||
required 82 47 29 52 97 98 99 100 101 102 103 104; }; node_106(){
|
||||
required 82 47 29 53; }; node_107(){ required 82 47 29 54; }; node_108(){
|
||||
required 82 47 29 55; }; node_109(){ required 82 47 29 56 32 33; }; node_110(){
|
||||
optional 30; }; node_111(){ required 82 47 29 57 110; }; node_112(){
|
||||
required 82 47 29 58; }; node_113(){ required 82 47 29 59 95; }; node_114(){
|
||||
either 60 61; }; node_115(){ required 114; }; node_116(){ optional 24; }
|
||||
node_117(){ required 82 47 29 115 116 92; }; node_118(){ optional 34; }
|
||||
node_119(){ required 82 47 29 59 30 118; }; node_120(){ optional 25; }
|
||||
node_121(){ optional 26; }; node_122(){ oneormore 35; }; node_123(){
|
||||
required 82 47 29 62 120 121 30 122; }; node_124(){ required 82 47 29 63 104; }
|
||||
node_125(){ required 36 31; }; node_126(){ either 125 16; }; node_127(){
|
||||
required 126; }; node_128(){ optional 37; }; node_129(){
|
||||
required 82 47 29 64 65 127 128 91; }; node_130(){
|
||||
required 82 47 29 64 66 36 31 38 91; }; node_131(){ either 36 16; }; node_132(){
|
||||
required 131; }; node_133(){ required 82 47 29 64 115 132 91; }; node_134(){
|
||||
required 82 47 29 67; }; node_135(){ required 82 47 29 68 49; }; node_136(){
|
||||
either 39 16; }; node_137(){ required 136; }; node_138(){
|
||||
required 82 47 29 68 115 137; }; node_139(){ optional 122; }; node_140(){
|
||||
required 82 47 29 40 139; }; node_141(){ required 82 69 49; }; node_142(){
|
||||
required 82 69 70 41; }; node_143(){ required 82 69 41 71 98; }; node_144(){
|
||||
required 82 69 41 72; }; node_145(){ optional 43; }; node_146(){ optional 44; }
|
||||
node_147(){ required 82 73 74 42 145 146; }; node_148(){
|
||||
required 82 73 50 45 75 35; }; node_149(){ required 82 73 84; }; node_150(){
|
||||
required 82 73 42 60; }; node_151(){ required 82 73 42 76; }; node_152(){
|
||||
required 82 73 42 77 85; }; node_153(){ optional 27; }; node_154(){
|
||||
required 82 78 153; }; node_155(){ required 82 54; }; node_156(){ required 82 79
|
||||
}; node_157(){ oneormore 46; }; node_158(){ optional 157; }; node_159(){
|
||||
required 82 80 158; }; node_160(){ required 82; }; node_161(){
|
||||
either 88 93 96 105 106 107 108 109 111 112 113 117 119 123 124 129 130 133 134 135 138 140 141 142 143 144 147 148 149 150 151 152 154 155 156 159 160
|
||||
}; node_162(){ required 161; }; cat <<<' docopt_exit() {
|
||||
[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1893}" >&2
|
||||
exit 1; }'; unset var___skip_update var___stack var___verbose var___branch \
|
||||
var___help var___debug var___env var___no_prompt var___skip_check var___status \
|
||||
var___server var___type var___domain var___app_name var___pass var___secrets \
|
||||
var___all var___update var___force var___fast var___skip_version_check \
|
||||
var___no_domain_poll var___no_state_poll var___chaos var___volumes \
|
||||
var___no_tty var___user var___dev var__type_ var__app_ var__service_ \
|
||||
var__version_ var__src_ var__dst_ var__backup_file_ var__args_ var__secret_ \
|
||||
var__cmd_ var__data_ var__volume_ var__command_ var__recipe_ var__host_ \
|
||||
var__user_ var__port_ var__provider_ var__subcommands_ var_app var_list var_ls \
|
||||
var_new var_backup var_deploy var_check var_version var_config var_cp var_logs \
|
||||
var_ps var_restore var_rm var_delete var_run var_rollback var_secret \
|
||||
var_generate var_insert var_undeploy var_volume var_recipe var_create \
|
||||
var_release var_versions var_server var_add var___ var_init var_apps \
|
||||
var_upgrade var_doctor var_help; parse 162 "$@"
|
||||
local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__skip_update" \
|
||||
"${prefix}__stack" "${prefix}__verbose" "${prefix}__branch" "${prefix}__help" \
|
||||
"${prefix}__debug" "${prefix}__env" "${prefix}__no_prompt" \
|
||||
"${prefix}__skip_check" "${prefix}__status" "${prefix}__server" \
|
||||
"${prefix}__type" "${prefix}__domain" "${prefix}__app_name" "${prefix}__pass" \
|
||||
switch __no_tty 25; }; node_26(){ value __user 26; }; node_27(){
|
||||
switch __bump 27; }; node_28(){ switch __dev 28; }; node_29(){ value _type_ a; }
|
||||
node_30(){ value _app_ a; }; node_31(){ value _service_ a; }; node_32(){
|
||||
value _version_ a; }; node_33(){ value _src_ a; }; node_34(){ value _dst_ a; }
|
||||
node_35(){ value _backup_file_ a; }; node_36(){ value _args_ a true; }
|
||||
node_37(){ value _secret_ a; }; node_38(){ value _cmd_ a; }; node_39(){
|
||||
value _data_ a; }; node_40(){ value _volume_ a; }; node_41(){ value _command_ a
|
||||
}; node_42(){ value _recipe_ a; }; node_43(){ value _host_ a; }; node_44(){
|
||||
value _user_ a; }; node_45(){ value _port_ a; }; node_46(){ value _provider_ a
|
||||
}; node_47(){ value _subcommands_ a true; }; node_48(){ _command app; }
|
||||
node_49(){ _command list; }; node_50(){ _command ls; }; node_51(){ _command new
|
||||
}; node_52(){ _command backup; }; node_53(){ _command deploy; }; node_54(){
|
||||
_command check; }; node_55(){ _command version; }; node_56(){ _command config; }
|
||||
node_57(){ _command cp; }; node_58(){ _command logs; }; node_59(){ _command ps
|
||||
}; node_60(){ _command restore; }; node_61(){ _command rm; }; node_62(){
|
||||
_command delete; }; node_63(){ _command run; }; node_64(){ _command rollback; }
|
||||
node_65(){ _command secret; }; node_66(){ _command generate; }; node_67(){
|
||||
_command insert; }; node_68(){ _command undeploy; }; node_69(){ _command volume
|
||||
}; node_70(){ _command recipe; }; node_71(){ _command create; }; node_72(){
|
||||
_command release; }; node_73(){ _command versions; }; node_74(){ _command server
|
||||
}; node_75(){ _command add; }; node_76(){ _command __ --; }; node_77(){
|
||||
_command init; }; node_78(){ _command apps; }; node_79(){ _command upgrade; }
|
||||
node_80(){ _command doctor; }; node_81(){ _command help; }; node_82(){
|
||||
optional 0 1 2 3 4 5 6 7 8; }; node_83(){ optional 82; }; node_84(){
|
||||
either 49 50; }; node_85(){ required 84; }; node_86(){ optional 9; }; node_87(){
|
||||
optional 10; }; node_88(){ optional 11; }; node_89(){ required 83 48 85 86 87 88
|
||||
}; node_90(){ optional 12; }; node_91(){ optional 13; }; node_92(){ optional 14
|
||||
}; node_93(){ optional 15; }; node_94(){ required 83 48 51 87 90 91 92 93 29; }
|
||||
node_95(){ either 31 16; }; node_96(){ required 95; }; node_97(){
|
||||
required 83 48 30 52 96; }; node_98(){ optional 17; }; node_99(){ optional 18; }
|
||||
node_100(){ optional 19; }; node_101(){ optional 20; }; node_102(){ optional 21
|
||||
}; node_103(){ optional 22; }; node_104(){ optional 23; }; node_105(){
|
||||
optional 32; }; node_106(){ required 83 48 30 53 98 99 100 101 102 103 104 105
|
||||
}; node_107(){ required 83 48 30 54; }; node_108(){ required 83 48 30 55; }
|
||||
node_109(){ required 83 48 30 56; }; node_110(){ required 83 48 30 57 33 34; }
|
||||
node_111(){ optional 31; }; node_112(){ required 83 48 30 58 111; }; node_113(){
|
||||
required 83 48 30 59; }; node_114(){ required 83 48 30 60 96; }; node_115(){
|
||||
either 61 62; }; node_116(){ required 115; }; node_117(){ optional 24; }
|
||||
node_118(){ required 83 48 30 116 117 93; }; node_119(){ optional 35; }
|
||||
node_120(){ required 83 48 30 60 31 119; }; node_121(){ optional 25; }
|
||||
node_122(){ optional 26; }; node_123(){ oneormore 36; }; node_124(){
|
||||
required 83 48 30 63 121 122 31 123; }; node_125(){ required 83 48 30 64 105; }
|
||||
node_126(){ required 37 32; }; node_127(){ either 126 16; }; node_128(){
|
||||
required 127; }; node_129(){ optional 38; }; node_130(){
|
||||
required 83 48 30 65 66 128 129 92; }; node_131(){
|
||||
required 83 48 30 65 67 37 32 39 92; }; node_132(){ either 37 16; }; node_133(){
|
||||
required 132; }; node_134(){ required 83 48 30 65 116 133 92; }; node_135(){
|
||||
required 83 48 30 68; }; node_136(){ required 83 48 30 69 50; }; node_137(){
|
||||
either 40 16; }; node_138(){ required 137; }; node_139(){
|
||||
required 83 48 30 69 116 138; }; node_140(){ optional 123; }; node_141(){
|
||||
required 83 48 30 41 140; }; node_142(){ required 83 70 50; }; node_143(){
|
||||
required 83 70 71 42; }; node_144(){ optional 27; }; node_145(){
|
||||
required 83 70 42 72 99 144; }; node_146(){ required 83 70 42 73; }; node_147(){
|
||||
optional 44; }; node_148(){ optional 45; }; node_149(){
|
||||
required 83 74 75 43 147 148; }; node_150(){ required 83 74 51 46 76 36; }
|
||||
node_151(){ required 83 74 85; }; node_152(){ required 83 74 43 61; }
|
||||
node_153(){ required 83 74 43 77; }; node_154(){ required 83 74 43 78 86; }
|
||||
node_155(){ optional 28; }; node_156(){ required 83 79 155; }; node_157(){
|
||||
required 83 55; }; node_158(){ required 83 80; }; node_159(){ oneormore 47; }
|
||||
node_160(){ optional 159; }; node_161(){ required 83 81 160; }; node_162(){
|
||||
required 83; }; node_163(){
|
||||
either 89 94 97 106 107 108 109 110 112 113 114 118 120 124 125 130 131 134 135 136 139 141 142 143 145 146 149 150 151 152 153 154 156 157 158 161 162
|
||||
}; node_164(){ required 163; }; cat <<<' docopt_exit() {
|
||||
[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1902}" >&2
|
||||
exit 1; }'; unset var___stack var___debug var___skip_update var___branch \
|
||||
var___help var___skip_check var___no_prompt var___verbose var___env \
|
||||
var___status var___server var___type var___domain var___app_name var___pass \
|
||||
var___secrets var___all var___update var___force var___fast \
|
||||
var___skip_version_check var___no_domain_poll var___no_state_poll var___chaos \
|
||||
var___volumes var___no_tty var___user var___bump var___dev var__type_ \
|
||||
var__app_ var__service_ var__version_ var__src_ var__dst_ var__backup_file_ \
|
||||
var__args_ var__secret_ var__cmd_ var__data_ var__volume_ var__command_ \
|
||||
var__recipe_ var__host_ var__user_ var__port_ var__provider_ var__subcommands_ \
|
||||
var_app var_list var_ls var_new var_backup var_deploy var_check var_version \
|
||||
var_config var_cp var_logs var_ps var_restore var_rm var_delete var_run \
|
||||
var_rollback var_secret var_generate var_insert var_undeploy var_volume \
|
||||
var_recipe var_create var_release var_versions var_server var_add var___ \
|
||||
var_init var_apps var_upgrade var_doctor var_help; parse 164 "$@"
|
||||
local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__stack" "${prefix}__debug" \
|
||||
"${prefix}__skip_update" "${prefix}__branch" "${prefix}__help" \
|
||||
"${prefix}__skip_check" "${prefix}__no_prompt" "${prefix}__verbose" \
|
||||
"${prefix}__env" "${prefix}__status" "${prefix}__server" "${prefix}__type" \
|
||||
"${prefix}__domain" "${prefix}__app_name" "${prefix}__pass" \
|
||||
"${prefix}__secrets" "${prefix}__all" "${prefix}__update" "${prefix}__force" \
|
||||
"${prefix}__fast" "${prefix}__skip_version_check" "${prefix}__no_domain_poll" \
|
||||
"${prefix}__no_state_poll" "${prefix}__chaos" "${prefix}__volumes" \
|
||||
"${prefix}__no_tty" "${prefix}__user" "${prefix}__dev" "${prefix}_type_" \
|
||||
"${prefix}_app_" "${prefix}_service_" "${prefix}_version_" "${prefix}_src_" \
|
||||
"${prefix}_dst_" "${prefix}_backup_file_" "${prefix}_args_" \
|
||||
"${prefix}__no_tty" "${prefix}__user" "${prefix}__bump" "${prefix}__dev" \
|
||||
"${prefix}_type_" "${prefix}_app_" "${prefix}_service_" "${prefix}_version_" \
|
||||
"${prefix}_src_" "${prefix}_dst_" "${prefix}_backup_file_" "${prefix}_args_" \
|
||||
"${prefix}_secret_" "${prefix}_cmd_" "${prefix}_data_" "${prefix}_volume_" \
|
||||
"${prefix}_command_" "${prefix}_recipe_" "${prefix}_host_" "${prefix}_user_" \
|
||||
"${prefix}_port_" "${prefix}_provider_" "${prefix}_subcommands_" \
|
||||
|
|
@ -283,15 +284,15 @@ local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__skip_update" \
|
|||
"${prefix}recipe" "${prefix}create" "${prefix}release" "${prefix}versions" \
|
||||
"${prefix}server" "${prefix}add" "${prefix}__" "${prefix}init" "${prefix}apps" \
|
||||
"${prefix}upgrade" "${prefix}doctor" "${prefix}help"
|
||||
eval "${prefix}"'__skip_update=${var___skip_update:-false}'
|
||||
eval "${prefix}"'__stack=${var___stack:-}'
|
||||
eval "${prefix}"'__verbose=${var___verbose:-false}'
|
||||
eval "${prefix}"'__debug=${var___debug:-false}'
|
||||
eval "${prefix}"'__skip_update=${var___skip_update:-false}'
|
||||
eval "${prefix}"'__branch=${var___branch:-}'
|
||||
eval "${prefix}"'__help=${var___help:-false}'
|
||||
eval "${prefix}"'__debug=${var___debug:-false}'
|
||||
eval "${prefix}"'__env=${var___env:-}'
|
||||
eval "${prefix}"'__no_prompt=${var___no_prompt:-false}'
|
||||
eval "${prefix}"'__skip_check=${var___skip_check:-false}'
|
||||
eval "${prefix}"'__no_prompt=${var___no_prompt:-false}'
|
||||
eval "${prefix}"'__verbose=${var___verbose:-false}'
|
||||
eval "${prefix}"'__env=${var___env:-}'
|
||||
eval "${prefix}"'__status=${var___status:-false}'
|
||||
eval "${prefix}"'__server=${var___server:-}'
|
||||
eval "${prefix}"'__type=${var___type:-}'
|
||||
|
|
@ -310,6 +311,7 @@ eval "${prefix}"'__chaos=${var___chaos:-false}'
|
|||
eval "${prefix}"'__volumes=${var___volumes:-false}'
|
||||
eval "${prefix}"'__no_tty=${var___no_tty:-false}'
|
||||
eval "${prefix}"'__user=${var___user:-}'
|
||||
eval "${prefix}"'__bump=${var___bump:-false}'
|
||||
eval "${prefix}"'__dev=${var___dev:-false}'
|
||||
eval "${prefix}"'_type_=${var__type_:-}'; eval "${prefix}"'_app_=${var__app_:-}'
|
||||
eval "${prefix}"'_service_=${var__service_:-}'
|
||||
|
|
@ -361,17 +363,17 @@ eval "${prefix}"'upgrade=${var_upgrade:-false}'
|
|||
eval "${prefix}"'doctor=${var_doctor:-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}__skip_update" "${prefix}__stack" "${prefix}__verbose" \
|
||||
"${prefix}__branch" "${prefix}__help" "${prefix}__debug" "${prefix}__env" \
|
||||
"${prefix}__no_prompt" "${prefix}__skip_check" "${prefix}__status" \
|
||||
"${prefix}__server" "${prefix}__type" "${prefix}__domain" \
|
||||
declare -p "${prefix}__stack" "${prefix}__debug" "${prefix}__skip_update" \
|
||||
"${prefix}__branch" "${prefix}__help" "${prefix}__skip_check" \
|
||||
"${prefix}__no_prompt" "${prefix}__verbose" "${prefix}__env" \
|
||||
"${prefix}__status" "${prefix}__server" "${prefix}__type" "${prefix}__domain" \
|
||||
"${prefix}__app_name" "${prefix}__pass" "${prefix}__secrets" "${prefix}__all" \
|
||||
"${prefix}__update" "${prefix}__force" "${prefix}__fast" \
|
||||
"${prefix}__skip_version_check" "${prefix}__no_domain_poll" \
|
||||
"${prefix}__no_state_poll" "${prefix}__chaos" "${prefix}__volumes" \
|
||||
"${prefix}__no_tty" "${prefix}__user" "${prefix}__dev" "${prefix}_type_" \
|
||||
"${prefix}_app_" "${prefix}_service_" "${prefix}_version_" "${prefix}_src_" \
|
||||
"${prefix}_dst_" "${prefix}_backup_file_" "${prefix}_args_" \
|
||||
"${prefix}__no_tty" "${prefix}__user" "${prefix}__bump" "${prefix}__dev" \
|
||||
"${prefix}_type_" "${prefix}_app_" "${prefix}_service_" "${prefix}_version_" \
|
||||
"${prefix}_src_" "${prefix}_dst_" "${prefix}_backup_file_" "${prefix}_args_" \
|
||||
"${prefix}_secret_" "${prefix}_cmd_" "${prefix}_data_" "${prefix}_volume_" \
|
||||
"${prefix}_command_" "${prefix}_recipe_" "${prefix}_host_" "${prefix}_user_" \
|
||||
"${prefix}_port_" "${prefix}_provider_" "${prefix}_subcommands_" \
|
||||
|
|
@ -2066,7 +2068,7 @@ sub_recipe_versions() {
|
|||
|
||||
###### .. recipe <recipe> release
|
||||
help_recipe_release() {
|
||||
echo "abra [options] recipe <recipe> release
|
||||
echo "abra [options] recipe <recipe> release [--force] [--bump]
|
||||
|
||||
(For recipe maintainers)
|
||||
|
||||
|
|
@ -2079,6 +2081,7 @@ any of the images in <recipe>.
|
|||
OPTIONS
|
||||
--force Over-write existing tag; use this if you have a git tag for the
|
||||
recipe version already, to make sure labels are in sync.
|
||||
--bump Make an n+1 release (packager specific changes to recipe)
|
||||
|
||||
POWERED BY
|
||||
skopeo inspect docker://image:tag
|
||||
|
|
@ -2093,8 +2096,13 @@ sub_recipe_release() {
|
|||
|
||||
recipe="$abra__recipe_"
|
||||
force="$abra___force"
|
||||
bump="$abra___bump"
|
||||
recipe_dir="$ABRA_DIR/apps/$recipe"
|
||||
|
||||
if [ "$bump" = "true" ] && [ "$force" = "true" ]; then
|
||||
error "--bump and --force don't play nicely together"
|
||||
fi
|
||||
|
||||
cd "$recipe_dir" || error "Can't find recipe dir '$recipe_dir'"
|
||||
|
||||
get_recipe_versions "$recipe"
|
||||
|
|
@ -2107,15 +2115,18 @@ sub_recipe_release() {
|
|||
latest_version_message=$(git show -s --format=%s)
|
||||
fi
|
||||
info "Latest available version: '$latest_version'"
|
||||
info "Latest verion message: '$latest_version_message'"
|
||||
info "Latest version message: '$latest_version_message'"
|
||||
else
|
||||
latest_version=""
|
||||
latest_version_message="Initial tagged release"
|
||||
info "No previous releases found"
|
||||
if [ "$bump" = "true" ]; then
|
||||
error "--bump can't do its work when there are no existing release versions"
|
||||
fi
|
||||
fi
|
||||
|
||||
current_tag=$(git tag --points-at HEAD)
|
||||
if [ "$force" = "false" ] && [ -n "$current_tag" ]; then
|
||||
if [ "$force" = "false" ] && [ -n "$current_tag" ] && [ "$bump" = "false" ]; then
|
||||
success "$recipe is already on $current_tag, no release needed"
|
||||
fi
|
||||
|
||||
|
|
@ -2138,7 +2149,12 @@ sub_recipe_release() {
|
|||
new_version="false"
|
||||
|
||||
for compose_file in "${compose_files[@]}"; do
|
||||
if [ "$bump" = "true" ]; then
|
||||
continue # skip trying to upgrade labels for --bump logic
|
||||
fi
|
||||
|
||||
mapfile -t services < <($YQ e -N '.services | keys | .[]' "$compose_file" | sort -u)
|
||||
|
||||
if [ "$compose_file" = "compose.yml" ] && ! printf '%s\0' "${services[@]}" | grep -Fqxz -- "app"; then
|
||||
# shellcheck disable=SC2016
|
||||
warning 'No `app` service found; which one should we use for the version number?'
|
||||
|
|
@ -2549,7 +2565,8 @@ abra() {
|
|||
abra___help abra___branch abra___volumes abra__provider_ abra___type \
|
||||
abra___dev abra___update abra___no_prompt abra___force \
|
||||
abra___skip_version_check abra__recipe_ abra___no_domain_poll \
|
||||
abra___fast abra__volume_ abra___no_state_poll abra___chaos
|
||||
abra___fast abra__volume_ abra___no_state_poll abra___bump \
|
||||
abra___chaos
|
||||
|
||||
if ! type tput > /dev/null 2>&1; then
|
||||
tput() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue