Compare commits

...

51 Commits
0.7.3 ... 8.0.0

Author SHA1 Message Date
cac13fb64e Getting v8 out 2021-05-30 23:57:09 +02:00
42923ced55 Follow along with the formatting 2021-05-30 22:06:22 +02:00
6a12955649 Merge pull request 'Add app .. volume commands, working vol deletion' (#166) from volume-up into main
Reviewed-on: https://git.autonomic.zone/coop-cloud/abra/pulls/166
2021-05-30 22:04:35 +02:00
3wc
ceccb28380 .. and update CHANGELOG and fix typos 2021-05-30 22:03:43 +02:00
3wc
b033fe9450 Add app .. volume commands, working vol deletion
Fixes #161
2021-05-30 22:00:59 +02:00
3wc
0e29e78144 List some requirements in README
Closes #147
2021-05-30 21:25:33 +02:00
3wc
c92f80cf7e Upd8 changelog 2021-05-30 20:16:55 +02:00
3wc
a7f7c965c4 deploy --fast (The Homer Simpson way)
"Like the wrong way, but faster"
2021-05-30 20:14:41 +02:00
3wc
e04c5228de Downgrade duplicate message about versions to info
Fixes #155
2021-05-30 20:12:35 +02:00
3wc
6c9dff0eed change.log 2021-05-30 19:53:35 +02:00
3wc
c45598d7b4 Update apps.json 2021-05-30 19:51:04 +02:00
3wc
4e1c3bfe2f Fallback app name in app.json creation
Fixes #157
2021-05-30 19:49:54 +02:00
3wc
615c6b0614 CHANGELOG++ 2021-05-30 14:37:09 +02:00
3wc
b14219b492 Tweak regex for README metadata-parsing..
..to allow use of `- `-style Markdown lists (e.g. Wordpress).

Bonus: adds "sso" key to features data.
2021-05-30 14:35:18 +02:00
3wc
8c93d1ae88 Add Bash completion for abra recipe .. 2021-05-30 14:33:57 +02:00
3wc
cf2ae05dfd Update CHANGELOG 2021-05-30 00:21:04 +02:00
3wc
70974690f9 Switch from wget to cURL 2021-05-30 00:21:04 +02:00
3wc
a4f3fc5ce2 Bad YAML = showstopper
Fixes #154
2021-05-30 00:20:59 +02:00
3wc
8a4f82ba84 Sprinkle some sudo 2021-05-29 23:37:31 +02:00
3wc
a1534a244a Remove bogus slash in GIT_URL
Fixes #164
2021-05-29 23:37:31 +02:00
fccd7865f5 Upload latest keycloak tag 2021-05-27 14:10:39 +02:00
4e84664310 Remove weird version 2021-05-17 09:17:39 +02:00
3wc
047c0e6d47 Update apps.json 2021-05-15 23:18:38 +02:00
fc2d770099 Add log entry 2021-05-14 16:12:00 +02:00
1b85bf3d37 Fix secret length generation 2021-05-14 16:11:10 +02:00
2d6a08a671 Merge pull request 'refactor: changed misc prompts to convention' (#163) from prompt-cleanup into main
Reviewed-on: https://git.autonomic.zone/coop-cloud/abra/pulls/163
2021-05-12 16:40:17 +02:00
316bcd5a68 Merge branch 'prompt-cleanup' of ssh://git.autonomic.zone:2222/coop-cloud/abra into prompt-cleanup 2021-05-12 15:39:26 +01:00
1a4cf9be17 refactor: changed misc prompts to convention
Missed issue beore since I only changed the function, not these strays
Contiunation of PR #162
2021-05-12 15:37:42 +01:00
eadb353c2e refactor: changed misc prompts to convention
Missed issue beore since I only changed the function, not these strays
Contiunation of PR #162
2021-05-11 14:40:02 +01:00
f374b1bfa1 New patch release 2021-05-10 10:39:57 +02:00
0e6b0e0879 Add change log entry 2021-05-10 10:38:02 +02:00
3a353f4062 Possible fix to invalid length "20"?
See https://git.autonomic.zone/coop-cloud/abra/pulls/160.
2021-05-10 10:36:23 +02:00
e0258d397b Merge pull request 'feat: switches to conventional confirmation prompt' (#162) from roxxers/abra:prompt into main
Reviewed-on: https://git.autonomic.zone/coop-cloud/abra/pulls/162
2021-05-10 10:26:09 +02:00
e8ac353453 feat: switches to conventional confirmation prompt 2021-05-08 21:45:52 +01:00
3wc
552abdd980 Don't clobber global $DOMAIN variable
Closes #156
2021-05-06 00:43:16 +02:00
3wc
935007dd86 Improve recipe new subcommand 2021-05-03 03:22:32 +02:00
2cd1d053f0 Update change log 2021-05-02 22:18:04 +02:00
a1c8620cc0 Sort the JSON 2021-05-02 22:14:22 +02:00
39a7fc04fb Sort that JSON 2021-05-02 22:14:15 +02:00
a8b5fb5c1e Cut a new release of the apps.json 2021-05-02 22:11:12 +02:00
18e22b24ea Don't explode if missing the README 2021-05-02 22:10:58 +02:00
b53a3ed3f7 Exclude that repo too 2021-05-02 21:58:02 +02:00
112787b3aa Add gardening to exluded repos list 2021-05-02 21:48:35 +02:00
4f46ff7ee6 Remove that 2021-05-02 21:44:11 +02:00
845de093ba Let the formatter run at that 2021-05-02 21:42:55 +02:00
65e83ed885 Exclude more repos 2021-05-02 21:42:34 +02:00
b98d69b33e Remove slightly off-topic comment 2021-05-02 20:30:09 +02:00
d159b98c3c Add other plugin repos 2021-05-02 20:30:08 +02:00
1ef5c3980d Use new name of repos and sort 2021-05-02 20:30:08 +02:00
3wc
ffc569e275 Further fix to #151 2021-04-30 22:55:59 +02:00
3wc
0e28af9eb1 app-json.py: parse emoji status scores into digits 2021-04-30 22:55:59 +02:00
8 changed files with 2607 additions and 1251 deletions

View File

@ -9,6 +9,26 @@
# abra x.x.x (UNRELEASED) # abra x.x.x (UNRELEASED)
# abra 8.0.0 (2021-05-30)
- Fix secret length generation ([f537417](https://git.autonomic.zone/coop-cloud/abra/commit/1b85bf3d37280e9632c315d759c0f2d09c039fef))
- Fix checking out new apps ([#164](https://git.autonomic.zone/coop-cloud/abra/issues/164)
- Give up if YAML is invalid ([#154](https://git.autonomic.zone/coop-cloud/abra/issues/154))
- Switch from wget to cURL ([fc0caaa](https://git.autonomic.zone/coop-cloud/abra/commit/fc0caaa))
- Add Bash completion for `recipe ..` ([8c93d1a](https://git.autonomic.zone/coop-cloud/abra/commit/8c93d1a))
- Tweak README parsing in `app-json.py` ([b14219b](https://git.autonomic.zone/coop-cloud/abra/commit/b14219b))
- Add fallback names to `app.json` ([#157](https://git.autonomic.zone/coop-cloud/abra/issues/157))
- Remove duplicate message ([#155](https://git.autonomic.zone/coop-cloud/abra/issues/155))
- Add `deploy --fast` ([a7f7c96](https://git.autonomic.zone/coop-cloud/abra/commit/a7f7c96))
- Add `app .. volume` commands, fix volume deletion with `app .. delete --volumes` ([#161](https://git.autonomic.zone/coop-cloud/abra/issues/161))
# abra 0.7.4 (2021-05-10)
- Sort `apps.json` when publishing ([39a7fc0](https://git.autonomic.zone/coop-cloud/abra/commit/39a7fc04fb5df1a6d78b84f51838530ab3eb76db))
- Fix publishing of rating for new apps ([0e28af9](https://git.autonomic.zone/coop-cloud/abra/commit/0e28af9eb1af6c6da705b4614ddd173c60576629))
- Detect compose filenames in `n+1` release generation ([ffc569e](https://git.autonomic.zone/coop-cloud/abra/commit/ffc569e275df7ca784a4db1a3331e17975fd8c87))
- Fix secret generation when specifying length ([3a353f4](https://git.autonomic.zone/coop-cloud/abra/commit/3a353f4062baccde2c9f175b03afb2db6d462ae4))
# abra 0.7.3 (2021-04-28) # abra 0.7.3 (2021-04-28)
- Only check for pw(q)gen if we're actually trying to use them ([#147](https://git.autonomic.zone/coop-cloud/abra/issues/147)) - Only check for pw(q)gen if we're actually trying to use them ([#147](https://git.autonomic.zone/coop-cloud/abra/issues/147))

View File

@ -28,6 +28,14 @@ See [CHANGELOG.md](./CHANGELOG.md).
## Install ## Install
Requirements:
- `pwqgen` (optional)
- `pwgen` (optional)
- `curl`
- `docker`
- `bash` >= 4
Install the latest stable release: Install the latest stable release:
```sh ```sh

426
abra
View File

@ -3,7 +3,7 @@
GIT_URL="https://git.autonomic.zone/coop-cloud/" GIT_URL="https://git.autonomic.zone/coop-cloud/"
ABRA_APPS_URL="https://apps.coopcloud.tech" ABRA_APPS_URL="https://apps.coopcloud.tech"
ABRA_DIR="${ABRA_DIR:-$HOME/.abra}" ABRA_DIR="${ABRA_DIR:-$HOME/.abra}"
ABRA_VERSION="0.7.3" ABRA_VERSION="8.0.0"
ABRA_BACKUP_DIR="${ABRA_BACKUP_DIR:-$ABRA_DIR/backups}" ABRA_BACKUP_DIR="${ABRA_BACKUP_DIR:-$ABRA_DIR/backups}"
ABRA_VENDOR_DIR="$ABRA_DIR/vendor" ABRA_VENDOR_DIR="$ABRA_DIR/vendor"
ABRA_APPS_JSON="${ABRA_DIR}/apps.json" ABRA_APPS_JSON="${ABRA_DIR}/apps.json"
@ -19,7 +19,7 @@ Usage:
abra [options] app (list|ls) [--status] [--server=<server>] [--type=<type>] abra [options] app (list|ls) [--status] [--server=<server>] [--type=<type>]
abra [options] app new [--server=<server>] [--domain=<domain>] [--app-name=<app_name>] [--pass] [--secrets] <type> abra [options] app new [--server=<server>] [--domain=<domain>] [--app-name=<app_name>] [--pass] [--secrets] <type>
abra [options] app <app> backup (<service>|--all) abra [options] app <app> backup (<service>|--all)
abra [options] app <app> deploy [--update] [--force] [--skip-version-check] [--no-domain-poll] [<version>] abra [options] app <app> deploy [--update] [--force] [--fast] [--skip-version-check] [--no-domain-poll] [<version>]
abra [options] app <app> check abra [options] app <app> check
abra [options] app <app> version abra [options] app <app> version
abra [options] app <app> config abra [options] app <app> config
@ -35,6 +35,8 @@ Usage:
abra [options] app <app> secret insert <secret> <version> <data> [--pass] abra [options] app <app> secret insert <secret> <version> <data> [--pass]
abra [options] app <app> secret (rm|delete) (<secret>|--all) [--pass] abra [options] app <app> secret (rm|delete) (<secret>|--all) [--pass]
abra [options] app <app> undeploy abra [options] app <app> undeploy
abra [options] app <app> volume ls
abra [options] app <app> volume (rm|delete) (<volume>|--all)
abra [options] app <app> <command> [<args>...] abra [options] app <app> <command> [<args>...]
abra [options] recipe ls abra [options] recipe ls
abra [options] recipe create <recipe> abra [options] recipe create <recipe>
@ -165,123 +167,128 @@ 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() { return 1; }; stdout() { printf -- "cat <<'EOM'\n%s\nEOM\n" "$1"; }; stderr() {
printf -- "cat <<'EOM' >&2\n%s\nEOM\n" "$1"; }; error() { printf -- "cat <<'EOM' >&2\n%s\nEOM\n" "$1"; }; error() {
[[ -n $1 ]] && stderr "$1"; stderr "$usage"; _return 1; }; _return() { [[ -n $1 ]] && stderr "$1"; stderr "$usage"; _return 1; }; _return() {
printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:2365} printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:2474}
usage=${DOC:40:1756}; digest=de09c usage=${DOC:40:1865}; digest=c7702
shorts=(-s -b -d -C -e -n -h -v -U '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '') shorts=(-h -U -C -s -v -b -d -n -e '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
longs=(--stack --branch --debug --skip-check --env --no-prompt --help --verbose --skip-update --status --server --type --domain --app-name --pass --secrets --all --update --force --skip-version-check --no-domain-poll --volumes --no-tty --user --dev) longs=(--help --skip-update --skip-check --stack --verbose --branch --debug --no-prompt --env --status --server --type --domain --app-name --pass --secrets --all --update --force --fast --skip-version-check --no-domain-poll --volumes --no-tty --user --dev)
argcounts=(1 1 0 0 1 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 1 0); node_0(){ argcounts=(0 0 0 1 0 1 0 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 0); node_0(){
value __stack 0; }; node_1(){ value __branch 1; }; node_2(){ switch __debug 2; } switch __help 0; }; node_1(){ switch __skip_update 1; }; node_2(){
node_3(){ switch __skip_check 3; }; node_4(){ value __env 4; }; node_5(){ switch __skip_check 2; }; node_3(){ value __stack 3; }; node_4(){
switch __no_prompt 5; }; node_6(){ switch __help 6; }; node_7(){ switch __verbose 4; }; node_5(){ value __branch 5; }; node_6(){ switch __debug 6
switch __verbose 7; }; node_8(){ switch __skip_update 8; }; node_9(){ }; node_7(){ switch __no_prompt 7; }; node_8(){ value __env 8; }; node_9(){
switch __status 9; }; node_10(){ value __server 10; }; node_11(){ switch __status 9; }; node_10(){ value __server 10; }; node_11(){
value __type 11; }; node_12(){ value __domain 12; }; node_13(){ value __type 11; }; node_12(){ value __domain 12; }; node_13(){
value __app_name 13; }; node_14(){ switch __pass 14; }; node_15(){ value __app_name 13; }; node_14(){ switch __pass 14; }; node_15(){
switch __secrets 15; }; node_16(){ switch __all 16; }; node_17(){ switch __secrets 15; }; node_16(){ switch __all 16; }; node_17(){
switch __update 17; }; node_18(){ switch __force 18; }; node_19(){ switch __update 17; }; node_18(){ switch __force 18; }; node_19(){
switch __skip_version_check 19; }; node_20(){ switch __no_domain_poll 20; } switch __fast 19; }; node_20(){ switch __skip_version_check 20; }; node_21(){
node_21(){ switch __volumes 21; }; node_22(){ switch __no_tty 22; }; node_23(){ switch __no_domain_poll 21; }; node_22(){ switch __volumes 22; }; node_23(){
value __user 23; }; node_24(){ switch __dev 24; }; node_25(){ value _type_ a; } switch __no_tty 23; }; node_24(){ value __user 24; }; node_25(){ switch __dev 25
node_26(){ value _app_ a; }; node_27(){ value _service_ a; }; node_28(){ }; node_26(){ value _type_ a; }; node_27(){ value _app_ a; }; node_28(){
value _version_ a; }; node_29(){ value _src_ a; }; node_30(){ value _dst_ a; } value _service_ a; }; node_29(){ value _version_ a; }; node_30(){ value _src_ a
node_31(){ value _backup_file_ a; }; node_32(){ value _args_ a true; } }; node_31(){ value _dst_ a; }; node_32(){ value _backup_file_ a; }; node_33(){
node_33(){ value _secret_ a; }; node_34(){ value _cmd_ a; }; node_35(){ value _args_ a true; }; node_34(){ value _secret_ a; }; node_35(){ value _cmd_ a
value _data_ a; }; node_36(){ value _command_ a; }; node_37(){ value _recipe_ a }; node_36(){ value _data_ a; }; node_37(){ value _volume_ a; }; node_38(){
}; node_38(){ value _host_ a; }; node_39(){ value _user_ a; }; node_40(){ value _command_ a; }; node_39(){ value _recipe_ a; }; node_40(){ value _host_ a
value _port_ a; }; node_41(){ value _provider_ a; }; node_42(){ }; node_41(){ value _user_ a; }; node_42(){ value _port_ a; }; node_43(){
value _subcommands_ a true; }; node_43(){ _command app; }; node_44(){ value _provider_ a; }; node_44(){ value _subcommands_ a true; }; node_45(){
_command list; }; node_45(){ _command ls; }; node_46(){ _command new; } _command app; }; node_46(){ _command list; }; node_47(){ _command ls; }
node_47(){ _command backup; }; node_48(){ _command deploy; }; node_49(){ node_48(){ _command new; }; node_49(){ _command backup; }; node_50(){
_command check; }; node_50(){ _command version; }; node_51(){ _command config; } _command deploy; }; node_51(){ _command check; }; node_52(){ _command version; }
node_52(){ _command cp; }; node_53(){ _command logs; }; node_54(){ _command ps node_53(){ _command config; }; node_54(){ _command cp; }; node_55(){
}; node_55(){ _command restore; }; node_56(){ _command rm; }; node_57(){ _command logs; }; node_56(){ _command ps; }; node_57(){ _command restore; }
_command delete; }; node_58(){ _command run; }; node_59(){ _command rollback; } node_58(){ _command rm; }; node_59(){ _command delete; }; node_60(){
node_60(){ _command secret; }; node_61(){ _command generate; }; node_62(){ _command run; }; node_61(){ _command rollback; }; node_62(){ _command secret; }
_command insert; }; node_63(){ _command undeploy; }; node_64(){ _command recipe node_63(){ _command generate; }; node_64(){ _command insert; }; node_65(){
}; node_65(){ _command create; }; node_66(){ _command release; }; node_67(){ _command undeploy; }; node_66(){ _command volume; }; node_67(){ _command recipe
_command versions; }; node_68(){ _command server; }; node_69(){ _command add; } }; node_68(){ _command create; }; node_69(){ _command release; }; node_70(){
node_70(){ _command __ --; }; node_71(){ _command init; }; node_72(){ _command versions; }; node_71(){ _command server; }; node_72(){ _command add; }
_command apps; }; node_73(){ _command upgrade; }; node_74(){ _command doctor; } node_73(){ _command __ --; }; node_74(){ _command init; }; node_75(){
node_75(){ _command help; }; node_76(){ optional 0 1 2 3 4 5 6 7 8; } _command apps; }; node_76(){ _command upgrade; }; node_77(){ _command doctor; }
node_77(){ optional 76; }; node_78(){ either 44 45; }; node_79(){ required 78; } node_78(){ _command help; }; node_79(){ optional 0 1 2 3 4 5 6 7 8; }
node_80(){ optional 9; }; node_81(){ optional 10; }; node_82(){ optional 11; } node_80(){ optional 79; }; node_81(){ either 46 47; }; node_82(){ required 81; }
node_83(){ required 77 43 79 80 81 82; }; node_84(){ optional 12; }; node_85(){ node_83(){ optional 9; }; node_84(){ optional 10; }; node_85(){ optional 11; }
optional 13; }; node_86(){ optional 14; }; node_87(){ optional 15; }; node_88(){ node_86(){ required 80 45 82 83 84 85; }; node_87(){ optional 12; }; node_88(){
required 77 43 46 81 84 85 86 87 25; }; node_89(){ either 27 16; }; node_90(){ optional 13; }; node_89(){ optional 14; }; node_90(){ optional 15; }; node_91(){
required 89; }; node_91(){ required 77 43 26 47 90; }; node_92(){ optional 17; } required 80 45 48 84 87 88 89 90 26; }; node_92(){ either 28 16; }; node_93(){
node_93(){ optional 18; }; node_94(){ optional 19; }; node_95(){ optional 20; } required 92; }; node_94(){ required 80 45 27 49 93; }; node_95(){ optional 17; }
node_96(){ optional 28; }; node_97(){ required 77 43 26 48 92 93 94 95 96; } node_96(){ optional 18; }; node_97(){ optional 19; }; node_98(){ optional 20; }
node_98(){ required 77 43 26 49; }; node_99(){ required 77 43 26 50; } node_99(){ optional 21; }; node_100(){ optional 29; }; node_101(){
node_100(){ required 77 43 26 51; }; node_101(){ required 77 43 26 52 29 30; } required 80 45 27 50 95 96 97 98 99 100; }; node_102(){ required 80 45 27 51; }
node_102(){ optional 27; }; node_103(){ required 77 43 26 53 102; }; node_104(){ node_103(){ required 80 45 27 52; }; node_104(){ required 80 45 27 53; }
required 77 43 26 54; }; node_105(){ required 77 43 26 55 90; }; node_106(){ node_105(){ required 80 45 27 54 30 31; }; node_106(){ optional 28; }
either 56 57; }; node_107(){ required 106; }; node_108(){ optional 21; } node_107(){ required 80 45 27 55 106; }; node_108(){ required 80 45 27 56; }
node_109(){ required 77 43 26 107 108 87; }; node_110(){ optional 31; } node_109(){ required 80 45 27 57 93; }; node_110(){ either 58 59; }; node_111(){
node_111(){ required 77 43 26 55 27 110; }; node_112(){ optional 22; } required 110; }; node_112(){ optional 22; }; node_113(){
node_113(){ optional 23; }; node_114(){ oneormore 32; }; node_115(){ required 80 45 27 111 112 90; }; node_114(){ optional 32; }; node_115(){
required 77 43 26 58 112 113 27 114; }; node_116(){ required 77 43 26 59 96; } required 80 45 27 57 28 114; }; node_116(){ optional 23; }; node_117(){
node_117(){ required 33 28; }; node_118(){ either 117 16; }; node_119(){ optional 24; }; node_118(){ oneormore 33; }; node_119(){
required 118; }; node_120(){ optional 34; }; node_121(){ required 80 45 27 60 116 117 28 118; }; node_120(){ required 80 45 27 61 100; }
required 77 43 26 60 61 119 120 86; }; node_122(){ node_121(){ required 34 29; }; node_122(){ either 121 16; }; node_123(){
required 77 43 26 60 62 33 28 35 86; }; node_123(){ either 33 16; }; node_124(){ required 122; }; node_124(){ optional 35; }; node_125(){
required 123; }; node_125(){ required 77 43 26 60 107 124 86; }; node_126(){ required 80 45 27 62 63 123 124 89; }; node_126(){
required 77 43 26 63; }; node_127(){ optional 114; }; node_128(){ required 80 45 27 62 64 34 29 36 89; }; node_127(){ either 34 16; }; node_128(){
required 77 43 26 36 127; }; node_129(){ required 77 64 45; }; node_130(){ required 127; }; node_129(){ required 80 45 27 62 111 128 89; }; node_130(){
required 77 64 65 37; }; node_131(){ required 77 64 37 66 93; }; node_132(){ required 80 45 27 65; }; node_131(){ required 80 45 27 66 47; }; node_132(){
required 77 64 37 67; }; node_133(){ optional 39; }; node_134(){ optional 40; } either 37 16; }; node_133(){ required 132; }; node_134(){
node_135(){ required 77 68 69 38 133 134; }; node_136(){ required 80 45 27 66 111 133; }; node_135(){ optional 118; }; node_136(){
required 77 68 46 41 70 32; }; node_137(){ required 77 68 79; }; node_138(){ required 80 45 27 38 135; }; node_137(){ required 80 67 47; }; node_138(){
required 77 68 38 56; }; node_139(){ required 77 68 38 71; }; node_140(){ required 80 67 68 39; }; node_139(){ required 80 67 39 69 96; }; node_140(){
required 77 68 38 72 80; }; node_141(){ optional 24; }; node_142(){ required 80 67 39 70; }; node_141(){ optional 41; }; node_142(){ optional 42; }
required 77 73 141; }; node_143(){ required 77 50; }; node_144(){ required 77 74 node_143(){ required 80 71 72 40 141 142; }; node_144(){
}; node_145(){ oneormore 42; }; node_146(){ optional 145; }; node_147(){ required 80 71 48 43 73 33; }; node_145(){ required 80 71 82; }; node_146(){
required 77 75 146; }; node_148(){ required 77; }; node_149(){ required 80 71 40 58; }; node_147(){ required 80 71 40 74; }; node_148(){
either 83 88 91 97 98 99 100 101 103 104 105 109 111 115 116 121 122 125 126 128 129 130 131 132 135 136 137 138 139 140 142 143 144 147 148 required 80 71 40 75 83; }; node_149(){ optional 25; }; node_150(){
}; node_150(){ required 149; }; cat <<<' docopt_exit() { required 80 76 149; }; node_151(){ required 80 52; }; node_152(){ required 80 77
[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1756}" >&2 }; node_153(){ oneormore 44; }; node_154(){ optional 153; }; node_155(){
exit 1; }'; unset var___stack var___branch var___debug var___skip_check \ required 80 78 154; }; node_156(){ required 80; }; node_157(){
var___env var___no_prompt var___help var___verbose var___skip_update \ either 86 91 94 101 102 103 104 105 107 108 109 113 115 119 120 125 126 129 130 131 134 136 137 138 139 140 143 144 145 146 147 148 150 151 152 155 156
var___status var___server var___type var___domain var___app_name var___pass \ }; node_158(){ required 157; }; cat <<<' docopt_exit() {
var___secrets var___all var___update var___force var___skip_version_check \ [[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1865}" >&2
exit 1; }'; unset var___help var___skip_update var___skip_check var___stack \
var___verbose var___branch var___debug var___no_prompt 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___volumes var___no_tty var___user var___dev \ var___no_domain_poll var___volumes var___no_tty var___user var___dev \
var__type_ var__app_ var__service_ var__version_ var__src_ var__dst_ \ var__type_ var__app_ var__service_ var__version_ var__src_ var__dst_ \
var__backup_file_ var__args_ var__secret_ var__cmd_ var__data_ var__command_ \ var__backup_file_ var__args_ var__secret_ var__cmd_ var__data_ var__volume_ \
var__recipe_ var__host_ var__user_ var__port_ var__provider_ var__subcommands_ \ var__command_ var__recipe_ var__host_ var__user_ var__port_ var__provider_ \
var_app var_list var_ls var_new var_backup var_deploy var_check var_version \ var__subcommands_ var_app var_list var_ls var_new var_backup var_deploy \
var_config var_cp var_logs var_ps var_restore var_rm var_delete var_run \ var_check var_version var_config var_cp var_logs var_ps var_restore var_rm \
var_rollback var_secret var_generate var_insert var_undeploy var_recipe \ var_delete var_run var_rollback var_secret var_generate var_insert \
var_create var_release var_versions var_server var_add var___ var_init \ var_undeploy var_volume var_recipe var_create var_release var_versions \
var_apps var_upgrade var_doctor var_help; parse 150 "$@" var_server var_add var___ var_init var_apps var_upgrade var_doctor var_help
local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__stack" \ parse 158 "$@"; local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__help" \
"${prefix}__branch" "${prefix}__debug" "${prefix}__skip_check" \ "${prefix}__skip_update" "${prefix}__skip_check" "${prefix}__stack" \
"${prefix}__env" "${prefix}__no_prompt" "${prefix}__help" "${prefix}__verbose" \ "${prefix}__verbose" "${prefix}__branch" "${prefix}__debug" \
"${prefix}__skip_update" "${prefix}__status" "${prefix}__server" \ "${prefix}__no_prompt" "${prefix}__env" "${prefix}__status" \
"${prefix}__type" "${prefix}__domain" "${prefix}__app_name" "${prefix}__pass" \ "${prefix}__server" "${prefix}__type" "${prefix}__domain" \
"${prefix}__secrets" "${prefix}__all" "${prefix}__update" "${prefix}__force" \ "${prefix}__app_name" "${prefix}__pass" "${prefix}__secrets" "${prefix}__all" \
"${prefix}__update" "${prefix}__force" "${prefix}__fast" \
"${prefix}__skip_version_check" "${prefix}__no_domain_poll" \ "${prefix}__skip_version_check" "${prefix}__no_domain_poll" \
"${prefix}__volumes" "${prefix}__no_tty" "${prefix}__user" "${prefix}__dev" \ "${prefix}__volumes" "${prefix}__no_tty" "${prefix}__user" "${prefix}__dev" \
"${prefix}_type_" "${prefix}_app_" "${prefix}_service_" "${prefix}_version_" \ "${prefix}_type_" "${prefix}_app_" "${prefix}_service_" "${prefix}_version_" \
"${prefix}_src_" "${prefix}_dst_" "${prefix}_backup_file_" "${prefix}_args_" \ "${prefix}_src_" "${prefix}_dst_" "${prefix}_backup_file_" "${prefix}_args_" \
"${prefix}_secret_" "${prefix}_cmd_" "${prefix}_data_" "${prefix}_command_" \ "${prefix}_secret_" "${prefix}_cmd_" "${prefix}_data_" "${prefix}_volume_" \
"${prefix}_recipe_" "${prefix}_host_" "${prefix}_user_" "${prefix}_port_" \ "${prefix}_command_" "${prefix}_recipe_" "${prefix}_host_" "${prefix}_user_" \
"${prefix}_provider_" "${prefix}_subcommands_" "${prefix}app" "${prefix}list" \ "${prefix}_port_" "${prefix}_provider_" "${prefix}_subcommands_" \
"${prefix}ls" "${prefix}new" "${prefix}backup" "${prefix}deploy" \ "${prefix}app" "${prefix}list" "${prefix}ls" "${prefix}new" "${prefix}backup" \
"${prefix}check" "${prefix}version" "${prefix}config" "${prefix}cp" \ "${prefix}deploy" "${prefix}check" "${prefix}version" "${prefix}config" \
"${prefix}logs" "${prefix}ps" "${prefix}restore" "${prefix}rm" \ "${prefix}cp" "${prefix}logs" "${prefix}ps" "${prefix}restore" "${prefix}rm" \
"${prefix}delete" "${prefix}run" "${prefix}rollback" "${prefix}secret" \ "${prefix}delete" "${prefix}run" "${prefix}rollback" "${prefix}secret" \
"${prefix}generate" "${prefix}insert" "${prefix}undeploy" "${prefix}recipe" \ "${prefix}generate" "${prefix}insert" "${prefix}undeploy" "${prefix}volume" \
"${prefix}create" "${prefix}release" "${prefix}versions" "${prefix}server" \ "${prefix}recipe" "${prefix}create" "${prefix}release" "${prefix}versions" \
"${prefix}add" "${prefix}__" "${prefix}init" "${prefix}apps" \ "${prefix}server" "${prefix}add" "${prefix}__" "${prefix}init" "${prefix}apps" \
"${prefix}upgrade" "${prefix}doctor" "${prefix}help" "${prefix}upgrade" "${prefix}doctor" "${prefix}help"
eval "${prefix}"'__help=${var___help:-false}'
eval "${prefix}"'__skip_update=${var___skip_update:-false}'
eval "${prefix}"'__skip_check=${var___skip_check:-false}'
eval "${prefix}"'__stack=${var___stack:-}' eval "${prefix}"'__stack=${var___stack:-}'
eval "${prefix}"'__verbose=${var___verbose:-false}'
eval "${prefix}"'__branch=${var___branch:-}' eval "${prefix}"'__branch=${var___branch:-}'
eval "${prefix}"'__debug=${var___debug:-false}' eval "${prefix}"'__debug=${var___debug:-false}'
eval "${prefix}"'__skip_check=${var___skip_check:-false}'
eval "${prefix}"'__env=${var___env:-}'
eval "${prefix}"'__no_prompt=${var___no_prompt:-false}' eval "${prefix}"'__no_prompt=${var___no_prompt:-false}'
eval "${prefix}"'__help=${var___help:-false}' eval "${prefix}"'__env=${var___env:-}'
eval "${prefix}"'__verbose=${var___verbose:-false}'
eval "${prefix}"'__skip_update=${var___skip_update:-false}'
eval "${prefix}"'__status=${var___status:-false}' eval "${prefix}"'__status=${var___status:-false}'
eval "${prefix}"'__server=${var___server:-}' eval "${prefix}"'__server=${var___server:-}'
eval "${prefix}"'__type=${var___type:-}' eval "${prefix}"'__type=${var___type:-}'
@ -292,6 +299,7 @@ eval "${prefix}"'__secrets=${var___secrets:-false}'
eval "${prefix}"'__all=${var___all:-false}' eval "${prefix}"'__all=${var___all:-false}'
eval "${prefix}"'__update=${var___update:-false}' eval "${prefix}"'__update=${var___update:-false}'
eval "${prefix}"'__force=${var___force:-false}' eval "${prefix}"'__force=${var___force:-false}'
eval "${prefix}"'__fast=${var___fast:-false}'
eval "${prefix}"'__skip_version_check=${var___skip_version_check:-false}' eval "${prefix}"'__skip_version_check=${var___skip_version_check:-false}'
eval "${prefix}"'__no_domain_poll=${var___no_domain_poll:-false}' eval "${prefix}"'__no_domain_poll=${var___no_domain_poll:-false}'
eval "${prefix}"'__volumes=${var___volumes:-false}' eval "${prefix}"'__volumes=${var___volumes:-false}'
@ -307,6 +315,7 @@ if declare -p var__args_ >/dev/null 2>&1; then
eval "${prefix}"'_args_=("${var__args_[@]}")'; else eval "${prefix}"'_args_=()' eval "${prefix}"'_args_=("${var__args_[@]}")'; else eval "${prefix}"'_args_=()'
fi; eval "${prefix}"'_secret_=${var__secret_:-}' fi; eval "${prefix}"'_secret_=${var__secret_:-}'
eval "${prefix}"'_cmd_=${var__cmd_:-}'; eval "${prefix}"'_data_=${var__data_:-}' eval "${prefix}"'_cmd_=${var__cmd_:-}'; eval "${prefix}"'_data_=${var__data_:-}'
eval "${prefix}"'_volume_=${var__volume_:-}'
eval "${prefix}"'_command_=${var__command_:-}' eval "${prefix}"'_command_=${var__command_:-}'
eval "${prefix}"'_recipe_=${var__recipe_:-}' eval "${prefix}"'_recipe_=${var__recipe_:-}'
eval "${prefix}"'_host_=${var__host_:-}' eval "${prefix}"'_host_=${var__host_:-}'
@ -334,6 +343,7 @@ eval "${prefix}"'secret=${var_secret:-false}'
eval "${prefix}"'generate=${var_generate:-false}' eval "${prefix}"'generate=${var_generate:-false}'
eval "${prefix}"'insert=${var_insert:-false}' eval "${prefix}"'insert=${var_insert:-false}'
eval "${prefix}"'undeploy=${var_undeploy:-false}' eval "${prefix}"'undeploy=${var_undeploy:-false}'
eval "${prefix}"'volume=${var_volume:-false}'
eval "${prefix}"'recipe=${var_recipe:-false}' eval "${prefix}"'recipe=${var_recipe:-false}'
eval "${prefix}"'create=${var_create:-false}' eval "${prefix}"'create=${var_create:-false}'
eval "${prefix}"'release=${var_release:-false}' eval "${prefix}"'release=${var_release:-false}'
@ -346,27 +356,27 @@ eval "${prefix}"'upgrade=${var_upgrade:-false}'
eval "${prefix}"'doctor=${var_doctor:-false}' eval "${prefix}"'doctor=${var_doctor:-false}'
eval "${prefix}"'help=${var_help:-false}'; local docopt_i=1 eval "${prefix}"'help=${var_help:-false}'; local docopt_i=1
[[ $BASH_VERSION =~ ^4.3 ]] && docopt_i=2; for ((;docopt_i>0;docopt_i--)); do [[ $BASH_VERSION =~ ^4.3 ]] && docopt_i=2; for ((;docopt_i>0;docopt_i--)); do
declare -p "${prefix}__stack" "${prefix}__branch" "${prefix}__debug" \ declare -p "${prefix}__help" "${prefix}__skip_update" "${prefix}__skip_check" \
"${prefix}__skip_check" "${prefix}__env" "${prefix}__no_prompt" \ "${prefix}__stack" "${prefix}__verbose" "${prefix}__branch" "${prefix}__debug" \
"${prefix}__help" "${prefix}__verbose" "${prefix}__skip_update" \ "${prefix}__no_prompt" "${prefix}__env" "${prefix}__status" \
"${prefix}__status" "${prefix}__server" "${prefix}__type" "${prefix}__domain" \ "${prefix}__server" "${prefix}__type" "${prefix}__domain" \
"${prefix}__app_name" "${prefix}__pass" "${prefix}__secrets" "${prefix}__all" \ "${prefix}__app_name" "${prefix}__pass" "${prefix}__secrets" "${prefix}__all" \
"${prefix}__update" "${prefix}__force" "${prefix}__skip_version_check" \ "${prefix}__update" "${prefix}__force" "${prefix}__fast" \
"${prefix}__no_domain_poll" "${prefix}__volumes" "${prefix}__no_tty" \ "${prefix}__skip_version_check" "${prefix}__no_domain_poll" \
"${prefix}__user" "${prefix}__dev" "${prefix}_type_" "${prefix}_app_" \ "${prefix}__volumes" "${prefix}__no_tty" "${prefix}__user" "${prefix}__dev" \
"${prefix}_service_" "${prefix}_version_" "${prefix}_src_" "${prefix}_dst_" \ "${prefix}_type_" "${prefix}_app_" "${prefix}_service_" "${prefix}_version_" \
"${prefix}_backup_file_" "${prefix}_args_" "${prefix}_secret_" \ "${prefix}_src_" "${prefix}_dst_" "${prefix}_backup_file_" "${prefix}_args_" \
"${prefix}_cmd_" "${prefix}_data_" "${prefix}_command_" "${prefix}_recipe_" \ "${prefix}_secret_" "${prefix}_cmd_" "${prefix}_data_" "${prefix}_volume_" \
"${prefix}_host_" "${prefix}_user_" "${prefix}_port_" "${prefix}_provider_" \ "${prefix}_command_" "${prefix}_recipe_" "${prefix}_host_" "${prefix}_user_" \
"${prefix}_subcommands_" "${prefix}app" "${prefix}list" "${prefix}ls" \ "${prefix}_port_" "${prefix}_provider_" "${prefix}_subcommands_" \
"${prefix}new" "${prefix}backup" "${prefix}deploy" "${prefix}check" \ "${prefix}app" "${prefix}list" "${prefix}ls" "${prefix}new" "${prefix}backup" \
"${prefix}version" "${prefix}config" "${prefix}cp" "${prefix}logs" \ "${prefix}deploy" "${prefix}check" "${prefix}version" "${prefix}config" \
"${prefix}ps" "${prefix}restore" "${prefix}rm" "${prefix}delete" \ "${prefix}cp" "${prefix}logs" "${prefix}ps" "${prefix}restore" "${prefix}rm" \
"${prefix}run" "${prefix}rollback" "${prefix}secret" "${prefix}generate" \ "${prefix}delete" "${prefix}run" "${prefix}rollback" "${prefix}secret" \
"${prefix}insert" "${prefix}undeploy" "${prefix}recipe" "${prefix}create" \ "${prefix}generate" "${prefix}insert" "${prefix}undeploy" "${prefix}volume" \
"${prefix}release" "${prefix}versions" "${prefix}server" "${prefix}add" \ "${prefix}recipe" "${prefix}create" "${prefix}release" "${prefix}versions" \
"${prefix}__" "${prefix}init" "${prefix}apps" "${prefix}upgrade" \ "${prefix}server" "${prefix}add" "${prefix}__" "${prefix}init" "${prefix}apps" \
"${prefix}doctor" "${prefix}help"; done; } "${prefix}upgrade" "${prefix}doctor" "${prefix}help"; done; }
# docopt parser above, complete command for generating this parser is `docopt.sh abra` # docopt parser above, complete command for generating this parser is `docopt.sh abra`
PROGRAM_NAME=$(basename "$0") PROGRAM_NAME=$(basename "$0")
@ -478,6 +488,16 @@ require_docker_version() {
done done
} }
require_valid_json() {
require_jq
$JQ "$1" > /dev/null || error "Invalid JSON '$1'"
}
require_valid_yaml() {
require_yq
$YQ e "$1" > /dev/null || error "Invalid YAML '$1'"
}
###### Download and update data ###### Download and update data
require_apps_json() { require_apps_json() {
@ -496,13 +516,13 @@ require_apps_json() {
if [ "$local_ctime" -lt "$remote_ctime" ]; then if [ "$local_ctime" -lt "$remote_ctime" ]; then
info "Downloading new apps.json" info "Downloading new apps.json"
wget -qO "$ABRA_APPS_JSON" "$ABRA_APPS_URL" curl -sLo "$ABRA_APPS_JSON" "$ABRA_APPS_URL"
else else
debug "No apps.json update needed" debug "No apps.json update needed"
fi fi
else else
info "Downloading apps.json" info "Downloading apps.json"
wget -qO "$ABRA_APPS_JSON" "$ABRA_APPS_URL" curl -sLo "$ABRA_APPS_JSON" "$ABRA_APPS_URL"
fi fi
} }
@ -545,7 +565,7 @@ require_app (){
fi fi
# shellcheck disable=SC2086 # shellcheck disable=SC2086
if ! git clone ${git_extra_args:-} "$GIT_URL/$APP.git" "$ABRA_DIR/apps/$APP" > /dev/null 2>&1 ; then if ! git clone ${git_extra_args:-} "$GIT_URL$APP.git" "$ABRA_DIR/apps/$APP" > /dev/null 2>&1 ; then
error "Could not retrieve app type '$APP', this app type doesn't exist?" error "Could not retrieve app type '$APP', this app type doesn't exist?"
fi fi
@ -586,7 +606,6 @@ require_app_version() {
vendor_binary() { vendor_binary() {
require_vendor_dir require_vendor_dir
require_binary wget
local REPO="$1" local REPO="$1"
local VERSION="$2" local VERSION="$2"
@ -613,7 +632,7 @@ vendor_binary() {
;; ;;
esac esac
wget -qO "$ABRA_VENDOR_DIR/$BINARY" "$RELEASE_URL" curl -sLo "$ABRA_VENDOR_DIR/$BINARY" "$RELEASE_URL"
chmod +x "$ABRA_VENDOR_DIR/$BINARY" chmod +x "$ABRA_VENDOR_DIR/$BINARY"
success "$BINARY is now vendored ☮" success "$BINARY is now vendored ☮"
} }
@ -660,7 +679,7 @@ get_recipe_versions() {
get_recipe_version_latest() { get_recipe_version_latest() {
if [ "${#RECIPE_VERSIONS[@]}" = 0 ]; then if [ "${#RECIPE_VERSIONS[@]}" = 0 ]; then
VERSION="" VERSION=""
warning "No version specified, dangerously using latest git 😨" info "No versions found"
else else
VERSION="${RECIPE_VERSIONS[-1]}" VERSION="${RECIPE_VERSIONS[-1]}"
info "Chose version $VERSION" info "Chose version $VERSION"
@ -702,6 +721,7 @@ output_version_summary() {
IFS=':' read -ra COMPOSE_FILES <<< "$COMPOSE_FILE" IFS=':' read -ra COMPOSE_FILES <<< "$COMPOSE_FILE"
for COMPOSE in "${COMPOSE_FILES[@]}"; do for COMPOSE in "${COMPOSE_FILES[@]}"; do
require_valid_yaml "$APP_DIR/$COMPOSE"
SERVICES=$($YQ e '.services | keys | .[]' "${APP_DIR}/${COMPOSE}") SERVICES=$($YQ e '.services | keys | .[]' "${APP_DIR}/${COMPOSE}")
for SERVICE in $SERVICES; do for SERVICE in $SERVICES; do
@ -808,17 +828,17 @@ ensure_stack_deployed() {
} }
ensure_domain_deployed() { ensure_domain_deployed() {
DOMAIN=$1 local domain=$1
warning "Waiting for $DOMAIN to come up..." warning "Waiting for $domain to come up..."
idx=1 idx=1
until curl --output /dev/null --silent --head --fail "$DOMAIN"; do until curl --output /dev/null --silent --head --fail "$domain"; do
debug "Polled $DOMAIN $idx time(s) already" debug "Polled $domain $idx time(s) already"
sleep 3 sleep 3
idx=$(("$idx" + 1)) idx=$(("$idx" + 1))
if [[ $idx -gt 10 ]]; then if [[ $idx -gt 10 ]]; then
error "$DOMAIN still isn't up, check status by running \"abra app ${STACK_NAME} ps\"" error "$domain still isn't up, check status by running \"abra app ${STACK_NAME} ps\""
fi fi
done done
} }
@ -899,7 +919,7 @@ prompt_confirm() {
return return
fi fi
read -rp "Continue? (y/[n])? " choice read -rp "Continue? [y/N]? " choice
case "$choice" in case "$choice" in
y|Y ) return ;; y|Y ) return ;;
@ -1278,7 +1298,7 @@ _abra_backup_mysql() {
###### .. app deploy ###### .. app deploy
help_app_deploy (){ help_app_deploy (){
echo "abra [options] app <app> deploy [--update] [--force] [--skip-version-check] [--no-domain-poll] echo "abra [options] app <app> deploy [--update] [--force] [--fast] [--skip-version-check] [--no-domain-poll]
Deploy app <app> to the configured server. Deploy app <app> to the configured server.
@ -1287,6 +1307,7 @@ OPTIONS
--force Force a deployment regardless of state --force Force a deployment regardless of state
--skip-version-check Don't try and detect deployed version --skip-version-check Don't try and detect deployed version
--no-domain-poll Don't wait for the configured domain to come up --no-domain-poll Don't wait for the configured domain to come up
--fast Alias for --skip-version-check --no-domain-poll
POWERED BY POWERED BY
docker stack deploy -c compose.yml <app>" docker stack deploy -c compose.yml <app>"
@ -1295,8 +1316,13 @@ POWERED BY
sub_app_deploy (){ sub_app_deploy (){
require_yq require_yq
SKIP_VERSION_CHECK=$abra___skip_version_check if [ "$abra___fast" = "true" ]; then
NO_DOMAIN_POLL=$abra___no_domain_poll SKIP_VERSION_CHECK=true
NO_DOMAIN_POLL=true
else
SKIP_VERSION_CHECK=$abra___skip_version_check
NO_DOMAIN_POLL=$abra___no_domain_poll
fi
if [ ! "$abra__version_" = "dev" ]; then if [ ! "$abra__version_" = "dev" ]; then
get_recipe_versions "$TYPE" get_recipe_versions "$TYPE"
@ -1346,6 +1372,10 @@ sub_app_deploy (){
(cd "$APP_DIR" || error "\$APP_DIR '$APP_DIR' not found") (cd "$APP_DIR" || error "\$APP_DIR '$APP_DIR' not found")
# shellcheck disable=SC2086 # shellcheck disable=SC2086
if (cd "$APP_DIR" && docker stack deploy -c ${COMPOSE_FILE//:/ -c } "$STACK_NAME"); then if (cd "$APP_DIR" && docker stack deploy -c ${COMPOSE_FILE//:/ -c } "$STACK_NAME"); then
if [ "$abra___fast" = "true" ]; then
success "Something happened! Hope it was good 🙏"
exit 0
fi
ensure_stack_deployed "$STACK_NAME" ensure_stack_deployed "$STACK_NAME"
if [ -n "$DOMAIN" ]; then if [ -n "$DOMAIN" ]; then
if [[ $NO_DOMAIN_POLL == "false" ]]; then if [[ $NO_DOMAIN_POLL == "false" ]]; then
@ -1510,16 +1540,8 @@ sub_app_delete (){
rm "$ENV_FILE" rm "$ENV_FILE"
if [ "$abra___volumes" = "true" ]; then if [ "$abra___volumes" = "true" ]; then
volumes="$(docker volume ls --filter "name=${STACK_NAME}" --quiet)" abra___all="true"
sub_app_volume_delete
if [ "$abra___volumes" = "true" ]; then
# shellcheck disable=SC2086
warning "SCARY: About to remove all volumes associated with ${STACK_NAME}: $(echo $volumes | tr -d '\n')"
prompt_confirm
fi
docker volume rm --force "$volumes"
fi fi
@ -1633,9 +1655,9 @@ POWERED BY
} }
sub_app_secret_generate(){ sub_app_secret_generate(){
SECRET="$abra__secret_" local secret="$abra__secret_"
VERSION="$abra__version_" local version="$abra__version_"
LENGTH="$abra__length_" local length="$abra__length_"
if [ "$abra___all" == "true" ]; then if [ "$abra___all" == "true" ]; then
# Note(decentral1se): we need to reset the flag here to avoid the infinite # Note(decentral1se): we need to reset the flag here to avoid the infinite
@ -1646,22 +1668,18 @@ sub_app_secret_generate(){
return return
fi fi
if [[ -n "$LENGTH" ]]; then if [[ -n "$length" ]]; then
if [ -z "$abra__cmd_" ]; then require_binary pwgen
require_binary pwgen abra__cmd_="pwgen -s $length 1"
abra__cmd_="pwgen -s \"$LENGTH\" 1"
fi
else else
if [ -z "$abra__cmd_" ]; then require_binary pwqgen
require_binary pwqgen abra__cmd_=pwqgen
abra__cmd_=pwqgen
fi
fi fi
PWGEN=${abra__cmd_}
PWGEN=${abra__cmd_}
debug "SECRET: $SECRET, VERSION $VERSION, PW $PWGEN, ALL $abra___all" debug "SECRET: $SECRET, VERSION $VERSION, PW $PWGEN, ALL $abra___all"
if [ -z "$SECRET" ] || [ -z "$VERSION" ] && [ "$abra___all" == "false" ]; then if [ -z "$secret" ] || [ -z "$version" ] && [ "$abra___all" == "false" ]; then
error "Required arguments missing" error "Required arguments missing"
fi fi
@ -1681,6 +1699,75 @@ sub_app_secret_generate(){
warning "See https://docs.docker.com/engine/swarm/secrets/ for more on secrets" warning "See https://docs.docker.com/engine/swarm/secrets/ for more on secrets"
} }
###### .. app volume
###### .. app volume ls
help_app_volume_ls (){
help_app_volume_list
}
sub_app_volume_ls(){
sub_app_volume_list
}
help_app_volume_list (){
echo "abra [options] app <app> volume (ls|list)
Show all volumes associated with <app>.
OPTIONS
<secret> Generate a single secret
--all Auto-generate all secrets
POWERED BY
docker volume ls"
}
sub_app_volume_list(){
docker volume ls --filter "name=${STACK_NAME}"
}
###### .. app volume rm
help_app_volume_rm (){
help_app_volume_delete
}
sub_app_volume_rm(){
sub_app_volume_delete
}
help_app_volume_delete (){
echo "abra [options] app <app> volume (delete|rm) (<volume>|--all)
Remove <app>'s Docker volume <volume>, or all volumes with --all.
OPTIONS
--pass Remove volume(s) from \`pass\` as well
--all Delete all volumes for <app>
POWERED BY
docker volume rm
docker volume ls # for --all"
}
sub_app_volume_delete(){
# if --all is provided then $abra__secret_ will be blank and this will work
# auto-magically
NAMES=$(docker volume ls --filter "name=${STACK_NAME}_${abra__volume_}" --format "{{.Name}}")
if [ -z "$NAMES" ]; then
error "Could not find any volumes under ${STACK_NAME}_${abra__volume_}"
fi
warning "About to delete volume(s) $(echo "$NAMES" | paste -d "")"
prompt_confirm
for NAME in ${NAMES}; do
docker volume rm "$NAME" > /dev/null
done
}
###### .. app run ###### .. app run
help_app_run (){ help_app_run (){
echo "abra [options] app <app> run [--no-tty] [--user=<user>] <service> <args>... echo "abra [options] app <app> run [--no-tty] [--user=<user>] <service> <args>...
@ -1881,6 +1968,7 @@ Create a new application recipe called <recipe>."
sub_recipe_create() { sub_recipe_create() {
recipe="$abra__recipe_" recipe="$abra__recipe_"
recipe_kebab="${recipe//-/_}"
recipe_dir="$ABRA_DIR/apps/$recipe" recipe_dir="$ABRA_DIR/apps/$recipe"
@ -1894,7 +1982,11 @@ sub_recipe_create() {
cd "$recipe_dir" || error "Failed to create directory '$recipe_dir'" cd "$recipe_dir" || error "Failed to create directory '$recipe_dir'"
rm -rf .git .gitea rm -rf .git .gitea .drone.yml
sed -i "s/\${REPO_NAME}/$recipe/g" README.md
sed -i "s/\${REPO_NAME_TITLE}/$recipe/g" README.md
sed -i "s/\${REPO_NAME_KEBAB}/$recipe_kebab/g" .env.sample
success "New recipe created in '$recipe_dir', happy hacking! 👌" success "New recipe created in '$recipe_dir', happy hacking! 👌"
} }
@ -2019,8 +2111,7 @@ sub_recipe_release() {
for compose_file in "${compose_files[@]}"; do for compose_file in "${compose_files[@]}"; do
mapfile -t services < <($YQ e -N '.services | keys | .[]' "$compose_file" | sort -u) 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
if ! printf '%s\0' "${services[@]}" | grep -Fqxz -- "app"; then
# shellcheck disable=SC2016 # shellcheck disable=SC2016
warning 'No `app` service found; which one should we use for the version number?' warning 'No `app` service found; which one should we use for the version number?'
select service_item in "${services[@]##*/}"; do select service_item in "${services[@]##*/}"; do
@ -2095,7 +2186,7 @@ sub_recipe_release() {
success "All compose files updated; new version is $new_version" success "All compose files updated; new version is $new_version"
read -rp "Commit your changes to git? (y/[n])? " choice read -rp "Commit your changes to git? [y/N]? " choice
if [ "${choice,,}" != "y" ]; then if [ "${choice,,}" != "y" ]; then
return return
@ -2103,7 +2194,7 @@ sub_recipe_release() {
git commit -avem "Version $new_version; sync labels" || exit git commit -avem "Version $new_version; sync labels" || exit
read -rp "Tag this as \`$new_version\`? (y/[n])? " choice read -rp "Tag this as \`$new_version\`? [y/N]? " choice
if [ "${choice,,}" != "y" ]; then if [ "${choice,,}" != "y" ]; then
return return
@ -2402,7 +2493,8 @@ abra() {
abra___skip_check abra__backup_file_ abra___verbose abra___debug \ abra___skip_check abra__backup_file_ abra___verbose abra___debug \
abra___help abra___branch abra___volumes abra__provider_ abra___type \ abra___help abra___branch abra___volumes abra__provider_ abra___type \
abra___dev abra___update abra___no_prompt abra___force \ abra___dev abra___update abra___no_prompt abra___force \
abra___skip_version_check abra__recipe_ abra___no_domain_poll abra___skip_version_check abra__recipe_ abra___no_domain_poll \
abra___fast abra__volume_
if ! type tput > /dev/null 2>&1; then if ! type tput > /dev/null 2>&1; then
tput() { tput() {

View File

@ -25,15 +25,21 @@ SCRIPT_PATH = Path(__file__).absolute().parent
REPOS_TO_SKIP = ( REPOS_TO_SKIP = (
"abra", "abra",
"abra-apps", "abra-apps",
"abra-gandi",
"abra-hetzner",
"backup-bot", "backup-bot",
"cloud.autonomic.zone", "coopcloud.tech",
"docs.cloud.autonomic.zone", "coturn",
"docker-cp-deploy",
"docker-dind-bats-kcov",
"docs.coopcloud.tech",
"example", "example",
"gardening",
"organising", "organising",
"pyabra", "pyabra",
"stack-ssh-deploy",
"radicle-seed-node", "radicle-seed-node",
"coturn", "stack-ssh-deploy",
"swarm-cronjob",
) )
log = getLogger(__name__) log = getLogger(__name__)
@ -101,7 +107,6 @@ def clone_all_apps(repos_json):
repos = [[p["name"], p["ssh_url"]] for p in repos_json] repos = [[p["name"], p["ssh_url"]] for p in repos_json]
for name, url in repos: for name, url in repos:
continue
if name in REPOS_TO_SKIP: if name in REPOS_TO_SKIP:
continue continue
@ -135,7 +140,8 @@ def generate_apps_json(repos_json):
chdir(app_path) chdir(app_path)
metadata = get_app_metadata(app_path) metadata = get_app_metadata(app_path)
name = metadata.pop("name", "")
name = metadata.pop("name", app)
log.info(f"Processing {app}") log.info(f"Processing {app}")
apps_json[app] = { apps_json[app] = {
@ -145,11 +151,6 @@ def generate_apps_json(repos_json):
"default_branch": repo_details.get("default_branch", ""), "default_branch": repo_details.get("default_branch", ""),
"description": repo_details.get("description", ""), "description": repo_details.get("description", ""),
"website": repo_details.get("website", ""), "website": repo_details.get("website", ""),
# Note(decentral1se): please note that the app metadata do not
# correspond to version tags. We simply parse the latest metadata
# list from HEAD. This may lead to unexpected situations where
# users believe X feature is available under Y version but it is
# not.
"features": metadata, "features": metadata,
"versions": get_app_versions(app_path, cached_apps_json), "versions": get_app_versions(app_path, cached_apps_json),
"icon": repo_details.get("avatar_url", ""), "icon": repo_details.get("avatar_url", ""),
@ -164,12 +165,16 @@ def get_app_metadata(app_path):
chdir(app_path) chdir(app_path)
with open(f"{app_path}/README.md", "r") as handle: try:
log.info(f"{app_path}/README.md") with open(f"{app_path}/README.md", "r") as handle:
contents = handle.read() log.info(f"{app_path}/README.md")
contents = handle.read()
except Exception:
log.info(f"No {app_path}/README.md discovered, moving on")
return {}
try: try:
for match in findall(r"\*\*.*\s\*", contents): for match in findall(r"\*\*.*", contents):
title = search(r"(?<=\*\*).*(?=\*\*)", match).group().lower() title = search(r"(?<=\*\*).*(?=\*\*)", match).group().lower()
if title == "image": if title == "image":
@ -179,6 +184,10 @@ def get_app_metadata(app_path):
"rating": match.split(",")[1].strip(), "rating": match.split(",")[1].strip(),
"source": match.split(",")[-1].replace("*", "").strip(), "source": match.split(",")[-1].replace("*", "").strip(),
} }
elif title == "status":
value = {"❶💚": 1, "❷💛": 2, "❸🍎": 3, "❹💣": 4, "?": 5, "": 5}[
match.split(":")[-1].replace("*", "").strip()
]
else: else:
value = match.split(":")[-1].replace("*", "").strip() value = match.split(":")[-1].replace("*", "").strip()
@ -276,7 +285,13 @@ def main():
target = f"{SCRIPT_PATH}/../deploy/apps.coopcloud.tech/apps.json" target = f"{SCRIPT_PATH}/../deploy/apps.coopcloud.tech/apps.json"
with open(target, "w", encoding="utf-8") as handle: with open(target, "w", encoding="utf-8") as handle:
dump(generate_apps_json(repos_json), handle, ensure_ascii=False, indent=4) dump(
generate_apps_json(repos_json),
handle,
ensure_ascii=False,
indent=4,
sort_keys=True,
)
log.info(f"Successfully generated {target}") log.info(f"Successfully generated {target}")

View File

@ -38,6 +38,22 @@ _abra_complete_apps()
mapfile -t COMPREPLY < <(compgen -W "$(_abra_apps)" -- "$1") mapfile -t COMPREPLY < <(compgen -W "$(_abra_apps)" -- "$1")
} }
_abra_recipes()
{
shopt -s nullglob dotglob
local RECIPES=(~/.abra/apps/*)
shopt -u nullglob dotglob
for RECIPE in "${RECIPES[@]}"; do
_abra_basename "${RECIPE%.env}"
done
}
_abra_complete_recipes()
{
mapfile -t COMPREPLY < <(compgen -W "$(_abra_recipes)" -- "$1")
}
_abra_complete() _abra_complete()
{ {
compopt +o default +o nospace compopt +o default +o nospace
@ -46,6 +62,7 @@ _abra_complete()
local -r cmds=' local -r cmds='
app app
server server
recipe
' '
local -r short_opts='-e -h -s -v' local -r short_opts='-e -h -s -v'
local -r long_opts='--env --help --stack --version' local -r long_opts='--env --help --stack --version'
@ -101,6 +118,12 @@ _abra_complete()
_abra_complete_apps "$cur" _abra_complete_apps "$cur"
fi fi
;; ;;
recipe)
# Offer exactly one app completion.
if (( COMP_CWORD == cmd_index + 1 )); then
_abra_complete_recipes "$cur"
fi
;;
#help) #help)
# # Offer exactly one command name completion. # # Offer exactly one command name completion.
# if (( COMP_CWORD == cmd_index + 1 )); then # if (( COMP_CWORD == cmd_index + 1 )); then

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
ABRA_VERSION="0.7.3" ABRA_VERSION="8.0.0"
GIT_URL="https://git.autonomic.zone/coop-cloud/abra" GIT_URL="https://git.autonomic.zone/coop-cloud/abra"
ABRA_SRC="$GIT_URL/raw/tag/$ABRA_VERSION/abra" ABRA_SRC="$GIT_URL/raw/tag/$ABRA_VERSION/abra"
ABRA_DIR="${ABRA_DIR:-$HOME/.abra/}" ABRA_DIR="${ABRA_DIR:-$HOME/.abra/}"

View File

@ -8,12 +8,12 @@ test:
--name=abra-test-dind \ --name=abra-test-dind \
-e DOCKER_TLS_CERTDIR="" \ -e DOCKER_TLS_CERTDIR="" \
decentral1se/docker-dind-bats-kcov decentral1se/docker-dind-bats-kcov
@DOCKER_CONTEXT=default docker exec \ @DOCKER_CONTEXT=default sudo docker exec \
-it \ -it \
abra-test-dind \ abra-test-dind \
sh -c "cd /workdir && bats /workdir/tests" sh -c "cd /workdir && bats /workdir/tests"
@DOCKER_CONTEXT=default docker stop abra-test-dind @DOCKER_CONTEXT=default sudo docker stop abra-test-dind
@DOCKER_CONTEXT=default docker rm abra-test-dind @DOCKER_CONTEXT=default sudo docker rm abra-test-dind
shellcheck: shellcheck:
@docker run \ @docker run \