Possible fix to invalid length "20"?

.drone.yml

@@ -18,61 +18,32 @@ steps:
     commands:
       - bats tests
 
-  - name: publish image
+  - name: collect code coverage
-    image: plugins/docker
+    failure: ignore # until we fix this
-    settings:
+    image: decentral1se/docker-dind-bats-kcov
-      auto_tag: true
+    commands:
-      username:
+      - kcov . bats tests || true
-        from_secret: docker_reg_username
-      password:
-        from_secret: docker_reg_passwd
-      repo: decentral1se/abra
-      tags: latest
-    depends_on:
-      - run shellcheck
-      - run flake8
-      - run unit tests
-    when:
-      event:
-        exclude:
-          - pull_request
 
-  - name: trigger downstream builds
+  - name: send code coverage report to codecov
-    image: plugins/downstream
+    failure: ignore # until we fix this
+    image: plugins/codecov
     settings:
-      server: https://drone.autonomic.zone
       token:
-        from_secret: decentral1se_token
+        from_secret: codecov_token
-      fork: true
+        required: true
-      repositories:
-        - coop-cloud/drone-abra
-    depends_on:
-      - run shellcheck
-      - run flake8
-      - run unit tests
-      - publish image
-    when:
-      event:
-        exclude:
-          - pull_request
 
-  - name: notify on failure
+  - name: notify rocket chat
-    image: plugins/matrix
+    image: plugins/slack
     settings:
-      homeserver: https://matrix.autonomic.zone
+      webhook:
-      roomid: "IFazIpLtxiScqbHqoa:autonomic.zone"
+        from_secret: rc_builds_url
-      userid: "@autono-bot:autonomic.zone"
+      username: comradebritney
-      accesstoken:
+      channel: "internal.builds"
-        from_secret: autono_bot_access_token
+      template: "{{repo.owner}}/{{repo.name}} build failed: {{build.link}}"
-    depends_on:
-      - run shellcheck
-      - run flake8
-      - run unit tests
-      - publish image
-      - trigger downstream builds
     when:
       status:
         - failure
+
 trigger:
   branch:
     - main

.gitignore

@@ -1,5 +1,2 @@
-*.json
-*.pyc
 /.venv
-__pycache__
 coverage/

CHANGELOG.md

@@ -9,42 +9,9 @@
 
 # abra x.x.x (UNRELEASED)
 
-# abra 9.0.0 (2021-06-10)
-
-- Add Docker image for `abra` ([64d578cf91](https://git.autonomic.zone/coop-cloud/abra/commit/64d578cf914bd2bad378ea4ef375747d10b33191))
-- Support unattended mode for recipe releasing ([3759bcd641](https://git.autonomic.zone/coop-cloud/abra/commit/3759bcd641cf60611c13927e83425e773d2bb629))
-- Add Renovate bot configuraiton script ([9fadc430a7](https://git.autonomic.zone/coop-cloud/abra/commit/9fadc430a7bb2d554c0ee26c0f9b6c51dc5b0475))
-- Add release automation via [drone-abra](https://git.autonomic.zone/coop-cloud/drone-abra) ([#56](https://git.autonomic.zone/coop-cloud/organising/issues/56))
-- Move `apps.json` generation to [auto-apps-json](https://git.autonomic.zone/coop-cloud/auto-apps-json) ([#125](https://git.autonomic.zone/coop-cloud/abra/issues/125))
-- Add Github mirroring script ([4ef433312d](https://git.autonomic.zone/coop-cloud/abra/commit/4ef433312dd0b0ace91b3c285f82f3973093d92d))
-- Add `--chaos` flag to deploy (always choose latest Git commit) ([#178](https://git.autonomic.zone/coop-cloud/abra/issues/178))
-
-# 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)
-
 - Sort `apps.json` when publishing ([39a7fc0](https://git.autonomic.zone/coop-cloud/abra/commit/39a7fc04fb5df1a6d78b84f51838530ab3eb76db))
 - Fix publishing of rating for new apps ([0e28af9](https://git.autonomic.zone/coop-cloud/abra/commit/0e28af9eb1af6c6da705b4614ddd173c60576629))
 - Detect compose filenames in `n+1` release generation ([ffc569e](https://git.autonomic.zone/coop-cloud/abra/commit/ffc569e275df7ca784a4db1a3331e17975fd8c87))
-- Fix secret generation when specifying length ([3a353f4](https://git.autonomic.zone/coop-cloud/abra/commit/3a353f4062baccde2c9f175b03afb2db6d462ae4))
 
 # abra 0.7.3 (2021-04-28)
 

Dockerfile

@@ -1,33 +0,0 @@
-FROM alpine:latest
-
-RUN apk add --upgrade --no-cache \
-  bash \
-  curl \
-  git \
-  grep \
-  openssh-client \
-  py3-requests \
-  skopeo \
-  util-linux
-
-RUN mkdir -p ~./local/bin
-RUN mkdir -p ~/.abra/apps
-RUN mkdir -p ~/.abra/vendor
-RUN mkdir -p ~/.ssh/
-
-RUN ssh-keyscan -p 2222 git.autonomic.zone > ~/.ssh/known_hosts
-
-RUN curl -L https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 --output ~/.abra/vendor/jq
-RUN chmod +x ~/.abra/vendor/jq
-
-RUN curl -L https://github.com/mikefarah/yq/releases/download/v4.9.3/yq_linux_amd64 --output ~/.abra/vendor/yq
-RUN chmod +x ~/.abra/vendor/yq
-
-# Note(decentral1se): it is fine to always use the development branch because
-# our Drone CI docker auto-tagger will publish official release tags and
-# otherwise give us the latest abra on the latest tag
-RUN curl https://install.abra.coopcloud.tech | bash -s -- --dev
-
-COPY bin/* /root/.local/bin/
-
-ENTRYPOINT ["/root/.local/bin/abra"]

README.md

@@ -1,10 +1,11 @@
 # abra
 
 [![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://coopcloud.tech
 
-The Co-op Cloud utility belt 🎩🐇
+The cooperative cloud utility belt 🎩🐇
 
 `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.
 
@@ -27,35 +28,19 @@ 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.coopcloud.tech | bash
+curl https://install.abra.autonomic.zone | bash
 ```
 
 or the bleeding-edge development version:
 
 ```sh
-curl https://install.abra.coopcloud.tech | bash -s -- --dev
+curl https://install.abra.autonomic.zone | bash -s -- --dev
 ```
 
-The source for this script is [here](./deploy/install.abra.coopcloud.tech/installer).
+The source for this script is [here](./deploy/install.abra.autonomic.zone/installer).
-
-## Container
-
-An [image](https://hub.docker.com/r/decentral1se/abra) is also provided.
-
-```
-docker run decentral1se/abra app ls
-```
 
 ## Update
 
@@ -68,22 +53,41 @@ 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.coopcloud.tech | bash -s -- --dev`, then you can hack on the source in `~/.abra/src`.
+Install it via `curl https://install.abra.autonomic.zone | 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.
 
 Please remember to update the [CHANGELOG](./CHANGELOG.md) when you make a change.
 
+## Generating a new apps.json
+
+You'll need to install the following requirements:
+
+- [requests](https://docs.python-requests.org/en/master/) (`apt install python3-requests` / `pip install requests`)
+- [skopeo](https://github.com/containers/skopeo) (check [the install docs](https://github.com/containers/skopeo/blob/master/install.md))
+- [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/apps.coopcloud.tech/apps.json](./deploy/apps.coopcloud.tech/apps.json).
+
 ## Releasing
 
 ### `abra`
 
-> [install.abra.coopcloud.tech](https://install.abra.coopcloud.tech)
+> [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.coopcloud.tech/installer](./deploy/install.abra.coopcloud.tech/installer)
+- Update the version in [deploy/install.abra.autonomic.zone/installer](./deploy/install.abra.autonomic.zone/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`
 - Tell the world (CoTech forum, Matrix public channel, Autonomic mastodon, etc.)
+
+### apps.coopcloud.tech
+
+> [apps.coopcloud.tech](https://apps.coopcloud.tech)
+
+```bash
+$ make release-apps
+```

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="9.0.0"
+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"
@@ -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] [--fast] [--skip-version-check] [--no-domain-poll] [--no-state-poll] [--chaos] [<version>]
+  abra [options] app <app> deploy [--update] [--force] [--skip-version-check] [--no-domain-poll] [<version>]
   abra [options] app <app> check
   abra [options] app <app> version
   abra [options] app <app> config
@@ -35,8 +35,6 @@ Usage:
   abra [options] app <app> secret insert <secret> <version> <data> [--pass]
   abra [options] app <app> secret (rm|delete) (<secret>|--all) [--pass]
   abra [options] app <app> undeploy
-  abra [options] app <app> volume ls
-  abra [options] app <app> volume (rm|delete) (<volume>|--all)
   abra [options] app <app> <command> [<args>...]
   abra [options] recipe ls
   abra [options] recipe create <recipe>
@@ -167,131 +165,123 @@ eval "var_$1+=($value)"; else eval "var_$1=$value"; fi; return 0; fi; done
 return 1; }; stdout() { printf -- "cat <<'EOM'\n%s\nEOM\n" "$1"; }; stderr() {
 printf -- "cat <<'EOM' >&2\n%s\nEOM\n" "$1"; }; error() {
 [[ -n $1 ]] && stderr "$1"; stderr "$usage"; _return 1; }; _return() {
-printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:2502}
+printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:2365}
-usage=${DOC:40:1893}; digest=580ee
+usage=${DOC:40:1756}; digest=de09c
-shorts=(-U -s -v -b -h -d -e -n -C '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
+shorts=(-s -b -d -C -e -n -h -v -U '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
-longs=(--skip-update --stack --verbose --branch --help --debug --env --no-prompt --skip-check --status --server --type --domain --app-name --pass --secrets --all --update --force --fast --skip-version-check --no-domain-poll --no-state-poll --chaos --volumes --no-tty --user --dev)
+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=(0 1 0 1 0 0 1 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0); node_0(){
+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(){
-switch __skip_update 0; }; node_1(){ value __stack 1; }; node_2(){
+value __stack 0; }; node_1(){ value __branch 1; }; node_2(){ switch __debug 2; }
-switch __verbose 2; }; node_3(){ value __branch 3; }; node_4(){ switch __help 4
+node_3(){ switch __skip_check 3; }; node_4(){ value __env 4; }; node_5(){
-}; node_5(){ switch __debug 5; }; node_6(){ value __env 6; }; node_7(){
+switch __no_prompt 5; }; node_6(){ switch __help 6; }; node_7(){
-switch __no_prompt 7; }; node_8(){ switch __skip_check 8; }; node_9(){
+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(){
 switch __secrets 15; }; node_16(){ switch __all 16; }; node_17(){
 switch __update 17; }; node_18(){ switch __force 18; }; node_19(){
-switch __fast 19; }; node_20(){ switch __skip_version_check 20; }; node_21(){
+switch __skip_version_check 19; }; node_20(){ switch __no_domain_poll 20; }
-switch __no_domain_poll 21; }; node_22(){ switch __no_state_poll 22; }
+node_21(){ switch __volumes 21; }; node_22(){ switch __no_tty 22; }; node_23(){
-node_23(){ switch __chaos 23; }; node_24(){ switch __volumes 24; }; node_25(){
+value __user 23; }; node_24(){ switch __dev 24; }; node_25(){ value _type_ a; }
-switch __no_tty 25; }; node_26(){ value __user 26; }; node_27(){ switch __dev 27
+node_26(){ value _app_ a; }; node_27(){ value _service_ a; }; node_28(){
-}; node_28(){ value _type_ a; }; node_29(){ value _app_ a; }; node_30(){
+value _version_ a; }; node_29(){ value _src_ a; }; node_30(){ value _dst_ a; }
-value _service_ a; }; node_31(){ value _version_ a; }; node_32(){ value _src_ a
+node_31(){ value _backup_file_ a; }; node_32(){ value _args_ a true; }
-}; node_33(){ value _dst_ a; }; node_34(){ value _backup_file_ a; }; node_35(){
+node_33(){ value _secret_ a; }; node_34(){ value _cmd_ a; }; node_35(){
-value _args_ a true; }; node_36(){ value _secret_ a; }; node_37(){ value _cmd_ a
+value _data_ a; }; node_36(){ value _command_ a; }; node_37(){ value _recipe_ a
-}; node_38(){ value _data_ a; }; node_39(){ value _volume_ a; }; node_40(){
+}; node_38(){ value _host_ a; }; node_39(){ value _user_ a; }; node_40(){
-value _command_ a; }; node_41(){ value _recipe_ a; }; node_42(){ value _host_ a
+value _port_ a; }; node_41(){ value _provider_ a; }; node_42(){
-}; node_43(){ value _user_ a; }; node_44(){ value _port_ a; }; node_45(){
+value _subcommands_ a true; }; node_43(){ _command app; }; node_44(){
-value _provider_ a; }; node_46(){ value _subcommands_ a true; }; node_47(){
+_command list; }; node_45(){ _command ls; }; node_46(){ _command new; }
-_command app; }; node_48(){ _command list; }; node_49(){ _command ls; }
+node_47(){ _command backup; }; node_48(){ _command deploy; }; node_49(){
-node_50(){ _command new; }; node_51(){ _command backup; }; node_52(){
+_command check; }; node_50(){ _command version; }; node_51(){ _command config; }
-_command deploy; }; node_53(){ _command check; }; node_54(){ _command version; }
+node_52(){ _command cp; }; node_53(){ _command logs; }; node_54(){ _command ps
-node_55(){ _command config; }; node_56(){ _command cp; }; node_57(){
+}; node_55(){ _command restore; }; node_56(){ _command rm; }; node_57(){
-_command logs; }; node_58(){ _command ps; }; node_59(){ _command restore; }
+_command delete; }; node_58(){ _command run; }; node_59(){ _command rollback; }
-node_60(){ _command rm; }; node_61(){ _command delete; }; node_62(){
+node_60(){ _command secret; }; node_61(){ _command generate; }; node_62(){
-_command run; }; node_63(){ _command rollback; }; node_64(){ _command secret; }
+_command insert; }; node_63(){ _command undeploy; }; node_64(){ _command recipe
-node_65(){ _command generate; }; node_66(){ _command insert; }; node_67(){
+}; node_65(){ _command create; }; node_66(){ _command release; }; node_67(){
-_command undeploy; }; node_68(){ _command volume; }; node_69(){ _command recipe
+_command versions; }; node_68(){ _command server; }; node_69(){ _command add; }
-}; node_70(){ _command create; }; node_71(){ _command release; }; node_72(){
+node_70(){ _command __ --; }; node_71(){ _command init; }; node_72(){
-_command versions; }; node_73(){ _command server; }; node_74(){ _command add; }
+_command apps; }; node_73(){ _command upgrade; }; node_74(){ _command doctor; }
-node_75(){ _command __ --; }; node_76(){ _command init; }; node_77(){
+node_75(){ _command help; }; node_76(){ optional 0 1 2 3 4 5 6 7 8; }
-_command apps; }; node_78(){ _command upgrade; }; node_79(){ _command doctor; }
+node_77(){ optional 76; }; node_78(){ either 44 45; }; node_79(){ required 78; }
-node_80(){ _command help; }; node_81(){ optional 0 1 2 3 4 5 6 7 8; }
+node_80(){ optional 9; }; node_81(){ optional 10; }; node_82(){ optional 11; }
-node_82(){ optional 81; }; node_83(){ either 48 49; }; node_84(){ required 83; }
+node_83(){ required 77 43 79 80 81 82; }; node_84(){ optional 12; }; node_85(){
-node_85(){ optional 9; }; node_86(){ optional 10; }; node_87(){ optional 11; }
+optional 13; }; node_86(){ optional 14; }; node_87(){ optional 15; }; node_88(){
-node_88(){ required 82 47 84 85 86 87; }; node_89(){ optional 12; }; node_90(){
+required 77 43 46 81 84 85 86 87 25; }; node_89(){ either 27 16; }; node_90(){
-optional 13; }; node_91(){ optional 14; }; node_92(){ optional 15; }; node_93(){
+required 89; }; node_91(){ required 77 43 26 47 90; }; node_92(){ optional 17; }
-required 82 47 50 86 89 90 91 92 28; }; node_94(){ either 30 16; }; node_95(){
+node_93(){ optional 18; }; node_94(){ optional 19; }; node_95(){ optional 20; }
-required 94; }; node_96(){ required 82 47 29 51 95; }; node_97(){ optional 17; }
+node_96(){ optional 28; }; node_97(){ required 77 43 26 48 92 93 94 95 96; }
-node_98(){ optional 18; }; node_99(){ optional 19; }; node_100(){ optional 20; }
+node_98(){ required 77 43 26 49; }; node_99(){ required 77 43 26 50; }
-node_101(){ optional 21; }; node_102(){ optional 22; }; node_103(){ optional 23
+node_100(){ required 77 43 26 51; }; node_101(){ required 77 43 26 52 29 30; }
-}; node_104(){ optional 31; }; node_105(){
+node_102(){ optional 27; }; node_103(){ required 77 43 26 53 102; }; node_104(){
-required 82 47 29 52 97 98 99 100 101 102 103 104; }; node_106(){
+required 77 43 26 54; }; node_105(){ required 77 43 26 55 90; }; node_106(){
-required 82 47 29 53; }; node_107(){ required 82 47 29 54; }; node_108(){
+either 56 57; }; node_107(){ required 106; }; node_108(){ optional 21; }
-required 82 47 29 55; }; node_109(){ required 82 47 29 56 32 33; }; node_110(){
+node_109(){ required 77 43 26 107 108 87; }; node_110(){ optional 31; }
-optional 30; }; node_111(){ required 82 47 29 57 110; }; node_112(){
+node_111(){ required 77 43 26 55 27 110; }; node_112(){ optional 22; }
-required 82 47 29 58; }; node_113(){ required 82 47 29 59 95; }; node_114(){
+node_113(){ optional 23; }; node_114(){ oneormore 32; }; node_115(){
-either 60 61; }; node_115(){ required 114; }; node_116(){ optional 24; }
+required 77 43 26 58 112 113 27 114; }; node_116(){ required 77 43 26 59 96; }
-node_117(){ required 82 47 29 115 116 92; }; node_118(){ optional 34; }
+node_117(){ required 33 28; }; node_118(){ either 117 16; }; node_119(){
-node_119(){ required 82 47 29 59 30 118; }; node_120(){ optional 25; }
+required 118; }; node_120(){ optional 34; }; node_121(){
-node_121(){ optional 26; }; node_122(){ oneormore 35; }; node_123(){
+required 77 43 26 60 61 119 120 86; }; node_122(){
-required 82 47 29 62 120 121 30 122; }; node_124(){ required 82 47 29 63 104; }
+required 77 43 26 60 62 33 28 35 86; }; node_123(){ either 33 16; }; node_124(){
-node_125(){ required 36 31; }; node_126(){ either 125 16; }; node_127(){
+required 123; }; node_125(){ required 77 43 26 60 107 124 86; }; node_126(){
-required 126; }; node_128(){ optional 37; }; node_129(){
+required 77 43 26 63; }; node_127(){ optional 114; }; node_128(){
-required 82 47 29 64 65 127 128 91; }; node_130(){
+required 77 43 26 36 127; }; node_129(){ required 77 64 45; }; node_130(){
-required 82 47 29 64 66 36 31 38 91; }; node_131(){ either 36 16; }; node_132(){
+required 77 64 65 37; }; node_131(){ required 77 64 37 66 93; }; node_132(){
-required 131; }; node_133(){ required 82 47 29 64 115 132 91; }; node_134(){
+required 77 64 37 67; }; node_133(){ optional 39; }; node_134(){ optional 40; }
-required 82 47 29 67; }; node_135(){ required 82 47 29 68 49; }; node_136(){
+node_135(){ required 77 68 69 38 133 134; }; node_136(){
-either 39 16; }; node_137(){ required 136; }; node_138(){
+required 77 68 46 41 70 32; }; node_137(){ required 77 68 79; }; node_138(){
-required 82 47 29 68 115 137; }; node_139(){ optional 122; }; node_140(){
+required 77 68 38 56; }; node_139(){ required 77 68 38 71; }; node_140(){
-required 82 47 29 40 139; }; node_141(){ required 82 69 49; }; node_142(){
+required 77 68 38 72 80; }; node_141(){ optional 24; }; node_142(){
-required 82 69 70 41; }; node_143(){ required 82 69 41 71 98; }; node_144(){
+required 77 73 141; }; node_143(){ required 77 50; }; node_144(){ required 77 74
-required 82 69 41 72; }; node_145(){ optional 43; }; node_146(){ optional 44; }
+}; node_145(){ oneormore 42; }; node_146(){ optional 145; }; node_147(){
-node_147(){ required 82 73 74 42 145 146; }; node_148(){
+required 77 75 146; }; node_148(){ required 77; }; node_149(){
-required 82 73 50 45 75 35; }; node_149(){ required 82 73 84; }; node_150(){
+either 83 88 91 97 98 99 100 101 103 104 105 109 111 115 116 121 122 125 126 128 129 130 131 132 135 136 137 138 139 140 142 143 144 147 148
-required 82 73 42 60; }; node_151(){ required 82 73 42 76; }; node_152(){
+}; node_150(){ required 149; }; cat <<<' docopt_exit() {
-required 82 73 42 77 85; }; node_153(){ optional 27; }; node_154(){
+[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1756}" >&2
-required 82 78 153; }; node_155(){ required 82 54; }; node_156(){ required 82 79
+exit 1; }'; unset var___stack var___branch var___debug var___skip_check \
-}; node_157(){ oneormore 46; }; node_158(){ optional 157; }; node_159(){
+var___env var___no_prompt var___help var___verbose var___skip_update \
-required 82 80 158; }; node_160(){ required 82; }; node_161(){
+var___status var___server var___type var___domain var___app_name var___pass \
-either 88 93 96 105 106 107 108 109 111 112 113 117 119 123 124 129 130 133 134 135 138 140 141 142 143 144 147 148 149 150 151 152 154 155 156 159 160
+var___secrets var___all var___update var___force var___skip_version_check \
-}; node_162(){ required 161; }; cat <<<' docopt_exit() {
+var___no_domain_poll var___volumes var___no_tty var___user var___dev \
-[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1893}" >&2
+var__type_ var__app_ var__service_ var__version_ var__src_ var__dst_ \
-exit 1; }'; unset var___skip_update var___stack var___verbose var___branch \
+var__backup_file_ var__args_ var__secret_ var__cmd_ var__data_ var__command_ \
-var___help var___debug var___env var___no_prompt var___skip_check var___status \
+var__recipe_ var__host_ var__user_ var__port_ var__provider_ var__subcommands_ \
-var___server var___type var___domain var___app_name var___pass var___secrets \
+var_app var_list var_ls var_new var_backup var_deploy var_check var_version \
-var___all var___update var___force var___fast var___skip_version_check \
+var_config var_cp var_logs var_ps var_restore var_rm var_delete var_run \
-var___no_domain_poll var___no_state_poll var___chaos var___volumes \
+var_rollback var_secret var_generate var_insert var_undeploy var_recipe \
-var___no_tty var___user var___dev var__type_ var__app_ var__service_ \
+var_create var_release var_versions var_server var_add var___ var_init \
-var__version_ var__src_ var__dst_ var__backup_file_ var__args_ var__secret_ \
+var_apps var_upgrade var_doctor var_help; parse 150 "$@"
-var__cmd_ var__data_ var__volume_ var__command_ var__recipe_ var__host_ \
+local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__stack" \
-var__user_ var__port_ var__provider_ var__subcommands_ var_app var_list var_ls \
+"${prefix}__branch" "${prefix}__debug" "${prefix}__skip_check" \
-var_new var_backup var_deploy var_check var_version var_config var_cp var_logs \
+"${prefix}__env" "${prefix}__no_prompt" "${prefix}__help" "${prefix}__verbose" \
-var_ps var_restore var_rm var_delete var_run var_rollback var_secret \
+"${prefix}__skip_update" "${prefix}__status" "${prefix}__server" \
-var_generate var_insert var_undeploy var_volume var_recipe var_create \
-var_release var_versions var_server var_add var___ var_init var_apps \
-var_upgrade var_doctor var_help; parse 162 "$@"
-local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__skip_update" \
-"${prefix}__stack" "${prefix}__verbose" "${prefix}__branch" "${prefix}__help" \
-"${prefix}__debug" "${prefix}__env" "${prefix}__no_prompt" \
-"${prefix}__skip_check" "${prefix}__status" "${prefix}__server" \
 "${prefix}__type" "${prefix}__domain" "${prefix}__app_name" "${prefix}__pass" \
 "${prefix}__secrets" "${prefix}__all" "${prefix}__update" "${prefix}__force" \
-"${prefix}__fast" "${prefix}__skip_version_check" "${prefix}__no_domain_poll" \
+"${prefix}__skip_version_check" "${prefix}__no_domain_poll" \
-"${prefix}__no_state_poll" "${prefix}__chaos" "${prefix}__volumes" \
+"${prefix}__volumes" "${prefix}__no_tty" "${prefix}__user" "${prefix}__dev" \
-"${prefix}__no_tty" "${prefix}__user" "${prefix}__dev" "${prefix}_type_" \
+"${prefix}_type_" "${prefix}_app_" "${prefix}_service_" "${prefix}_version_" \
-"${prefix}_app_" "${prefix}_service_" "${prefix}_version_" "${prefix}_src_" \
+"${prefix}_src_" "${prefix}_dst_" "${prefix}_backup_file_" "${prefix}_args_" \
-"${prefix}_dst_" "${prefix}_backup_file_" "${prefix}_args_" \
+"${prefix}_secret_" "${prefix}_cmd_" "${prefix}_data_" "${prefix}_command_" \
-"${prefix}_secret_" "${prefix}_cmd_" "${prefix}_data_" "${prefix}_volume_" \
+"${prefix}_recipe_" "${prefix}_host_" "${prefix}_user_" "${prefix}_port_" \
-"${prefix}_command_" "${prefix}_recipe_" "${prefix}_host_" "${prefix}_user_" \
+"${prefix}_provider_" "${prefix}_subcommands_" "${prefix}app" "${prefix}list" \
-"${prefix}_port_" "${prefix}_provider_" "${prefix}_subcommands_" \
+"${prefix}ls" "${prefix}new" "${prefix}backup" "${prefix}deploy" \
-"${prefix}app" "${prefix}list" "${prefix}ls" "${prefix}new" "${prefix}backup" \
+"${prefix}check" "${prefix}version" "${prefix}config" "${prefix}cp" \
-"${prefix}deploy" "${prefix}check" "${prefix}version" "${prefix}config" \
+"${prefix}logs" "${prefix}ps" "${prefix}restore" "${prefix}rm" \
-"${prefix}cp" "${prefix}logs" "${prefix}ps" "${prefix}restore" "${prefix}rm" \
 "${prefix}delete" "${prefix}run" "${prefix}rollback" "${prefix}secret" \
-"${prefix}generate" "${prefix}insert" "${prefix}undeploy" "${prefix}volume" \
+"${prefix}generate" "${prefix}insert" "${prefix}undeploy" "${prefix}recipe" \
-"${prefix}recipe" "${prefix}create" "${prefix}release" "${prefix}versions" \
+"${prefix}create" "${prefix}release" "${prefix}versions" "${prefix}server" \
-"${prefix}server" "${prefix}add" "${prefix}__" "${prefix}init" "${prefix}apps" \
+"${prefix}add" "${prefix}__" "${prefix}init" "${prefix}apps" \
 "${prefix}upgrade" "${prefix}doctor" "${prefix}help"
-eval "${prefix}"'__skip_update=${var___skip_update:-false}'
 eval "${prefix}"'__stack=${var___stack:-}'
-eval "${prefix}"'__verbose=${var___verbose:-false}'
 eval "${prefix}"'__branch=${var___branch:-}'
-eval "${prefix}"'__help=${var___help:-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}"'__skip_check=${var___skip_check:-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:-}'
@@ -302,11 +292,8 @@ 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}"'__chaos=${var___chaos:-false}'
 eval "${prefix}"'__volumes=${var___volumes:-false}'
 eval "${prefix}"'__no_tty=${var___no_tty:-false}'
 eval "${prefix}"'__user=${var___user:-}'
@@ -320,7 +307,6 @@ if declare -p var__args_ >/dev/null 2>&1; then
 eval "${prefix}"'_args_=("${var__args_[@]}")'; else eval "${prefix}"'_args_=()'
 fi; eval "${prefix}"'_secret_=${var__secret_:-}'
 eval "${prefix}"'_cmd_=${var__cmd_:-}'; eval "${prefix}"'_data_=${var__data_:-}'
-eval "${prefix}"'_volume_=${var__volume_:-}'
 eval "${prefix}"'_command_=${var__command_:-}'
 eval "${prefix}"'_recipe_=${var__recipe_:-}'
 eval "${prefix}"'_host_=${var__host_:-}'
@@ -348,7 +334,6 @@ eval "${prefix}"'secret=${var_secret:-false}'
 eval "${prefix}"'generate=${var_generate:-false}'
 eval "${prefix}"'insert=${var_insert:-false}'
 eval "${prefix}"'undeploy=${var_undeploy:-false}'
-eval "${prefix}"'volume=${var_volume:-false}'
 eval "${prefix}"'recipe=${var_recipe:-false}'
 eval "${prefix}"'create=${var_create:-false}'
 eval "${prefix}"'release=${var_release:-false}'
@@ -361,28 +346,27 @@ eval "${prefix}"'upgrade=${var_upgrade:-false}'
 eval "${prefix}"'doctor=${var_doctor:-false}'
 eval "${prefix}"'help=${var_help:-false}'; local docopt_i=1
 [[ $BASH_VERSION =~ ^4.3 ]] && docopt_i=2; for ((;docopt_i>0;docopt_i--)); do
-declare -p "${prefix}__skip_update" "${prefix}__stack" "${prefix}__verbose" \
+declare -p "${prefix}__stack" "${prefix}__branch" "${prefix}__debug" \
-"${prefix}__branch" "${prefix}__help" "${prefix}__debug" "${prefix}__env" \
+"${prefix}__skip_check" "${prefix}__env" "${prefix}__no_prompt" \
-"${prefix}__no_prompt" "${prefix}__skip_check" "${prefix}__status" \
+"${prefix}__help" "${prefix}__verbose" "${prefix}__skip_update" \
-"${prefix}__server" "${prefix}__type" "${prefix}__domain" \
+"${prefix}__status" "${prefix}__server" "${prefix}__type" "${prefix}__domain" \
 "${prefix}__app_name" "${prefix}__pass" "${prefix}__secrets" "${prefix}__all" \
-"${prefix}__update" "${prefix}__force" "${prefix}__fast" \
+"${prefix}__update" "${prefix}__force" "${prefix}__skip_version_check" \
-"${prefix}__skip_version_check" "${prefix}__no_domain_poll" \
+"${prefix}__no_domain_poll" "${prefix}__volumes" "${prefix}__no_tty" \
-"${prefix}__no_state_poll" "${prefix}__chaos" "${prefix}__volumes" \
+"${prefix}__user" "${prefix}__dev" "${prefix}_type_" "${prefix}_app_" \
-"${prefix}__no_tty" "${prefix}__user" "${prefix}__dev" "${prefix}_type_" \
+"${prefix}_service_" "${prefix}_version_" "${prefix}_src_" "${prefix}_dst_" \
-"${prefix}_app_" "${prefix}_service_" "${prefix}_version_" "${prefix}_src_" \
+"${prefix}_backup_file_" "${prefix}_args_" "${prefix}_secret_" \
-"${prefix}_dst_" "${prefix}_backup_file_" "${prefix}_args_" \
+"${prefix}_cmd_" "${prefix}_data_" "${prefix}_command_" "${prefix}_recipe_" \
-"${prefix}_secret_" "${prefix}_cmd_" "${prefix}_data_" "${prefix}_volume_" \
+"${prefix}_host_" "${prefix}_user_" "${prefix}_port_" "${prefix}_provider_" \
-"${prefix}_command_" "${prefix}_recipe_" "${prefix}_host_" "${prefix}_user_" \
+"${prefix}_subcommands_" "${prefix}app" "${prefix}list" "${prefix}ls" \
-"${prefix}_port_" "${prefix}_provider_" "${prefix}_subcommands_" \
+"${prefix}new" "${prefix}backup" "${prefix}deploy" "${prefix}check" \
-"${prefix}app" "${prefix}list" "${prefix}ls" "${prefix}new" "${prefix}backup" \
+"${prefix}version" "${prefix}config" "${prefix}cp" "${prefix}logs" \
-"${prefix}deploy" "${prefix}check" "${prefix}version" "${prefix}config" \
+"${prefix}ps" "${prefix}restore" "${prefix}rm" "${prefix}delete" \
-"${prefix}cp" "${prefix}logs" "${prefix}ps" "${prefix}restore" "${prefix}rm" \
+"${prefix}run" "${prefix}rollback" "${prefix}secret" "${prefix}generate" \
-"${prefix}delete" "${prefix}run" "${prefix}rollback" "${prefix}secret" \
+"${prefix}insert" "${prefix}undeploy" "${prefix}recipe" "${prefix}create" \
-"${prefix}generate" "${prefix}insert" "${prefix}undeploy" "${prefix}volume" \
+"${prefix}release" "${prefix}versions" "${prefix}server" "${prefix}add" \
-"${prefix}recipe" "${prefix}create" "${prefix}release" "${prefix}versions" \
+"${prefix}__" "${prefix}init" "${prefix}apps" "${prefix}upgrade" \
-"${prefix}server" "${prefix}add" "${prefix}__" "${prefix}init" "${prefix}apps" \
+"${prefix}doctor" "${prefix}help"; done; }
-"${prefix}upgrade" "${prefix}doctor" "${prefix}help"; done; }
 # docopt parser above, complete command for generating this parser is `docopt.sh abra`
 
 PROGRAM_NAME=$(basename "$0")
@@ -494,16 +478,6 @@ 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() {
@@ -522,13 +496,13 @@ require_apps_json() {
 
     if [ "$local_ctime" -lt "$remote_ctime" ]; then
       info "Downloading new apps.json"
-      curl -sLo "$ABRA_APPS_JSON" "$ABRA_APPS_URL"
+      wget -qO "$ABRA_APPS_JSON" "$ABRA_APPS_URL"
     else
       debug "No apps.json update needed"
     fi
   else
     info "Downloading apps.json"
-    curl -sLo "$ABRA_APPS_JSON" "$ABRA_APPS_URL"
+    wget -qO "$ABRA_APPS_JSON" "$ABRA_APPS_URL"
   fi
 }
 
@@ -571,7 +545,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
 
@@ -606,16 +580,13 @@ require_app_version() {
   if [ -z "$VERSION" ]; then
     warning "No version specified, dangerously using latest git 😨"
   else
-    if [ "$abra___chaos" = "false" ]; then
     git checkout -q "$VERSION" || error "Can't find version $VERSION"
-    else
-      warning "Chaos deploy specified, dangerously using latest git 😨"
-    fi
   fi
 }
 
 vendor_binary() {
   require_vendor_dir
+  require_binary wget
 
   local REPO="$1"
   local VERSION="$2"
@@ -642,7 +613,7 @@ vendor_binary() {
       ;;
   esac
 
-  curl -sLo "$ABRA_VENDOR_DIR/$BINARY" "$RELEASE_URL"
+  wget -qO "$ABRA_VENDOR_DIR/$BINARY" "$RELEASE_URL"
   chmod +x "$ABRA_VENDOR_DIR/$BINARY"
   success "$BINARY is now vendored ☮"
 }
@@ -689,7 +660,7 @@ get_recipe_versions() {
 get_recipe_version_latest() {
   if [ "${#RECIPE_VERSIONS[@]}" = 0 ]; then
     VERSION=""
-    info "No versions found"
+    warning "No version specified, dangerously using latest git 😨"
   else
     VERSION="${RECIPE_VERSIONS[-1]}"
     info "Chose version $VERSION"
@@ -719,7 +690,6 @@ output_version_summary() {
 
   CONSENT_TO_UPDATE=$abra___update
   FORCE_DEPLOY=$abra___force
-  CHAOS_DEPLOY=$abra___chaos
 
   local -a IS_AN_UPDATE="false"
   local -a UNABLE_TO_DETECT="false"
@@ -732,7 +702,6 @@ 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
@@ -761,12 +730,8 @@ output_version_summary() {
           if [ "$live_version" != "$service_tag" ] || [ "$live_digest" != "$service_digest" ]; then
             IS_AN_UPDATE="true"
           fi
-          if [ "$abra___chaos" = "true" ]; then
-            echo "      to be deployed: $(tput setaf 1)$service_tag ($service_digest) (+ latest git)$(tput sgr0)"
-          else
           echo "      to be deployed: $(tput setaf 1)$service_tag ($service_digest)$(tput sgr0)"
         fi
-        fi
       else
         if [[ $UNDEPLOYED_STATE == "true" ]]; then
           image=$($YQ e ".services.${SERVICE}.image" "${APP_DIR}/${COMPOSE}" | cut -d':' -f1)
@@ -791,8 +756,7 @@ output_version_summary() {
   else
     if [[ $UNABLE_TO_DETECT == "false" ]] && \
        [[ $UNDEPLOYED_STATE == "false" ]] && \
-       [[ $FORCE_DEPLOY == "false" ]] && \
+       [[ $FORCE_DEPLOY == "false" ]]; then
-       [[ $CHAOS_DEPLOY = "false" ]]; then
       success "Nothing to deploy, you're on latest (use --force to re-deploy anyway)"
       exit 0
     fi
@@ -803,7 +767,7 @@ output_version_summary() {
 ensure_stack_deployed() {
   STACK_NAME=$1
 
-  warning "Polling deploy state to check for success"
+  info "Waiting for deployment to succeed"
 
   while true; do
     all_services_done=1
@@ -831,12 +795,10 @@ ensure_stack_deployed() {
 
     if [ "$all_services_done" == "1" ]; then
       if [ "$has_errors" == "1" ]; then
-        warning "Deployment appears to have failed"
+        debug "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
-        warning "Deployment appears to have suceeded"
+        debug "Deployment appears to have suceeded"
         break
       fi
     else
@@ -846,17 +808,17 @@ ensure_stack_deployed() {
 }
 
 ensure_domain_deployed() {
-  local domain=$1
+  DOMAIN=$1
 
-  warning "Waiting for $domain to come up..."
+  warning "Waiting for $DOMAIN to come up..."
 
   idx=1
-  until curl --output /dev/null --silent --head --fail "$domain"; do
+  until curl --output /dev/null --silent --head --fail "$DOMAIN"; do
-    debug "Polled $domain $idx time(s) already"
+    debug "Polled $DOMAIN $idx time(s) already"
     sleep 3
     idx=$(("$idx" + 1))
     if [[ $idx -gt 10 ]]; then
-      error "$domain still isn't up, check status by running \"abra app ${STACK_NAME} ps\""
+      error "$DOMAIN still isn't up, check status by running \"abra app ${STACK_NAME} ps\""
     fi
   done
 }
@@ -937,7 +899,7 @@ prompt_confirm() {
     return
   fi
 
-  read -rp "Continue? [y/N]? " choice
+  read -rp "Continue? (y/[n])? " choice
 
   case "$choice" in
     y|Y ) return ;;
@@ -1316,7 +1278,7 @@ _abra_backup_mysql() {
 
 ###### .. app deploy
 help_app_deploy (){
-  echo "abra [options] app <app> deploy [--update] [--force] [--fast] [--skip-version-check] [--no-domain-poll] [--no-state-poll]
+  echo "abra [options] app <app> deploy [--update] [--force] [--skip-version-check] [--no-domain-poll]
 
 Deploy app <app> to the configured server.
 
@@ -1325,9 +1287,6 @@ 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
-  --chaos                 Deploy straight from latest Git version (potentially chaotic!)
 
 POWERED BY
   docker stack deploy -c compose.yml <app>"
@@ -1336,15 +1295,8 @@ POWERED BY
 sub_app_deploy (){
   require_yq
 
-  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"
@@ -1394,13 +1346,7 @@ 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
-      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}"
@@ -1564,8 +1510,16 @@ sub_app_delete (){
   rm "$ENV_FILE"
 
   if [ "$abra___volumes" = "true" ]; then
-    abra___all="true"
+    volumes="$(docker volume ls --filter "name=${STACK_NAME}" --quiet)"
-    sub_app_volume_delete
+
+    if [ "$abra___volumes" = "true" ]; then
+      # shellcheck disable=SC2086
+      warning "SCARY: About to remove all volumes associated with ${STACK_NAME}: $(echo $volumes | tr -d '\n')"
+
+      prompt_confirm
+    fi
+
+    docker volume rm --force "$volumes"
   fi
 
 
@@ -1679,18 +1633,9 @@ POWERED BY
 }
 
 sub_app_secret_generate(){
-  local secret="$abra__secret_"
+  SECRET="$abra__secret_"
-  local version="$abra__version_"
+  VERSION="$abra__version_"
-  local length="$abra__length_"
+  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
@@ -1701,18 +1646,22 @@ sub_app_secret_generate(){
     return
   fi
 
-  if [[ -n "$length" ]]; then
+  if [[ -n "$LENGTH" ]]; then
+    if [ -z "$abra__cmd_" ]; then
       require_binary pwgen
-    abra__cmd_="pwgen -s $length 1"
+      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"
 
-  if [ -z "$secret" ] || [ -z "$version" ] && [ "$abra___all" == "false" ]; then
+  if [ -z "$SECRET" ] || [ -z "$VERSION" ] && [ "$abra___all" == "false" ]; then
     error "Required arguments missing"
   fi
 
@@ -1725,71 +1674,11 @@ sub_app_secret_generate(){
   abra__data_="$PW"
 
   sub_app_secret_insert
-}
 
-###### .. app volume
+  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"
-###### .. app volume ls
+  warning "Abra is not able to show the password values in plain text again"
-help_app_volume_ls (){
+  warning "See https://docs.docker.com/engine/swarm/secrets/ for more on secrets"
-  help_app_volume_list
-}
-
-sub_app_volume_ls(){
-  sub_app_volume_list
-}
-
-help_app_volume_list (){
-  echo "abra [options] app <app> volume (ls|list)
-
-Show all volumes associated with <app>.
-
-POWERED BY
-  docker volume ls"
-}
-
-sub_app_volume_list(){
-  docker volume ls --filter "name=${STACK_NAME}"
-}
-
-###### .. app volume rm
-help_app_volume_rm (){
-  help_app_volume_delete
-}
-
-sub_app_volume_rm(){
-  sub_app_volume_delete
-}
-
-help_app_volume_delete (){
-  echo "abra [options] app <app> volume (delete|rm) (<volume>|--all)
-
-Remove <app>'s Docker volume <volume>, or all volumes with --all.
-
-OPTIONS
-  --pass     Remove volume(s) from \`pass\` as well
-  --all      Delete all volumes for <app>
-
-POWERED BY
-  docker volume rm
-  docker volume ls  # for --all"
-}
-
-sub_app_volume_delete(){
-  # if --all is provided then $abra__secret_ will be blank and this will work
-  # auto-magically
-  NAMES=$(docker volume ls --filter "name=${STACK_NAME}_${abra__volume_}" --format "{{.Name}}")
-
-  if [ -z "$NAMES" ]; then
-    error "Could not find any volumes under ${STACK_NAME}_${abra__volume_}"
-  fi
-
-  warning "About to delete volume(s) $(echo "$NAMES" | paste -d "")"
-  prompt_confirm
-
-  for NAME in ${NAMES}; do
-    docker volume rm "$NAME" > /dev/null
-
-  done
 }
 
 ###### .. app run
@@ -2116,19 +2005,15 @@ sub_recipe_release() {
 
   current_tag=$(git tag --points-at HEAD)
   if [ "$force" = "false" ] && [ -n "$current_tag" ]; then
-    success "$recipe is already on $current_tag, no release needed"
+    error "$recipe is already on $current_tag, no release needed"
   fi
 
   if [ "$(git rev-parse --abbrev-ref --symbolic-full-name HEAD)" = "HEAD" ]; then
     warning "It looks like $recipe_dir is in 'detached HEAD' state"
-    if [ "$abra___no_prompt" = "false" ]; then
     read -rp "Check out main/master branch first? [Y/n] "
     if [ "${choice,,}" != "n" ]; then
       checkout_main_or_master
     fi
-    else
-      checkout_main_or_master
-    fi
   fi
 
   mapfile -t extra_compose_files < <(ls -- compose.*.yml 2> /dev/null || true)
@@ -2214,49 +2099,22 @@ sub_recipe_release() {
 
   success "All compose files updated; new version is $new_version"
 
-  if [ "$abra___no_prompt" = "false" ]; then
+  read -rp "Commit your changes to git? (y/[n])? " choice
-    read -rp "Commit your changes to git? [y/N]? " choice
 
   if [ "${choice,,}" != "y" ]; then
     return
   fi
-  fi
 
-  if [ "$abra___no_prompt" = "false" ]; then
   git commit -avem "Version $new_version; sync labels" || exit
-  else
-    git commit -am "Version $new_version; sync labels" || true
-  fi
 
-  if [ "$abra___no_prompt" = "false" ]; then
+  read -rp "Tag this as \`$new_version\`? (y/[n])? " choice
-    read -rp "Tag this as \`$new_version\`? [y/N]? " choice
 
   if [ "${choice,,}" != "y" ]; then
     return
   fi
-  fi
 
-  if [ "$force" = "true" ]; then
+  test "$force" = "true" && git tag -d "$new_version"
-    git tag -d "$new_version" || true
-    git push origin --delete "$new_version" || true
-    debug "Deleted local tag and remote tag if present"
-  fi
-
-  if [ "$abra___no_prompt" = "false" ]; then
   git tag -aem "$latest_version_message" "$new_version"
-  else
-    git tag -am "$latest_version_message" "$new_version" || true
-  fi
-
-  if [ "$abra___no_prompt" = "false" ]; then
-    read -rp "Git push this new tag? [y/N]? " choice
-
-    if [ "${choice,,}" != "y" ]; then
-      git push && git push --tags
-    fi
-  else
-    git push && git push --tags
-  fi
 }
 
 #######################################
@@ -2453,9 +2311,9 @@ OPTIONS
 
 sub_upgrade() {
   if [[ "$abra___dev" == "true" ]]; then
-    curl https://install.abra.coopcloud.tech | bash -s -- --dev
+    curl https://install.abra.autonomic.zone | bash -s -- --dev
   else
-    curl https://install.abra.coopcloud.tech | bash
+    curl https://install.abra.autonomic.zone | bash
   fi
 }
 
@@ -2548,8 +2406,7 @@ abra() {
     abra___skip_check abra__backup_file_ abra___verbose abra___debug \
     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___skip_version_check abra__recipe_ abra___no_domain_poll
-    abra___fast abra__volume_ abra___no_state_poll abra___chaos
 
   if ! type tput > /dev/null 2>&1; then
     tput() {

bin/abralib.py

@@ -1,108 +0,0 @@
-"""Shared utilities for bin/*.py scripts."""
-
-from logging import DEBUG, basicConfig, getLogger
-from os import chdir, mkdir
-from os.path import exists, expanduser
-from pathlib import Path
-from shlex import split
-from subprocess import check_output
-from sys import exit
-
-from requests import get
-
-HOME_PATH = expanduser("~/")
-CLONES_PATH = Path(f"{HOME_PATH}/.abra/apps").absolute()
-REPOS_TO_SKIP = (
-    "abra",
-    "abra-apps",
-    "abra-gandi",
-    "abra-hetzner",
-    "auto-apps-json",
-    "auto-mirror",
-    "backup-bot",
-    "coopcloud.tech",
-    "coturn",
-    "docker-cp-deploy",
-    "docker-dind-bats-kcov",
-    "docs.coopcloud.tech",
-    "example",
-    "gardening",
-    "organising",
-    "pyabra",
-    "radicle-seed-node",
-    "stack-ssh-deploy",
-    "swarm-cronjob",
-)
-YQ_PATH = Path(f"{HOME_PATH}/.abra/vendor/yq")
-JQ_PATH = Path(f"{HOME_PATH}/.abra/vendor/jq")
-
-log = getLogger(__name__)
-basicConfig()
-log.setLevel(DEBUG)
-
-
-def _run_cmd(cmd, shell=False, **kwargs):
-    """Run a shell command."""
-    args = [split(cmd)]
-
-    if shell:
-        args = [cmd]
-        kwargs = {"shell": shell}
-
-    try:
-        return check_output(*args, **kwargs).decode("utf-8").strip()
-    except Exception as exception:
-        log.error(f"Failed to run {cmd}, saw {str(exception)}")
-        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 clone_all_apps(repos_json, ssh=False):
-    """Clone all Co-op Cloud apps to ~/.abra/apps."""
-    if not exists(CLONES_PATH):
-        mkdir(CLONES_PATH)
-
-    if ssh:
-        repos = [[p["name"], p["ssh_url"]] for p in repos_json]
-    else:
-        repos = [[p["name"], p["clone_url"]] for p in repos_json]
-
-    for name, url in repos:
-        if name in REPOS_TO_SKIP:
-            continue
-
-        if not exists(f"{CLONES_PATH}/{name}"):
-            log.info(f"Retrieving {url}")
-            _run_cmd(f"git clone {url} {CLONES_PATH}/{name}")
-
-            chdir(f"{CLONES_PATH}/{name}")
-            if not int(_run_cmd("git branch --list | wc -l", shell=True)):
-                log.info(f"Guessing main branch is HEAD for {name}")
-                _run_cmd("git checkout main")
-        else:
-            log.info(f"Updating {name}")
-            chdir(f"{CLONES_PATH}/{name}")
-            _run_cmd("git fetch -a")

bin/app-json.py

@@ -7,24 +7,84 @@
 # https://apps.coopcloud.tech
 
 from json import dump
-from os import chdir, getcwd, listdir
+from logging import DEBUG, basicConfig, getLogger
-from os.path import basename
+from os import chdir, listdir, mkdir
+from os.path import basename, exists, expanduser
+from pathlib import Path
 from re import findall, search
-from subprocess import DEVNULL
+from shlex import split
+from subprocess import DEVNULL, check_output
+from sys import exit
 
 from requests import get
 
-from abralib import (
+HOME_PATH = expanduser("~/")
-    CLONES_PATH,
+CLONES_PATH = Path(f"{HOME_PATH}/.abra/apps").absolute()
-    JQ_PATH,
+YQ_PATH = Path(f"{HOME_PATH}/.abra/vendor/yq")
-    REPOS_TO_SKIP,
+SCRIPT_PATH = Path(__file__).absolute().parent
-    YQ_PATH,
+REPOS_TO_SKIP = (
-    _run_cmd,
+    "abra",
-    clone_all_apps,
+    "abra-apps",
-    get_repos_json,
+    "abra-gandi",
-    log,
+    "abra-hetzner",
+    "backup-bot",
+    "coopcloud.tech",
+    "coturn",
+    "docker-cp-deploy",
+    "docker-dind-bats-kcov",
+    "docs.coopcloud.tech",
+    "example",
+    "gardening",
+    "organising",
+    "pyabra",
+    "radicle-seed-node",
+    "stack-ssh-deploy",
+    "swarm-cronjob",
 )
 
+log = getLogger(__name__)
+basicConfig()
+log.setLevel(DEBUG)
+
+
+def _run_cmd(cmd, shell=False, **kwargs):
+    """Run a shell command."""
+    args = [split(cmd)]
+
+    if shell:
+        args = [cmd]
+        kwargs = {"shell": shell}
+
+    try:
+        return check_output(*args, **kwargs).decode("utf-8").strip()
+    except Exception as exception:
+        log.error(f"Failed to run {cmd}, saw {str(exception)}")
+        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."""
@@ -39,6 +99,31 @@ def get_published_apps_json():
         return {}
 
 
+def clone_all_apps(repos_json):
+    """Clone all Co-op Cloud apps to ~/.abra/apps."""
+    if not exists(CLONES_PATH):
+        mkdir(CLONES_PATH)
+
+    repos = [[p["name"], p["ssh_url"]] for p in repos_json]
+
+    for name, url in repos:
+        if name in REPOS_TO_SKIP:
+            continue
+
+        if not exists(f"{CLONES_PATH}/{name}"):
+            log.info(f"Retrieving {url}")
+            _run_cmd(f"git clone {url} {CLONES_PATH}/{name}")
+
+            chdir(f"{CLONES_PATH}/{name}")
+            if not int(_run_cmd("git branch --list | wc -l", shell=True)):
+                log.info(f"Guessing main branch is HEAD for {name}")
+                _run_cmd("git checkout main")
+        else:
+            log.info(f"Updating {name}")
+            chdir(f"{CLONES_PATH}/{name}")
+            _run_cmd("git fetch -a")
+
+
 def generate_apps_json(repos_json):
     """Generate the abra-apps.json application versions file."""
     apps_json = {}
@@ -55,8 +140,7 @@ 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] = {
@@ -89,7 +173,7 @@ def get_app_metadata(app_path):
         return {}
 
     try:
-        for match in findall(r"\*\*.*", contents):
+        for match in findall(r"\*\*.*\s\*", contents):
             title = search(r"(?<=\*\*).*(?=\*\*)", match).group().lower()
 
             if title == "image":
@@ -172,7 +256,7 @@ def get_app_versions(app_path, cached_apps_json):
                 if image in ("null", "---"):
                     continue
 
-                images_cmd = f"skopeo inspect docker://{image} | {JQ_PATH} '.Digest'"
+                images_cmd = f"skopeo inspect docker://{image} | jq '.Digest'"
                 output = _run_cmd(images_cmd, shell=True)
 
                 service_version_info = {
@@ -198,7 +282,7 @@ def main():
     repos_json = get_repos_json()
     clone_all_apps(repos_json)
 
-    target = f"{getcwd()}/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(repos_json),

bin/clone-all-apps.py

@@ -1,16 +0,0 @@
-#!/usr/bin/env python3
-
-# Usage: ./clone-all-apps.py
-#
-# Clone all available apps into ~/.abra/apps using ssh:// URLs
-
-from abralib import clone_all_apps, get_repos_json
-
-
-def main():
-    """Run the script."""
-    repos_json = get_repos_json()
-    clone_all_apps(repos_json, ssh=True)
-
-
-main()

bin/github-sync.py

@@ -1,47 +0,0 @@
-#!/usr/bin/env python3
-
-# Usage: ./github-sync.py
-#
-# Mirror repositories to Github (Fuck M$, get it straight)
-
-from os import chdir, environ, listdir
-
-from abralib import (
-    CLONES_PATH,
-    REPOS_TO_SKIP,
-    _run_cmd,
-    clone_all_apps,
-    get_repos_json,
-    log,
-)
-
-
-def main():
-    """Run the script."""
-    repos_json = get_repos_json()
-    clone_all_apps(repos_json)
-
-    for app in listdir(CLONES_PATH):
-        if app in REPOS_TO_SKIP:
-            log.info(f"Skipping {app}")
-            continue
-
-        app_path = f"{CLONES_PATH}/{app}"
-        chdir(app_path)
-
-        log.info(f"Mirroring {app}...")
-
-        token = environ.get("GITHUB_ACCESS_TOKEN")
-        remote = (
-            f"https://decentral1se:{token}@github.com/Autonomic-Cooperative/{app}.git"
-        )
-
-        _run_cmd(
-            f"git remote add github {remote} || true",
-            shell=True,
-        )
-
-        _run_cmd("git push github --all")
-
-
-main()

bin/renovate-ls-apps.py

@@ -1,20 +0,0 @@
-#!/usr/bin/env python3
-
-# Usage: ./renovate-ls-apps.py
-#
-# Output list of apps for Renovate bot configuration
-
-from abralib import REPOS_TO_SKIP, get_repos_json
-
-
-def main():
-    """Run the script."""
-    repos = [p["full_name"] for p in get_repos_json()]
-    repos.sort()
-    for repo in repos:
-        if repo.split("/")[-1] in REPOS_TO_SKIP:
-            continue
-        print(f'"{repo}",')
-
-
-main()

completion/abra.bash

@@ -38,22 +38,6 @@ _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
@@ -62,7 +46,6 @@ _abra_complete()
     local -r cmds='
         app
         server
-        recipe
     '
     local -r short_opts='-e      -h     -s      -v'
     local -r long_opts='--env --help --stack --version'
@@ -118,12 +101,6 @@ _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/compose.yml

@@ -0,0 +1,41 @@
+---
+version: "3.8"
+
+services:
+  app:
+    image: "nginx:stable"
+    configs:
+      - source: abra_conf
+        target: /etc/nginx/conf.d/abra.conf
+      - source: abra_apps_json
+        target: /var/www/abra-apps/apps.json
+    volumes:
+      - "public:/var/www/abra-apps"
+    networks:
+      - proxy
+    deploy:
+      update_config:
+        failure_action: rollback
+        order: start-first
+      labels:
+        - "traefik.enable=true"
+        - "traefik.http.services.abra-apps.loadbalancer.server.port=80"
+        - "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: apps.json
+  abra_conf:
+    file: nginx.conf
+
+networks:
+  proxy:
+    external: true
+
+volumes:
+  public:

deploy/apps.coopcloud.tech/nginx.conf

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

deploy/install.abra.autonomic.zone/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`,`install.abra.coopcloud.tech`)"
+        - "traefik.http.routers.abra-installer.rule=Host(`install.abra.autonomic.zone`)"
         - "traefik.http.routers.abra-installer.entrypoints=web-secure"
         - "traefik.http.routers.abra-installer.tls.certresolver=production"
 

deploy/install.abra.autonomic.zone/installer

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-ABRA_VERSION="9.0.0"
+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}"
+ABRA_DIR="${ABRA_DIR:-$HOME/.abra/}"
 
 function install_abra_release {
   mkdir -p "$HOME/.local/bin"

deploy/install.abra.autonomic.zone/nginx.conf

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

makefile

@@ -1,4 +1,4 @@
-.PHONY: test shellcheck docopt release-installer build push
+.PHONY: test shellcheck docopt kcov codecov release-installer
 
 test:
 	@sudo DOCKER_CONTEXT=default docker run \
@@ -7,13 +7,13 @@ test:
 		-d \
 		--name=abra-test-dind \
 		-e DOCKER_TLS_CERTDIR="" \
-		decentral1se/docker-dind-bats-kcov \
+		decentral1se/docker-dind-bats-kcov
-	@DOCKER_CONTEXT=default sudo docker exec \
+	@DOCKER_CONTEXT=default docker exec \
 		-it \
 		abra-test-dind \
 		sh -c "cd /workdir && bats /workdir/tests"
-	@DOCKER_CONTEXT=default sudo docker stop abra-test-dind
+	@DOCKER_CONTEXT=default docker stop abra-test-dind
-	@DOCKER_CONTEXT=default sudo docker rm abra-test-dind
+	@DOCKER_CONTEXT=default docker rm abra-test-dind
 
 shellcheck:
 	@docker run \
@@ -32,14 +32,27 @@ docopt:
 	fi
 	.venv/bin/docopt.sh abra
 
+kcov:
+	@docker run \
+		-it \
+		--rm \
+		-v $$(pwd):/workdir \
+		kcov/kcov:latest \
+		sh -c "kcov /workdir/coverage /workdir/abra || true"
+
+codecov: SHELL:=/bin/bash
+codecov:
+	@bash <(curl -s https://codecov.io/bash) \
+		-s coverage -t $$(pass show hosts/swarm.autonomic.zone/drone/codecov/token)
+
 release-installer:
 	@DOCKER_CONTEXT=swarm.autonomic.zone \
 		docker stack rm abra-installer-script && \
-		cd deploy/install.abra.coopcloud.tech && \
+		cd deploy/install.abra.autonomic.zone && \
 		DOCKER_CONTEXT=swarm.autonomic.zone docker stack deploy -c compose.yml abra-installer-script
 
-build:
+release-apps:
-	@docker build -t decentral1se/abra .
+	@DOCKER_CONTEXT=swarm.autonomic.zone \
-
+		docker stack rm abra-apps-json && \
-push: build
+		cd deploy/apps.coopcloud.tech && \
-	@docker push decentral1se/abra
+		DOCKER_CONTEXT=swarm.autonomic.zone docker stack deploy -c compose.yml abra-apps-json