13 changed files with 281 additions and 846 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -3,43 +3,35 @@ kind: pipeline
 name: linters
 steps:
  - name: run shellcheck
-    image: koalaman/shellcheck-alpine
+    image: koalaman/shellcheck-alpine:v0.7.1
    commands:
      - shellcheck abra
      - shellcheck bin/*.sh
      - shellcheck deploy/install.abra.coopcloud.tech/installer
  - name: run flake8
-    image: alpine/flake8
+    image: alpine/flake8:3.9.0
    commands:
-      - flake8 --max-line-length 100 bin/*.py
+      - flake8 --max-line-length 100 bin/app-json.py
  - name: run unit tests
    image: decentral1se/docker-dind-bats-kcov
    commands:
      - bats tests
  - name: test installation script
    image: debian:buster
    commands:
      - apt update && apt install -yqq sudo lsb-release
      - deploy/install.abra.coopcloud.tech/installer --no-prompt
      - ~/.local/bin/abra version
  - name: publish image
    image: plugins/docker
    settings:
      auto_tag: true
-      username: thecoopcloud
+      username:
        from_secret: docker_reg_username
      password:
-        from_secret: thecoopcloud_password
+        from_secret: docker_reg_passwd
-      repo: thecoopcloud/abra
+      repo: decentral1se/abra
      tags: latest
    depends_on:
      - run shellcheck
      - run flake8
      - run unit tests
      - test installation script
    when:
      event:
        exclude:
@ -48,9 +40,9 @@ steps:
  - name: trigger downstream builds
    image: plugins/downstream
    settings:
-      server: https://build.coopcloud.tech
+      server: https://drone.autonomic.zone
      token:
-        from_secret: coopcloud_drone_token
+        from_secret: decentral1se_token
      fork: true
      repositories:
        - coop-cloud/drone-abra
@ -58,7 +50,6 @@ steps:
      - run shellcheck
      - run flake8
      - run unit tests
      - test installation script
      - publish image
    when:
      event:
@ -72,12 +63,11 @@ steps:
      roomid: "IFazIpLtxiScqbHqoa:autonomic.zone"
      userid: "@autono-bot:autonomic.zone"
      accesstoken:
-        from_secret: autonobot_rocketchat_access_token
+        from_secret: autono_bot_access_token
    depends_on:
      - run shellcheck
      - run flake8
      - run unit tests
      - test installation script
      - publish image
      - trigger downstream builds
    when:
--- a/.gitea/ISSUE_TEMPLATE.md
+++ b/.gitea/ISSUE_TEMPLATE.md
@ -1,8 +0,0 @@
 ---
 name: "Do not use this issue tracker"
 about: "Do not use this issue tracker"
 title: "Do not use this issue tracker"
 labels: []
 ---
 Please report your issue on [`coop-cloud/organising`](https://git.coopcloud.tech/coop-cloud/organising)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -9,106 +9,67 @@
 # abra x.x.x (UNRELEASED)
 # abra 10.0.5 (2021-09-06)
 - Fix catalogue version listing parsing.
 # abra 10.0.4 (2021-09-06)
 - Understand how to parse the new catalogue versions listing.
 # abra 10.0.3 (????-??-??)
 - Sorry folks, no change log.
 # abra 10.0.2 (????-??-??)
 - Sorry folks, no change log.
 # abra 10.0.1 (2021-07-30)
 - New `recipe .. lint` command ([#202](https://git.autonomic.zone/coop-cloud/abra/issues/202))
 - `abra-capsul` plugin ([e85bcc4](https://git.autonomic.zone/coop-cloud/abra/commit/e85bcc4))
 - Fix `run <service> <cmd>` invocations ([#204](https://git.autonomic.zone/coop-cloud/abra/issues/204))
 - Point installer at our [half-migrated new Gitea instance](https://git.coopcloud.tech) ([#207](https://git.coopcloud.tech/coop-cloud/abra/pulls/207) thanks @nicksellen!)
 # abra 10.0.0 (2021-07-06)
 - Add `--bump` to `deploy` command to allow packagers to make minor package related releases ([#173](https://git.autonomic.zone/coop-cloud/abra/issues/173))
 - Drop `--skip-version-check`/`--no-domain-poll`/`--no-state-poll` in favour of `--fast` ([#169](https://git.autonomic.zone/coop-cloud/abra/issues/169))
 - Move `abra` image under the new `thecoopcloud/...` namespace ([#1](https://git.autonomic.zone/coop-cloud/auto-apps-json/issues/1))
 - Add a `--output` flag to the `app-json.py` app generator for the CI environment ([#2](https://git.autonomic.zone/coop-cloud/auto-apps-json/issues/2))
 - Support logging in as new `thecoopcloud` Docker account via `skopeo` when generating new `apps.json` ([`7482362`](https://git.autonomic.zone/coop-cloud/abra/commit/7482362af1d01cc02828abd45b1222fa643d1f80))
 - App deployment checks are somewhat more reliable (see [#193](https://git.autonomic.zone/coop-cloud/abra/issues/193) for remaining work) ([#165](https://git.autonomic.zone/coop-cloud/abra/issues/165))
 - Skip generation of commented out secrets and correctly fail deploy when secret generation fails ([#133](https://git.autonomic.zone/coop-cloud/abra/issues/133))
 - Fix logging for chaos deploys and recipe selection logic ([#185](https://git.autonomic.zone/coop-cloud/abra/issues/185))
 - Improve reliability of selecting when to download a new `apps.json` ([#170](https://git.autonomic.zone/coop-cloud/abra/issues/170))
 - Implement `pwgen`/`pwqgen` native fallback for password generation ([#167](https://git.autonomic.zone/coop-cloud/abra/issues/167) / [#197](https://git.autonomic.zone/coop-cloud/abra/issues/197))
 - `abra` installer script will now try to install system requirements ([#196](https://git.autonomic.zone/coop-cloud/abra/issues/196))
 - Use latest [v4.9.6](https://github.com/mikefarah/yq/releases/tag/v4.9.6) install of `yq` for vendoring (**upgrade HOWTO:** `rm -rf ~/.abra/vendor/*`)
 - Support overriding `$ARGS` from `abra.sh` custom commands and error out correctly when these commands fail ([#1](https://github.com/Coop-Cloud/peertube/issues/1))
 - Add `abra <app> restart <service>` to support restarting individual services ([#200](https://git.autonomic.zone/coop-cloud/abra/issues/200))
 - Output diff of proposed changes when asking to commit during release logic ([`4b82045`](https://git.autonomic.zone/coop-cloud/abra/commit/4b820457defe1511208b6caa8b9feb9603ffc8be))
 - Add validation for generated output when making new release labels ([#186](https://git.autonomic.zone/coop-cloud/abra/issues/186))
 # abra 9.0.0 (2021-06-10)
- Add Docker image for `abra` ([`64d578cf`](https://git.autonomic.zone/coop-cloud/abra/commit/64d578cf914bd2bad378ea4ef375747d10b33191))
+- Add Docker image for `abra` ([64d578cf91](https://git.autonomic.zone/coop-cloud/abra/commit/64d578cf914bd2bad378ea4ef375747d10b33191))
- Support unattended mode for recipe releasing ([`3759bcd6`](https://git.autonomic.zone/coop-cloud/abra/commit/3759bcd641cf60611c13927e83425e773d2bb629))
+- Support unattended mode for recipe releasing ([3759bcd641](https://git.autonomic.zone/coop-cloud/abra/commit/3759bcd641cf60611c13927e83425e773d2bb629))
- Add Renovate bot configuraiton script ([`9fadc430`](https://git.autonomic.zone/coop-cloud/abra/commit/9fadc430a7bb2d554c0ee26c0f9b6c51dc5b0475))
+- 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 ([`4ef43331`](https://git.autonomic.zone/coop-cloud/abra/commit/4ef433312dd0b0ace91b3c285f82f3973093d92d))
+- 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` ([`efad71c4`](https://git.autonomic.zone/coop-cloud/abra/commit/efad71c470d6d65f7e4bfe39c5f68ff1097f80a2))
+- 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 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))
+- 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))
+- 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))
+- 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 `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))
+- 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))
+- 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))
+- 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))
+- Fix secret generation when specifying length ([3a353f4](https://git.autonomic.zone/coop-cloud/abra/commit/3a353f4062baccde2c9f175b03afb2db6d462ae4))
 # 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))
+- 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))
+- Fix installation script development installs (again! Thanks Bash!) ([4747d9b7](https://git.autonomic.zone/coop-cloud/abra/commit/4747d9b7fb5fba914f210b6570bfe2db0b53da23))
 # abra 0.7.1 (2021-04-07)
- Fix installation script development installs ([`8f2fadb3c`](https://git.autonomic.zone/coop-cloud/abra/commit/8f2fadb3c43c5915520f5ea531ea3815c2ba8531))
+- Fix installation script development installs ([8f2fadb3c](https://git.autonomic.zone/coop-cloud/abra/commit/8f2fadb3c43c5915520f5ea531ea3815c2ba8531))
 # abra 0.7.0 (2021-04-07)
 - Add `--force` to the `deploy` command to allow overriding deployment logic ([#105](https://git.autonomic.zone/coop-cloud/abra/issues/105))
 - Handle undeployed apps in version summaries when deploying ([#104](https://git.autonomic.zone/coop-cloud/abra/issues/104))
- Add `--force` to `undeploy` command ([`e5e98d5`](https://git.autonomic.zone/coop-cloud/abra/commit/e5e98d5))
+- Add `--force` to `undeploy` command ([e5e98d5](https://git.autonomic.zone/coop-cloud/abra/commit/e5e98d5))
- Rename "app type" back to "stack" in the deployment overview ([`54b6acc`](https://git.autonomic.zone/coop-cloud/abra/commit/54b6acc))
+- Rename "app type" back to "stack" in the deployment overview ([54b6acc](https://git.autonomic.zone/coop-cloud/abra/commit/54b6acc))
 - Show context connection details on `abra server ls` ([#110](https://git.autonomic.zone/coop-cloud/abra/issues/110))
 - Allow to debug the SSH connection details on swarm init ([#109](https://git.autonomic.zone/coop-cloud/abra/issues/109))
 - Show correct status for apps deployed on servers with missing context ([#99](https://git.autonomic.zone/coop-cloud/abra/issues/99))
@ -123,53 +84,53 @@
 - 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 ([`4e94a424e`](https://git.autonomic.zone/coop-cloud/abra/commit/4e94a424e94a42))
+- Support `ABRA_DIR` in the installer script ([4e94a424e94a42](https://git.autonomic.zone/coop-cloud/abra/commit/4e94a424e94a42))
 - Support [abra-hetzner](https://git.autonomic.zone/coop-cloud/abra-hetzner) plugin ([#88](https://git.autonomic.zone/coop-cloud/abra/issues/88))
 # abra 0.6.0 (2021-03-17)
- Show version and digest of app if labelled ([`98e674b8e`](https://git.autonomic.zone/coop-cloud/abra/commit/98e674b8e83458a83dcbf331e8e34c7188559c4a))
+- Show version and digest of app if labelled ([98e674b8e8](https://git.autonomic.zone/coop-cloud/abra/commit/98e674b8e83458a83dcbf331e8e34c7188559c4a))
 - Implement basic version checking on deployment ([#82](https://git.autonomic.zone/coop-cloud/abra/issues/82))
- New `app-catalogue.sh` script to auto-generate app list for documentation ([`f163d4b0f`](https://git.autonomic.zone/coop-cloud/abra/commit/f163d4b0fa920232e9d995a22d20fe78b174b3a9))
+- New `app-catalogue.sh` script to auto-generate app list for documentation ([f163d4b](https://git.autonomic.zone/coop-cloud/abra/commit/f163d4b0fa920232e9d995a22d20fe78b174b3a9))
 - Support app service rollbacks with `abra <app> rollback <service>` ([#76](https://git.autonomic.zone/coop-cloud/abra/issues/76))
 - Detect when latest version is deployed and perform a no-op ([#87](https://git.autonomic.zone/coop-cloud/abra/issues/87))
 - Allow cloning of app repos with different main branches using `-b, --branch=<branch>` ([#80](https://git.autonomic.zone/coop-cloud/abra/issues/80))
 - Protect against lengthy app names which gives Docker trouble later on ([#83](https://git.autonomic.zone/coop-cloud/abra/issues/83))
 - Support removal of secrets and volumes when `rm`'ing apps ([#44](https://git.autonomic.zone/coop-cloud/abra/issues/44))
 - Always choose the default IPv4 address with `abra server <host> init` ([#91](https://git.autonomic.zone/coop-cloud/abra/issues/91))
- Add `--type=<type>` filtering option to `abra <app> ls` ([`0828189`](https://git.autonomic.zone/coop-cloud/abra/commit/0828189))
+- Add `--type=<type>` filtering option to `abra <app> ls` ([0828189](https://git.autonomic.zone/coop-cloud/abra/commit/0828189))
 - Check for bash 4+ ([#96](https://git.autonomic.zone/coop-cloud/abra/commit/0828189))
- Add `--dev` option to installer using `git clone` ([`88d2a75`](https://git.autonomic.zone/coop-cloud/abra/commit/88d2a75))
+- Add `--dev` option to installer using `git clone` ([88d2a75](https://git.autonomic.zone/coop-cloud/abra/commit/88d2a75))
- Support `--dev` on the `abra upgrade` command also ([`bcc15ec`](https://git.autonomic.zone/coop-cloud/abra/commit/bcc15ec))
+- Support `--dev` on the `abra upgrade` command also ([bcc15ec](https://git.autonomic.zone/coop-cloud/abra/commit/bcc15ec))
- Vendor [yq](https://github.com/mikefarah/yq/releases) automatically ([`3b59adf`](https://git.autonomic.zone/coop-cloud/abra/commit/3b59adf))
+- Vendor [yq](https://github.com/mikefarah/yq/releases) automatically ([3b59adf](https://git.autonomic.zone/coop-cloud/abra/commit/3b59adf))
 - Extend version handling logic to support all underlying services ([#90](https://git.autonomic.zone/coop-cloud/abra/issues/90))
 - Fix development installation script symlink issue ([#98](https://git.autonomic.zone/coop-cloud/abra/issues/98))
- Add `app-version.sh` script to help packagers version apps ([`28618bd`](https://git.autonomic.zone/coop-cloud/abra/commit/28618bd))
+- Add `app-version.sh` script to help packagers version apps ([28618bd](https://git.autonomic.zone/coop-cloud/abra/commit/28618bd))
- Add git digest to `abra version` output ([`8b41416`](https://git.autonomic.zone/coop-cloud/abra/commit/8b41416))
+- Add git digest to `abra version` output ([8b41416](https://git.autonomic.zone/coop-cloud/abra/commit/8b41416))
 # abra 0.5.0 (2021-03-01)
 - `secret auto` merged into `secret generate` and `app new --auto` is now `app new --secrets` ([#64](https://git.autonomic.zone/coop-cloud/abra/pulls/64))
 - Avoid outputting length during secret generation when not in use ([#67](https://git.autonomic.zone/coop-cloud/abra/issues/67))
- Support graceful failure when missing secret generation commands ([`44d3ac3`](https://git.autonomic.zone/coop-cloud/abra/commit/44d3ac3a1cb86edc9b9e91eea1a00e70eae14965))
+- Support graceful failure when missing secret generation commands ([44d3ac3](https://git.autonomic.zone/coop-cloud/abra/commit/44d3ac3a1cb86edc9b9e91eea1a00e70eae14965))
- Fix secret detection when using new `.env` file format in apps ([`5532452`](https://git.autonomic.zone/coop-cloud/abra/commit/55324524ca77141666ffe6cc41b62cc71cf89ace))
+- Fix secret detection when using new `.env` file format in apps ([5532452](https://git.autonomic.zone/coop-cloud/abra/commit/55324524ca77141666ffe6cc41b62cc71cf89ace))
- Support choosing an `$EDITOR` when editing configs ([`29cc392`](https://git.autonomic.zone/coop-cloud/abra/commit/29cc392dff3e93e48e0e2edd3ce11b405c66a95a))
+- Support choosing an `$EDITOR` when editing configs ([29cc392](https://git.autonomic.zone/coop-cloud/abra/commit/29cc392dff3e93e48e0e2edd3ce11b405c66a95a))
- "server" shell completion fixed ([`8839bd4`](https://git.autonomic.zone/coop-cloud/abra/commit/8839bd45951d00dccf4ef81ece445bcc49e13ee6))
+- "server" shell completion fixed ([8839bd4](https://git.autonomic.zone/coop-cloud/abra/commit/8839bd45951d00dccf4ef81ece445bcc49e13ee6))
 - Drop `multilogs` command ([#56](https://git.autonomic.zone/coop-cloud/abra/pulls/56))
 - Remove `server use` command ([#51](https://git.autonomic.zone/coop-cloud/abra/issues/51))
 - `new <app>` becomes `new <type>` ([#48](https://git.autonomic.zone/coop-cloud/abra/issues/48))
- `check` is run on `deploy` now and configurable ([`77ba565`](https://git.autonomic.zone/coop-cloud/abra/commit/77ba5652b2fe15820f5edfa0f642636f7b8eae7e))
+- `check` is run on `deploy` now and configurable ([77ba565](https://git.autonomic.zone/coop-cloud/abra/commit/77ba5652b2fe15820f5edfa0f642636f7b8eae7e))
 - App configurations are always updated now ([#42](https://git.autonomic.zone/coop-cloud/abra/issues/42))
 - We use docker format `.env` files (no "export" syntax) from now now ([#55](https://git.autonomic.zone/coop-cloud/abra/pulls/55))
 - Rename `<domain>` option to `<app>` and `APP` variable to `TYPE`, see ([#47](https://git.autonomic.zone/coop-cloud/abra/issues/47))
- Use Docker-in-Docker (dind), and `dind-bats-kcov` Docker image, for `make test` ([`1600b62`](https://git.autonomic.zone/coop-cloud/abra/commit/1600b6277fbbffc4c6de1e4ba799c7bbe72ec6a0))
+- Use Docker-in-Docker (dind), and `dind-bats-kcov` Docker image, for `make test` ([1600b62](https://git.autonomic.zone/coop-cloud/abra/commit/1600b6277fbbffc4c6de1e4ba799c7bbe72ec6a0))
 - Add built-in documentation using `abra help <subcommand>...`, see ([#50](https://git.autonomic.zone/coop-cloud/abra/issues/50))
 - `version` subcommand ([e6b24fe](https://git.autonomic.zone/coop-cloud/abra/commit/e6b24fe))
 - Use `# length=x` comments to generate passwords with `pwgen` and drop `KEY`/`PASSWORD` logic ([#68](https://git.autonomic.zone/coop-cloud/abra/issues/68))
- Global `--skip-update|-U` / `--skip-check|-C` options to make things quicker ([`37e8b00`](https://git.autonomic.zone/coop-cloud/abra/commit/37e8b00))
+- Global `--skip-update|-U` / `--skip-check|-C` options to make things quicker ([37e8b00](https://git.autonomic.zone/coop-cloud/abra/commit/37e8b00))
 - `app backup` and `app restore` commands; requires per-app definition ([#70](https://git.autonomic.zone/coop-cloud/abra/issues/70))
 - Rename per-type `abra-commands.sh` to `abra.sh`, and include config versions as type-level instead of app-level config ([#43](https://git.autonomic.zone/coop-cloud/abra/issues/43))
 - Show per-subcommand help by adding `-h/--help` to a command line ([#38](https://git.autonomic.zone/coop-cloud/abra/issues/78))
--- a/2
+++ b/2
@ -15,7 +15,7 @@ RUN mkdir -p ~/.abra/apps
 RUN mkdir -p ~/.abra/vendor
 RUN mkdir -p ~/.ssh/
-RUN ssh-keyscan -p 2222 git.coopcloud.tech > ~/.ssh/known_hosts
+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
--- a/README.md
+++ b/README.md
@ -1,13 +1,5 @@
 # abra
 ## 🔥 🔥 🔥 D E P R E C A T E D 🔥 🔥 🔥
 [`abra`](https://git.coopcloud.tech/coop-cloud/abra) served us well but we're porting it to [Golang](https://golang.org) over in [`go-abra`](https://git.coopcloud.tech/coop-cloud/go-abra). To learn more about the reasons for that, see [this blog post](https://coopcloud.tech/blog/this-month-in-coop-cloud-july/). This means this repository and tool are officially deprecated as of August 1rst 2021. We will still provide bug security fixes but no new features will be developed in `abra`. Feel free to go on using it and reporting issues against this issue tracker. Thanks for all the good times Bash.
 ## 🔥 🔥 🔥 D E P R E C A T E D 🔥 🔥 🔥
 ---
 [![Build Status](https://drone.autonomic.zone/api/badges/coop-cloud/abra/status.svg)](https://drone.autonomic.zone/coop-cloud/abra)
 > https://coopcloud.tech
@ -33,39 +25,36 @@ See [CHANGELOG.md](./CHANGELOG.md).
 > [docs.coopcloud.tech](https://docs.coopcloud.tech)
-## Requirements
+## Install
 Requirements:
 - `pwqgen` (optional)
 - `pwgen` (optional)
 - `curl`
 - `docker`
 - `bash` >= 4
 ## Install
 Install the latest stable release:
 ```sh
 curl https://install.abra.coopcloud.tech | bash
 ```
-The source for this script is [here](./deploy/install.abra.coopcloud.tech/installer).
+or the bleeding-edge development version:
 You can pass options to the script like so (e.g. install the bleeding edge development version):
 ```sh
 curl https://install.abra.coopcloud.tech | bash -s -- --dev
 ```
-Other options available are as follows:
+The source for this script is [here](./deploy/install.abra.coopcloud.tech/installer).
 - **--no-prompt**: non-interactive installation
 - **--no-deps**: do not attempt to install [requirements](#requirements)
 ## Container
-An [image](https://hub.docker.com/r/thecoopcloud/abra) is also provided.
+An [image](https://hub.docker.com/r/decentral1se/abra) is also provided.
 ```
-docker run thecoopcloud/abra app ls
+docker run decentral1se/abra app ls
 ```
 ## Update
--- a/567
+++ b/567
@ -1,11 +1,9 @@
 #!/usr/bin/env bash
-# shellcheck disable=SC2154
+GIT_URL="https://git.autonomic.zone/coop-cloud/"
 GIT_URL="https://git.coopcloud.tech/coop-cloud/"
 ABRA_APPS_URL="https://apps.coopcloud.tech"
 ABRA_DIR="${ABRA_DIR:-$HOME/.abra}"
-ABRA_VERSION="10.0.5"
+ABRA_VERSION="9.0.0"
 ABRA_BACKUP_DIR="${ABRA_BACKUP_DIR:-$ABRA_DIR/backups}"
 ABRA_VENDOR_DIR="$ABRA_DIR/vendor"
 ABRA_APPS_JSON="${ABRA_DIR}/apps.json"
@ -15,14 +13,7 @@ ABRA_APPS_JSON="${ABRA_DIR}/apps.json"
 #######################################
 DOC="
-The Co-op Cloud utility belt 🎩🐇
+The cooperative cloud utility belt 🎩🐇
    ____                           ____ _                 _
   / ___|___         ___  _ __    / ___| | ___  _   _  __| |
  | |   / _ \ _____ / _ \| '_ \  | |   | |/ _ \| | | |/ _' |
  | |__| (_) |_____| (_) | |_) | | |___| | (_) | |_| | (_| |
   \____\___/       \___/| .__/   \____|_|\___/ \__,_|\__,_|
                         |_|
 Usage:
  abra [options] app (list|ls) [--status] [--server=<server>] [--type=<type>]
@ -40,7 +31,6 @@ Usage:
  abra [options] app <app> restore <service> [<backup file>]
  abra [options] app <app> run [--no-tty] [--user=<user>] <service> <args>...
  abra [options] app <app> rollback [<version>]
  abra [options] app <app> restart <service>
  abra [options] app <app> secret generate (<secret> <version>|--all) [<cmd>] [--pass]
  abra [options] app <app> secret insert <secret> <version> <data> [--pass]
  abra [options] app <app> secret (rm|delete) (<secret>|--all) [--pass]
@ -51,7 +41,6 @@ Usage:
  abra [options] recipe ls
  abra [options] recipe create <recipe>
  abra [options] recipe <recipe> release [--force] [--bump]
  abra [options] recipe <recipe> lint
  abra [options] recipe <recipe> versions
  abra [options] server add <host> [<user>] [<port>]
  abra [options] server new <provider> -- <args>
@ -178,87 +167,86 @@ 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:2862}
+printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:2451}
-usage=${DOC:368:1925}; digest=d31d6
+usage=${DOC:40:1842}; digest=c7bae
-shorts=(-e -C -d -s -U -n -b -v -h '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
+shorts=(-e -b -s -C -U -h -d -v -n '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
-longs=(--env --skip-check --debug --stack --skip-update --no-prompt --branch --verbose --help --status --server --type --domain --app-name --pass --secrets --all --update --force --fast --chaos --volumes --no-tty --user --bump --dev)
+longs=(--env --branch --stack --skip-check --skip-update --help --debug --verbose --no-prompt --status --server --type --domain --app-name --pass --secrets --all --update --force --fast --chaos --volumes --no-tty --user --bump --dev)
-argcounts=(1 0 0 1 0 0 1 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 1 0 0); node_0(){
+argcounts=(1 1 1 0 0 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 1 0 0); node_0(){
-value __env 0; }; node_1(){ switch __skip_check 1; }; node_2(){ switch __debug 2
+value __env 0; }; node_1(){ value __branch 1; }; node_2(){ value __stack 2; }
-}; node_3(){ value __stack 3; }; node_4(){ switch __skip_update 4; }; node_5(){
+node_3(){ switch __skip_check 3; }; node_4(){ switch __skip_update 4; }
-switch __no_prompt 5; }; node_6(){ value __branch 6; }; node_7(){
+node_5(){ switch __help 5; }; node_6(){ switch __debug 6; }; node_7(){
-switch __verbose 7; }; node_8(){ switch __help 8; }; node_9(){ switch __status 9
+switch __verbose 7; }; node_8(){ switch __no_prompt 8; }; node_9(){
-}; node_10(){ value __server 10; }; node_11(){ value __type 11; }; node_12(){
+switch __status 9; }; node_10(){ value __server 10; }; node_11(){
-value __domain 12; }; node_13(){ value __app_name 13; }; node_14(){
+value __type 11; }; node_12(){ value __domain 12; }; node_13(){
-switch __pass 14; }; node_15(){ switch __secrets 15; }; node_16(){
+value __app_name 13; }; node_14(){ switch __pass 14; }; node_15(){
-switch __all 16; }; node_17(){ switch __update 17; }; node_18(){
+switch __secrets 15; }; node_16(){ switch __all 16; }; node_17(){
-switch __force 18; }; node_19(){ switch __fast 19; }; node_20(){
+switch __update 17; }; node_18(){ switch __force 18; }; node_19(){
-switch __chaos 20; }; node_21(){ switch __volumes 21; }; node_22(){
+switch __fast 19; }; node_20(){ switch __chaos 20; }; node_21(){
-switch __no_tty 22; }; node_23(){ value __user 23; }; node_24(){
+switch __volumes 21; }; node_22(){ switch __no_tty 22; }; node_23(){
-switch __bump 24; }; node_25(){ switch __dev 25; }; node_26(){ value _type_ a; }
+value __user 23; }; node_24(){ switch __bump 24; }; node_25(){ switch __dev 25
-node_27(){ value _app_ a; }; node_28(){ value _service_ a; }; node_29(){
+}; node_26(){ value _type_ a; }; node_27(){ value _app_ a; }; node_28(){
-value _version_ a; }; node_30(){ value _src_ a; }; node_31(){ value _dst_ a; }
+value _service_ a; }; node_29(){ value _version_ a; }; node_30(){ value _src_ a
-node_32(){ value _backup_file_ a; }; node_33(){ value _args_ a true; }
+}; node_31(){ value _dst_ a; }; node_32(){ value _backup_file_ a; }; node_33(){
-node_34(){ value _secret_ a; }; node_35(){ value _cmd_ a; }; node_36(){
+value _args_ a true; }; node_34(){ value _secret_ a; }; node_35(){ value _cmd_ a
-value _data_ a; }; node_37(){ value _volume_ a; }; node_38(){ value _command_ a
+}; node_36(){ value _data_ a; }; node_37(){ value _volume_ a; }; node_38(){
-}; node_39(){ value _recipe_ a; }; node_40(){ value _host_ a; }; node_41(){
+value _command_ a; }; node_39(){ value _recipe_ a; }; node_40(){ value _host_ a
-value _user_ a; }; node_42(){ value _port_ a; }; node_43(){ value _provider_ a
+}; node_41(){ value _user_ a; }; node_42(){ value _port_ a; }; node_43(){
-}; node_44(){ value _subcommands_ a true; }; node_45(){ _command app; }
+value _provider_ a; }; node_44(){ value _subcommands_ a true; }; node_45(){
-node_46(){ _command list; }; node_47(){ _command ls; }; node_48(){ _command new
+_command app; }; node_46(){ _command list; }; node_47(){ _command ls; }
-}; node_49(){ _command backup; }; node_50(){ _command deploy; }; node_51(){
+node_48(){ _command new; }; node_49(){ _command backup; }; node_50(){
-_command check; }; node_52(){ _command version; }; node_53(){ _command config; }
+_command deploy; }; node_51(){ _command check; }; node_52(){ _command version; }
-node_54(){ _command cp; }; node_55(){ _command logs; }; node_56(){ _command ps
+node_53(){ _command config; }; node_54(){ _command cp; }; node_55(){
-}; node_57(){ _command restore; }; node_58(){ _command rm; }; node_59(){
+_command logs; }; node_56(){ _command ps; }; node_57(){ _command restore; }
-_command delete; }; node_60(){ _command run; }; node_61(){ _command rollback; }
+node_58(){ _command rm; }; node_59(){ _command delete; }; node_60(){
-node_62(){ _command restart; }; node_63(){ _command secret; }; node_64(){
+_command run; }; node_61(){ _command rollback; }; node_62(){ _command secret; }
-_command generate; }; node_65(){ _command insert; }; node_66(){
+node_63(){ _command generate; }; node_64(){ _command insert; }; node_65(){
-_command undeploy; }; node_67(){ _command volume; }; node_68(){ _command recipe
+_command undeploy; }; node_66(){ _command volume; }; node_67(){ _command recipe
-}; node_69(){ _command create; }; node_70(){ _command release; }; node_71(){
+}; node_68(){ _command create; }; node_69(){ _command release; }; node_70(){
-_command lint; }; node_72(){ _command versions; }; node_73(){ _command server; }
+_command versions; }; node_71(){ _command server; }; node_72(){ _command add; }
-node_74(){ _command add; }; node_75(){ _command __ --; }; node_76(){
+node_73(){ _command __ --; }; node_74(){ _command init; }; node_75(){
-_command init; }; node_77(){ _command apps; }; node_78(){ _command upgrade; }
+_command apps; }; node_76(){ _command upgrade; }; node_77(){ _command doctor; }
-node_79(){ _command doctor; }; node_80(){ _command help; }; node_81(){
+node_78(){ _command help; }; node_79(){ optional 0 1 2 3 4 5 6 7 8; }
-optional 0 1 2 3 4 5 6 7 8; }; node_82(){ optional 81; }; node_83(){
+node_80(){ optional 79; }; node_81(){ either 46 47; }; node_82(){ required 81; }
-either 46 47; }; node_84(){ required 83; }; node_85(){ optional 9; }; node_86(){
+node_83(){ optional 9; }; node_84(){ optional 10; }; node_85(){ optional 11; }
-optional 10; }; node_87(){ optional 11; }; node_88(){ required 82 45 84 85 86 87
+node_86(){ required 80 45 82 83 84 85; }; node_87(){ optional 12; }; node_88(){
-}; node_89(){ optional 12; }; node_90(){ optional 13; }; node_91(){ optional 14
+optional 13; }; node_89(){ optional 14; }; node_90(){ optional 15; }; node_91(){
-}; node_92(){ optional 15; }; node_93(){ required 82 45 48 86 89 90 91 92 26; }
+required 80 45 48 84 87 88 89 90 26; }; node_92(){ either 28 16; }; node_93(){
-node_94(){ either 28 16; }; node_95(){ required 94; }; node_96(){
+required 92; }; node_94(){ required 80 45 27 49 93; }; node_95(){ optional 17; }
-required 82 45 27 49 95; }; node_97(){ optional 17; }; node_98(){ optional 18; }
+node_96(){ optional 18; }; node_97(){ optional 19; }; node_98(){ optional 20; }
-node_99(){ optional 19; }; node_100(){ optional 20; }; node_101(){ optional 29
+node_99(){ optional 29; }; node_100(){ required 80 45 27 50 95 96 97 98 99; }
-}; node_102(){ required 82 45 27 50 97 98 99 100 101; }; node_103(){
+node_101(){ required 80 45 27 51; }; node_102(){ required 80 45 27 52; }
-required 82 45 27 51; }; node_104(){ required 82 45 27 52; }; node_105(){
+node_103(){ required 80 45 27 53; }; node_104(){ required 80 45 27 54 30 31; }
-required 82 45 27 53; }; node_106(){ required 82 45 27 54 30 31; }; node_107(){
+node_105(){ optional 28; }; node_106(){ required 80 45 27 55 105; }; node_107(){
-optional 28; }; node_108(){ required 82 45 27 55 107; }; node_109(){
+required 80 45 27 56; }; node_108(){ required 80 45 27 57 93; }; node_109(){
-required 82 45 27 56; }; node_110(){ required 82 45 27 57 95; }; node_111(){
+either 58 59; }; node_110(){ required 109; }; node_111(){ optional 21; }
-either 58 59; }; node_112(){ required 111; }; node_113(){ optional 21; }
+node_112(){ required 80 45 27 110 111 90; }; node_113(){ optional 32; }
-node_114(){ required 82 45 27 112 113 92; }; node_115(){ optional 32; }
+node_114(){ required 80 45 27 57 28 113; }; node_115(){ optional 22; }
-node_116(){ required 82 45 27 57 28 115; }; node_117(){ optional 22; }
+node_116(){ optional 23; }; node_117(){ oneormore 33; }; node_118(){
-node_118(){ optional 23; }; node_119(){ oneormore 33; }; node_120(){
+required 80 45 27 60 115 116 28 117; }; node_119(){ required 80 45 27 61 99; }
-required 82 45 27 60 117 118 28 119; }; node_121(){ required 82 45 27 61 101; }
+node_120(){ required 34 29; }; node_121(){ either 120 16; }; node_122(){
-node_122(){ required 82 45 27 62 28; }; node_123(){ required 34 29; }
+required 121; }; node_123(){ optional 35; }; node_124(){
-node_124(){ either 123 16; }; node_125(){ required 124; }; node_126(){
+required 80 45 27 62 63 122 123 89; }; node_125(){
-optional 35; }; node_127(){ required 82 45 27 63 64 125 126 91; }; node_128(){
+required 80 45 27 62 64 34 29 36 89; }; node_126(){ either 34 16; }; node_127(){
-required 82 45 27 63 65 34 29 36 91; }; node_129(){ either 34 16; }; node_130(){
+required 126; }; node_128(){ required 80 45 27 62 110 127 89; }; node_129(){
-required 129; }; node_131(){ required 82 45 27 63 112 130 91; }; node_132(){
+required 80 45 27 65; }; node_130(){ required 80 45 27 66 47; }; node_131(){
-required 82 45 27 66; }; node_133(){ required 82 45 27 67 47; }; node_134(){
+either 37 16; }; node_132(){ required 131; }; node_133(){
-either 37 16; }; node_135(){ required 134; }; node_136(){
+required 80 45 27 66 110 132; }; node_134(){ optional 117; }; node_135(){
-required 82 45 27 67 112 135; }; node_137(){ optional 119; }; node_138(){
+required 80 45 27 38 134; }; node_136(){ required 80 67 47; }; node_137(){
-required 82 45 27 38 137; }; node_139(){ required 82 68 47; }; node_140(){
+required 80 67 68 39; }; node_138(){ optional 24; }; node_139(){
-required 82 68 69 39; }; node_141(){ optional 24; }; node_142(){
+required 80 67 39 69 96 138; }; node_140(){ required 80 67 39 70; }; node_141(){
-required 82 68 39 70 98 141; }; node_143(){ required 82 68 39 71; }; node_144(){
+optional 41; }; node_142(){ optional 42; }; node_143(){
-required 82 68 39 72; }; node_145(){ optional 41; }; node_146(){ optional 42; }
+required 80 71 72 40 141 142; }; node_144(){ required 80 71 48 43 73 33; }
-node_147(){ required 82 73 74 40 145 146; }; node_148(){
+node_145(){ required 80 71 82; }; node_146(){ required 80 71 40 58; }
-required 82 73 48 43 75 33; }; node_149(){ required 82 73 84; }; node_150(){
+node_147(){ required 80 71 40 74; }; node_148(){ required 80 71 40 75 83; }
-required 82 73 40 58; }; node_151(){ required 82 73 40 76; }; node_152(){
+node_149(){ optional 25; }; node_150(){ required 80 76 149; }; node_151(){
-required 82 73 40 77 85; }; node_153(){ optional 25; }; node_154(){
+required 80 52; }; node_152(){ required 80 77; }; node_153(){ oneormore 44; }
-required 82 78 153; }; node_155(){ required 82 52; }; node_156(){ required 82 79
+node_154(){ optional 153; }; node_155(){ required 80 78 154; }; node_156(){
-}; node_157(){ oneormore 44; }; node_158(){ optional 157; }; node_159(){
+required 80; }; node_157(){
-required 82 80 158; }; node_160(){ required 82; }; node_161(){
+either 86 91 94 100 101 102 103 104 106 107 108 112 114 118 119 124 125 128 129 130 133 135 136 137 139 140 143 144 145 146 147 148 150 151 152 155 156
-either 88 93 96 102 103 104 105 106 108 109 110 114 116 120 121 122 127 128 131 132 133 136 138 139 140 142 143 144 147 148 149 150 151 152 154 155 156 159 160
+}; node_158(){ required 157; }; cat <<<' docopt_exit() {
-}; node_162(){ required 161; }; cat <<<' docopt_exit() {
+[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1842}" >&2
-[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:368:1925}" >&2
+exit 1; }'; unset var___env var___branch var___stack var___skip_check \
-exit 1; }'; unset var___env var___skip_check var___debug var___stack \
+var___skip_update var___help var___debug var___verbose var___no_prompt \
 var___skip_update var___no_prompt var___branch var___verbose var___help \
 var___status var___server var___type var___domain var___app_name var___pass \
 var___secrets var___all var___update var___force var___fast var___chaos \
 var___volumes var___no_tty var___user var___bump var___dev var__type_ \
@ -267,13 +255,13 @@ var__args_ var__secret_ var__cmd_ var__data_ var__volume_ var__command_ \
 var__recipe_ var__host_ var__user_ var__port_ var__provider_ var__subcommands_ \
 var_app var_list var_ls var_new var_backup var_deploy var_check var_version \
 var_config var_cp var_logs var_ps var_restore var_rm var_delete var_run \
-var_rollback var_restart var_secret var_generate var_insert var_undeploy \
+var_rollback var_secret var_generate var_insert var_undeploy var_volume \
-var_volume var_recipe var_create var_release var_lint var_versions var_server \
+var_recipe var_create var_release var_versions var_server var_add var___ \
-var_add var___ var_init var_apps var_upgrade var_doctor var_help; parse 162 "$@"
+var_init var_apps var_upgrade var_doctor var_help; parse 158 "$@"
-local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__env" \
+local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__env" "${prefix}__branch" \
-"${prefix}__skip_check" "${prefix}__debug" "${prefix}__stack" \
+"${prefix}__stack" "${prefix}__skip_check" "${prefix}__skip_update" \
-"${prefix}__skip_update" "${prefix}__no_prompt" "${prefix}__branch" \
+"${prefix}__help" "${prefix}__debug" "${prefix}__verbose" \
-"${prefix}__verbose" "${prefix}__help" "${prefix}__status" "${prefix}__server" \
+"${prefix}__no_prompt" "${prefix}__status" "${prefix}__server" \
 "${prefix}__type" "${prefix}__domain" "${prefix}__app_name" "${prefix}__pass" \
 "${prefix}__secrets" "${prefix}__all" "${prefix}__update" "${prefix}__force" \
 "${prefix}__fast" "${prefix}__chaos" "${prefix}__volumes" "${prefix}__no_tty" \
@ -286,20 +274,20 @@ local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__env" \
 "${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}restart" \
+"${prefix}delete" "${prefix}run" "${prefix}rollback" "${prefix}secret" \
-"${prefix}secret" "${prefix}generate" "${prefix}insert" "${prefix}undeploy" \
+"${prefix}generate" "${prefix}insert" "${prefix}undeploy" "${prefix}volume" \
-"${prefix}volume" "${prefix}recipe" "${prefix}create" "${prefix}release" \
+"${prefix}recipe" "${prefix}create" "${prefix}release" "${prefix}versions" \
-"${prefix}lint" "${prefix}versions" "${prefix}server" "${prefix}add" \
+"${prefix}server" "${prefix}add" "${prefix}__" "${prefix}init" "${prefix}apps" \
-"${prefix}__" "${prefix}init" "${prefix}apps" "${prefix}upgrade" \
+"${prefix}upgrade" "${prefix}doctor" "${prefix}help"
-"${prefix}doctor" "${prefix}help"; eval "${prefix}"'__env=${var___env:-}'
+eval "${prefix}"'__env=${var___env:-}'
 eval "${prefix}"'__skip_check=${var___skip_check:-false}'
 eval "${prefix}"'__debug=${var___debug:-false}'
 eval "${prefix}"'__stack=${var___stack:-}'
 eval "${prefix}"'__skip_update=${var___skip_update:-false}'
 eval "${prefix}"'__no_prompt=${var___no_prompt:-false}'
 eval "${prefix}"'__branch=${var___branch:-}'
-eval "${prefix}"'__verbose=${var___verbose:-false}'
+eval "${prefix}"'__stack=${var___stack:-}'
 eval "${prefix}"'__skip_check=${var___skip_check:-false}'
 eval "${prefix}"'__skip_update=${var___skip_update:-false}'
 eval "${prefix}"'__help=${var___help:-false}'
 eval "${prefix}"'__debug=${var___debug:-false}'
 eval "${prefix}"'__verbose=${var___verbose:-false}'
 eval "${prefix}"'__no_prompt=${var___no_prompt:-false}'
 eval "${prefix}"'__status=${var___status:-false}'
 eval "${prefix}"'__server=${var___server:-}'
 eval "${prefix}"'__type=${var___type:-}'
@ -350,7 +338,6 @@ eval "${prefix}"'rm=${var_rm:-false}'
 eval "${prefix}"'delete=${var_delete:-false}'
 eval "${prefix}"'run=${var_run:-false}'
 eval "${prefix}"'rollback=${var_rollback:-false}'
 eval "${prefix}"'restart=${var_restart:-false}'
 eval "${prefix}"'secret=${var_secret:-false}'
 eval "${prefix}"'generate=${var_generate:-false}'
 eval "${prefix}"'insert=${var_insert:-false}'
@ -359,7 +346,6 @@ eval "${prefix}"'volume=${var_volume:-false}'
 eval "${prefix}"'recipe=${var_recipe:-false}'
 eval "${prefix}"'create=${var_create:-false}'
 eval "${prefix}"'release=${var_release:-false}'
 eval "${prefix}"'lint=${var_lint:-false}'
 eval "${prefix}"'versions=${var_versions:-false}'
 eval "${prefix}"'server=${var_server:-false}'
 eval "${prefix}"'add=${var_add:-false}'; eval "${prefix}"'__=${var___:-false}'
@ -369,10 +355,10 @@ eval "${prefix}"'upgrade=${var_upgrade:-false}'
 eval "${prefix}"'doctor=${var_doctor:-false}'
 eval "${prefix}"'help=${var_help:-false}'; local docopt_i=1
 [[ $BASH_VERSION =~ ^4.3 ]] && docopt_i=2; for ((;docopt_i>0;docopt_i--)); do
-declare -p "${prefix}__env" "${prefix}__skip_check" "${prefix}__debug" \
+declare -p "${prefix}__env" "${prefix}__branch" "${prefix}__stack" \
-"${prefix}__stack" "${prefix}__skip_update" "${prefix}__no_prompt" \
+"${prefix}__skip_check" "${prefix}__skip_update" "${prefix}__help" \
-"${prefix}__branch" "${prefix}__verbose" "${prefix}__help" "${prefix}__status" \
+"${prefix}__debug" "${prefix}__verbose" "${prefix}__no_prompt" \
-"${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}__chaos" \
 "${prefix}__volumes" "${prefix}__no_tty" "${prefix}__user" "${prefix}__bump" \
@ -385,12 +371,11 @@ declare -p "${prefix}__env" "${prefix}__skip_check" "${prefix}__debug" \
 "${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}restart" \
+"${prefix}delete" "${prefix}run" "${prefix}rollback" "${prefix}secret" \
-"${prefix}secret" "${prefix}generate" "${prefix}insert" "${prefix}undeploy" \
+"${prefix}generate" "${prefix}insert" "${prefix}undeploy" "${prefix}volume" \
-"${prefix}volume" "${prefix}recipe" "${prefix}create" "${prefix}release" \
+"${prefix}recipe" "${prefix}create" "${prefix}release" "${prefix}versions" \
-"${prefix}lint" "${prefix}versions" "${prefix}server" "${prefix}add" \
+"${prefix}server" "${prefix}add" "${prefix}__" "${prefix}init" "${prefix}apps" \
-"${prefix}__" "${prefix}init" "${prefix}apps" "${prefix}upgrade" \
+"${prefix}upgrade" "${prefix}doctor" "${prefix}help"; done; }
 "${prefix}doctor" "${prefix}help"; done; }
 # docopt parser above, complete command for generating this parser is `docopt.sh abra`
 PROGRAM_NAME=$(basename "$0")
@ -502,7 +487,13 @@ 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'"
 }
@ -517,8 +508,8 @@ require_apps_json() {
  if [ -f "$ABRA_APPS_JSON" ]; then
    modified=$(curl --silent --head "$ABRA_APPS_URL" | \
-             awk '/^last-modified/{print tolower($0)}' | \
+             awk '/^Last-Modified/{print $0}' | \
-             sed 's/^last-modified: //I')
+             sed 's/^Last-Modified: //')
    remote_ctime=$(date --date="$modified" +%s)
    local_ctime=$(stat -c %Z "$ABRA_APPS_JSON")
@ -548,8 +539,8 @@ require_plugin() {
  fi
  # shellcheck disable=SC2086
-  if ! git clone ${git_extra_args:-} "$GIT_URL$PLUGIN.git" "$ABRA_DIR/plugins/$PLUGIN" > /dev/null 2>&1 ; then
+  if ! git clone ${git_extra_args:-} "$GIT_URL/$PLUGIN.git" "$ABRA_DIR/plugins/$PLUGIN" > /dev/null 2>&1 ; then
-    error "Could not retrieve the plugin '$PLUGIN' from '$GIT_URL$PLUGIN.git' to '$ABRA_DIR/plugins/$PLUGIN', does it exist?"
+    error "Could not retrieve the $PLUGIN plugin, does it exist?"
  fi
  if [[ $(cd "$ABRA_DIR/plugins/$PLUGIN" && git branch --list | wc -l) == "0" ]]; then
@ -654,30 +645,17 @@ require_jq() {
 }
 require_yq() {
-  vendor_binary "https://github.com/mikefarah/yq" "v4.9.6" "yq_linux_amd64"
+  vendor_binary "https://github.com/mikefarah/yq" "v4.6.1" "yq_linux_amd64"
 }
 checkout_main_or_master() {
  git checkout main > /dev/null 2>&1 || git checkout master > /dev/null 2>&1
 }
-pwgen_native() {
+# FIXME 3wc: update or remove
-  if type pwgen > /dev/null 2>&1; then
+if [ -z "$ABRA_ENV" ] && [ -f .env ] && type direnv > /dev/null 2>&1 && ! direnv status | grep -q 'Found RC allowed true'; then
-    pwgen -s "$length" 1
+  error "direnv is blocked, run direnv allow"
-    return
+fi
  fi
  tr -dc 'a-zA-Z0-9' < /dev/urandom | head -c "$1"
 }
 pwqgen_native() {
  if type pwqgen > /dev/null 2>&1; then
    pwqgen
    return
  fi
  shuf -n 3 /usr/share/dict/words | tr -dc 'a-zA-Z0-9' | tr -d '\n'
 }
 ###### Parse apps.json
@ -697,7 +675,7 @@ get_recipe_versions() {
  if [ "$recipe_json" = "null" ]; then
    declare -a RECIPE_VERSIONS
  else
-    mapfile -t RECIPE_VERSIONS < <(echo "$recipe_json" | $JQ -r ".versions | .[] | keys | add")
+    mapfile -t RECIPE_VERSIONS < <(echo "$recipe_json" | $JQ -r ".versions | keys | .[]" - | sort)
  fi
 }
@ -707,11 +685,7 @@ get_recipe_version_latest() {
    info "No versions found"
  else
    VERSION="${RECIPE_VERSIONS[-1]}"
-    if [ "$abra___chaos" = "true" ]; then
+    info "Chose version $VERSION"
      info "Not choosing a version and instead deploying from latest commit"
    else
      info "Chose version $VERSION"
    fi
  fi
 }
@ -818,56 +792,49 @@ output_version_summary() {
  fi
 }
 # Note(decentral1se): inspired by https://github.com/vitalets/docker-stack-wait-deploy
 ensure_stack_deployed() {
-  local -a HEALTHY # mapping
+  STACK_NAME=$1
  local -a MISSING # mapping
-  TIMEOUT=60
+  warning "Polling deploy state to check for success"
  idx=0
-  IFS=' ' read -r -a SERVICES <<< "$(docker stack services "${STACK_NAME}" --format "{{.ID}}" | tr '\n' ' ')"
+  while true; do
-  debug "Considering the following service IDs: ${SERVICES[*]} for ${STACK_NAME} deployment"
+    all_services_done=1
    has_errors=0
-  while [ ! $(( ${#HEALTHY[@]} + ${#MISSING[@]} )) -eq ${#SERVICES[@]} ]; do
+    service_ids=$(docker stack services -q "$STACK_NAME")
    for service in $(docker ps -f "name=$STACK_NAME" -q); do
      debug "Polling $service for deployment status"
-      healthcheck=$(docker inspect --format "{{ json .State }}" "$service" | $JQ "try(.Health.Status // \"missing\")")
+    for service_id in $service_ids; do
-      name=$(docker inspect --format '{{ index .Config.Labels "com.docker.swarm.service.name" }}' "$service")
+      # see: https://github.com/moby/moby/issues/28012
      service_state=$(docker service inspect --format "{{if .UpdateStatus}}{{.UpdateStatus.State}}{{else}}created{{end}}" "$service_id")
-      if [[ ${MISSING[*]} =~ ${name} ]] || [[ ${HEALTHY[*]} =~ ${name} ]]; then
+      debug "$service_id has state: $service_state"
        debug "$name already marked as missing healthcheck / healthy status"
        continue
      fi
-      if [[ "$healthcheck" == "\"missing\"" ]] && [[ ! "${MISSING[*]}" =~ $name ]]; then
+      case "$service_state" in
-        MISSING+=("$name")
+        created|completed)
-        debug "No healthcheck configured for $name"
+          ;;
-        continue
+        paused|rollback_completed)
-      fi
+          has_errors=1
-
+          ;;
-      if [[ "$healthcheck" == "\"healthy\"" ]] && [[ ! "${HEALTHY[*]}" =~ $name ]]; then
+        *)
-        HEALTHY+=("$name")
+          all_services_done=0
-        debug "Marking $name with healthy status"
+          ;;
-        continue
+      esac
      fi
      if [[ "$healthcheck" == \""unhealthy"\" ]]; then
        logs=$(docker inspect --format "{{ json .State.Health.Log }}" "$service")
        exitcode="$(echo "$logs" | $JQ '.[-1] | .ExitCode')"
        warning "Healthcheck for new instance of $name is failing (exit code: $exitcode)"
        warning "$(echo "$logs" | $JQ -r '.[-1] | .Output')"
        error "healthcheck for $name is failing, this deployment did not succeed :("
      fi
    done
-    idx=$(("$idx" + 1))
+    if [ "$all_services_done" == "1" ]; then
-    if [[ $idx -eq "$TIMEOUT" ]]; then
+      if [ "$has_errors" == "1" ]; then
-      error "Waiting for healthy status timed out, this deployment did not succeed :("
+        warning "Deployment appears to have failed"
        warning "Run \"abra app ${STACK_NAME} logs \" to see app logs"
        warning "Run \"abra app ${STACK_NAME} ps \" to see app status"
        break
      else
        warning "Deployment appears to have suceeded"
        break
      fi
    else
      sleep 1
    fi
    sleep 1
    debug "Deploying: $(( ${#HEALTHY[@]} + ${#MISSING[@]} ))/${#SERVICES[@]} (timeout: $idx/$TIMEOUT)"
  done
 }
@ -896,14 +863,14 @@ get_servers() {
 get_app_secrets() {
  # FIXME 3wc: requires bash 4, use for loop instead
-  mapfile -t PASSWORDS < <(grep "^SECRET.*VERSION.*" "$ENV_FILE")
+  mapfile -t PASSWORDS < <(grep "SECRET.*VERSION.*" "$ENV_FILE")
 }
 load_instance() {
  APP="$abra__app_"
  # load all files matching "$APP.env" into ENV_FILES array
-  mapfile -t ENV_FILES < <(find -L "$ABRA_DIR/servers/" -name "$APP.env")
+  mapfile -t ENV_FILES < <(find -L "$ABRA_DIR" -name "$APP.env")
  # FIXME 3wc: requires bash 4, use for loop instead
  case "${#ENV_FILES[@]}" in
@ -1375,7 +1342,7 @@ sub_app_deploy (){
    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"
+        error "'$version' doesn't appear to be a valid version of $TYPE"
      fi
      info "Chose version $VERSION"
    else
@ -1631,9 +1598,6 @@ sub_app_secret_insert() {
  # shellcheck disable=SC2059
  printf "$PW" | docker secret create "${STACK_NAME}_${SECRET}_${VERSION}" - > /dev/null
  # shellcheck disable=SC2181
  if [[ $? != 0 ]]; then exit 1; fi
  if [ "$STORE_WITH_PASS" == "true" ] && type pass > /dev/null 2>&1; then
    echo "$PW" | pass insert "hosts/$DOCKER_CONTEXT/${STACK_NAME}/${SECRET}" -m > /dev/null
    success "pass: hosts/$DOCKER_CONTEXT/${STACK_NAME}/${SECRET}"
@ -1714,7 +1678,7 @@ sub_app_secret_generate(){
    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.coopcloud.tech/secrets/ for more on secrets"
+    warning "See https://docs.cloud.autonomic.zone/secrets/ for more on secrets"
    msg_already_outputted="true"
  fi
@ -1728,9 +1692,11 @@ sub_app_secret_generate(){
  fi
  if [[ -n "$length" ]]; then
-    abra__cmd_="pwgen_native $length"
+    require_binary pwgen
    abra__cmd_="pwgen -s $length 1"
  else
-    abra__cmd_=pwqgen_native
+    require_binary pwqgen
    abra__cmd_=pwqgen
  fi
  PWGEN=${abra__cmd_}
@ -1740,7 +1706,7 @@ sub_app_secret_generate(){
    error "Required arguments missing"
  fi
-  PW=$($PWGEN)
+  PW=$($PWGEN|tr -d "\n")
  success "Password: $PW"
@ -1841,12 +1807,10 @@ sub_app_run(){
    RUN_USER="-u $abra___user"
  fi
  local -a ARGS="${ARGS:-""}"
  if [ "$abra___no_tty" = "true" ]; then
-    ARGS+=" -i"
+    ARGS="-i"
  else
-    ARGS+=" -it"
+    ARGS="-it"
  fi
  CONTAINER=$(docker container ls --format "table {{.ID}},{{.Names}}" \
@ -1859,15 +1823,11 @@ sub_app_run(){
  debug "Using container ID ${CONTAINER}"
-  # shellcheck disable=SC2145
+  # 3wc: we want the "splitting" that shellcheck warns us about, so that -u and
-  debug "Running command: docker exec $RUN_USER $ARGS $CONTAINER $@"
+  # $RUN_USER aren't treated as a single argument:
  # shellcheck disable=SC2086
  docker exec $RUN_USER $ARGS "$CONTAINER" "$@"
  # shellcheck disable=SC2181
  if [[ $? != 0 ]]; then exit 1; fi
  return
 }
@ -1910,31 +1870,6 @@ sub_app_rollback(){
  sub_app_deploy
 }
 ###### .. app restart
 help_app_restart (){
  echo "abra [options] app <app> restart <service>
 Restart a service.
 EXAMPLES
  abra app peertube restart app
 POWERED BY
  docker service scale foo=bar"
 }
 sub_app_restart(){
  SERVICE="${abra__service_}"
  debug "Scaling ${STACK_NAME}_${SERVICE} to 0 running containers..."
  docker service scale "${STACK_NAME}_${SERVICE}=0"
  debug "Scaling ${STACK_NAME}_${SERVICE} back to 1 running container..."
  docker service scale "${STACK_NAME}_${SERVICE}=1"
  success "${STACK_NAME}_${SERVICE} was succesfully restarted!"
 }
 ###### .. app logs
 help_app_logs (){
  echo "abra [options] app <app> logs [<service>]
@ -2119,126 +2054,6 @@ sub_recipe_versions() {
  done
 }
 ###### .. recipe <recipe> lint
 help_recipe_lint() {
  echo "abra [options] recipe <recipe> lint
 (For recipe maintainers)
 Check for various Docker and Co-op Cloud best-practices.
 POWERED BY
  yq"
 }
 sub_recipe_lint() {
  require_yq
  local recipe
  recipe="$abra__recipe_"
  local recipe_dir
  recipe_dir="$ABRA_DIR/apps/$recipe"
  local compose_file
  compose_file="compose.yml"
  cd "$recipe_dir" || error "Can't find recipe dir '$recipe_dir'"
  local app_data
  app_data=$($YQ e '.services.app' "$compose_file")
  # Check for an "app" service
  if [ "$app_data" = "null" ]; then
    warning "Missing 'app' service"
  else
    info "'app' service found"
  fi
  # Check that at least one service has Traefik enabled
  if $YQ e '.services.*.deploy.labels.[] == "traefik.enable=true"' "$compose_file" | grep -q true; then
    info "Found at least one Traefik-enabled service"
  else
    warning "Can't find any Traefik-enabled service"
  fi
  # Healthcheck check (check)
  if $YQ e -e '.services.*.healthcheck' "$compose_file" > /dev/null 2>&1; then
    info "Found a healthcheck for at least one service."
  else
    warning "Can't find any healthchecks."
  fi
  # Verify compose version
  local compose_version
  compose_version=$($YQ e '.version' "$compose_file")
  if [ "$compose_version" = "3.8" ]; then
    info "Compose version 3.8"
  else
    warning "Compose version $compose_version, should be 3.8."
  fi
  local image_tags
  image_tags=$($YQ e '.services.*.image' "$compose_file")
  # Check that each image is using a tag
  local untagged_images
  untagged_images=$(grep '^[^:]*$' <<< "$image_tags")
  if [ -n "$untagged_images" ]; then
    warning "Untagged images found: $untagged_images"
  else
    info "No untagged images found"
  fi
  # Check no images are using "latest"
  local latest_images
  latest_images=$(grep ':latest' <<< "$image_tags")
  if [ -n "$latest_images" ]; then
    warning "Images found using 'latest': $latest_images"
  else
    info "No 'latest' images found"
  fi
  # Check for .env.sample
  if [ -f .env.sample ]; then
    info "Found .env.sample"
  else
    warning "No .env.sample"
  fi
  local service_configs
  service_configs=$($YQ e '.services.*.configs' "$compose_file")
  if grep -v "null" -q <<< "$service_configs"; then
    # Check for .env.sample
    if [ -f abra.sh ]; then
      info "Found abra.sh"
    else
      warning "No abra.sh, but config vars defined"
    fi
  fi
  # Check for .drone.yml
  if [ -f .drone.yml ]; then
    info "Found .drone.yml"
    # Check for stack-ssh-deploy CI
    if $YQ e -e '.steps.[] | select(.image == "decentral1se/stack-ssh-deploy:latest")' .drone.yml > /dev/null 2>&1; then
      info "Found abra auto-release"
    else
      warning "Missing drone-abra auto-release"
    fi
    # Check for drone-abra auto-release
    if $YQ e -e '.steps.[] | select(.image == "decentral1se/drone-abra:latest")' .drone.yml > /dev/null 2>&1; then
      info "Found abra auto-release"
    else
      warning "Missing drone-abra auto-release"
    fi
  else
    warning "No .drone.yml"
  fi
 }
 ###### .. recipe <recipe> release
 help_recipe_release() {
  echo "abra [options] recipe <recipe> release [--force] [--bump]
@ -2368,7 +2183,7 @@ sub_recipe_release() {
        fi
        info "Fetching $service_image metadata from Docker Hub"
        service_data=$(skopeo inspect "docker://$service_image")
-        service_digest=$(echo "$service_data" | $JQ -r '.Digest' | cut -d':' -f2 | cut -c-8)
+        service_digest=$(echo "$service_data" | jq -r '.Digest' | cut -d':' -f2 | cut -c-8)
        label="coop-cloud.\${STACK_NAME}.$service.version=${service_tag}-${service_digest}"
@ -2401,15 +2216,9 @@ sub_recipe_release() {
    error "Hmm, something went wrong generating a new version number.."
  fi
  local -a expected_format="^coop-cloud.[a-z]*.[a-z]*.[a-z]*=v\\d*.\\d*.\\d*-\\S{8}"
  if [[ ! "$new_version" =~ $expected_format ]]; then
    error "'$new_version' does not match the expected label format, bailing out..."
  fi
  success "All compose files updated; new version is $new_version"
-  if [ "$abra___no_prompt" = "false" ] && [ "$bump" = "false" ]; then
+  if [ "$abra___no_prompt" = "false" ]; then
    git --no-pager diff
    read -rp "Commit your changes to git? [y/N]? " choice
    if [ "${choice,,}" != "y" ]; then
@ -2417,7 +2226,7 @@ sub_recipe_release() {
    fi
  fi
-  if [ "$abra___no_prompt" = "false" ] && [ "$bump" = "false" ]; then
+  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
@ -2446,7 +2255,7 @@ sub_recipe_release() {
  if [ "$abra___no_prompt" = "false" ]; then
    read -rp "Git push this new tag? [y/N]? " choice
-    if [ "${choice,,}" = "y" ]; then
+    if [ "${choice,,}" != "y" ]; then
      git push && git push --tags
    fi
  else
@ -2579,7 +2388,7 @@ sub_server_new() {
  PROVIDER="$abra__provider_"
-  if [ "$PROVIDER" != "hetzner" ] && [ "$PROVIDER" != "capsul" ]; then
+  if [ "$PROVIDER" != "hetzner" ]; then
    error "Unknown provider plugin 'abra-${PROVIDER}'"
  fi
@ -2648,9 +2457,9 @@ OPTIONS
 sub_upgrade() {
  if [[ "$abra___dev" == "true" ]]; then
-    curl https://install.abra.coopcloud.tech | bash -s -- --dev --no-deps
+    curl https://install.abra.coopcloud.tech | bash -s -- --dev
  else
-    curl https://install.abra.coopcloud.tech | bash -s -- --no-deps
+    curl https://install.abra.coopcloud.tech | bash
  fi
 }
@ -2733,6 +2542,18 @@ sub_network() {
 abra() {
  require_bash_4
  # TODO (3wc): we either need to do this, or add 'shellcheck disable' all over
  # the place to handle the dynamically-defined vars
  declare abra___stack abra___env abra__command_ abra__args_ \
    abra__secret_ abra__version_ abra__data_ abra___user abra__host_ \
    abra__type_ abra__port_ abra__user_ abra__service_ abra__src_ abra__dst_ \
    abra___server abra___domain abra___pass abra___secrets abra___status  \
    abra___no_tty abra___app_name abra__subcommands_ abra___skip_update \
    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__recipe_ abra___fast abra__volume_ abra___bump abra___chaos
  if ! type tput > /dev/null 2>&1; then
    tput() {
      echo -n
@ -2796,7 +2617,7 @@ abra() {
  # Use abra__command_ in case `command` is provided (i.e. `volume` or `stack`)
  CMD="sub_${abra__command_}"
  if type "$CMD" > /dev/null 2>&1; then
-    # shellcheck disable=SC2086,SC2048
+    # shellcheck disable=SC2086
    "$CMD" ${abra__args_[*]}
  else
    docopt_exit
--- a/bin/abralib.py
+++ b/bin/abralib.py
@ -14,15 +14,11 @@ HOME_PATH = expanduser("~/")
 CLONES_PATH = Path(f"{HOME_PATH}/.abra/apps").absolute()
 REPOS_TO_SKIP = (
    "abra",
    "abra-aur",
    "abra-apps",
    "abra-capsul",
    "abra-gandi",
    "abra-hetzner",
    "apps",
    "auto-apps-json",
    "auto-mirror",
    "aur-abra-git",
    "backup-bot",
    "coopcloud.tech",
    "coturn",
@ -31,14 +27,11 @@ REPOS_TO_SKIP = (
    "docs.coopcloud.tech",
    "example",
    "gardening",
    "go-abra",
    "organising",
    "pyabra",
    "radicle-seed-node",
    "tagcmp",
    "stack-ssh-deploy",
    "swarm-cronjob",
    "tyop",
 )
 YQ_PATH = Path(f"{HOME_PATH}/.abra/vendor/yq")
 JQ_PATH = Path(f"{HOME_PATH}/.abra/vendor/jq")
@ -66,7 +59,7 @@ def _run_cmd(cmd, shell=False, **kwargs):
 def get_repos_json():
    """ Retrieve repo list from Gitea """
-    url = "https://git.coopcloud.tech/api/v1/orgs/coop-cloud/repos"
+    url = "https://git.autonomic.zone/api/v1/orgs/coop-cloud/repos"
    log.info(f"Retrieving {url}")
--- a/bin/app-json.py
+++ b/bin/app-json.py
@ -6,11 +6,9 @@
 # ~/.abra/apps), and format it as JSON so that it can be hosted here:
 # https://apps.coopcloud.tech
 import argparse
 from json import dump
-from os import chdir, environ, getcwd, listdir
+from os import chdir, getcwd, listdir
 from os.path import basename
 from pathlib import Path
 from re import findall, search
 from subprocess import DEVNULL
@ -27,24 +25,6 @@ from abralib import (
    log,
 )
 parser = argparse.ArgumentParser(description="Generate a new apps.json")
 parser.add_argument("--output", type=Path, default=f"{getcwd()}/apps.json")
 def skopeo_login():
    """Log into the docker registry to avoid rate limits."""
    user = environ.get("SKOPEO_USER")
    password = environ.get("SKOPEO_PASSWORD")
    registry = environ.get("SKOPEO_REGISTRY", "docker.io")
    if not user or not password:
        log.info("Failed to log in via Skopeo due to missing env vars")
        return
    login_cmd = f"skopeo login {registry} -u {user} -p {password}"
    output = _run_cmd(login_cmd, shell=True)
    log.info(f"Skopeo login attempt: {output}")
 def get_published_apps_json():
    """Retrieve already published apps json."""
@ -139,13 +119,8 @@ def get_app_metadata(app_path):
    return metadata
 def get_cached_versions(cached_apps_json, app_name):
    versions = cached_apps_json[app_name]["versions"]
    return [list(k)[0] for k in [version.keys() for version in versions]]
 def get_app_versions(app_path, cached_apps_json):
-    versions = []
+    versions = {}
    chdir(app_path)
@ -160,7 +135,7 @@ def get_app_versions(app_path, cached_apps_json):
    app_name = basename(app_path)
    try:
-        existing_tags = get_cached_versions(cached_apps_json, app_name)
+        existing_tags = cached_apps_json[app_name]["versions"].keys()
    except KeyError:
        existing_tags = []
@ -176,8 +151,9 @@ def get_app_versions(app_path, cached_apps_json):
            if service in ("null", "---"):
                continue
-            if tag in existing_tags and service in get_cached_versions(
+            if (
-                cached_apps_json, app_name
+                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]
@ -210,7 +186,7 @@ def get_app_versions(app_path, cached_apps_json):
            parsed_services.append(service)
-        versions.append({tag: service_versions})
+        versions[tag] = service_versions
    _run_cmd(f"git checkout {initial_branch}")
@ -219,14 +195,11 @@ def get_app_versions(app_path, cached_apps_json):
 def main():
    """Run the script."""
    args = parser.parse_args()
    skopeo_login()
    repos_json = get_repos_json()
-    # clone_all_apps(repos_json)
+    clone_all_apps(repos_json)
-    with open(args.output, "w", encoding="utf-8") as handle:
+    target = f"{getcwd()}/apps.json"
    with open(target, "w", encoding="utf-8") as handle:
        dump(
            generate_apps_json(repos_json),
            handle,
@ -235,7 +208,7 @@ def main():
            sort_keys=True,
        )
-    log.info(f"Successfully generated {args.output}")
+    log.info(f"Successfully generated {target}")
 main()
--- a/bin/github-sync.py
+++ b/bin/github-sync.py
@ -6,17 +6,13 @@
 from os import chdir, environ, listdir
-from abralib import CLONES_PATH, _run_cmd, clone_all_apps, get_repos_json, log
+from abralib import (
-
+    CLONES_PATH,
-REPOS_TO_SKIP = (
+    REPOS_TO_SKIP,
-    "apps",
+    _run_cmd,
-    "backup-bot",
+    clone_all_apps,
-    "docker-dind-bats-kcov",
+    get_repos_json,
-    "docs.coopcloud.tech",
+    log,
    "pyabra",
    "radicle-seed-node",
    "swarm-cronjob",
    "tyop",
 )
@ -36,7 +32,9 @@ def main():
        log.info(f"Mirroring {app}...")
        token = environ.get("GITHUB_ACCESS_TOKEN")
-        remote = f"https://coopcloudbot:{token}@github.com/Coop-Cloud/{app}.git"
+        remote = (
            f"https://decentral1se:{token}@github.com/Autonomic-Cooperative/{app}.git"
        )
        _run_cmd(
            f"git remote add github {remote} || true",
--- a/deploy/install.abra.coopcloud.tech/installer
+++ b/deploy/install.abra.coopcloud.tech/installer
@ -1,179 +1,10 @@
-#!/usr/bin/env bash
+#!/bin/bash
-# shellcheck disable=SC2154,SC2034
+ABRA_VERSION="9.0.0"
-
+GIT_URL="https://git.autonomic.zone/coop-cloud/abra"
 ABRA_VERSION="10.0.5"
 GIT_URL="https://git.coopcloud.tech/coop-cloud/abra"
 ABRA_SRC="$GIT_URL/raw/tag/$ABRA_VERSION/abra"
 ABRA_DIR="${ABRA_DIR:-$HOME/.abra}"
 DOC="
 abra command-line installer script
 Usage:
  installer [options]
 Options:
  -h, --help            Show this message and exit
  -d, --dev             Install bleeding edge development version
  -n, --no-prompt       Don't prompt for input and run non-interactively
  -p, --no-deps         Don't attempt to install system dependencies
 "
 # docopt parser below, refresh this parser with `docopt.sh installer`
 # shellcheck disable=2016,1075
 docopt() { parse() { if ${DOCOPT_DOC_CHECK:-true}; then local doc_hash
 if doc_hash=$(printf "%s" "$DOC" | (sha256sum 2>/dev/null || shasum -a 256)); then
 if [[ ${doc_hash:0:5} != "$digest" ]]; then
 stderr "The current usage doc (${doc_hash:0:5}) does not match \
 what the parser was generated with (${digest})
 Run \`docopt.sh\` to refresh the parser."; _return 70; fi; fi; fi
 local root_idx=$1; shift; argv=("$@"); parsed_params=(); parsed_values=()
 left=(); testdepth=0; local arg; while [[ ${#argv[@]} -gt 0 ]]; do
 if [[ ${argv[0]} = "--" ]]; then for arg in "${argv[@]}"; do
 parsed_params+=('a'); parsed_values+=("$arg"); done; break
 elif [[ ${argv[0]} = --* ]]; then parse_long
 elif [[ ${argv[0]} = -* && ${argv[0]} != "-" ]]; then parse_shorts
 elif ${DOCOPT_OPTIONS_FIRST:-false}; then for arg in "${argv[@]}"; do
 parsed_params+=('a'); parsed_values+=("$arg"); done; break; else
 parsed_params+=('a'); parsed_values+=("${argv[0]}"); argv=("${argv[@]:1}"); fi
 done; local idx; if ${DOCOPT_ADD_HELP:-true}; then
 for idx in "${parsed_params[@]}"; do [[ $idx = 'a' ]] && continue
 if [[ ${shorts[$idx]} = "-h" || ${longs[$idx]} = "--help" ]]; then
 stdout "$trimmed_doc"; _return 0; fi; done; fi
 if [[ ${DOCOPT_PROGRAM_VERSION:-false} != 'false' ]]; then
 for idx in "${parsed_params[@]}"; do [[ $idx = 'a' ]] && continue
 if [[ ${longs[$idx]} = "--version" ]]; then stdout "$DOCOPT_PROGRAM_VERSION"
 _return 0; fi; done; fi; local i=0; while [[ $i -lt ${#parsed_params[@]} ]]; do
 left+=("$i"); ((i++)) || true; done
 if ! required "$root_idx" || [ ${#left[@]} -gt 0 ]; then error; fi; return 0; }
 parse_shorts() { local token=${argv[0]}; local value; argv=("${argv[@]:1}")
 [[ $token = -* && $token != --* ]] || _return 88; local remaining=${token#-}
 while [[ -n $remaining ]]; do local short="-${remaining:0:1}"
 remaining="${remaining:1}"; local i=0; local similar=(); local match=false
 for o in "${shorts[@]}"; do if [[ $o = "$short" ]]; then similar+=("$short")
 [[ $match = false ]] && match=$i; fi; ((i++)) || true; done
 if [[ ${#similar[@]} -gt 1 ]]; then
 error "${short} is specified ambiguously ${#similar[@]} times"
 elif [[ ${#similar[@]} -lt 1 ]]; then match=${#shorts[@]}; value=true
 shorts+=("$short"); longs+=(''); argcounts+=(0); else value=false
 if [[ ${argcounts[$match]} -ne 0 ]]; then if [[ $remaining = '' ]]; then
 if [[ ${#argv[@]} -eq 0 || ${argv[0]} = '--' ]]; then
 error "${short} requires argument"; fi; value=${argv[0]}; argv=("${argv[@]:1}")
 else value=$remaining; remaining=''; fi; fi; if [[ $value = false ]]; then
 value=true; fi; fi; parsed_params+=("$match"); parsed_values+=("$value"); done
 }; parse_long() { local token=${argv[0]}; local long=${token%%=*}
 local value=${token#*=}; local argcount; argv=("${argv[@]:1}")
 [[ $token = --* ]] || _return 88; if [[ $token = *=* ]]; then eq='='; else eq=''
 value=false; fi; local i=0; local similar=(); local match=false
 for o in "${longs[@]}"; do if [[ $o = "$long" ]]; then similar+=("$long")
 [[ $match = false ]] && match=$i; fi; ((i++)) || true; done
 if [[ $match = false ]]; then i=0; for o in "${longs[@]}"; do
 if [[ $o = $long* ]]; then similar+=("$long"); [[ $match = false ]] && match=$i
 fi; ((i++)) || true; done; fi; if [[ ${#similar[@]} -gt 1 ]]; then
 error "${long} is not a unique prefix: ${similar[*]}?"
 elif [[ ${#similar[@]} -lt 1 ]]; then
 [[ $eq = '=' ]] && argcount=1 || argcount=0; match=${#shorts[@]}
 [[ $argcount -eq 0 ]] && value=true; shorts+=(''); longs+=("$long")
 argcounts+=("$argcount"); else if [[ ${argcounts[$match]} -eq 0 ]]; then
 if [[ $value != false ]]; then
 error "${longs[$match]} must not have an argument"; fi
 elif [[ $value = false ]]; then
 if [[ ${#argv[@]} -eq 0 || ${argv[0]} = '--' ]]; then
 error "${long} requires argument"; fi; value=${argv[0]}; argv=("${argv[@]:1}")
 fi; if [[ $value = false ]]; then value=true; fi; fi; parsed_params+=("$match")
 parsed_values+=("$value"); }; required() { local initial_left=("${left[@]}")
 local node_idx; ((testdepth++)) || true; for node_idx in "$@"; do
 if ! "node_$node_idx"; then left=("${initial_left[@]}"); ((testdepth--)) || true
 return 1; fi; done; if [[ $((--testdepth)) -eq 0 ]]; then
 left=("${initial_left[@]}"); for node_idx in "$@"; do "node_$node_idx"; done; fi
 return 0; }; optional() { local node_idx; for node_idx in "$@"; do
 "node_$node_idx"; done; return 0; }; switch() { local i
 for i in "${!left[@]}"; do local l=${left[$i]}
 if [[ ${parsed_params[$l]} = "$2" ]]; then
 left=("${left[@]:0:$i}" "${left[@]:((i+1))}")
 [[ $testdepth -gt 0 ]] && return 0; if [[ $3 = true ]]; then
 eval "((var_$1++))" || true; else eval "var_$1=true"; 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:333}
 usage=${DOC:37:28}; digest=36916; shorts=(-h -d -n -p)
 longs=(--help --dev --no-prompt --no-deps); argcounts=(0 0 0 0); node_0(){
 switch __help 0; }; node_1(){ switch __dev 1; }; node_2(){ switch __no_prompt 2
 }; node_3(){ switch __no_deps 3; }; node_4(){ optional 0 1 2 3; }; node_5(){
 optional 4; }; node_6(){ required 5; }; node_7(){ required 6; }
 cat <<<' docopt_exit() { [[ -n $1 ]] && printf "%s\n" "$1" >&2
 printf "%s\n" "${DOC:37:28}" >&2; exit 1; }'; unset var___help var___dev \
 var___no_prompt var___no_deps; parse 7 "$@"; local prefix=${DOCOPT_PREFIX:-''}
 unset "${prefix}__help" "${prefix}__dev" "${prefix}__no_prompt" \
 "${prefix}__no_deps"; eval "${prefix}"'__help=${var___help:-false}'
 eval "${prefix}"'__dev=${var___dev:-false}'
 eval "${prefix}"'__no_prompt=${var___no_prompt:-false}'
 eval "${prefix}"'__no_deps=${var___no_deps:-false}'; local docopt_i=1
 [[ $BASH_VERSION =~ ^4.3 ]] && docopt_i=2; for ((;docopt_i>0;docopt_i--)); do
 declare -p "${prefix}__help" "${prefix}__dev" "${prefix}__no_prompt" \
 "${prefix}__no_deps"; done; }
 # docopt parser above, complete command for generating this parser is `docopt.sh installer`
 function prompt_confirm {
  if [ "$no_prompt" == "true" ]; then
    return
  fi
  read -rp "Continue? [y/N]? " choice
  case "$choice" in
    y|Y ) return ;;
    * ) exit;;
  esac
 }
 function show_banner {
  echo ""
  echo "   ____                           ____ _                 _ "
  echo "  / ___|___         ___  _ __    / ___| | ___  _   _  __| |"
  echo " | |   / _ \ _____ / _ \| '_ \  | |   | |/ _ \| | | |/ _' |"
  echo " | |__| (_) |_____| (_) | |_) | | |___| | (_) | |_| | (_| |"
  echo "  \____\___/       \___/| .__/   \____|_|\___/ \__,_|\__,_|"
  echo "                        |_|"
  echo ""
 }
 function install_docker {
  sudo apt-get remove docker docker-engine docker.io containerd runc
  sudo apt-get install -yq \
    apt-transport-https \
    ca-certificates \
    gnupg \
    lsb-release
  curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
  echo \
  "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian \
  $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
  sudo apt-get update
  sudo apt-get install -yq docker-ce docker-ce-cli containerd.io
 }
 function install_requirements {
  if [ -f "/etc/debian_version" ]; then
    echo "Detected Debian based distribution, attempting to install system requirements..."
    sudo apt update && sudo apt install -y \
      passwdqc \
      pwgen \
      git
    echo "Install Docker (https://docs.docker.com/engine/install/debian/)?"
    prompt_confirm
    install_docker
  else
    echo "Sorry, we only support Debian based distributions at the moment"
    echo "You'll have to install the requirements manually for your distribution"
    echo "See https://git.coopcloud.tech/coop-cloud/abra#requirements for more"
  fi
 }
 function install_abra_release {
  mkdir -p "$HOME/.local/bin"
  curl "$ABRA_SRC" > "$HOME/.local/bin/abra"
@ -193,21 +24,7 @@ function install_abra_dev {
 }
 function run_installation {
-  show_banner
+  if [ "$1" = "--dev" ]; then
  DOCOPT_PREFIX=installer_
  DOCOPT_ADD_HELP=false
  eval "$(docopt "$@")"
  dev="$installer___dev"
  no_prompt="$installer___no_prompt"
  no_deps="$installer___no_deps"
  if [ "$no_deps" == "false" ]; then
    install_requirements
  fi
  if [ "$dev" == "true" ]; then
    install_abra_dev
  else
    install_abra_release
--- a/24
+++ b/24
@ -1,4 +1,4 @@
-.PHONY: test shellcheck docopt release-installer build push deploy-docopt symlink
+.PHONY: test shellcheck docopt release-installer build push
 test:
 	@sudo DOCKER_CONTEXT=default docker run \
@ -21,9 +21,8 @@ shellcheck:
 		--rm \
 		-v $$(pwd):/workdir \
 		koalaman/shellcheck-alpine \
-		sh -c "shellcheck /workdir/abra && \
+		shellcheck /workdir/abra && \
-		       shellcheck /workdir/bin/*.sh && \
+		shellcheck /workdir/bin/*.sh
 		       shellcheck /workdir/deploy/install.abra.coopcloud.tech/installer"
 docopt:
 	@if [ ! -d ".venv" ]; then \
@ -33,14 +32,6 @@ docopt:
 	fi
 	.venv/bin/docopt.sh abra
 deploy-docopt:
 	@if [ ! -d ".venv" ]; then \
 		python3 -m venv .venv && \
 		.venv/bin/pip install -U pip setuptools wheel && \
 		.venv/bin/pip install docopt-sh; \
 	fi
 	.venv/bin/docopt.sh deploy/install.abra.coopcloud.tech/installer
 release-installer:
 	@DOCKER_CONTEXT=swarm.autonomic.zone \
 		docker stack rm abra-installer-script && \
@ -48,12 +39,7 @@ release-installer:
 		DOCKER_CONTEXT=swarm.autonomic.zone docker stack deploy -c compose.yml abra-installer-script
 build:
-	@docker build -t thecoopcloud/abra .
+	@docker build -t decentral1se/abra .
 push: build
-	@docker push thecoopcloud/abra
+	@docker push decentral1se/abra
 symlink:
 	@mkdir -p ~/.abra/servers/ && \
 	ln -srf tests/default ~/.abra/servers && \
 	ln -srf tests/apps/* ~/.abra/apps
--- a/tests/apps/works/compose.yml
+++ b/tests/apps/works/compose.yml
@ -1,84 +0,0 @@
 ---
 # The goal of this compose file is to have a testing ground for understanding
 # what cases we need to handle to get stable deployments. For that, we need to
 # work with healthchecks and deploy configurations quite closely. If you run
 # the `make symlink` target then this will be loaded into a "fake" app on your
 # local machine which you can deploy with `abra`.
 version: "3.8"
 services:
  r1_should_work:
    image: redis:alpine
    deploy:
      update_config:
        failure_action: rollback
        order: start-first
      rollback_config:
        order: start-first
      restart_policy:
        max_attempts: 1
    healthcheck:
      test: redis-cli ping
      interval: 2s
      retries: 3
      start_period: 1s
      timeout: 3s
  r2_broken_health_check:
    image: redis:alpine
    deploy:
      update_config:
        failure_action: rollback
        order: start-first
      rollback_config:
        order: start-first
      restart_policy:
        max_attempts: 3
    healthcheck:
      test: foobar
      interval: 2s
      retries: 3
      start_period: 1s
      timeout: 3s
  r3_no_health_check:
    image: redis:alpine
    deploy:
      update_config:
        failure_action: rollback
        order: start-first
      rollback_config:
        order: start-first
      restart_policy:
        max_attempts: 3
  r4_disabled_health_check:
    image: redis:alpine
    deploy:
      update_config:
        failure_action: rollback
        order: start-first
      rollback_config:
        order: start-first
      restart_policy:
        max_attempts: 3
    healthcheck:
      disable: true
  r5_should_also_work:
    image: redis:alpine
    deploy:
      update_config:
        failure_action: rollback
        order: start-first
      rollback_config:
        order: start-first
      restart_policy:
        max_attempts: 1
    healthcheck:
      test: redis-cli ping
      interval: 2s
      retries: 3
      start_period: 1s
      timeout: 3s
--- a/tests/default/works.env
+++ b/tests/default/works.env
@ -1 +0,0 @@
 TYPE=works