Bump new patch release

See https://git.autonomic.zone/coop-cloud/abra/issues/165.

CHANGELOG.md

@@ -9,7 +9,24 @@
 
 # abra x.x.x (UNRELEASED)
 
+# abra 8.0.1 (2021-05-31)
+
+- Fix help for `... app ... volume ls` ([efad71c470](https://git.autonomic.zone/coop-cloud/abra/commits/branch/main))
+- Only output secrets warnings once ([#143](https://git.autonomic.zone/coop-cloud/abra/issues/143))
+- Migrate `abra` installation script to `coopcloud.tech` domain ([#150](https://git.autonomic.zone/coop-cloud/abra/issues/150))
+- Add `--no-state-poll` to avoid success/failure forecasting on deployment ([#165](https://git.autonomic.zone/coop-cloud/abra/issues/165))
+
+# 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)

README.md

@@ -28,19 +28,27 @@ See [CHANGELOG.md](./CHANGELOG.md).
 
 ## Install
 
+Requirements:
+
+- `pwqgen` (optional)
+- `pwgen` (optional)
+- `curl`
+- `docker`
+- `bash` >= 4
+
 Install the latest stable release:
 
 ```sh
-curl https://install.abra.autonomic.zone | bash
+curl https://install.abra.coopcloud.tech | bash
 ```
 
 or the bleeding-edge development version:
 
 ```sh
-curl https://install.abra.autonomic.zone | bash -s -- --dev
+curl https://install.abra.coopcloud.tech | bash -s -- --dev
 ```
 
-The source for this script is [here](./deploy/install.abra.autonomic.zone/installer).
+The source for this script is [here](./deploy/install.abra.coopcloud.tech/installer).
 
 ## Update
 
@@ -53,7 +61,7 @@ To update the development version, run `abra upgrade --dev`.
 
 It's written in Bash version 4 or greater!
 
-Install it via `curl https://install.abra.autonomic.zone | bash -s -- --dev`, then you can hack on the source in `~/.abra/src`.
+Install it via `curl https://install.abra.coopcloud.tech | bash -s -- --dev`, then you can hack on the source in `~/.abra/src`.
 
 The command-line interface is generated via [docopt](http://docopt.org/). If you add arguments then you need to run `make docopt` ro regenerate the parser.
 
@@ -74,11 +82,11 @@ Then run `./bin/app-json.py` ([source](./bin/app-json.py)) and it will spit out
 
 ### `abra`
 
-> [install.abra.autonomic.zone](https://install.abra.autonomic.zone)
+> [install.abra.coopcloud.tech](https://install.abra.coopcloud.tech)
 
 - Change the `x.x.x` header in [CHANGELOG.md](./CHANGELOG.md) to reflect new version and mark date
 - Update the version in [abra](./abra)
-- Update the version in [deploy/install.abra.autonomic.zone/installer](./deploy/install.abra.autonomic.zone/installer)
+- Update the version in [deploy/install.abra.coopcloud.tech/installer](./deploy/install.abra.coopcloud.tech/installer)
 - `git commit` the above changes and then tag it with `git tag <your-new-version>`
 - `git push` and `git push --tags`
 - Deploy a new installer script `make release-installer`

abra

@@ -3,7 +3,7 @@
 GIT_URL="https://git.autonomic.zone/coop-cloud/"
 ABRA_APPS_URL="https://apps.coopcloud.tech"
 ABRA_DIR="${ABRA_DIR:-$HOME/.abra}"
-ABRA_VERSION="0.7.4"
+ABRA_VERSION="8.0.1"
 ABRA_BACKUP_DIR="${ABRA_BACKUP_DIR:-$ABRA_DIR/backups}"
 ABRA_VENDOR_DIR="$ABRA_DIR/vendor"
 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 new [--server=<server>] [--domain=<domain>] [--app-name=<app_name>] [--pass] [--secrets] <type>
   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] [--no-state-poll] [<version>]
   abra [options] app <app> check
   abra [options] app <app> version
   abra [options] app <app> config
@@ -167,126 +167,130 @@ 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:2465}
-usage=${DOC:40:1856}; digest=ec8da
-shorts=(-e -U -C -b -v -s -n -d -h '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
-longs=(--env --skip-update --skip-check --branch --verbose --stack --no-prompt --debug --help --status --server --type --domain --app-name --pass --secrets --all --update --force --skip-version-check --no-domain-poll --volumes --no-tty --user --dev)
-argcounts=(1 0 0 1 0 1 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 1 0); node_0(){
-value __env 0; }; node_1(){ switch __skip_update 1; }; node_2(){
-switch __skip_check 2; }; node_3(){ value __branch 3; }; node_4(){
-switch __verbose 4; }; node_5(){ value __stack 5; }; node_6(){
-switch __no_prompt 6; }; node_7(){ switch __debug 7; }; node_8(){
-switch __help 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:2492}
+usage=${DOC:40:1883}; digest=f774b
+shorts=(-e -s -U -h -C -v -d -n -b '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
+longs=(--env --stack --skip-update --help --skip-check --verbose --debug --no-prompt --branch --status --server --type --domain --app-name --pass --secrets --all --update --force --fast --skip-version-check --no-domain-poll --no-state-poll --volumes --no-tty --user --dev)
+argcounts=(1 1 0 0 0 0 0 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 1 0); node_0(){
+value __env 0; }; node_1(){ value __stack 1; }; node_2(){ switch __skip_update 2
+}; node_3(){ switch __help 3; }; node_4(){ switch __skip_check 4; }; node_5(){
+switch __verbose 5; }; node_6(){ switch __debug 6; }; node_7(){
+switch __no_prompt 7; }; node_8(){ value __branch 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 __skip_version_check 19; }; node_20(){ switch __no_domain_poll 20; }
-node_21(){ switch __volumes 21; }; node_22(){ switch __no_tty 22; }; node_23(){
-value __user 23; }; node_24(){ switch __dev 24; }; node_25(){ value _type_ a; }
-node_26(){ value _app_ a; }; node_27(){ value _service_ a; }; node_28(){
-value _version_ a; }; node_29(){ value _src_ a; }; node_30(){ value _dst_ a; }
-node_31(){ value _backup_file_ a; }; node_32(){ value _args_ a true; }
-node_33(){ value _secret_ a; }; node_34(){ value _cmd_ a; }; node_35(){
-value _data_ a; }; node_36(){ value _volume_ a; }; node_37(){ value _command_ a
-}; node_38(){ value _recipe_ a; }; node_39(){ value _host_ a; }; node_40(){
-value _user_ a; }; node_41(){ value _port_ a; }; node_42(){ value _provider_ a
-}; node_43(){ value _subcommands_ a true; }; node_44(){ _command app; }
-node_45(){ _command list; }; node_46(){ _command ls; }; node_47(){ _command new
-}; node_48(){ _command backup; }; node_49(){ _command deploy; }; node_50(){
-_command check; }; node_51(){ _command version; }; node_52(){ _command config; }
-node_53(){ _command cp; }; node_54(){ _command logs; }; node_55(){ _command ps
-}; node_56(){ _command restore; }; node_57(){ _command rm; }; node_58(){
-_command delete; }; node_59(){ _command run; }; node_60(){ _command rollback; }
-node_61(){ _command secret; }; node_62(){ _command generate; }; node_63(){
-_command insert; }; node_64(){ _command undeploy; }; node_65(){ _command volume
-}; node_66(){ _command recipe; }; node_67(){ _command create; }; node_68(){
-_command release; }; node_69(){ _command versions; }; node_70(){ _command server
-}; node_71(){ _command add; }; node_72(){ _command __ --; }; node_73(){
-_command init; }; node_74(){ _command apps; }; node_75(){ _command upgrade; }
-node_76(){ _command doctor; }; node_77(){ _command help; }; node_78(){
-optional 0 1 2 3 4 5 6 7 8; }; node_79(){ optional 78; }; node_80(){
-either 45 46; }; node_81(){ required 80; }; node_82(){ optional 9; }; node_83(){
-optional 10; }; node_84(){ optional 11; }; node_85(){ required 79 44 81 82 83 84
-}; node_86(){ optional 12; }; node_87(){ optional 13; }; node_88(){ optional 14
-}; node_89(){ optional 15; }; node_90(){ required 79 44 47 83 86 87 88 89 25; }
-node_91(){ either 27 16; }; node_92(){ required 91; }; node_93(){
-required 79 44 26 48 92; }; node_94(){ optional 17; }; node_95(){ optional 18; }
-node_96(){ optional 19; }; node_97(){ optional 20; }; node_98(){ optional 28; }
-node_99(){ required 79 44 26 49 94 95 96 97 98; }; node_100(){
-required 79 44 26 50; }; node_101(){ required 79 44 26 51; }; node_102(){
-required 79 44 26 52; }; node_103(){ required 79 44 26 53 29 30; }; node_104(){
-optional 27; }; node_105(){ required 79 44 26 54 104; }; node_106(){
-required 79 44 26 55; }; node_107(){ required 79 44 26 56 92; }; node_108(){
-either 57 58; }; node_109(){ required 108; }; node_110(){ optional 21; }
-node_111(){ required 79 44 26 109 110 89; }; node_112(){ optional 31; }
-node_113(){ required 79 44 26 56 27 112; }; node_114(){ optional 22; }
-node_115(){ optional 23; }; node_116(){ oneormore 32; }; node_117(){
-required 79 44 26 59 114 115 27 116; }; node_118(){ required 79 44 26 60 98; }
-node_119(){ required 33 28; }; node_120(){ either 119 16; }; node_121(){
-required 120; }; node_122(){ optional 34; }; node_123(){
-required 79 44 26 61 62 121 122 88; }; node_124(){
-required 79 44 26 61 63 33 28 35 88; }; node_125(){ either 33 16; }; node_126(){
-required 125; }; node_127(){ required 79 44 26 61 109 126 88; }; node_128(){
-required 79 44 26 64; }; node_129(){ required 79 44 26 65 46; }; node_130(){
-either 36 16; }; node_131(){ required 130; }; node_132(){
-required 79 44 26 65 109 131; }; node_133(){ optional 116; }; node_134(){
-required 79 44 26 37 133; }; node_135(){ required 79 66 46; }; node_136(){
-required 79 66 67 38; }; node_137(){ required 79 66 38 68 95; }; node_138(){
-required 79 66 38 69; }; node_139(){ optional 40; }; node_140(){ optional 41; }
-node_141(){ required 79 70 71 39 139 140; }; node_142(){
-required 79 70 47 42 72 32; }; node_143(){ required 79 70 81; }; node_144(){
-required 79 70 39 57; }; node_145(){ required 79 70 39 73; }; node_146(){
-required 79 70 39 74 82; }; node_147(){ optional 24; }; node_148(){
-required 79 75 147; }; node_149(){ required 79 51; }; node_150(){ required 79 76
-}; node_151(){ oneormore 43; }; node_152(){ optional 151; }; node_153(){
-required 79 77 152; }; node_154(){ required 79; }; node_155(){
-either 85 90 93 99 100 101 102 103 105 106 107 111 113 117 118 123 124 127 128 129 132 134 135 136 137 138 141 142 143 144 145 146 148 149 150 153 154
-}; node_156(){ required 155; }; cat <<<' docopt_exit() {
-[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1856}" >&2
-exit 1; }'; unset var___env var___skip_update var___skip_check var___branch \
-var___verbose var___stack var___no_prompt var___debug var___help var___status \
-var___server var___type var___domain var___app_name var___pass var___secrets \
-var___all var___update var___force var___skip_version_check \
-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__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 156 "$@"; local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__env" \
-"${prefix}__skip_update" "${prefix}__skip_check" "${prefix}__branch" \
-"${prefix}__verbose" "${prefix}__stack" "${prefix}__no_prompt" \
-"${prefix}__debug" "${prefix}__help" "${prefix}__status" "${prefix}__server" \
-"${prefix}__type" "${prefix}__domain" "${prefix}__app_name" "${prefix}__pass" \
+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 __volumes 23; }; node_24(){ switch __no_tty 24; }; node_25(){
+value __user 25; }; node_26(){ switch __dev 26; }; node_27(){ value _type_ a; }
+node_28(){ value _app_ a; }; node_29(){ value _service_ a; }; node_30(){
+value _version_ a; }; node_31(){ value _src_ a; }; node_32(){ value _dst_ a; }
+node_33(){ value _backup_file_ a; }; node_34(){ value _args_ a true; }
+node_35(){ value _secret_ a; }; node_36(){ value _cmd_ a; }; node_37(){
+value _data_ a; }; node_38(){ value _volume_ a; }; node_39(){ value _command_ a
+}; node_40(){ value _recipe_ a; }; node_41(){ value _host_ a; }; node_42(){
+value _user_ a; }; node_43(){ value _port_ a; }; node_44(){ value _provider_ a
+}; node_45(){ value _subcommands_ a true; }; node_46(){ _command app; }
+node_47(){ _command list; }; node_48(){ _command ls; }; node_49(){ _command new
+}; node_50(){ _command backup; }; node_51(){ _command deploy; }; node_52(){
+_command check; }; node_53(){ _command version; }; node_54(){ _command config; }
+node_55(){ _command cp; }; node_56(){ _command logs; }; node_57(){ _command ps
+}; node_58(){ _command restore; }; node_59(){ _command rm; }; node_60(){
+_command delete; }; node_61(){ _command run; }; node_62(){ _command rollback; }
+node_63(){ _command secret; }; node_64(){ _command generate; }; node_65(){
+_command insert; }; node_66(){ _command undeploy; }; node_67(){ _command volume
+}; node_68(){ _command recipe; }; node_69(){ _command create; }; node_70(){
+_command release; }; node_71(){ _command versions; }; node_72(){ _command server
+}; node_73(){ _command add; }; node_74(){ _command __ --; }; node_75(){
+_command init; }; node_76(){ _command apps; }; node_77(){ _command upgrade; }
+node_78(){ _command doctor; }; node_79(){ _command help; }; node_80(){
+optional 0 1 2 3 4 5 6 7 8; }; node_81(){ optional 80; }; node_82(){
+either 47 48; }; node_83(){ required 82; }; node_84(){ optional 9; }; node_85(){
+optional 10; }; node_86(){ optional 11; }; node_87(){ required 81 46 83 84 85 86
+}; node_88(){ optional 12; }; node_89(){ optional 13; }; node_90(){ optional 14
+}; node_91(){ optional 15; }; node_92(){ required 81 46 49 85 88 89 90 91 27; }
+node_93(){ either 29 16; }; node_94(){ required 93; }; node_95(){
+required 81 46 28 50 94; }; node_96(){ optional 17; }; node_97(){ optional 18; }
+node_98(){ optional 19; }; node_99(){ optional 20; }; node_100(){ optional 21; }
+node_101(){ optional 22; }; node_102(){ optional 30; }; node_103(){
+required 81 46 28 51 96 97 98 99 100 101 102; }; node_104(){
+required 81 46 28 52; }; node_105(){ required 81 46 28 53; }; node_106(){
+required 81 46 28 54; }; node_107(){ required 81 46 28 55 31 32; }; node_108(){
+optional 29; }; node_109(){ required 81 46 28 56 108; }; node_110(){
+required 81 46 28 57; }; node_111(){ required 81 46 28 58 94; }; node_112(){
+either 59 60; }; node_113(){ required 112; }; node_114(){ optional 23; }
+node_115(){ required 81 46 28 113 114 91; }; node_116(){ optional 33; }
+node_117(){ required 81 46 28 58 29 116; }; node_118(){ optional 24; }
+node_119(){ optional 25; }; node_120(){ oneormore 34; }; node_121(){
+required 81 46 28 61 118 119 29 120; }; node_122(){ required 81 46 28 62 102; }
+node_123(){ required 35 30; }; node_124(){ either 123 16; }; node_125(){
+required 124; }; node_126(){ optional 36; }; node_127(){
+required 81 46 28 63 64 125 126 90; }; node_128(){
+required 81 46 28 63 65 35 30 37 90; }; node_129(){ either 35 16; }; node_130(){
+required 129; }; node_131(){ required 81 46 28 63 113 130 90; }; node_132(){
+required 81 46 28 66; }; node_133(){ required 81 46 28 67 48; }; node_134(){
+either 38 16; }; node_135(){ required 134; }; node_136(){
+required 81 46 28 67 113 135; }; node_137(){ optional 120; }; node_138(){
+required 81 46 28 39 137; }; node_139(){ required 81 68 48; }; node_140(){
+required 81 68 69 40; }; node_141(){ required 81 68 40 70 97; }; node_142(){
+required 81 68 40 71; }; node_143(){ optional 42; }; node_144(){ optional 43; }
+node_145(){ required 81 72 73 41 143 144; }; node_146(){
+required 81 72 49 44 74 34; }; node_147(){ required 81 72 83; }; node_148(){
+required 81 72 41 59; }; node_149(){ required 81 72 41 75; }; node_150(){
+required 81 72 41 76 84; }; node_151(){ optional 26; }; node_152(){
+required 81 77 151; }; node_153(){ required 81 53; }; node_154(){ required 81 78
+}; node_155(){ oneormore 45; }; node_156(){ optional 155; }; node_157(){
+required 81 79 156; }; node_158(){ required 81; }; node_159(){
+either 87 92 95 103 104 105 106 107 109 110 111 115 117 121 122 127 128 131 132 133 136 138 139 140 141 142 145 146 147 148 149 150 152 153 154 157 158
+}; node_160(){ required 159; }; cat <<<' docopt_exit() {
+[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1883}" >&2
+exit 1; }'; unset var___env var___stack var___skip_update var___help \
+var___skip_check var___verbose var___debug var___no_prompt var___branch \
+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___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 160 "$@"
+local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__env" "${prefix}__stack" \
+"${prefix}__skip_update" "${prefix}__help" "${prefix}__skip_check" \
+"${prefix}__verbose" "${prefix}__debug" "${prefix}__no_prompt" \
+"${prefix}__branch" "${prefix}__status" "${prefix}__server" "${prefix}__type" \
+"${prefix}__domain" "${prefix}__app_name" "${prefix}__pass" \
 "${prefix}__secrets" "${prefix}__all" "${prefix}__update" "${prefix}__force" \
-"${prefix}__skip_version_check" "${prefix}__no_domain_poll" \
-"${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}_secret_" "${prefix}_cmd_" "${prefix}_data_" "${prefix}_volume_" \
-"${prefix}_command_" "${prefix}_recipe_" "${prefix}_host_" "${prefix}_user_" \
-"${prefix}_port_" "${prefix}_provider_" "${prefix}_subcommands_" \
-"${prefix}app" "${prefix}list" "${prefix}ls" "${prefix}new" "${prefix}backup" \
-"${prefix}deploy" "${prefix}check" "${prefix}version" "${prefix}config" \
-"${prefix}cp" "${prefix}logs" "${prefix}ps" "${prefix}restore" "${prefix}rm" \
+"${prefix}__fast" "${prefix}__skip_version_check" "${prefix}__no_domain_poll" \
+"${prefix}__no_state_poll" "${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}_secret_" \
+"${prefix}_cmd_" "${prefix}_data_" "${prefix}_volume_" "${prefix}_command_" \
+"${prefix}_recipe_" "${prefix}_host_" "${prefix}_user_" "${prefix}_port_" \
+"${prefix}_provider_" "${prefix}_subcommands_" "${prefix}app" "${prefix}list" \
+"${prefix}ls" "${prefix}new" "${prefix}backup" "${prefix}deploy" \
+"${prefix}check" "${prefix}version" "${prefix}config" "${prefix}cp" \
+"${prefix}logs" "${prefix}ps" "${prefix}restore" "${prefix}rm" \
 "${prefix}delete" "${prefix}run" "${prefix}rollback" "${prefix}secret" \
 "${prefix}generate" "${prefix}insert" "${prefix}undeploy" "${prefix}volume" \
 "${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}"'__env=${var___env:-}'
-eval "${prefix}"'__skip_update=${var___skip_update:-false}'
-eval "${prefix}"'__skip_check=${var___skip_check:-false}'
-eval "${prefix}"'__branch=${var___branch:-}'
-eval "${prefix}"'__verbose=${var___verbose:-false}'
 eval "${prefix}"'__stack=${var___stack:-}'
-eval "${prefix}"'__no_prompt=${var___no_prompt:-false}'
-eval "${prefix}"'__debug=${var___debug:-false}'
+eval "${prefix}"'__skip_update=${var___skip_update:-false}'
 eval "${prefix}"'__help=${var___help:-false}'
+eval "${prefix}"'__skip_check=${var___skip_check:-false}'
+eval "${prefix}"'__verbose=${var___verbose:-false}'
+eval "${prefix}"'__debug=${var___debug:-false}'
+eval "${prefix}"'__no_prompt=${var___no_prompt:-false}'
+eval "${prefix}"'__branch=${var___branch:-}'
 eval "${prefix}"'__status=${var___status:-false}'
 eval "${prefix}"'__server=${var___server:-}'
 eval "${prefix}"'__type=${var___type:-}'
@@ -297,8 +301,10 @@ eval "${prefix}"'__secrets=${var___secrets:-false}'
 eval "${prefix}"'__all=${var___all:-false}'
 eval "${prefix}"'__update=${var___update:-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}"'__no_domain_poll=${var___no_domain_poll:-false}'
+eval "${prefix}"'__no_state_poll=${var___no_state_poll:-false}'
 eval "${prefix}"'__volumes=${var___volumes:-false}'
 eval "${prefix}"'__no_tty=${var___no_tty:-false}'
 eval "${prefix}"'__user=${var___user:-}'
@@ -353,13 +359,14 @@ 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}__env" "${prefix}__skip_update" "${prefix}__skip_check" \
-"${prefix}__branch" "${prefix}__verbose" "${prefix}__stack" \
-"${prefix}__no_prompt" "${prefix}__debug" "${prefix}__help" \
+declare -p "${prefix}__env" "${prefix}__stack" "${prefix}__skip_update" \
+"${prefix}__help" "${prefix}__skip_check" "${prefix}__verbose" \
+"${prefix}__debug" "${prefix}__no_prompt" "${prefix}__branch" \
 "${prefix}__status" "${prefix}__server" "${prefix}__type" "${prefix}__domain" \
 "${prefix}__app_name" "${prefix}__pass" "${prefix}__secrets" "${prefix}__all" \
-"${prefix}__update" "${prefix}__force" "${prefix}__skip_version_check" \
-"${prefix}__no_domain_poll" "${prefix}__volumes" "${prefix}__no_tty" \
+"${prefix}__update" "${prefix}__force" "${prefix}__fast" \
+"${prefix}__skip_version_check" "${prefix}__no_domain_poll" \
+"${prefix}__no_state_poll" "${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}_secret_" \
@@ -485,6 +492,16 @@ require_docker_version() {
   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
 
 require_apps_json() {
@@ -503,13 +520,13 @@ require_apps_json() {
 
     if [ "$local_ctime" -lt "$remote_ctime" ]; then
       info "Downloading new apps.json"
-      wget -qO "$ABRA_APPS_JSON" "$ABRA_APPS_URL"
+      curl -sLo "$ABRA_APPS_JSON" "$ABRA_APPS_URL"
     else
       debug "No apps.json update needed"
     fi
   else
     info "Downloading apps.json"
-    wget -qO "$ABRA_APPS_JSON" "$ABRA_APPS_URL"
+    curl -sLo "$ABRA_APPS_JSON" "$ABRA_APPS_URL"
   fi
 }
 
@@ -552,7 +569,7 @@ require_app (){
   fi
 
   # 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?"
   fi
 
@@ -593,7 +610,6 @@ require_app_version() {
 
 vendor_binary() {
   require_vendor_dir
-  require_binary wget
 
   local REPO="$1"
   local VERSION="$2"
@@ -620,7 +636,7 @@ vendor_binary() {
       ;;
   esac
 
-  wget -qO "$ABRA_VENDOR_DIR/$BINARY" "$RELEASE_URL"
+  curl -sLo "$ABRA_VENDOR_DIR/$BINARY" "$RELEASE_URL"
   chmod +x "$ABRA_VENDOR_DIR/$BINARY"
   success "$BINARY is now vendored ☮"
 }
@@ -667,7 +683,7 @@ get_recipe_versions() {
 get_recipe_version_latest() {
   if [ "${#RECIPE_VERSIONS[@]}" = 0 ]; then
     VERSION=""
-    warning "No version specified, dangerously using latest git 😨"
+    info "No versions found"
   else
     VERSION="${RECIPE_VERSIONS[-1]}"
     info "Chose version $VERSION"
@@ -709,6 +725,7 @@ output_version_summary() {
 
   IFS=':' read -ra COMPOSE_FILES <<< "$COMPOSE_FILE"
   for COMPOSE in "${COMPOSE_FILES[@]}"; do
+    require_valid_yaml "$APP_DIR/$COMPOSE"
     SERVICES=$($YQ e '.services | keys | .[]' "${APP_DIR}/${COMPOSE}")
 
     for SERVICE in $SERVICES; do
@@ -774,7 +791,7 @@ output_version_summary() {
 ensure_stack_deployed() {
   STACK_NAME=$1
 
-  info "Waiting for deployment to succeed"
+  warning "Polling deploy state to check for success"
 
   while true; do
     all_services_done=1
@@ -802,10 +819,12 @@ ensure_stack_deployed() {
 
     if [ "$all_services_done" == "1" ]; then
       if [ "$has_errors" == "1" ]; then
-        debug "Deployment appears to have failed"
+        warning "Deployment appears to have failed"
+        warning "Run \"abra app ${STACK_NAME} logs \" to see app logs"
+        warning "Run \"abra app ${STACK_NAME} ps \" to see app status"
         break
       else
-        debug "Deployment appears to have suceeded"
+        warning "Deployment appears to have suceeded"
         break
       fi
     else
@@ -1285,7 +1304,7 @@ _abra_backup_mysql() {
 
 ###### .. 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] [--no-state-poll]
 
 Deploy app <app> to the configured server.
 
@@ -1294,6 +1313,8 @@ OPTIONS
   --force                 Force a deployment regardless of state
   --skip-version-check    Don't try and detect deployed version
   --no-domain-poll        Don't wait for the configured domain to come up
+  --no-state-poll         Don't watch deployment state for success/failure
+  --fast                  Alias for --skip-version-check --no-domain-poll
 
 POWERED BY
   docker stack deploy -c compose.yml <app>"
@@ -1302,8 +1323,15 @@ POWERED BY
 sub_app_deploy (){
   require_yq
 
-  SKIP_VERSION_CHECK=$abra___skip_version_check
-  NO_DOMAIN_POLL=$abra___no_domain_poll
+  if [ "$abra___fast" = "true" ]; then
+    SKIP_VERSION_CHECK=true
+    NO_DOMAIN_POLL=true
+    NO_STATE_POLL=true
+  else
+    SKIP_VERSION_CHECK=$abra___skip_version_check
+    NO_DOMAIN_POLL=$abra___no_domain_poll
+    NO_STATE_POLL=$abra___no_state_poll
+  fi
 
   if [ ! "$abra__version_" = "dev" ]; then
     get_recipe_versions "$TYPE"
@@ -1353,7 +1381,13 @@ sub_app_deploy (){
     (cd "$APP_DIR" || error "\$APP_DIR '$APP_DIR' not found")
     # shellcheck disable=SC2086
     if (cd "$APP_DIR" && docker stack deploy -c ${COMPOSE_FILE//:/ -c } "$STACK_NAME"); then
-      ensure_stack_deployed "$STACK_NAME"
+      if [ "$abra___fast" = "true" ]; then
+        success "Something happened! Hope it was good 🙏"
+        exit 0
+      fi
+      if [[ $NO_STATE_POLL == "false" ]]; then
+        ensure_stack_deployed "$STACK_NAME"
+      fi
       if [ -n "$DOMAIN" ]; then
         if [[ $NO_DOMAIN_POLL == "false" ]]; then
           ensure_domain_deployed "https://${DOMAIN}"
@@ -1581,7 +1615,7 @@ help_app_secret_delete (){
 
 Remove <app>'s Docker secret <secret>.
 
-PTIONS
+OPTIONS
   --pass     Remove secret(s) from \`pass\` as well
   --all      Delete all secrets for <app>
 
@@ -1635,6 +1669,15 @@ sub_app_secret_generate(){
   local secret="$abra__secret_"
   local version="$abra__version_"
   local length="$abra__length_"
+  local msg_already_outputted=${msg_already_outputted:-"false"}
+
+  if [ "$msg_already_outputted" == "false" ]; then
+    warning "These generated secrets are now stored as encrypted data on your server"
+    warning "Please take a moment to make sure you have saved a copy of the passwords"
+    warning "Abra is not able to show the password values in plain text again"
+    warning "See https://docs.cloud.autonomic.zone/secrets/ for more on secrets"
+    msg_already_outputted="true"
+  fi
 
   if [ "$abra___all" == "true" ]; then
     # Note(decentral1se): we need to reset the flag here to avoid the infinite
@@ -1669,11 +1712,6 @@ sub_app_secret_generate(){
   abra__data_="$PW"
 
   sub_app_secret_insert
-
-  warning "These generated secrets are now stored as encrypted data on your server"
-  warning "Please take a moment to make sure you have saved a copy of the passwords"
-  warning "Abra is not able to show the password values in plain text again"
-  warning "See https://docs.docker.com/engine/swarm/secrets/ for more on secrets"
 }
 
 ###### .. app volume
@@ -1692,10 +1730,6 @@ help_app_volume_list (){
 
 Show all volumes associated with <app>.
 
-OPTIONS
-  <secret>  Generate a single secret
-  --all     Auto-generate all secrets
-
 POWERED BY
   docker volume ls"
 }
@@ -1718,7 +1752,7 @@ help_app_volume_delete (){
 
 Remove <app>'s Docker volume <volume>, or all volumes with --all.
 
-PTIONS
+OPTIONS
   --pass     Remove volume(s) from \`pass\` as well
   --all      Delete all volumes for <app>
 
@@ -2375,9 +2409,9 @@ OPTIONS
 
 sub_upgrade() {
   if [[ "$abra___dev" == "true" ]]; then
-    curl https://install.abra.autonomic.zone | bash -s -- --dev
+    curl https://install.abra.coopcloud.tech | bash -s -- --dev
   else
-    curl https://install.abra.autonomic.zone | bash
+    curl https://install.abra.coopcloud.tech | bash
   fi
 }
 
@@ -2471,7 +2505,7 @@ 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__volume_
+    abra___fast abra__volume_ abra___no_state_poll
 
   if ! type tput > /dev/null 2>&1; then
     tput() {

bin/app-json.py

@@ -140,7 +140,8 @@ def generate_apps_json(repos_json):
         chdir(app_path)
 
         metadata = get_app_metadata(app_path)
-        name = metadata.pop("name", "")
+
+        name = metadata.pop("name", app)
 
         log.info(f"Processing {app}")
         apps_json[app] = {
@@ -173,7 +174,7 @@ def get_app_metadata(app_path):
         return {}
 
     try:
-        for match in findall(r"\*\*.*\s\*", contents):
+        for match in findall(r"\*\*.*", contents):
             title = search(r"(?<=\*\*).*(?=\*\*)", match).group().lower()
 
             if title == "image":

completion/abra.bash

@@ -38,6 +38,22 @@ _abra_complete_apps()
     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()
 {
     compopt +o default +o nospace
@@ -46,6 +62,7 @@ _abra_complete()
     local -r cmds='
         app
         server
+        recipe
     '
     local -r short_opts='-e      -h     -s      -v'
     local -r long_opts='--env --help --stack --version'
@@ -101,6 +118,12 @@ _abra_complete()
                     _abra_complete_apps "$cur"
                 fi
                 ;;
+            recipe)
+                # Offer exactly one app completion.
+                if (( COMP_CWORD == cmd_index + 1 )); then
+                    _abra_complete_recipes "$cur"
+                fi
+                ;;
             #help)
             #    # Offer exactly one command name completion.
             #    if (( COMP_CWORD == cmd_index + 1 )); then

deploy/apps.coopcloud.tech/apps.json

@@ -25,6 +25,7 @@
                 "source": "own",
                 "url": "https://hub.docker.com/r/3wordchant/adaptauthoring"
             },
+            "sso": "No",
             "status": 3,
             "tests": "❷💛"
         },
@@ -126,10 +127,11 @@
             "healthcheck": "No",
             "image": {
                 "image": "michaelmcandrew/civicrm",
-                "rating": "3rd party\n*",
+                "rating": "3rd party",
                 "source": "3rd party",
                 "url": "https://hub.docker.com/r/michaelmcandrew/civicrm/"
             },
+            "sso": "No",
             "status": 4,
             "tests": "No"
         },
@@ -167,10 +169,11 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/r/hackmdio/hackmd/"
             },
+            "sso": "❶💚 (OAuth)",
             "status": 2,
             "tests": "❷💛"
         },
-        "icon": "",
+        "icon": "https://git.autonomic.zone/repo-avatars/120-41a3ded2e81db68ba898ebd757b32e47",
         "name": "CodiMD",
         "repository": "https://git.autonomic.zone/coop-cloud/codimd.git",
         "versions": {
@@ -190,10 +193,24 @@
         "website": "https://github.com/hackmdio/codimd"
     },
     "collabora": {
-        "category": "",
+        "category": "Apps",
         "default_branch": "main",
         "description": "An awesome, Online Office suite image suitable for home use.",
-        "features": {},
+        "features": {
+            "backups": "No",
+            "category": "Apps",
+            "email": "❶💚",
+            "healthcheck": "No",
+            "image": {
+                "image": "collabora",
+                "rating": "❶💚",
+                "source": "upstream",
+                "url": "https://hub.docker.com/r/collabora/code"
+            },
+            "sso": "No",
+            "status": 1,
+            "tests": "❷💛"
+        },
         "icon": "https://git.autonomic.zone/repo-avatars/249-0937028d43099df58d85bc41a7e69fbd",
         "name": "collabora",
         "repository": "https://git.autonomic.zone/coop-cloud/collabora.git",
@@ -239,6 +256,7 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/_/nginx"
             },
+            "sso": "No",
             "status": 2,
             "tests": "❷💛"
         },
@@ -271,6 +289,7 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/_/registry/"
             },
+            "sso": "?",
             "status": 4,
             "tests": "?"
         },
@@ -281,14 +300,36 @@
         "website": ""
     },
     "docker-hub-rss": {
-        "category": "",
+        "category": "Utilities",
         "default_branch": "main",
         "description": "RSS feed for Docker Hub images",
-        "features": {},
+        "features": {
+            "backups": "?",
+            "category": "Utilities",
+            "email": "?",
+            "healthcheck": "?",
+            "image": {
+                "image": "docker-hub-rss",
+                "rating": "❶💚",
+                "source": "upstream",
+                "url": "https://hub.docker.com/r/theconnman/docker-hub-rss/"
+            },
+            "sso": "?",
+            "status": 5,
+            "tests": "?"
+        },
         "icon": "",
-        "name": "Docker-Hub-Rss",
+        "name": "Docker-Hub-RSS",
         "repository": "https://git.autonomic.zone/coop-cloud/docker-hub-rss.git",
-        "versions": {},
+        "versions": {
+            "0.4.2": {
+                "app": {
+                    "digest": "67a5d9f9",
+                    "image": "theconnman/docker-hub-rss",
+                    "tag": "0.4.2"
+                }
+            }
+        },
         "website": ""
     },
     "drone": {
@@ -306,6 +347,7 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/r/drone/drone"
             },
+            "sso": "❶💚 (OAuth)",
             "status": 5,
             "tests": "❷💛"
         },
@@ -338,6 +380,7 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/r/drone/drone-docker-runner/"
             },
+            "sso": "?",
             "status": 4,
             "tests": "?"
         },
@@ -370,6 +413,7 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/r/afian/filerun"
             },
+            "sso": "No",
             "status": 4,
             "tests": "No"
         },
@@ -394,6 +438,7 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/r/machines/filestash/"
             },
+            "sso": "No",
             "status": 4,
             "tests": "No"
         },
@@ -437,6 +482,7 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/gitea/gitea"
             },
+            "sso": "❶💚 (OAuth)",
             "status": 2,
             "tests": "❷💛"
         },
@@ -535,7 +581,7 @@
                     "tag": "1.14.1-rootless"
                 },
                 "db": {
-                    "digest": "018ee505",
+                    "digest": "0c3c5603",
                     "image": "mariadb",
                     "tag": "10.5"
                 }
@@ -558,6 +604,7 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/r/go-neb/go-neb"
             },
+            "sso": "",
             "status": 4,
             "tests": ""
         },
@@ -582,6 +629,7 @@
                 "source": "3rd-party",
                 "url": "https://hub.docker.com/r/michaeljefferys/docker-h5ai"
             },
+            "sso": "No",
             "status": 3,
             "tests": "No"
         },
@@ -591,6 +639,17 @@
         "versions": {},
         "website": "https://github.com/lrsjng/h5ai"
     },
+    "hometown": {
+        "category": "",
+        "default_branch": "main",
+        "description": "A supported fork of Mastodon that provides local posting and a wider range of content types.",
+        "features": {},
+        "icon": "https://git.autonomic.zone/repo-avatars/270-8d213bc7168656fd842894218de803ba",
+        "name": "hometown",
+        "repository": "https://git.autonomic.zone/coop-cloud/hometown.git",
+        "versions": {},
+        "website": ""
+    },
     "invoiceninja": {
         "category": "Apps",
         "default_branch": "master",
@@ -606,6 +665,7 @@
                 "source": "3rd party",
                 "url": "https://hub.docker.com/r/invoiceninja/invoiceninja"
             },
+            "sso": "?",
             "status": 4,
             "tests": "No"
         },
@@ -699,6 +759,7 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/r/jboss/keycloak"
             },
+            "sso": "N/A",
             "status": 2,
             "tests": "❷💛"
         },
@@ -729,6 +790,18 @@
                     "image": "mariadb",
                     "tag": "10.6"
                 }
+            },
+            "13.0.1": {
+                "app": {
+                    "digest": "e2a216ff",
+                    "image": "jboss/keycloak",
+                    "tag": "13.0.1"
+                },
+                "db": {
+                    "digest": "b4018557",
+                    "image": "mariadb",
+                    "tag": "10.6"
+                }
             }
         },
         "website": "https://github.com/keycloak/keycloak"
@@ -748,6 +821,7 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/r/keyoxide/keyoxide"
             },
+            "sso": "N/A",
             "status": 2,
             "tests": "❷💛"
         },
@@ -787,6 +861,7 @@
                 "source": "official",
                 "url": "https://hub.docker.com/kimai/kimai2"
             },
+            "sso": "No",
             "status": 5,
             "tests": "❷💛"
         },
@@ -824,6 +899,7 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/r/kutt/kutt"
             },
+            "sso": "No",
             "status": 3,
             "tests": "No"
         },
@@ -852,14 +928,56 @@
         "website": "https://github.com/thedevs-network/kutt"
     },
     "loomio": {
-        "category": "",
+        "category": "Apps",
         "default_branch": "main",
         "description": "Help people make decisions together ",
-        "features": {},
+        "features": {
+            "backups": "No",
+            "category": "Apps",
+            "email": "?",
+            "healthcheck": "No",
+            "image": {
+                "image": "loomio/*",
+                "rating": "❶💚",
+                "source": "upstream",
+                "url": "https://hub.docker.com/r/loomio"
+            },
+            "sso": "No",
+            "status": 4,
+            "tests": "No"
+        },
         "icon": "https://git.autonomic.zone/repo-avatars/251-8127254f041f324f83cbb43074841d34",
-        "name": "",
+        "name": "Loomio",
         "repository": "https://git.autonomic.zone/coop-cloud/loomio.git",
-        "versions": {},
+        "versions": {
+            "v2.7.9": {
+                "app": {
+                    "digest": "8007a47b",
+                    "image": "loomio/loomio",
+                    "tag": "v2.7.9"
+                },
+                "channels": {
+                    "digest": "0f331ad6",
+                    "image": "loomio/loomio_channel_server",
+                    "tag": "loomio/loomio_channel_server"
+                },
+                "db": {
+                    "digest": "d96835c9",
+                    "image": "postgres",
+                    "tag": "12.2"
+                },
+                "redis": {
+                    "digest": "3412d21e",
+                    "image": "redis",
+                    "tag": "5.0"
+                },
+                "worker": {
+                    "digest": "8007a47b",
+                    "image": "loomio/loomio",
+                    "tag": "v2.7.9"
+                }
+            }
+        },
         "website": "https://github.com/loomio/loomio"
     },
     "mailman3": {
@@ -888,6 +1006,7 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/r/mailu/"
             },
+            "sso": "No",
             "status": 3,
             "tests": "No"
         },
@@ -903,7 +1022,7 @@
         "description": "Your self-hosted, globally interconnected microblogging community",
         "features": {},
         "icon": "https://git.autonomic.zone/repo-avatars/258-a5a9122d2052bf928aadc5454133685e",
-        "name": "",
+        "name": "mastodon",
         "repository": "https://git.autonomic.zone/coop-cloud/mastodon.git",
         "versions": {},
         "website": "https://joinmastodon.org"
@@ -923,6 +1042,7 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/_/matomo"
             },
+            "sso": "No",
             "status": 3,
             "tests": "❷💛"
         },
@@ -960,6 +1080,7 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/r/matrixdotorg/synapse"
             },
+            "sso": "No",
             "status": 4,
             "tests": "No"
         },
@@ -1006,6 +1127,7 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/_/mediawiki"
             },
+            "sso": "❷💛 (OAuth, SAML)",
             "status": 3,
             "tests": "❷💛"
         },
@@ -1097,6 +1219,7 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/r/minio/minio"
             },
+            "sso": "❌",
             "status": 2,
             "tests": "❷💛"
         },
@@ -1121,6 +1244,7 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/_/nextcloud"
             },
+            "sso": "❸🍎 (OAuth)",
             "status": 2,
             "tests": "❷💛"
         },
@@ -1161,16 +1285,30 @@
         "description": "Self hosted note taking app stored on S3. ",
         "features": {},
         "icon": "https://git.autonomic.zone/repo-avatars/253-3c9cb77fc29149a1e34c25664c06f045",
-        "name": "",
+        "name": "notea",
         "repository": "https://git.autonomic.zone/coop-cloud/notea.git",
         "versions": {},
         "website": "https://github.com/QingWei-Li/notea"
     },
     "onlyoffice": {
-        "category": "",
+        "category": "Apps",
         "default_branch": "main",
         "description": "An online office suite comprising viewers and editors for texts, spreadsheets and presentations, fully compatible with Office Open XML formats: .docx, .xlsx, .pptx and enabling collaborative editing in real time.",
-        "features": {},
+        "features": {
+            "backups": "No",
+            "category": "Apps",
+            "email": "❶💚",
+            "healthcheck": "No",
+            "image": {
+                "image": "onlyoffice",
+                "rating": "❶💚",
+                "source": "upstream",
+                "url": "https://hub.docker.com/r/onlyoffice/documentserver/"
+            },
+            "sso": "No",
+            "status": 1,
+            "tests": "❷💛"
+        },
         "icon": "",
         "name": "onlyoffice",
         "repository": "https://git.autonomic.zone/coop-cloud/onlyoffice.git",
@@ -1185,7 +1323,15 @@
         "icon": "https://git.autonomic.zone/repo-avatars/244-4b521501493c7a3e60af4fbd1c1ac918",
         "name": "opencpu-rstudio",
         "repository": "https://git.autonomic.zone/coop-cloud/opencpu-rstudio.git",
-        "versions": {},
+        "versions": {
+            "2.1.7": {
+                "app": {
+                    "digest": "c036fae9",
+                    "image": "opencpu/rstudio",
+                    "tag": "2.1.7"
+                }
+            }
+        },
         "website": ""
     },
     "osticket": {
@@ -1203,6 +1349,7 @@
                 "source": "3rd party",
                 "url": "https://hub.docker.com/r/osticket/osticket"
             },
+            "sso": "",
             "status": 4,
             "tests": ""
         },
@@ -1213,14 +1360,51 @@
         "website": "https://github.com/osTicket/osTicket"
     },
     "peertube": {
-        "category": "",
+        "category": "Applications",
         "default_branch": "main",
         "description": "An ActivityPub-federated video streaming platform using P2P directly in your web browser.",
-        "features": {},
+        "features": {
+            "backups": "❸🍎",
+            "category": "Applications",
+            "email": "❶💚",
+            "healthcheck": "❶💚",
+            "image": {
+                "image": "chocobozzz/peertube",
+                "rating": "❷💛",
+                "source": "official",
+                "url": "https://hub.docker.com/r/chocobozzz/peertube"
+            },
+            "sso": "❸🍎",
+            "status": 2,
+            "tests": "❌"
+        },
         "icon": "https://git.autonomic.zone/repo-avatars/213-5148e886c39da6c86dace88dfab25877",
         "name": "Peertube",
         "repository": "https://git.autonomic.zone/coop-cloud/peertube.git",
-        "versions": {},
+        "versions": {
+            "v3.1.0-buster": {
+                "app": {
+                    "digest": "455af623",
+                    "image": "chocobozzz/peertube",
+                    "tag": "v3.1.0-buster"
+                },
+                "cache": {
+                    "digest": "aaf7c123",
+                    "image": "redis",
+                    "tag": "4-alpine"
+                },
+                "db": {
+                    "digest": "f2d229fd",
+                    "image": "postgres",
+                    "tag": "10-alpine"
+                },
+                "web": {
+                    "digest": "ea4560b8",
+                    "image": "nginx",
+                    "tag": "1.20.0"
+                }
+            }
+        },
         "website": ""
     },
     "pelican": {
@@ -1238,6 +1422,7 @@
                 "source": "own",
                 "url": "https://hub.docker.com/r/3wordchant/pelican"
             },
+            "sso": "No",
             "status": 2,
             "tests": "❷💛"
         },
@@ -1266,7 +1451,7 @@
         "description": "The Open-Source design & prototyping platform",
         "features": {},
         "icon": "https://git.autonomic.zone/repo-avatars/235-2d649ef2cac767f666190ee583a35de5",
-        "name": "",
+        "name": "penpot",
         "repository": "https://git.autonomic.zone/coop-cloud/penpot.git",
         "versions": {
             "1.4.0-alpha": {
@@ -1314,6 +1499,7 @@
                 "source": "3rd party",
                 "url": "https://hub.docker.com/r/benoitpodwinski/phpservermon"
             },
+            "sso": "No",
             "status": 4,
             "tests": "No"
         },
@@ -1351,6 +1537,7 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/r/portainer/portainer"
             },
+            "sso": "No",
             "status": 5,
             "tests": "❷💛"
         },
@@ -1388,6 +1575,8 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/r/boky/postfix/"
             },
+            "note": "",
+            "sso": "N/A",
             "status": 2,
             "tests": "❷💛"
         },
@@ -1420,6 +1609,7 @@
                 "source": "3rd party",
                 "url": "https://hub.docker.com/r/linuxserver/projectsend"
             },
+            "sso": "No",
             "status": 4,
             "tests": "No"
         },
@@ -1457,6 +1647,7 @@
                 "source": "3rd party",
                 "url": "https://hub.docker.com/r/tomsquest/radicale"
             },
+            "sso": "No",
             "status": 4,
             "tests": "No"
         },
@@ -1500,6 +1691,7 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/r/renovate/renovate"
             },
+            "sso": "?",
             "status": 5,
             "tests": "❷💛"
         },
@@ -1532,6 +1724,7 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/r/rocketchat/rocket.chat/"
             },
+            "sso": "❶💚 (OAuth)",
             "status": 2,
             "tests": "❷💛"
         },
@@ -1598,8 +1791,8 @@
         "default_branch": "main",
         "description": "An integrated development environment for R and Python, with a console, syntax-highlighting editor that supports direct code execution, and tools for plotting, history, debugging and workspace management.",
         "features": {},
-        "icon": "https://git.autonomic.zone/repo-avatars/261-359d0c955f531b6a5cca9aacdff3fa53",
-        "name": "",
+        "icon": "https://git.autonomic.zone/repo-avatars/261-4b521501493c7a3e60af4fbd1c1ac918",
+        "name": "rstudio",
         "repository": "https://git.autonomic.zone/coop-cloud/rstudio.git",
         "versions": {},
         "website": ""
@@ -1619,6 +1812,7 @@
                 "source": "3rd-party",
                 "url": "https://hub.docker.com/r/akito13/selfoss"
             },
+            "sso": "N/A",
             "status": 3,
             "tests": "❸🍎"
         },
@@ -1656,6 +1850,7 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/r/statping/statping"
             },
+            "sso": "No",
             "status": 3,
             "tests": "No"
         },
@@ -1688,6 +1883,7 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/r/statuspal/statuspal"
             },
+            "sso": "No",
             "status": 4,
             "tests": "No"
         },
@@ -1725,6 +1921,7 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/r/strapi/strapi"
             },
+            "sso": "No",
             "status": 3,
             "tests": "❷💛"
         },
@@ -1786,6 +1983,7 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/_/swarmpit"
             },
+            "sso": "N/A",
             "status": 2,
             "tests": "❷💛"
         },
@@ -1833,6 +2031,7 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/_/traefik"
             },
+            "sso": "? (Keycloak)",
             "status": 5,
             "tests": "❷💛"
         },
@@ -1865,6 +2064,7 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/r/crazymax/swarm-cronjob/"
             },
+            "sso": "?",
             "status": 5,
             "tests": "?"
         },
@@ -1897,6 +2097,7 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/r/wallabag/wallabag"
             },
+            "sso": "No",
             "status": 3,
             "tests": "❷💛"
         },
@@ -1939,6 +2140,7 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/_/wordpress"
             },
+            "sso": "No",
             "status": 1,
             "tests": "❷💛"
         },
@@ -1993,6 +2195,30 @@
                     "image": "mariadb",
                     "tag": "10.6"
                 }
+            },
+            "5.7.2_1": {
+                "app": {
+                    "digest": "7caa73eb",
+                    "image": "wordpress",
+                    "tag": "5.7.2"
+                },
+                "db": {
+                    "digest": "171746d0",
+                    "image": "mariadb",
+                    "tag": "10.6"
+                }
+            },
+            "5.7.2_2": {
+                "app": {
+                    "digest": "7caa73eb",
+                    "image": "wordpress",
+                    "tag": "5.7.2"
+                },
+                "db": {
+                    "digest": "171746d0",
+                    "image": "mariadb",
+                    "tag": "10.6"
+                }
             }
         },
         "website": "https://github.com/wordpress/wordpress"
@@ -2012,6 +2238,7 @@
                 "source": "upstream",
                 "url": "https://hub.docker.com/r/thecodingmachine/"
             },
+            "sso": "No",
             "status": 4,
             "tests": "No"
         },
@@ -2064,6 +2291,7 @@
                 "source": "3rd party",
                 "url": "https://hub.docker.com/r/linuxserver/znc"
             },
+            "sso": "No",
             "status": 4,
             "tests": "No"
         },

deploy/install.abra.coopcloud.tech/compose.yml

@@ -20,7 +20,7 @@ services:
       labels:
         - "traefik.enable=true"
         - "traefik.http.services.abra-installer.loadbalancer.server.port=80"
-        - "traefik.http.routers.abra-installer.rule=Host(`install.abra.autonomic.zone`)"
+        - "traefik.http.routers.abra-installer.rule=Host(`install.abra.autonomic.zone`,`install.abra.coopcloud.tech`)"
         - "traefik.http.routers.abra-installer.entrypoints=web-secure"
         - "traefik.http.routers.abra-installer.tls.certresolver=production"
 

deploy/install.abra.coopcloud.tech/installer

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

deploy/install.abra.coopcloud.tech/nginx.conf

@@ -1,6 +1,6 @@
 server {
   listen         80 default_server;
-  server_name    install.abra.autonomic.zone;
+  server_name    install.abra.autonomic.zone install.abra.coopcloud.tech;
 
   location / {
     root /var/www/abra-installer;

makefile

@@ -8,12 +8,12 @@ test:
 		--name=abra-test-dind \
 		-e DOCKER_TLS_CERTDIR="" \
 		decentral1se/docker-dind-bats-kcov
-	@DOCKER_CONTEXT=default docker exec \
+	@DOCKER_CONTEXT=default sudo docker exec \
 		-it \
 		abra-test-dind \
 		sh -c "cd /workdir && bats /workdir/tests"
-	@DOCKER_CONTEXT=default docker stop abra-test-dind
-	@DOCKER_CONTEXT=default docker rm abra-test-dind
+	@DOCKER_CONTEXT=default sudo docker stop abra-test-dind
+	@DOCKER_CONTEXT=default sudo docker rm abra-test-dind
 
 shellcheck:
 	@docker run \
@@ -48,7 +48,7 @@ codecov:
 release-installer:
 	@DOCKER_CONTEXT=swarm.autonomic.zone \
 		docker stack rm abra-installer-script && \
-		cd deploy/install.abra.autonomic.zone && \
+		cd deploy/install.abra.coopcloud.tech && \
 		DOCKER_CONTEXT=swarm.autonomic.zone docker stack deploy -c compose.yml abra-installer-script
 
 release-apps: