Publish 0.7.3

Closes #145

CHANGELOG.md

@@ -1,5 +1,5 @@
-> 🔥 🔥 🔥 Please note, while we are still in [public
-> alpha](https://docs.cloud.autonomic.zone/roadmap/), the `abra` release
+> 🔥 🔥 🔥 Please note, while we are still in
+> [public alpha](https://docs.cloud.autonomic.zone/roadmap/), the `abra` release
 > versioning scheme is not following [semver](https://semver.org/) conventions
 > because we are still in the exploratory phases of building this tool. Please
 > read the changes before upgrading your `abra` installation as there are
@@ -9,6 +9,13 @@
 
 # abra x.x.x (UNRELEASED)
 
+# 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))
+- Use apps.coopcloud.tech for app data hosting & download ([75bd599](https://git.autonomic.zone/coop-cloud/abra/commit/75bd599))
+- Choose latest commit messages for new tags ([#144](https://git.autonomic.zone/coop-cloud/abra/issues/144))
+- Handle recipes without an `app` service in `recipe .. release` ([#151](https://git.autonomic.zone/coop-cloud/abra/issues/151))
+
 # abra 0.7.2 (2021-04-07)
 
 - Fix installation script development installs (again! Thanks Bash!) ([4747d9b7](https://git.autonomic.zone/coop-cloud/abra/commit/4747d9b7fb5fba914f210b6570bfe2db0b53da23))
@@ -37,7 +44,7 @@
 - Recognise when apps are already undeployed with `abra app <app> undeploy` ([#123](https://git.autonomic.zone/coop-cloud/abra/issues/123))
 - Add `abra doctor` command to help diagnose setup issues ([#119](https://git.autonomic.zone/coop-cloud/abra/issues/119))
 - Add apps version and feature catalogue generation script ([#121](https://git.autonomic.zone/coop-cloud/abra/issues/121))
-- New `--skip-version-check` option to `deploy` ([df4e504](https://git.autonomic.zone/coop-cloud/abra/commit/df4e504)
+- New `--skip-version-check` option to `deploy` ([df4e504](https://git.autonomic.zone/coop-cloud/abra/commit/df4e504))
 - Look up local available version from compose files instead of `abra.sh` ([#131](https://git.autonomic.zone/coop-cloud/abra/issues/131))
 - Improve domain polling logging and allow to skip the check altogether with `--no-domain-poll` ([#140](https://git.autonomic.zone/coop-cloud/abra/issues/140), [#141](https://git.autonomic.zone/coop-cloud/abra/issues/141))
 - Support `ABRA_DIR` in the installer script ([4e94a424e94a42](https://git.autonomic.zone/coop-cloud/abra/commit/4e94a424e94a42))

README.md

@@ -3,16 +3,16 @@
 [![Build Status](https://drone.autonomic.zone/api/badges/coop-cloud/abra/status.svg)](https://drone.autonomic.zone/coop-cloud/abra)
 [![codecov](https://codecov.io/gh/Autonomic-Cooperative/abra/branch/main/graph/badge.svg?token=aX3I5NMRsj)](undefined)
 
-> https://cloud.autonomic.zone
+> https://coopcloud.tech
 
 The cooperative cloud utility belt 🎩🐇
 
-`abra` is a command-line tool for managing your own [Co-op Cloud](https://cloud.autonomic.zone). It can provision new servers, create applications, deploy them, run backup and restore operations and a whole lot of other things. It is the go-to tool for day-to-day operations when managing a Co-op Cloud instance.
+`abra` is a command-line tool for managing your own [Co-op Cloud](https://coopcloud.tech). It can provision new servers, create applications, deploy them, run backup and restore operations and a whole lot of other things. It is the go-to tool for day-to-day operations when managing a Co-op Cloud instance.
 
 ## Change log
 
 > 🔥 🔥 🔥 Please note, while we are still in [public
-> alpha](https://docs.cloud.autonomic.zone/roadmap/), the `abra` release
+> alpha](https://docs.coopcloud.tech/roadmap/), the `abra` release
 > versioning scheme is not following [semver](https://semver.org/) conventions
 > because we are still in the exploratory phases of building this tool. Please
 > read the changes before upgrading your `abra` installation as there are
@@ -24,7 +24,7 @@ See [CHANGELOG.md](./CHANGELOG.md).
 
 ## Documentation
 
-> [docs.cloud.autonomic.zone](https://docs.cloud.autonomic.zone/)
+> [docs.coopcloud.tech](https://docs.coopcloud.tech)
 
 ## Install
 
@@ -59,7 +59,7 @@ The command-line interface is generated via [docopt](http://docopt.org/). If you
 
 Please remember to update the [CHANGELOG](./CHANGELOG.md) when you make a change.
 
-## Generating a new abra-apps.json
+## Generating a new apps.json
 
 You'll need to install the following requirements:
 
@@ -68,12 +68,14 @@ You'll need to install the following requirements:
 - [jq](https://stedolan.github.io/jq/tutorial/) (`sudo apt-get install jq` or see [the install docs](https://stedolan.github.io/jq/download/))
 - [yq](https://mikefarah.gitbook.io/yq/) (see [the install docs](https://mikefarah.gitbook.io/yq/#install))
 
-Then run `./bin/app-json.py` ([source](./bin/app-json.py)) and it will spit out the JSON file into [deploy/abra-apps.cloud.autonomic.zone/abra-apps.json](./deploy/abra-apps.cloud.autonomic.zone/abra-apps.json).
+Then run `./bin/app-json.py` ([source](./bin/app-json.py)) and it will spit out the JSON file into [deploy/apps.coopcloud.tech/apps.json](./deploy/apps.coopcloud.tech/apps.json).
 
 ## Releasing
 
 ### `abra`
 
+> [install.abra.autonomic.zone](https://install.abra.autonomic.zone)
+
 - 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)
@@ -82,10 +84,10 @@ Then run `./bin/app-json.py` ([source](./bin/app-json.py)) and it will spit out
 - Deploy a new installer script `make release-installer`
 - Tell the world (CoTech forum, Matrix public channel, Autonomic mastodon, etc.)
 
-### abra-apps.cloud.autonomic.zone
+### apps.coopcloud.tech
 
-> [abra-apps.cloud.autonomic.zone](https://abra-apps.cloud.autonomic.zone)
+> [apps.coopcloud.tech](https://apps.coopcloud.tech)
 
 ```bash
-$ make release-abra-apps
+$ make release-apps
 ```

abra

@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
 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.1"
+ABRA_VERSION="0.7.3"
 ABRA_BACKUP_DIR="${ABRA_BACKUP_DIR:-$ABRA_DIR/backups}"
 ABRA_VENDOR_DIR="$ABRA_DIR/vendor"
 ABRA_APPS_JSON="${ABRA_DIR}/apps.json"
@@ -36,6 +37,7 @@ Usage:
   abra [options] app <app> undeploy
   abra [options] app <app> <command> [<args>...]
   abra [options] recipe ls
+  abra [options] recipe create <recipe>
   abra [options] recipe <recipe> release [--force]
   abra [options] recipe <recipe> versions
   abra [options] server add <host> [<user>] [<port>]
@@ -163,15 +165,15 @@ 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:2325}
-usage=${DOC:40:1716}; digest=aefb0
-shorts=(-h -n -e -s -U -b -C -v -d '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
-longs=(--help --no-prompt --env --stack --skip-update --branch --skip-check --verbose --debug --status --server --type --domain --app-name --pass --secrets --all --update --force --skip-version-check --no-domain-poll --volumes --no-tty --user --dev)
-argcounts=(0 0 1 1 0 1 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 1 0); node_0(){
-switch __help 0; }; node_1(){ switch __no_prompt 1; }; node_2(){ value __env 2
-}; node_3(){ value __stack 3; }; node_4(){ switch __skip_update 4; }; node_5(){
-value __branch 5; }; node_6(){ switch __skip_check 6; }; node_7(){
-switch __verbose 7; }; node_8(){ switch __debug 8; }; node_9(){
+printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:2365}
+usage=${DOC:40:1756}; digest=de09c
+shorts=(-s -b -d -C -e -n -h -v -U '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
+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)
+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(){
+value __stack 0; }; node_1(){ value __branch 1; }; node_2(){ switch __debug 2; }
+node_3(){ switch __skip_check 3; }; node_4(){ value __env 4; }; node_5(){
+switch __no_prompt 5; }; node_6(){ switch __help 6; }; node_7(){
+switch __verbose 7; }; node_8(){ switch __skip_update 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(){
@@ -196,49 +198,49 @@ node_52(){ _command cp; }; node_53(){ _command logs; }; node_54(){ _command ps
 _command delete; }; node_58(){ _command run; }; node_59(){ _command rollback; }
 node_60(){ _command secret; }; node_61(){ _command generate; }; node_62(){
 _command insert; }; node_63(){ _command undeploy; }; node_64(){ _command recipe
-}; node_65(){ _command release; }; node_66(){ _command versions; }; node_67(){
-_command server; }; node_68(){ _command add; }; node_69(){ _command __ --; }
-node_70(){ _command init; }; node_71(){ _command apps; }; node_72(){
-_command upgrade; }; node_73(){ _command doctor; }; node_74(){ _command help; }
-node_75(){ optional 0 1 2 3 4 5 6 7 8; }; node_76(){ optional 75; }; node_77(){
-either 44 45; }; node_78(){ required 77; }; node_79(){ optional 9; }; node_80(){
-optional 10; }; node_81(){ optional 11; }; node_82(){ required 76 43 78 79 80 81
-}; node_83(){ optional 12; }; node_84(){ optional 13; }; node_85(){ optional 14
-}; node_86(){ optional 15; }; node_87(){ required 76 43 46 80 83 84 85 86 25; }
-node_88(){ either 27 16; }; node_89(){ required 88; }; node_90(){
-required 76 43 26 47 89; }; node_91(){ optional 17; }; node_92(){ optional 18; }
-node_93(){ optional 19; }; node_94(){ optional 20; }; node_95(){ optional 28; }
-node_96(){ required 76 43 26 48 91 92 93 94 95; }; node_97(){
-required 76 43 26 49; }; node_98(){ required 76 43 26 50; }; node_99(){
-required 76 43 26 51; }; node_100(){ required 76 43 26 52 29 30; }; node_101(){
-optional 27; }; node_102(){ required 76 43 26 53 101; }; node_103(){
-required 76 43 26 54; }; node_104(){ required 76 43 26 55 89; }; node_105(){
-either 56 57; }; node_106(){ required 105; }; node_107(){ optional 21; }
-node_108(){ required 76 43 26 106 107 86; }; node_109(){ optional 31; }
-node_110(){ required 76 43 26 55 27 109; }; node_111(){ optional 22; }
-node_112(){ optional 23; }; node_113(){ oneormore 32; }; node_114(){
-required 76 43 26 58 111 112 27 113; }; node_115(){ required 76 43 26 59 95; }
-node_116(){ required 33 28; }; node_117(){ either 116 16; }; node_118(){
-required 117; }; node_119(){ optional 34; }; node_120(){
-required 76 43 26 60 61 118 119 85; }; node_121(){
-required 76 43 26 60 62 33 28 35 85; }; node_122(){ either 33 16; }; node_123(){
-required 122; }; node_124(){ required 76 43 26 60 106 123 85; }; node_125(){
-required 76 43 26 63; }; node_126(){ optional 113; }; node_127(){
-required 76 43 26 36 126; }; node_128(){ required 76 64 45; }; node_129(){
-required 76 64 37 65 92; }; node_130(){ required 76 64 37 66; }; node_131(){
-optional 39; }; node_132(){ optional 40; }; node_133(){
-required 76 67 68 38 131 132; }; node_134(){ required 76 67 46 41 69 32; }
-node_135(){ required 76 67 78; }; node_136(){ required 76 67 38 56; }
-node_137(){ required 76 67 38 70; }; node_138(){ required 76 67 38 71 79; }
-node_139(){ optional 24; }; node_140(){ required 76 72 139; }; node_141(){
-required 76 50; }; node_142(){ required 76 73; }; node_143(){ oneormore 42; }
-node_144(){ optional 143; }; node_145(){ required 76 74 144; }; node_146(){
-required 76; }; node_147(){
-either 82 87 90 96 97 98 99 100 102 103 104 108 110 114 115 120 121 124 125 127 128 129 130 133 134 135 136 137 138 140 141 142 145 146
-}; node_148(){ required 147; }; cat <<<' docopt_exit() {
-[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1716}" >&2
-exit 1; }'; unset var___help var___no_prompt var___env var___stack \
-var___skip_update var___branch var___skip_check var___verbose var___debug \
+}; node_65(){ _command create; }; node_66(){ _command release; }; node_67(){
+_command versions; }; node_68(){ _command server; }; node_69(){ _command add; }
+node_70(){ _command __ --; }; node_71(){ _command init; }; node_72(){
+_command apps; }; node_73(){ _command upgrade; }; node_74(){ _command doctor; }
+node_75(){ _command help; }; node_76(){ optional 0 1 2 3 4 5 6 7 8; }
+node_77(){ optional 76; }; node_78(){ either 44 45; }; node_79(){ required 78; }
+node_80(){ optional 9; }; node_81(){ optional 10; }; node_82(){ optional 11; }
+node_83(){ required 77 43 79 80 81 82; }; node_84(){ optional 12; }; node_85(){
+optional 13; }; node_86(){ optional 14; }; node_87(){ optional 15; }; node_88(){
+required 77 43 46 81 84 85 86 87 25; }; node_89(){ either 27 16; }; node_90(){
+required 89; }; node_91(){ required 77 43 26 47 90; }; node_92(){ optional 17; }
+node_93(){ optional 18; }; node_94(){ optional 19; }; node_95(){ optional 20; }
+node_96(){ optional 28; }; node_97(){ required 77 43 26 48 92 93 94 95 96; }
+node_98(){ required 77 43 26 49; }; node_99(){ required 77 43 26 50; }
+node_100(){ required 77 43 26 51; }; node_101(){ required 77 43 26 52 29 30; }
+node_102(){ optional 27; }; node_103(){ required 77 43 26 53 102; }; node_104(){
+required 77 43 26 54; }; node_105(){ required 77 43 26 55 90; }; node_106(){
+either 56 57; }; node_107(){ required 106; }; node_108(){ optional 21; }
+node_109(){ required 77 43 26 107 108 87; }; node_110(){ optional 31; }
+node_111(){ required 77 43 26 55 27 110; }; node_112(){ optional 22; }
+node_113(){ optional 23; }; node_114(){ oneormore 32; }; node_115(){
+required 77 43 26 58 112 113 27 114; }; node_116(){ required 77 43 26 59 96; }
+node_117(){ required 33 28; }; node_118(){ either 117 16; }; node_119(){
+required 118; }; node_120(){ optional 34; }; node_121(){
+required 77 43 26 60 61 119 120 86; }; node_122(){
+required 77 43 26 60 62 33 28 35 86; }; node_123(){ either 33 16; }; node_124(){
+required 123; }; node_125(){ required 77 43 26 60 107 124 86; }; node_126(){
+required 77 43 26 63; }; node_127(){ optional 114; }; node_128(){
+required 77 43 26 36 127; }; node_129(){ required 77 64 45; }; node_130(){
+required 77 64 65 37; }; node_131(){ required 77 64 37 66 93; }; node_132(){
+required 77 64 37 67; }; node_133(){ optional 39; }; node_134(){ optional 40; }
+node_135(){ required 77 68 69 38 133 134; }; node_136(){
+required 77 68 46 41 70 32; }; node_137(){ required 77 68 79; }; node_138(){
+required 77 68 38 56; }; node_139(){ required 77 68 38 71; }; node_140(){
+required 77 68 38 72 80; }; node_141(){ optional 24; }; node_142(){
+required 77 73 141; }; node_143(){ required 77 50; }; node_144(){ required 77 74
+}; node_145(){ oneormore 42; }; node_146(){ optional 145; }; node_147(){
+required 77 75 146; }; node_148(){ required 77; }; node_149(){
+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
+}; node_150(){ required 149; }; cat <<<' docopt_exit() {
+[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1756}" >&2
+exit 1; }'; unset var___stack var___branch var___debug var___skip_check \
+var___env var___no_prompt var___help var___verbose var___skip_update \
 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 \
@@ -248,38 +250,38 @@ 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_recipe \
-var_release var_versions var_server var_add var___ var_init var_apps \
-var_upgrade var_doctor var_help; parse 148 "$@"
-local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__help" \
-"${prefix}__no_prompt" "${prefix}__env" "${prefix}__stack" \
-"${prefix}__skip_update" "${prefix}__branch" "${prefix}__skip_check" \
-"${prefix}__verbose" "${prefix}__debug" "${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}_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}recipe" "${prefix}release" \
-"${prefix}versions" "${prefix}server" "${prefix}add" "${prefix}__" \
-"${prefix}init" "${prefix}apps" "${prefix}upgrade" "${prefix}doctor" \
-"${prefix}help"; eval "${prefix}"'__help=${var___help:-false}'
-eval "${prefix}"'__no_prompt=${var___no_prompt:-false}'
-eval "${prefix}"'__env=${var___env:-}'
+var_create var_release var_versions var_server var_add var___ var_init \
+var_apps var_upgrade var_doctor var_help; parse 150 "$@"
+local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__stack" \
+"${prefix}__branch" "${prefix}__debug" "${prefix}__skip_check" \
+"${prefix}__env" "${prefix}__no_prompt" "${prefix}__help" "${prefix}__verbose" \
+"${prefix}__skip_update" "${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}_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}recipe" \
+"${prefix}create" "${prefix}release" "${prefix}versions" "${prefix}server" \
+"${prefix}add" "${prefix}__" "${prefix}init" "${prefix}apps" \
+"${prefix}upgrade" "${prefix}doctor" "${prefix}help"
 eval "${prefix}"'__stack=${var___stack:-}'
-eval "${prefix}"'__skip_update=${var___skip_update:-false}'
 eval "${prefix}"'__branch=${var___branch:-}'
-eval "${prefix}"'__skip_check=${var___skip_check:-false}'
-eval "${prefix}"'__verbose=${var___verbose:-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}"'__help=${var___help:-false}'
+eval "${prefix}"'__verbose=${var___verbose:-false}'
+eval "${prefix}"'__skip_update=${var___skip_update:-false}'
 eval "${prefix}"'__status=${var___status:-false}'
 eval "${prefix}"'__server=${var___server:-}'
 eval "${prefix}"'__type=${var___type:-}'
@@ -333,6 +335,7 @@ eval "${prefix}"'generate=${var_generate:-false}'
 eval "${prefix}"'insert=${var_insert:-false}'
 eval "${prefix}"'undeploy=${var_undeploy:-false}'
 eval "${prefix}"'recipe=${var_recipe:-false}'
+eval "${prefix}"'create=${var_create:-false}'
 eval "${prefix}"'release=${var_release:-false}'
 eval "${prefix}"'versions=${var_versions:-false}'
 eval "${prefix}"'server=${var_server:-false}'
@@ -343,9 +346,9 @@ 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}__help" "${prefix}__no_prompt" "${prefix}__env" \
-"${prefix}__stack" "${prefix}__skip_update" "${prefix}__branch" \
-"${prefix}__skip_check" "${prefix}__verbose" "${prefix}__debug" \
+declare -p "${prefix}__stack" "${prefix}__branch" "${prefix}__debug" \
+"${prefix}__skip_check" "${prefix}__env" "${prefix}__no_prompt" \
+"${prefix}__help" "${prefix}__verbose" "${prefix}__skip_update" \
 "${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" \
@@ -360,10 +363,10 @@ declare -p "${prefix}__help" "${prefix}__no_prompt" "${prefix}__env" \
 "${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}recipe" "${prefix}release" \
-"${prefix}versions" "${prefix}server" "${prefix}add" "${prefix}__" \
-"${prefix}init" "${prefix}apps" "${prefix}upgrade" "${prefix}doctor" \
-"${prefix}help"; done; }
+"${prefix}insert" "${prefix}undeploy" "${prefix}recipe" "${prefix}create" \
+"${prefix}release" "${prefix}versions" "${prefix}server" "${prefix}add" \
+"${prefix}__" "${prefix}init" "${prefix}apps" "${prefix}upgrade" \
+"${prefix}doctor" "${prefix}help"; done; }
 # docopt parser above, complete command for generating this parser is `docopt.sh abra`
 
 PROGRAM_NAME=$(basename "$0")
@@ -484,10 +487,8 @@ require_apps_json() {
     return
   fi
 
-  apps_url="https://abra-apps.cloud.autonomic.zone"
-
   if [ -f "$ABRA_APPS_JSON" ]; then
-    modified=$(curl --silent --head $apps_url | \
+    modified=$(curl --silent --head "$ABRA_APPS_URL" | \
              awk '/^Last-Modified/{print $0}' | \
              sed 's/^Last-Modified: //')
     remote_ctime=$(date --date="$modified" +%s)
@@ -495,13 +496,13 @@ require_apps_json() {
 
     if [ "$local_ctime" -lt "$remote_ctime" ]; then
       info "Downloading new apps.json"
-      wget -qO "$ABRA_APPS_JSON" $apps_url
+      wget -qO "$ABRA_APPS_JSON" "$ABRA_APPS_URL"
     else
       debug "No apps.json update needed"
     fi
   else
     info "Downloading apps.json"
-    wget -qO "$ABRA_APPS_JSON" $apps_url
+    wget -qO "$ABRA_APPS_JSON" "$ABRA_APPS_URL"
   fi
 }
 
@@ -647,7 +648,23 @@ get_recipe_versions() {
 
   recipe="${1?Recipe not set}"
 
-  mapfile -t RECIPE_VERSIONS < <($JQ -r ".\"${recipe}\".versions | keys | .[]" "$ABRA_APPS_JSON" | sort)
+  recipe_json=$($JQ ".\"${recipe}\"" "$ABRA_APPS_JSON")
+
+  if [ "$recipe_json" = "null" ]; then
+    declare -a RECIPE_VERSIONS
+  else
+    mapfile -t RECIPE_VERSIONS < <(echo "$recipe_json" | $JQ -r ".versions | keys | .[]" - | sort)
+  fi
+}
+
+get_recipe_version_latest() {
+  if [ "${#RECIPE_VERSIONS[@]}" = 0 ]; then
+    VERSION=""
+    warning "No version specified, dangerously using latest git 😨"
+  else
+    VERSION="${RECIPE_VERSIONS[-1]}"
+    info "Chose version $VERSION"
+  fi
 }
 
 ###### Run-time loading
@@ -762,6 +779,8 @@ ensure_stack_deployed() {
       # see: https://github.com/moby/moby/issues/28012
       service_state=$(docker service inspect --format "{{if .UpdateStatus}}{{.UpdateStatus.State}}{{else}}created{{end}}" "$service_id")
 
+      debug "$service_id has state: $service_state"
+
       case "$service_state" in
         created|completed)
           ;;
@@ -830,7 +849,7 @@ load_instance() {
   esac
 
   ENV_FILE="${ENV_FILES[0]}"
-  debug "Selected ENV_FILE $ENV_FILE"
+  debug "ENV_FILE=$ENV_FILE"
 
   if [ ! -f "$ENV_FILE" ]; then
     error "Can't open ENV_FILE '$ENV_FILE'"
@@ -842,7 +861,7 @@ load_instance() {
   SERVER="${PARTS[-2]}"
 
   export STACK_NAME="${APP//./_}"
-  debug "Using ${STACK_NAME} as the STACK_NAME var"
+  debug "STACK_NAME=${STACK_NAME}"
 }
 
 load_instance_env() {
@@ -860,7 +879,7 @@ load_instance_env() {
 
   APP_DIR="$ABRA_DIR/apps/$TYPE"
   export DOCKER_CONTEXT="$SERVER"
-  info "Setting DOCKER_CONTEXT=$DOCKER_CONTEXT"
+  info "DOCKER_CONTEXT=$DOCKER_CONTEXT"
 
   export DOMAIN
 }
@@ -1085,13 +1104,7 @@ sub_app_new (){
   APP_NAME=$abra___app_name
 
   get_recipe_versions "$TYPE"
-  if [ "${#RECIPE_VERSIONS[@]}" = 0 ]; then
-    VERSION=""
-    warning "No version specified, dangerously using latest git 😨"
-  else
-    VERSION="${RECIPE_VERSIONS[-1]}"
-    info "Chose version $VERSION"
-  fi
+  get_recipe_version_latest
 
   require_app_version "$TYPE" "$VERSION"
 
@@ -1285,17 +1298,19 @@ sub_app_deploy (){
   SKIP_VERSION_CHECK=$abra___skip_version_check
   NO_DOMAIN_POLL=$abra___no_domain_poll
 
+  if [ ! "$abra__version_" = "dev" ]; then
+    get_recipe_versions "$TYPE"
+
     if [ -n "$abra__version_" ]; then
       VERSION="$abra__version_"
       if ! printf '%s\0' "${RECIPE_VERSIONS[@]}" | grep -Fqxz -- "$VERSION"; then
         error "'$version' doesn't appear to be a valid version of $TYPE"
       fi
-  else
-    get_recipe_versions "$TYPE"
-    VERSION="${RECIPE_VERSIONS[-1]}"
-  fi
-
       info "Chose version $VERSION"
+    else
+      get_recipe_version_latest
+    fi
+  fi
 
   require_app_version "$TYPE" "$VERSION"
 
@@ -1632,12 +1647,17 @@ sub_app_secret_generate(){
   fi
 
   if [[ -n "$LENGTH" ]]; then
+    if [ -z "$abra__cmd_" ]; then
       require_binary pwgen
-    PWGEN=${abra__cmd_:-pwgen -s "$LENGTH" 1}
-  else
-    require_binary pwqgen
-    PWGEN="${abra__cmd_:-pwqgen}"
+      abra__cmd_="pwgen -s \"$LENGTH\" 1"
     fi
+  else
+    if [ -z "$abra__cmd_" ]; then
+      require_binary pwqgen
+      abra__cmd_=pwqgen
+    fi
+  fi
+  PWGEN=${abra__cmd_}
 
   debug "SECRET: $SECRET, VERSION $VERSION, PW $PWGEN, ALL $abra___all"
 
@@ -1852,6 +1872,33 @@ sub_app_cp() {
 # abra recipe ..
 #######################################
 
+###### .. recipe create
+help_recipe_create() {
+  echo "abra [options] recipe create <recipe>
+
+Create a new application recipe called <recipe>."
+}
+
+sub_recipe_create() {
+  recipe="$abra__recipe_"
+
+  recipe_dir="$ABRA_DIR/apps/$recipe"
+
+  if [ -d "$recipe_dir" ]; then
+    error "Recipe '$recipe' already exists"
+  fi
+
+  cd "$ABRA_DIR/apps/" || error "Can't find '$ABRA_DIR/apps/'"
+
+  git clone -q "${GIT_URL}example" "$recipe_dir"
+
+  cd "$recipe_dir" || error "Failed to create directory '$recipe_dir'"
+
+  rm -rf .git .gitea
+
+  success "New recipe created in '$recipe_dir', happy hacking! 👌"
+}
+
 ###### .. recipe ls
 help_recipe_ls (){
   help_recipe_list
@@ -1938,8 +1985,13 @@ sub_recipe_release() {
 
   if [ "${#RECIPE_VERSIONS[@]}" -gt 0 ]; then
     latest_version="${RECIPE_VERSIONS[-1]}"
+    if [ "$force" = "true" ]; then
       latest_version_message=$(git tag -l "$latest_version" --format='%(contents)')
+    else
+      latest_version_message=$(git show -s --format=%s)
+    fi
     info "Latest available version: '$latest_version'"
+    info "Latest verion message: '$latest_version_message'"
   else
     latest_version=""
     latest_version_message="Initial tagged release"
@@ -1968,6 +2020,20 @@ sub_recipe_release() {
   for compose_file in "${compose_files[@]}"; do
     mapfile -t services < <($YQ e -N '.services | keys | .[]' "$compose_file" | sort -u)
 
+    if ! printf '%s\0' "${services[@]}" | grep -Fqxz -- "app"; then
+      # shellcheck disable=SC2016
+      warning 'No `app` service found; which one should we use for the version number?'
+      select service_item in "${services[@]##*/}"; do
+        if [ 1 -le "$REPLY" ] && [ "$REPLY" -le ${#services[@]} ]; then
+          main_service="$service_item"
+          success "Selected ${service_item} as main service"
+          break
+        fi
+      done
+    else
+      main_service="app"
+    fi
+
     for service in "${services[@]}"; do
       # 3wc: skip the "app" service unless we're in compose.yml; this service is
       # often repeated in other compose.*.yml files to extend options, but we only
@@ -1989,7 +2055,7 @@ sub_recipe_release() {
       fi
 
       if [ -z "$latest_version" ] || [ "$force" = "true" ] || [ "$service_tag" != "$latest_tag" ]; then
-        if [ "$service" = "app" ]; then
+        if [ "$service" = "$main_service" ]; then
           new_version="$service_tag"
         fi
         info "Fetching $service_image metadata from Docker Hub"
@@ -2011,15 +2077,14 @@ sub_recipe_release() {
   done
 
   if [ "$new_version" = "false" ]; then
-
-    # `app` tag hasn't changed, just bump release
+    # $main_service tag hasn't changed, just bump release
     if echo "$latest_version" | grep -q '_'; then
       latest_version_minor="${latest_version##*_}"
     else
       latest_version_minor=0
     fi
     new_version_minor="$((latest_version_minor + 1))"
-    new_version="${latest_version%%*_}_$new_version_minor"
+    new_version="${latest_version%_*}_$new_version_minor"
   fi
 
   debug "Calculated new version $new_version"

bin/app-json.py

@@ -4,7 +4,7 @@
 #
 # Gather metadata from Co-op Cloud apps in $ABRA_DIR/apps (default
 # ~/.abra/apps), and format it as JSON so that it can be hosted here:
-# https://abra-apps.cloud.autonomic.zone
+# https://apps.coopcloud.tech
 
 from json import dump
 from logging import DEBUG, basicConfig, getLogger
@@ -13,7 +13,7 @@ from os.path import basename, exists, expanduser
 from pathlib import Path
 from re import findall, search
 from shlex import split
-from subprocess import check_output, DEVNULL
+from subprocess import DEVNULL, check_output
 from sys import exit
 
 from requests import get
@@ -24,6 +24,7 @@ YQ_PATH = Path(f"{HOME_PATH}/.abra/vendor/yq")
 SCRIPT_PATH = Path(__file__).absolute().parent
 REPOS_TO_SKIP = (
     "abra",
+    "abra-apps",
     "backup-bot",
     "cloud.autonomic.zone",
     "docs.cloud.autonomic.zone",
@@ -32,7 +33,7 @@ REPOS_TO_SKIP = (
     "pyabra",
     "stack-ssh-deploy",
     "radicle-seed-node",
-    "coturn"
+    "coturn",
 )
 
 log = getLogger(__name__)
@@ -55,9 +56,33 @@ def _run_cmd(cmd, shell=False, **kwargs):
         exit(1)
 
 
+def get_repos_json():
+    """ Retrieve repo list from Gitea """
+
+    url = "https://git.autonomic.zone/api/v1/orgs/coop-cloud/repos"
+
+    log.info(f"Retrieving {url}")
+
+    repos = []
+    response = True
+    page = 1
+
+    try:
+        while response:
+            log.info(f"Trying to fetch page {page}")
+            response = get(url + f"?page={page}", timeout=10).json()
+            repos.extend(response)
+            page += 1
+
+        return repos
+    except Exception as exception:
+        log.error(f"Failed to retrieve {url}, saw {str(exception)}")
+        exit(1)
+
+
 def get_published_apps_json():
     """Retrieve already published apps json."""
-    url = "https://abra-apps.cloud.autonomic.zone"
+    url = "https://apps.coopcloud.tech"
 
     log.info(f"Retrieving {url}")
 
@@ -68,23 +93,15 @@ def get_published_apps_json():
         return {}
 
 
-def clone_all_apps():
+def clone_all_apps(repos_json):
     """Clone all Co-op Cloud apps to ~/.abra/apps."""
     if not exists(CLONES_PATH):
         mkdir(CLONES_PATH)
-    url = "https://git.autonomic.zone/api/v1/orgs/coop-cloud/repos"
 
-    log.info(f"Retrieving {url}")
-
-    try:
-        response = get(url, timeout=10)
-    except Exception as exception:
-        log.error(f"Failed to retrieve {url}, saw {str(exception)}")
-        exit(1)
-
-    repos = [[p["name"], p["ssh_url"]] for p in response.json()]
+    repos = [[p["name"], p["ssh_url"]] for p in repos_json]
 
     for name, url in repos:
+        continue
         if name in REPOS_TO_SKIP:
             continue
 
@@ -102,7 +119,7 @@ def clone_all_apps():
             _run_cmd("git fetch -a")
 
 
-def generate_apps_json():
+def generate_apps_json(repos_json):
     """Generate the abra-apps.json application versions file."""
     apps_json = {}
     cached_apps_json = get_published_apps_json()
@@ -112,28 +129,38 @@ def generate_apps_json():
             log.info(f"Skipping {app}")
             continue
 
+        repo_details = next(filter(lambda x: x["name"] == app, repos_json), {})
+
         app_path = f"{CLONES_PATH}/{app}"
         chdir(app_path)
 
+        metadata = get_app_metadata(app_path)
+        name = metadata.pop("name", "")
+
         log.info(f"Processing {app}")
         apps_json[app] = {
-            "category": "apps",
-            "repository": f"https://git.autonomic.zone/coop-cloud/{app}.git",
-            # Note(decentral1se): please note that the app features do not
-            # correspond to version tags. We simply parse the latest features
+            "name": name,
+            "category": metadata.get("category", ""),
+            "repository": repo_details.get("clone_url", ""),
+            "default_branch": repo_details.get("default_branch", ""),
+            "description": repo_details.get("description", ""),
+            "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": get_app_features(app_path),
+            "features": metadata,
             "versions": get_app_versions(app_path, cached_apps_json),
+            "icon": repo_details.get("avatar_url", ""),
         }
 
     return apps_json
 
 
-def get_app_features(app_path):
-    """Parse features from app repo README files."""
-    features = {}
+def get_app_metadata(app_path):
+    """Parse metadata from app repo README files."""
+    metadata = {}
 
     chdir(app_path)
 
@@ -155,16 +182,17 @@ def get_app_features(app_path):
             else:
                 value = match.split(":")[-1].replace("*", "").strip()
 
-            features[title] = value
+            metadata[title] = value
+        metadata["name"] = findall(r"^# (.*)", contents)[0]
     except (IndexError, AttributeError):
         log.info(f"Can't parse {app_path}/README.md")
         return {}
     finally:
         _run_cmd("git checkout HEAD")
 
-    log.info(f"Parsed {features}")
+    log.info(f"Parsed {metadata}")
 
-    return features
+    return metadata
 
 
 def get_app_versions(app_path, cached_apps_json):
@@ -188,8 +216,7 @@ def get_app_versions(app_path, cached_apps_json):
         existing_tags = []
 
     for tag in tags:
-        _run_cmd(f"git checkout {tag}",
-                 stderr=DEVNULL)
+        _run_cmd(f"git checkout {tag}", stderr=DEVNULL)
 
         services_cmd = f"{YQ_PATH} e '.services | keys | .[]' compose*.yml"
         services = _run_cmd(services_cmd, shell=True).split()
@@ -200,7 +227,10 @@ def get_app_versions(app_path, cached_apps_json):
             if service in ("null", "---"):
                 continue
 
-            if tag in existing_tags:
+            if (
+                tag in existing_tags
+                and service in cached_apps_json[app_name]["versions"][tag]
+            ):
                 log.info(f"Skipping {tag} because we've already processed it")
                 existing_versions = cached_apps_json[app_name]["versions"][tag][service]
                 service_versions[service] = existing_versions
@@ -241,11 +271,12 @@ def get_app_versions(app_path, cached_apps_json):
 
 def main():
     """Run the script."""
-    clone_all_apps()
+    repos_json = get_repos_json()
+    clone_all_apps(repos_json)
 
-    target = f"{SCRIPT_PATH}/../deploy/abra-apps.cloud.autonomic.zone/abra-apps.json"
+    target = f"{SCRIPT_PATH}/../deploy/apps.coopcloud.tech/apps.json"
     with open(target, "w", encoding="utf-8") as handle:
-        dump(generate_apps_json(), handle, ensure_ascii=False, indent=4)
+        dump(generate_apps_json(repos_json), handle, ensure_ascii=False, indent=4)
 
     log.info(f"Successfully generated {target}")
 

deploy/apps.coopcloud.tech/compose.yml

@@ -8,7 +8,7 @@ services:
       - source: abra_conf
         target: /etc/nginx/conf.d/abra.conf
       - source: abra_apps_json
-        target: /var/www/abra-apps/abra-apps.json
+        target: /var/www/abra-apps/apps.json
     volumes:
       - "public:/var/www/abra-apps"
     networks:
@@ -20,13 +20,16 @@ services:
       labels:
         - "traefik.enable=true"
         - "traefik.http.services.abra-apps.loadbalancer.server.port=80"
-        - "traefik.http.routers.abra-apps.rule=Host(`abra-apps.cloud.autonomic.zone`)"
+        - "traefik.http.routers.abra-apps.rule=Host(`apps.coopcloud.tech`, `abra-apps.cloud.autonomic.zone`)"
         - "traefik.http.routers.abra-apps.entrypoints=web-secure"
         - "traefik.http.routers.abra-apps.tls.certresolver=production"
+        - "traefik.http.routers.abra-apps.middlewares=abra-apps-redirect"
+        - "traefik.http.middlewares.abra-apps-redirect.headers.SSLForceHost=true"
+        - "traefik.http.middlewares.abra-apps-redirect.headers.SSLHost=apps.coopcloud.tech"
 
 configs:
   abra_apps_json:
-    file: abra-apps.json
+    file: apps.json
   abra_conf:
     file: nginx.conf
 

deploy/apps.coopcloud.tech/nginx.conf

@@ -1,10 +1,10 @@
 server {
   listen         80 default_server;
-  server_name    abra-apps.cloud.autonomic.zone;
+  server_name    apps.coopcloud.tech;
 
   location / {
     root /var/www/abra-apps;
     add_header Content-Type application/json;
-    index abra-apps.json;
+    index apps.json;
   }
 }

deploy/install.abra.autonomic.zone/installer

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

makefile

@@ -51,8 +51,8 @@ release-installer:
 		cd deploy/install.abra.autonomic.zone && \
 		DOCKER_CONTEXT=swarm.autonomic.zone docker stack deploy -c compose.yml abra-installer-script
 
-release-abra-apps:
+release-apps:
 	@DOCKER_CONTEXT=swarm.autonomic.zone \
 		docker stack rm abra-apps-json && \
-		cd deploy/abra-apps.cloud.autonomic.zone && \
+		cd deploy/apps.coopcloud.tech && \
 		DOCKER_CONTEXT=swarm.autonomic.zone docker stack deploy -c compose.yml abra-apps-json