WIP: mass version checking

Ignore new apps repo
Use same formatting for all commits [ci skip]
2021-07-10 00:47:55 +02:00 · 2021-07-08 17:53:03 +02:00 · 2021-07-06 18:50:53 +02:00 · 2021-07-06 18:42:07 +02:00 · 2021-07-06 14:43:03 +02:00 · 2021-07-06 12:51:16 +02:00
5 changed files with 262 additions and 199 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -9,76 +9,83 @@

 # abra x.x.x (UNRELEASED)

+# 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` ([7482362af1](https://git.autonomic.zone/coop-cloud/abra/commit/7482362af1d01cc02828abd45b1222fa643d1f80))
+- 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 selectig when to download a new `apps.json` ([#170](https://git.autonomic.zone/coop-cloud/abra/issues/170))
- Remove `pwgen`/`pwqgen` as password generator requirements ([#167](https://git.autonomic.zone/coop-cloud/abra/issues/167))
+- 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` ([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 Docker image for `abra` ([`64d578cf`](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))
+- Add Renovate bot configuraiton script ([`9fadc430`](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 Github mirroring script ([`4ef43331`](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))
+- Fix help for `... app ... volume ls` ([`efad71c4`](https://git.autonomic.zone/coop-cloud/abra/commit/efad71c470d6d65f7e4bfe39c5f68ff1097f80a2))
 - 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))
- 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))
+- 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 `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))
+- 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)

 - 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))
- Rename "app type" back to "stack" in the deployment overview ([54b6acc](https://git.autonomic.zone/coop-cloud/abra/commit/54b6acc))
+- 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))
 - 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))
@ -93,53 +100,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 ([4e94a424e94a42](https://git.autonomic.zone/coop-cloud/abra/commit/4e94a424e94a42))
+- Support `ABRA_DIR` in the installer script ([`4e94a424e`](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 ([98e674b8e8](https://git.autonomic.zone/coop-cloud/abra/commit/98e674b8e83458a83dcbf331e8e34c7188559c4a))
+- Show version and digest of app if labelled ([`98e674b8e`](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 ([f163d4b](https://git.autonomic.zone/coop-cloud/abra/commit/f163d4b0fa920232e9d995a22d20fe78b174b3a9))
+- New `app-catalogue.sh` script to auto-generate app list for documentation ([`f163d4b0f`](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))
- 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))
+- 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))
+- 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 git digest to `abra version` output ([8b41416](https://git.autonomic.zone/coop-cloud/abra/commit/8b41416))
+- 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))

 # 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))
- 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))
- "server" shell completion fixed ([8839bd4](https://git.autonomic.zone/coop-cloud/abra/commit/8839bd45951d00dccf4ef81ece445bcc49e13ee6))
+- 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))
+- 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))
 - 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/364
+++ b/364
@ -5,7 +5,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="10.0.0"
 ABRA_BACKUP_DIR="${ABRA_BACKUP_DIR:-$ABRA_DIR/backups}"
 ABRA_VENDOR_DIR="$ABRA_DIR/vendor"
 ABRA_APPS_JSON="${ABRA_DIR}/apps.json"
@ -17,6 +17,13 @@ ABRA_APPS_JSON="${ABRA_DIR}/apps.json"
 DOC="
 The Co-op Cloud utility belt 🎩🐇

+    ____                           ____ _                 _
+   / ___|___         ___  _ __    / ___| | ___  _   _  __| |
+  | |   / _ \ _____ / _ \| '_ \  | |   | |/ _ \| | | |/ _' |
+  | |__| (_) |_____| (_) | |_) | | |___| | (_) | |_| | (_| |
+   \____\___/       \___/| .__/   \____|_|\___/ \__,_|\__,_|
+                         |_|
+
 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>
@ -33,6 +40,7 @@ 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]
@ -169,15 +177,15 @@ eval "var_$1+=($value)"; else eval "var_$1=$value"; fi; return 0; fi; done
 return 1; }; stdout() { printf -- "cat <<'EOM'\n%s\nEOM\n" "$1"; }; stderr() {
 printf -- "cat <<'EOM' >&2\n%s\nEOM\n" "$1"; }; error() {
 [[ -n $1 ]] && stderr "$1"; stderr "$usage"; _return 1; }; _return() {
-printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:2445}
-usage=${DOC:34:1842}; digest=d420c
-shorts=(-d -C -h -U -e -s -v -n -b '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
-longs=(--debug --skip-check --help --skip-update --env --stack --verbose --no-prompt --branch --status --server --type --domain --app-name --pass --secrets --all --update --force --fast --chaos --volumes --no-tty --user --bump --dev)
-argcounts=(0 0 0 0 1 1 0 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 0 1 0 0); node_0(){
-switch __debug 0; }; node_1(){ switch __skip_check 1; }; node_2(){
-switch __help 2; }; node_3(){ switch __skip_update 3; }; node_4(){ value __env 4
-}; node_5(){ value __stack 5; }; node_6(){ switch __verbose 6; }; node_7(){
-switch __no_prompt 7; }; node_8(){ value __branch 8; }; node_9(){
+printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:2824}
+usage=${DOC:368:1887}; digest=6ab46
+shorts=(-n -b -v -U -e -h -d -C -s '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
+longs=(--no-prompt --branch --verbose --skip-update --env --help --debug --skip-check --stack --status --server --type --domain --app-name --pass --secrets --all --update --force --fast --chaos --volumes --no-tty --user --bump --dev)
+argcounts=(0 1 0 0 1 0 0 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 0 1 0 0); node_0(){
+switch __no_prompt 0; }; node_1(){ value __branch 1; }; node_2(){
+switch __verbose 2; }; node_3(){ switch __skip_update 3; }; node_4(){
+value __env 4; }; node_5(){ switch __help 5; }; node_6(){ switch __debug 6; }
+node_7(){ switch __skip_check 7; }; node_8(){ value __stack 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(){
@ -200,55 +208,56 @@ _command deploy; }; node_51(){ _command check; }; node_52(){ _command version; }
 node_53(){ _command config; }; node_54(){ _command cp; }; node_55(){
 _command logs; }; node_56(){ _command ps; }; node_57(){ _command restore; }
 node_58(){ _command rm; }; node_59(){ _command delete; }; node_60(){
-_command run; }; node_61(){ _command rollback; }; node_62(){ _command secret; }
-node_63(){ _command generate; }; node_64(){ _command insert; }; node_65(){
-_command undeploy; }; node_66(){ _command volume; }; node_67(){ _command recipe
-}; node_68(){ _command create; }; node_69(){ _command release; }; node_70(){
-_command versions; }; node_71(){ _command server; }; node_72(){ _command add; }
-node_73(){ _command __ --; }; node_74(){ _command init; }; node_75(){
-_command apps; }; node_76(){ _command upgrade; }; node_77(){ _command doctor; }
-node_78(){ _command help; }; node_79(){ optional 0 1 2 3 4 5 6 7 8; }
-node_80(){ optional 79; }; node_81(){ either 46 47; }; node_82(){ required 81; }
-node_83(){ optional 9; }; node_84(){ optional 10; }; node_85(){ optional 11; }
-node_86(){ required 80 45 82 83 84 85; }; node_87(){ optional 12; }; node_88(){
-optional 13; }; node_89(){ optional 14; }; node_90(){ optional 15; }; node_91(){
-required 80 45 48 84 87 88 89 90 26; }; node_92(){ either 28 16; }; node_93(){
-required 92; }; node_94(){ required 80 45 27 49 93; }; node_95(){ optional 17; }
-node_96(){ optional 18; }; node_97(){ optional 19; }; node_98(){ optional 20; }
-node_99(){ optional 29; }; node_100(){ required 80 45 27 50 95 96 97 98 99; }
-node_101(){ required 80 45 27 51; }; node_102(){ required 80 45 27 52; }
-node_103(){ required 80 45 27 53; }; node_104(){ required 80 45 27 54 30 31; }
-node_105(){ optional 28; }; node_106(){ required 80 45 27 55 105; }; node_107(){
-required 80 45 27 56; }; node_108(){ required 80 45 27 57 93; }; node_109(){
-either 58 59; }; node_110(){ required 109; }; node_111(){ optional 21; }
-node_112(){ required 80 45 27 110 111 90; }; node_113(){ optional 32; }
-node_114(){ required 80 45 27 57 28 113; }; node_115(){ optional 22; }
-node_116(){ optional 23; }; node_117(){ oneormore 33; }; node_118(){
-required 80 45 27 60 115 116 28 117; }; node_119(){ required 80 45 27 61 99; }
-node_120(){ required 34 29; }; node_121(){ either 120 16; }; node_122(){
-required 121; }; node_123(){ optional 35; }; node_124(){
-required 80 45 27 62 63 122 123 89; }; node_125(){
-required 80 45 27 62 64 34 29 36 89; }; node_126(){ either 34 16; }; node_127(){
-required 126; }; node_128(){ required 80 45 27 62 110 127 89; }; node_129(){
-required 80 45 27 65; }; node_130(){ required 80 45 27 66 47; }; node_131(){
-either 37 16; }; node_132(){ required 131; }; node_133(){
-required 80 45 27 66 110 132; }; node_134(){ optional 117; }; node_135(){
-required 80 45 27 38 134; }; node_136(){ required 80 67 47; }; node_137(){
-required 80 67 68 39; }; node_138(){ optional 24; }; node_139(){
-required 80 67 39 69 96 138; }; node_140(){ required 80 67 39 70; }; node_141(){
-optional 41; }; node_142(){ optional 42; }; node_143(){
-required 80 71 72 40 141 142; }; node_144(){ required 80 71 48 43 73 33; }
-node_145(){ required 80 71 82; }; node_146(){ required 80 71 40 58; }
-node_147(){ required 80 71 40 74; }; node_148(){ required 80 71 40 75 83; }
-node_149(){ optional 25; }; node_150(){ required 80 76 149; }; node_151(){
-required 80 52; }; node_152(){ required 80 77; }; node_153(){ oneormore 44; }
-node_154(){ optional 153; }; node_155(){ required 80 78 154; }; node_156(){
-required 80; }; node_157(){
-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
-}; node_158(){ required 157; }; cat <<<' docopt_exit() {
-[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:34:1842}" >&2
-exit 1; }'; unset var___debug var___skip_check var___help var___skip_update \
-var___env var___stack var___verbose var___no_prompt var___branch var___status \
+_command run; }; node_61(){ _command rollback; }; node_62(){ _command restart; }
+node_63(){ _command secret; }; node_64(){ _command generate; }; node_65(){
+_command insert; }; node_66(){ _command undeploy; }; node_67(){ _command volume
+}; node_68(){ _command recipe; }; node_69(){ _command create; }; node_70(){
+_command release; }; node_71(){ _command versions; }; node_72(){ _command server
+}; node_73(){ _command add; }; node_74(){ _command __ --; }; node_75(){
+_command init; }; node_76(){ _command apps; }; node_77(){ _command upgrade; }
+node_78(){ _command doctor; }; node_79(){ _command help; }; node_80(){
+optional 0 1 2 3 4 5 6 7 8; }; node_81(){ optional 80; }; node_82(){
+either 46 47; }; node_83(){ required 82; }; node_84(){ optional 9; }; node_85(){
+optional 10; }; node_86(){ optional 11; }; node_87(){ required 81 45 83 84 85 86
+}; node_88(){ optional 12; }; node_89(){ optional 13; }; node_90(){ optional 14
+}; node_91(){ optional 15; }; node_92(){ required 81 45 48 85 88 89 90 91 26; }
+node_93(){ either 28 16; }; node_94(){ required 93; }; node_95(){
+required 81 45 27 49 94; }; node_96(){ optional 17; }; node_97(){ optional 18; }
+node_98(){ optional 19; }; node_99(){ optional 20; }; node_100(){ optional 29; }
+node_101(){ required 81 45 27 50 96 97 98 99 100; }; node_102(){
+required 81 45 27 51; }; node_103(){ required 81 45 27 52; }; node_104(){
+required 81 45 27 53; }; node_105(){ required 81 45 27 54 30 31; }; node_106(){
+optional 28; }; node_107(){ required 81 45 27 55 106; }; node_108(){
+required 81 45 27 56; }; node_109(){ required 81 45 27 57 94; }; node_110(){
+either 58 59; }; node_111(){ required 110; }; node_112(){ optional 21; }
+node_113(){ required 81 45 27 111 112 91; }; node_114(){ optional 32; }
+node_115(){ required 81 45 27 57 28 114; }; node_116(){ optional 22; }
+node_117(){ optional 23; }; node_118(){ oneormore 33; }; node_119(){
+required 81 45 27 60 116 117 28 118; }; node_120(){ required 81 45 27 61 100; }
+node_121(){ required 81 45 27 62 28; }; node_122(){ required 34 29; }
+node_123(){ either 122 16; }; node_124(){ required 123; }; node_125(){
+optional 35; }; node_126(){ required 81 45 27 63 64 124 125 90; }; node_127(){
+required 81 45 27 63 65 34 29 36 90; }; node_128(){ either 34 16; }; node_129(){
+required 128; }; node_130(){ required 81 45 27 63 111 129 90; }; node_131(){
+required 81 45 27 66; }; node_132(){ required 81 45 27 67 47; }; node_133(){
+either 37 16; }; node_134(){ required 133; }; node_135(){
+required 81 45 27 67 111 134; }; node_136(){ optional 118; }; node_137(){
+required 81 45 27 38 136; }; node_138(){ required 81 68 47; }; node_139(){
+required 81 68 69 39; }; node_140(){ optional 24; }; node_141(){
+required 81 68 39 70 97 140; }; node_142(){ required 81 68 39 71; }; node_143(){
+optional 41; }; node_144(){ optional 42; }; node_145(){
+required 81 72 73 40 143 144; }; node_146(){ required 81 72 48 43 74 33; }
+node_147(){ required 81 72 83; }; node_148(){ required 81 72 40 58; }
+node_149(){ required 81 72 40 75; }; node_150(){ required 81 72 40 76 84; }
+node_151(){ optional 25; }; node_152(){ required 81 77 151; }; node_153(){
+required 81 52; }; node_154(){ required 81 78; }; node_155(){ oneormore 44; }
+node_156(){ optional 155; }; node_157(){ required 81 79 156; }; node_158(){
+required 81; }; node_159(){
+either 87 92 95 101 102 103 104 105 107 108 109 113 115 119 120 121 126 127 130 131 132 135 137 138 139 141 142 145 146 147 148 149 150 152 153 154 157 158
+}; node_160(){ required 159; }; cat <<<' docopt_exit() {
+[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:368:1887}" >&2
+exit 1; }'; unset var___no_prompt var___branch var___verbose var___skip_update \
+var___env var___help var___debug var___skip_check var___stack 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_ var__app_ \
@ -257,40 +266,39 @@ var__secret_ var__cmd_ var__data_ var__volume_ var__command_ var__recipe_ \
 var__host_ var__user_ var__port_ var__provider_ var__subcommands_ var_app \
 var_list var_ls var_new var_backup var_deploy var_check var_version var_config \
 var_cp var_logs var_ps var_restore var_rm var_delete var_run var_rollback \
-var_secret var_generate var_insert var_undeploy var_volume var_recipe \
-var_create var_release var_versions var_server var_add var___ var_init \
-var_apps var_upgrade var_doctor var_help; parse 158 "$@"
-local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__debug" \
-"${prefix}__skip_check" "${prefix}__help" "${prefix}__skip_update" \
-"${prefix}__env" "${prefix}__stack" "${prefix}__verbose" \
-"${prefix}__no_prompt" "${prefix}__branch" "${prefix}__status" \
-"${prefix}__server" "${prefix}__type" "${prefix}__domain" \
-"${prefix}__app_name" "${prefix}__pass" "${prefix}__secrets" "${prefix}__all" \
-"${prefix}__update" "${prefix}__force" "${prefix}__fast" "${prefix}__chaos" \
-"${prefix}__volumes" "${prefix}__no_tty" "${prefix}__user" "${prefix}__bump" \
-"${prefix}__dev" "${prefix}_type_" "${prefix}_app_" "${prefix}_service_" \
-"${prefix}_version_" "${prefix}_src_" "${prefix}_dst_" \
-"${prefix}_backup_file_" "${prefix}_args_" "${prefix}_secret_" \
-"${prefix}_cmd_" "${prefix}_data_" "${prefix}_volume_" "${prefix}_command_" \
-"${prefix}_recipe_" "${prefix}_host_" "${prefix}_user_" "${prefix}_port_" \
-"${prefix}_provider_" "${prefix}_subcommands_" "${prefix}app" "${prefix}list" \
-"${prefix}ls" "${prefix}new" "${prefix}backup" "${prefix}deploy" \
-"${prefix}check" "${prefix}version" "${prefix}config" "${prefix}cp" \
-"${prefix}logs" "${prefix}ps" "${prefix}restore" "${prefix}rm" \
-"${prefix}delete" "${prefix}run" "${prefix}rollback" "${prefix}secret" \
-"${prefix}generate" "${prefix}insert" "${prefix}undeploy" "${prefix}volume" \
-"${prefix}recipe" "${prefix}create" "${prefix}release" "${prefix}versions" \
-"${prefix}server" "${prefix}add" "${prefix}__" "${prefix}init" "${prefix}apps" \
-"${prefix}upgrade" "${prefix}doctor" "${prefix}help"
-eval "${prefix}"'__debug=${var___debug:-false}'
-eval "${prefix}"'__skip_check=${var___skip_check:-false}'
-eval "${prefix}"'__help=${var___help:-false}'
+var_restart var_secret var_generate var_insert var_undeploy var_volume \
+var_recipe var_create var_release var_versions var_server var_add var___ \
+var_init var_apps var_upgrade var_doctor var_help; parse 160 "$@"
+local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__no_prompt" \
+"${prefix}__branch" "${prefix}__verbose" "${prefix}__skip_update" \
+"${prefix}__env" "${prefix}__help" "${prefix}__debug" "${prefix}__skip_check" \
+"${prefix}__stack" "${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" "${prefix}__dev" "${prefix}_type_" \
+"${prefix}_app_" "${prefix}_service_" "${prefix}_version_" "${prefix}_src_" \
+"${prefix}_dst_" "${prefix}_backup_file_" "${prefix}_args_" \
+"${prefix}_secret_" "${prefix}_cmd_" "${prefix}_data_" "${prefix}_volume_" \
+"${prefix}_command_" "${prefix}_recipe_" "${prefix}_host_" "${prefix}_user_" \
+"${prefix}_port_" "${prefix}_provider_" "${prefix}_subcommands_" \
+"${prefix}app" "${prefix}list" "${prefix}ls" "${prefix}new" "${prefix}backup" \
+"${prefix}deploy" "${prefix}check" "${prefix}version" "${prefix}config" \
+"${prefix}cp" "${prefix}logs" "${prefix}ps" "${prefix}restore" "${prefix}rm" \
+"${prefix}delete" "${prefix}run" "${prefix}rollback" "${prefix}restart" \
+"${prefix}secret" "${prefix}generate" "${prefix}insert" "${prefix}undeploy" \
+"${prefix}volume" "${prefix}recipe" "${prefix}create" "${prefix}release" \
+"${prefix}versions" "${prefix}server" "${prefix}add" "${prefix}__" \
+"${prefix}init" "${prefix}apps" "${prefix}upgrade" "${prefix}doctor" \
+"${prefix}help"; eval "${prefix}"'__no_prompt=${var___no_prompt:-false}'
+eval "${prefix}"'__branch=${var___branch:-}'
+eval "${prefix}"'__verbose=${var___verbose:-false}'
 eval "${prefix}"'__skip_update=${var___skip_update:-false}'
 eval "${prefix}"'__env=${var___env:-}'
+eval "${prefix}"'__help=${var___help:-false}'
+eval "${prefix}"'__debug=${var___debug:-false}'
+eval "${prefix}"'__skip_check=${var___skip_check:-false}'
 eval "${prefix}"'__stack=${var___stack:-}'
-eval "${prefix}"'__verbose=${var___verbose:-false}'
-eval "${prefix}"'__no_prompt=${var___no_prompt:-false}'
-eval "${prefix}"'__branch=${var___branch:-}'
 eval "${prefix}"'__status=${var___status:-false}'
 eval "${prefix}"'__server=${var___server:-}'
 eval "${prefix}"'__type=${var___type:-}'
@ -341,6 +349,7 @@ 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}'
@ -358,10 +367,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}__debug" "${prefix}__skip_check" "${prefix}__help" \
-"${prefix}__skip_update" "${prefix}__env" "${prefix}__stack" \
-"${prefix}__verbose" "${prefix}__no_prompt" "${prefix}__branch" \
-"${prefix}__status" "${prefix}__server" "${prefix}__type" "${prefix}__domain" \
+declare -p "${prefix}__no_prompt" "${prefix}__branch" "${prefix}__verbose" \
+"${prefix}__skip_update" "${prefix}__env" "${prefix}__help" "${prefix}__debug" \
+"${prefix}__skip_check" "${prefix}__stack" "${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" \
@ -374,11 +383,12 @@ declare -p "${prefix}__debug" "${prefix}__skip_check" "${prefix}__help" \
 "${prefix}ls" "${prefix}new" "${prefix}backup" "${prefix}deploy" \
 "${prefix}check" "${prefix}version" "${prefix}config" "${prefix}cp" \
 "${prefix}logs" "${prefix}ps" "${prefix}restore" "${prefix}rm" \
-"${prefix}delete" "${prefix}run" "${prefix}rollback" "${prefix}secret" \
-"${prefix}generate" "${prefix}insert" "${prefix}undeploy" "${prefix}volume" \
-"${prefix}recipe" "${prefix}create" "${prefix}release" "${prefix}versions" \
-"${prefix}server" "${prefix}add" "${prefix}__" "${prefix}init" "${prefix}apps" \
-"${prefix}upgrade" "${prefix}doctor" "${prefix}help"; done; }
+"${prefix}delete" "${prefix}run" "${prefix}rollback" "${prefix}restart" \
+"${prefix}secret" "${prefix}generate" "${prefix}insert" "${prefix}undeploy" \
+"${prefix}volume" "${prefix}recipe" "${prefix}create" "${prefix}release" \
+"${prefix}versions" "${prefix}server" "${prefix}add" "${prefix}__" \
+"${prefix}init" "${prefix}apps" "${prefix}upgrade" "${prefix}doctor" \
+"${prefix}help"; done; }
 # docopt parser above, complete command for generating this parser is `docopt.sh abra`

 PROGRAM_NAME=$(basename "$0")
@ -490,13 +500,7 @@ 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'"
 }

@ -648,7 +652,7 @@ require_jq() {
 }

 require_yq() {
-  vendor_binary "https://github.com/mikefarah/yq" "v4.6.1" "yq_linux_amd64"
+  vendor_binary "https://github.com/mikefarah/yq" "v4.9.6" "yq_linux_amd64"
 }

 checkout_main_or_master() {
@ -656,10 +660,20 @@ checkout_main_or_master() {
 }

 pwgen_native() {
+  if type pwgen > /dev/null 2>&1; then
+    pwgen -s "$length" 1
+    return
+  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'
 }

@ -1044,84 +1058,92 @@ POWERED BY (for --status)
 }

 sub_app_list (){
-  SERVER="$abra___server"
-  if [ -z "$SERVER" ]; then
-    SERVER='*'
+  local server="$abra___server"
+  if [ -z "$server" ]; then
+    server='*'
  fi

  shopt -s nullglob dotglob
  # shellcheck disable=SC2206
-  ENV_FILES=($ABRA_DIR/servers/$SERVER/*.env)
+  env_files=($ABRA_DIR/servers/$server/*.env)
  shopt -u nullglob dotglob

-  STATUS="$( [[ $abra___status == "true" ]] && echo "Y" )"
+  status="$( [[ $abra___status == "true" ]] && echo "Y" )"

-  if [ -n "$STATUS" ]; then
-    if [ "$SERVER" = "*" ]; then
+  if [ -n "$status" ]; then
+    if [ "$server" = "*" ]; then
      get_servers
    else
-      SERVERS=( "$SERVER" )
+      servers=( "$SERVER" )
    fi

-    local -a DEPLOYED_APPS  # array
-    local -a CHECKED_SERVERS  # array
+    local -a deployed_apps  # array
+    local -a checked_servers  # array

-    warning "Loading status from ${#SERVERS[@]} server(s), patience advised.."
+    warning "Loading status from ${#servers[@]} server(s), patience advised.."
+    if [ "$abra___versions" == "true" ]; then
+      warning "Also looking up container versions. Maybe go for a walk."
+    fi

-    for SERVER in "${SERVERS[@]}"; do
-      SERVER="${SERVER##*/}"  # basename
-      mapfile -t SERVER_APPS < <(DOCKER_CONTEXT="$SERVER" docker stack ls --format '{{ .Name }}' 2>/dev/null)
-      # add $SERVER~ to the start of each DEPLOYED_APPS
-      DEPLOYED_APPS+=("${SERVER_APPS[@]/#/$SERVER~}")
+    for server in "${servers[@]}"; do
+      server="${server##*/}"  # basename
+      mapfile -t server_apps < <(DOCKER_CONTEXT="$SERVER" docker stack ls --format '{{ .Name }}' 2>/dev/null)
+      #if [ "$abra___versions" == "true" ]; then
+      #  filter="{{index .Spec.Labels \"coop-cloud.*.$SERVICE.version\" }}"
+      #  labels=$(docker service inspect -f "$filter" "" 2>/dev/null)
+      #else
+      # add $server~ to the start of each DEPLOYED_APPS
+      deployed_apps+=("${server_apps[@]/#/$server~}")
+      #fi
    done
  fi

  # FIXME 3wc: doesn't take into account --type filtering
-  printf "%s lovely apps:\n\n" "${#ENV_FILES[@]}"
+  printf "%s lovely apps:\n\n" "${#env_files[@]}"

-  for i in "${!ENV_FILES[@]}"; do
+  for i in "${!env_files[@]}"; do
    # Output header inside the loop, so it's included in the pipe to `column`
    if [ "$i" == 0 ]; then
-      printf "  DOMAIN\tTYPE\tSERVER%s%s\n" "${STATUS:+	}" "${STATUS:+STATUS}"
-      printf "  --\t--\t--%s\n" "${STATUS:+	--}"
+      printf "  DOMAIN\tTYPE\tserver%s%s\n" "${status:+	}" "${status:+status}"
+      printf "  --\t--\t--%s\n" "${status:+	--}"
    fi

-    local ENV_FILE="${ENV_FILES[$i]}" APP_STACK_NAME
+    local env_file="${env_files[$i]}" app_stack_name

-    IFS='/' read -r -a PARTS <<< "$ENV_FILE"
+    IFS='/' read -r -a parts <<< "$env_file"

-    FILE="${PARTS[-1]}"
-    SERVER="${PARTS[-2]}"
-    DOMAIN="${FILE%.env}"
+    env_file="${parts[-1]}"
+    server="${parts[-2]}"
+    domain="${env_file%.env}"

    set -a
    # shellcheck disable=SC1090
-    TYPE="$(source "$ENV_FILE" && echo "$TYPE")"
+    app_type="$(source "$env_file" && echo "$TYPE")"
    # shellcheck disable=SC1090
-    APP_STACK_NAME="$(source "$ENV_FILE" && echo "$STACK_NAME")"
+    app_stack_name="$(source "$env_file" && echo "$STACK_NAME")"
    set +a

-    if [ "$abra___type" != "" ] && [ "$abra___type" != "$TYPE" ]; then
+    if [ "$abra___type" != "" ] && [ "$abra___type" != "$app_type" ]; then
      continue
    fi

-    if [ -z "$APP_STACK_NAME" ]; then
-      APP_STACK_NAME="${DOMAIN//./_}"
+    if [ -z "$app_stack_name" ]; then
+      app_stack_name="${domain//./_}"
    fi
-    if [ -n "$STATUS" ]; then
-      APP_STATUS=$( printf '%s\n' "${DEPLOYED_APPS[@]}" | grep -qP "^${SERVER}~${APP_STACK_NAME}$" && echo "deployed" || echo "inactive")
-      if [[ "$APP_STATUS" == "inactive" ]] ; then
-        if [[ ${CHECKED_SERVERS[*]} =~ ${SERVER} ]]; then
-          APP_STATUS="unknown"
+    if [ -n "$status" ]; then
+      app_status=$( printf '%s\n' "${deployed_apps[@]}" | grep -qP "^${server}~${app_stack_name}$" && echo "deployed" || echo "inactive")
+      if [[ "$app_status" == "inactive" ]] ; then
+        if [[ ${checked_servers[*]} =~ ${server} ]]; then
+          app_status="unknown"
        else
-          if ! docker context inspect "$SERVER" > /dev/null 2>&1; then
-            APP_STATUS="unknown"
+          if ! docker context inspect "$server" > /dev/null 2>&1; then
+            app_status="unknown"
          fi
-          CHECKED_SERVERS+=("$SERVER")
+          checked_servers+=("$server")
        fi
      fi
    fi
-    printf "  %s\t%s\t%s%s\n" "$DOMAIN" "$TYPE" "$SERVER" "${STATUS:+	}${APP_STATUS}"
+    printf "  %s\t%s\t%s%s\n" "$domain" "$app_type" "$server" "${status:+	}${app_status}"
  done | column -s'	' -t
  # Align table `-t` based on tab characters -s`^V<Tab>`
 }
@ -1621,7 +1643,7 @@ sub_app_secret_insert() {
  printf "$PW" | docker secret create "${STACK_NAME}_${SECRET}_${VERSION}" - > /dev/null

  # shellcheck disable=SC2181
-  if [[ $? != 0 ]]; then exit 1; fi     # exit if secret wasn't created
+  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
@ -1830,10 +1852,12 @@ 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}}" \
@ -1845,11 +1869,14 @@ sub_app_run(){
  fi

  debug "Using container ID ${CONTAINER}"
+  # shellcheck disable=SC2145
+  debug "Running command: docker exec $RUN_USER $ARGS $CONTAINER $@"
+  exit

-  # 3wc: we want the "splitting" that shellcheck warns us about, so that -u and
-  # $RUN_USER aren't treated as a single argument:
  # shellcheck disable=SC2086
-  docker exec $RUN_USER $ARGS "$CONTAINER" "$@"
+  if ! docker exec $RUN_USER $ARGS "$CONTAINER" "$@"; then
+    exit 1
+  fi

  return
 }
@ -1893,6 +1920,31 @@ 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>]
@ -2239,9 +2291,15 @@ 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
+    git --no-pager diff
    read -rp "Commit your changes to git? [y/N]? " choice

    if [ "${choice,,}" != "y" ]; then
@ -2480,9 +2538,9 @@ OPTIONS

 sub_upgrade() {
  if [[ "$abra___dev" == "true" ]]; then
-    curl https://install.abra.coopcloud.tech | bash -s -- --dev
+    curl https://install.abra.coopcloud.tech | bash -s -- --dev --no-deps
  else
-    curl https://install.abra.coopcloud.tech | bash
+    curl https://install.abra.coopcloud.tech | bash --no-deps
  fi
 }

--- a/bin/abralib.py
+++ b/bin/abralib.py
@ -17,6 +17,7 @@ REPOS_TO_SKIP = (
    "abra-apps",
    "abra-gandi",
    "abra-hetzner",
+    "apps",
    "auto-apps-json",
    "auto-mirror",
    "backup-bot",
@ -32,6 +33,7 @@ REPOS_TO_SKIP = (
    "radicle-seed-node",
    "stack-ssh-deploy",
    "swarm-cronjob",
+    "tyop",
 )
 YQ_PATH = Path(f"{HOME_PATH}/.abra/vendor/yq")
 JQ_PATH = Path(f"{HOME_PATH}/.abra/vendor/jq")
--- a/bin/github-sync.py
+++ b/bin/github-sync.py
@ -9,12 +9,14 @@ from os import chdir, environ, listdir
 from abralib import CLONES_PATH, _run_cmd, clone_all_apps, get_repos_json, log

 REPOS_TO_SKIP = (
+    "apps",
    "backup-bot",
    "docker-dind-bats-kcov",
    "docs.coopcloud.tech",
    "pyabra",
    "radicle-seed-node",
    "swarm-cronjob",
+    "tyop",
 )


--- a/deploy/install.abra.coopcloud.tech/installer
+++ b/deploy/install.abra.coopcloud.tech/installer
@ -2,7 +2,7 @@

 # shellcheck disable=SC2154,SC2034

-ABRA_VERSION="9.0.0"
+ABRA_VERSION="10.0.0"
 GIT_URL="https://git.autonomic.zone/coop-cloud/abra"
 ABRA_SRC="$GIT_URL/raw/tag/$ABRA_VERSION/abra"
 ABRA_DIR="${ABRA_DIR:-$HOME/.abra}"
@ -145,7 +145,6 @@ function install_docker {
  sudo apt-get install -yq \
    apt-transport-https \
    ca-certificates \
-    curl \
    gnupg \
    lsb-release
  curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
@ -161,7 +160,6 @@ function install_requirements {
    echo "Detected Debian based distribution, attempting to install system requirements..."

    sudo apt update && sudo apt install -y \
-      curl \
      passwdqc \
      pwgen

@ -208,10 +206,6 @@ function run_installation {
    install_requirements
  fi

-  if ! type curl > /dev/null 2>&1; then
-    error "'curl' program is not installed, cannot continue..."
-  fi
-
  if [ "$dev" == "true" ]; then
    install_abra_dev
  else
Author	SHA1	Message	Date
3wc	5b2e37a7b2	WIP: mass version checking	2021-07-10 00:47:55 +02:00
decentral1se	9f835318d2	Ignore new apps repo All checks were successful continuous-integration/drone/push Build is passing Details	2021-07-08 17:53:03 +02:00
decentral1se	8f7997a70b	Use same formatting for all commits [ci skip]	2021-07-06 18:50:53 +02:00
decentral1se	035b05ca86	Fix change log entry [ci skip]	2021-07-06 18:42:07 +02:00
decentral1se	98cf63f7aa	Add new repo to ignore All checks were successful continuous-integration/drone/push Build is passing Details	2021-07-06 14:43:03 +02:00
decentral1se	672df64011	Not required to check actually [ci skip] Since `curl` is used to actually run the script :)	2021-07-06 12:51:16 +02:00
decentral1se	0581559783	Bump to the next version All checks were successful continuous-integration/drone/push Build is passing Details	2021-07-06 12:34:15 +02:00
decentral1se	cdd196346a	Add label generation checking All checks were successful continuous-integration/drone/push Build is passing Details Closes https://git.autonomic.zone/coop-cloud/abra/issues/186.	2021-07-06 12:27:06 +02:00
decentral1se	78287fec37	Add change log entry All checks were successful continuous-integration/drone/push Build is passing Details	2021-07-06 11:51:03 +02:00
decentral1se	4b820457de	Output diff before committing changes All checks were successful continuous-integration/drone/push Build is passing Details See https://git.autonomic.zone/coop-cloud/abra/issues/174.	2021-07-06 11:50:09 +02:00
decentral1se	8519cb8661	Appease shellcheck and revert to original quote handling All checks were successful continuous-integration/drone/push Build is passing Details	2021-07-06 11:18:50 +02:00
decentral1se	3c30d3621b	Support restarting a service Closes https://git.autonomic.zone/coop-cloud/abra/issues/200.	2021-07-06 11:12:49 +02:00
decentral1se	76a0badc5a	Add new change log entries	2021-07-06 10:53:31 +02:00
decentral1se	b2e0a95a11	Override ARGS and fail correctly See https://github.com/Coop-Cloud/peertube/issues/1.	2021-07-06 10:53:08 +02:00
decentral1se	ace854e1d7	Don't describe the what here	2021-07-06 10:40:09 +02:00
decentral1se	bd7688f9e7	Do not install deps on CLI upgrade [ci skip]	2021-07-06 00:13:22 +02:00
decentral1se	d7a4c2cebe	This has to be already installed [ci skip]	2021-07-06 00:12:02 +02:00
decentral1se	d9a0922b2c	Add upgrade note [ci skip]	2021-07-06 00:09:25 +02:00
decentral1se	32a86e0317	Add change log entry All checks were successful continuous-integration/drone/push Build is passing Details	2021-07-06 00:06:39 +02:00
decentral1se	b1c5391a91	Use latest yq	2021-07-06 00:06:07 +02:00
decentral1se	b813f6b90e	Drop additional check All checks were successful continuous-integration/drone/push Build is passing Details This forces the `require yq` to only happen at the start of the top-level functions which makes more sense and is easier to manage. Closes https://git.autonomic.zone/coop-cloud/abra/issues/183.	2021-07-06 00:04:19 +02:00
decentral1se	73de76fc04	Remove unused function	2021-07-06 00:04:14 +02:00
decentral1se	5c5cbbf20f	Add ASCII radness [ci skip]	2021-07-06 00:01:32 +02:00
decentral1se	19498d9494	Fix typo [ci skip]	2021-07-05 23:58:39 +02:00
decentral1se	6f6a9ab413	Update change log entry All checks were successful continuous-integration/drone/push Build is passing Details	2021-07-05 23:56:37 +02:00
decentral1se	aa81d26d08	Use pwgen/pwqgen if installed Closes https://git.autonomic.zone/coop-cloud/abra/issues/197.	2021-07-05 23:55:23 +02:00
decentral1se	cc4efe69bf	Merge pull request 'Install requirements via install script' (#198 ) from requirements-install-script into main All checks were successful continuous-integration/drone/push Build is passing Details Reviewed-on: https://git.autonomic.zone/coop-cloud/abra/pulls/198	2021-07-05 23:49:26 +02:00