Compare commits

...

36 Commits
10.0.0 ... main

Author SHA1 Message Date
decentral1se e6f4e942a2
Add title 2021-09-11 12:19:46 +02:00
decentral1se 419e893968
Add issue template 2021-09-11 12:19:01 +02:00
decentral1se 4529c05d2b
fix: fix cached versions lookup logic
continuous-integration/drone/push Build is failing Details
2021-09-06 17:25:31 +02:00
decentral1se 32b11c9bee
fix: parse version listing properly
continuous-integration/drone/push Build is passing Details
2021-09-06 13:30:26 +02:00
decentral1se f1c1f25741
abra speaks the new list format. Also new patch
continuous-integration/drone/push Build is passing Details
2021-09-06 13:12:37 +02:00
decentral1se a515198b9f
fix: support ordered version listing
See coop-cloud/go-abra#44.
2021-09-06 12:44:51 +02:00
roxxers 55138b7e0f fix: add renamed aur repo to ignore list
continuous-integration/drone/push Build is passing Details
2021-09-03 19:06:41 +00:00
3wc 78ab592209 Remove .envrc check
continuous-integration/drone/push Build is passing Details
2021-08-18 17:52:44 +02:00
3wc fdbbe93679 Ignore tagcmp and abra-aur in apps.json
continuous-integration/drone/push Build is passing Details
2021-08-17 03:26:11 +02:00
3wc cfdf7f82f6 Various updates for great git.coopcloud.tech migration
continuous-integration/drone/push Build is passing Details
2021-08-17 03:07:52 +02:00
3wc f69e155d27 Don't `set -x` in that installer
continuous-integration/drone/push Build is passing Details
2021-08-16 18:46:27 +02:00
3wc 9b7674c6d4 Attempt to fix CI/CD 💪
continuous-integration/drone Build is failing Details
continuous-integration/drone/push Build is passing Details
2021-08-16 04:08:26 +02:00
3wc 1c820c70fb $another_installer_fix
continuous-integration/drone/push Build is failing Details
2021-08-11 02:05:05 +02:00
3wc e92fa554d4 Properly fix `abra upgrade`
continuous-integration/drone/push Build is failing Details
2021-08-11 01:54:48 +02:00
3wc 6ac14f55ca Bump version in installer
continuous-integration/drone/push Build is failing Details
2021-08-11 01:48:06 +02:00
3wc 71820f7e0b jq -> $JQ
continuous-integration/drone/push Build is failing Details
2021-08-11 01:44:32 +02:00
3wc 207728e1be Also install git
continuous-integration/drone/push Build is failing Details
2021-08-10 00:39:05 +02:00
decentral1se 36e470c8e7
Front-line that deprecation notice
continuous-integration/drone/push Build is failing Details
2021-08-02 11:32:52 +02:00
decentral1se 0096e0d30b
Add deprecation notice
continuous-integration/drone/push Build is failing Details
See coop-cloud/organising#107.
2021-08-02 11:29:33 +02:00
decentral1se a636d2f17c
New patch release
continuous-integration/drone/push Build is failing Details
2021-07-30 19:33:29 +02:00
3wordchant 179ed64e0f Merge pull request 'Update abra git repo url' (#207) from nicksellen/abra:main into main
continuous-integration/drone/push Build is failing Details
Reviewed-on: coop-cloud/abra#207
2021-07-30 17:01:07 +00:00
nicksellen 3ab85e4291 Update abra git repo url
continuous-integration/drone/pr Build is passing Details
2021-07-30 16:48:29 +00:00
decentral1se e012de44d7
Skip that repo too
continuous-integration/drone/push Build is passing Details
2021-07-14 10:16:05 +02:00
decentral1se edb7297e1f
Add change log [ci skip] 2021-07-12 19:42:33 +02:00
3wc 41e0b8bf12 Update CHANGELOG
[ci skip]
2021-07-11 17:22:44 +02:00
3wc b694c37073 More checks in `recipe .. lint` 2021-07-11 17:22:44 +02:00
3wc 19041af9d5 Enable abra-capsul, fix plugin clone URL 2021-07-11 17:22:44 +02:00
decentral1se 7a1a436601
Pass over that repo too
continuous-integration/drone/push Build is passing Details
2021-07-11 11:10:50 +02:00
decentral1se 3d5d3ff3ac
Attempt to unbork interactive breakage
continuous-integration/drone/push Build is passing Details
See https://git.autonomic.zone/coop-cloud/abra/issues/204.
2021-07-10 16:00:00 +02:00
3wc 349b468140 Revert "Override ARGS and fail correctly"
continuous-integration/drone/push Build is passing Details
This reverts commit b2e0a95a11.
2021-07-10 14:46:45 +02:00
3wc e982a45b5e Initial stab at `recipe .. lint`
Ref #202
2021-07-10 14:46:18 +02:00
decentral1se 9f835318d2
Ignore new apps repo
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
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
10 changed files with 354 additions and 187 deletions

View File

@ -48,9 +48,9 @@ steps:
- name: trigger downstream builds
image: plugins/downstream
settings:
server: https://drone.autonomic.zone
server: https://build.coopcloud.tech
token:
from_secret: decentral1se_token
from_secret: coopcloud_drone_token
fork: true
repositories:
- coop-cloud/drone-abra
@ -72,7 +72,7 @@ steps:
roomid: "IFazIpLtxiScqbHqoa:autonomic.zone"
userid: "@autono-bot:autonomic.zone"
accesstoken:
from_secret: autono_bot_access_token
from_secret: autonobot_rocketchat_access_token
depends_on:
- run shellcheck
- run flake8

8
.gitea/ISSUE_TEMPLATE.md Normal file
View File

@ -0,0 +1,8 @@
---
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)

View File

@ -9,13 +9,36 @@
# 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` ([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))
@ -25,67 +48,67 @@
- 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 changes when asking to commit during release logic ([3f0a907b5](https://git.autonomic.zone/coop-cloud/rocketchat/commit/3f0a907b57acf960d6befab3d943982d956e2474))
- 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))
@ -100,53 +123,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))

View File

@ -15,7 +15,7 @@ RUN mkdir -p ~/.abra/apps
RUN mkdir -p ~/.abra/vendor
RUN mkdir -p ~/.ssh/
RUN ssh-keyscan -p 2222 git.autonomic.zone > ~/.ssh/known_hosts
RUN ssh-keyscan -p 2222 git.coopcloud.tech > ~/.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

View File

@ -1,5 +1,13 @@
# 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

376
abra
View File

@ -2,10 +2,10 @@
# 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.0"
ABRA_VERSION="10.0.5"
ABRA_BACKUP_DIR="${ABRA_BACKUP_DIR:-$ABRA_DIR/backups}"
ABRA_VENDOR_DIR="$ABRA_DIR/vendor"
ABRA_APPS_JSON="${ABRA_DIR}/apps.json"
@ -51,6 +51,7 @@ 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>
@ -177,103 +178,103 @@ 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: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(){
switch __secrets 15; }; node_16(){ switch __all 16; }; node_17(){
switch __update 17; }; node_18(){ switch __force 18; }; node_19(){
switch __fast 19; }; node_20(){ switch __chaos 20; }; node_21(){
switch __volumes 21; }; node_22(){ switch __no_tty 22; }; node_23(){
value __user 23; }; node_24(){ switch __bump 24; }; node_25(){ switch __dev 25
}; node_26(){ value _type_ a; }; node_27(){ value _app_ a; }; node_28(){
value _service_ a; }; node_29(){ value _version_ a; }; node_30(){ value _src_ a
}; node_31(){ value _dst_ a; }; node_32(){ value _backup_file_ a; }; node_33(){
value _args_ a true; }; node_34(){ value _secret_ a; }; node_35(){ value _cmd_ a
}; node_36(){ value _data_ a; }; node_37(){ value _volume_ a; }; node_38(){
value _command_ a; }; node_39(){ value _recipe_ a; }; node_40(){ value _host_ a
}; node_41(){ value _user_ a; }; node_42(){ value _port_ a; }; node_43(){
value _provider_ a; }; node_44(){ value _subcommands_ a true; }; node_45(){
_command app; }; node_46(){ _command list; }; node_47(){ _command ls; }
node_48(){ _command new; }; node_49(){ _command backup; }; node_50(){
_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 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_ \
var__service_ var__version_ var__src_ var__dst_ var__backup_file_ var__args_ \
var__secret_ var__cmd_ var__data_ var__volume_ var__command_ var__recipe_ \
var__host_ var__user_ var__port_ var__provider_ var__subcommands_ var_app \
var_list var_ls var_new var_backup var_deploy var_check var_version var_config \
var_cp var_logs var_ps var_restore var_rm var_delete var_run var_rollback \
var_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" \
printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:2862}
usage=${DOC:368:1925}; digest=d31d6
shorts=(-e -C -d -s -U -n -b -v -h '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
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)
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(){
value __env 0; }; node_1(){ switch __skip_check 1; }; node_2(){ switch __debug 2
}; node_3(){ value __stack 3; }; node_4(){ switch __skip_update 4; }; node_5(){
switch __no_prompt 5; }; node_6(){ value __branch 6; }; node_7(){
switch __verbose 7; }; node_8(){ switch __help 8; }; node_9(){ switch __status 9
}; node_10(){ value __server 10; }; node_11(){ value __type 11; }; node_12(){
value __domain 12; }; node_13(){ value __app_name 13; }; node_14(){
switch __pass 14; }; node_15(){ switch __secrets 15; }; node_16(){
switch __all 16; }; node_17(){ switch __update 17; }; node_18(){
switch __force 18; }; node_19(){ switch __fast 19; }; node_20(){
switch __chaos 20; }; node_21(){ switch __volumes 21; }; node_22(){
switch __no_tty 22; }; node_23(){ value __user 23; }; node_24(){
switch __bump 24; }; node_25(){ switch __dev 25; }; node_26(){ value _type_ a; }
node_27(){ value _app_ a; }; node_28(){ value _service_ a; }; node_29(){
value _version_ a; }; node_30(){ value _src_ a; }; node_31(){ value _dst_ a; }
node_32(){ value _backup_file_ a; }; node_33(){ value _args_ a true; }
node_34(){ value _secret_ a; }; node_35(){ value _cmd_ a; }; node_36(){
value _data_ a; }; node_37(){ value _volume_ a; }; node_38(){ value _command_ a
}; node_39(){ value _recipe_ a; }; node_40(){ value _host_ a; }; node_41(){
value _user_ a; }; node_42(){ value _port_ a; }; node_43(){ value _provider_ a
}; node_44(){ value _subcommands_ a true; }; node_45(){ _command app; }
node_46(){ _command list; }; node_47(){ _command ls; }; node_48(){ _command new
}; node_49(){ _command backup; }; node_50(){ _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 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 lint; }; node_72(){ _command versions; }; node_73(){ _command server; }
node_74(){ _command add; }; node_75(){ _command __ --; }; node_76(){
_command init; }; node_77(){ _command apps; }; node_78(){ _command upgrade; }
node_79(){ _command doctor; }; node_80(){ _command help; }; node_81(){
optional 0 1 2 3 4 5 6 7 8; }; node_82(){ optional 81; }; node_83(){
either 46 47; }; node_84(){ required 83; }; node_85(){ optional 9; }; node_86(){
optional 10; }; node_87(){ optional 11; }; node_88(){ required 82 45 84 85 86 87
}; node_89(){ optional 12; }; node_90(){ optional 13; }; node_91(){ optional 14
}; node_92(){ optional 15; }; node_93(){ required 82 45 48 86 89 90 91 92 26; }
node_94(){ either 28 16; }; node_95(){ required 94; }; node_96(){
required 82 45 27 49 95; }; node_97(){ optional 17; }; node_98(){ optional 18; }
node_99(){ optional 19; }; node_100(){ optional 20; }; node_101(){ optional 29
}; node_102(){ required 82 45 27 50 97 98 99 100 101; }; node_103(){
required 82 45 27 51; }; node_104(){ required 82 45 27 52; }; node_105(){
required 82 45 27 53; }; node_106(){ required 82 45 27 54 30 31; }; node_107(){
optional 28; }; node_108(){ required 82 45 27 55 107; }; node_109(){
required 82 45 27 56; }; node_110(){ required 82 45 27 57 95; }; node_111(){
either 58 59; }; node_112(){ required 111; }; node_113(){ optional 21; }
node_114(){ required 82 45 27 112 113 92; }; node_115(){ optional 32; }
node_116(){ required 82 45 27 57 28 115; }; node_117(){ optional 22; }
node_118(){ optional 23; }; node_119(){ oneormore 33; }; node_120(){
required 82 45 27 60 117 118 28 119; }; node_121(){ required 82 45 27 61 101; }
node_122(){ required 82 45 27 62 28; }; node_123(){ required 34 29; }
node_124(){ either 123 16; }; node_125(){ required 124; }; node_126(){
optional 35; }; node_127(){ required 82 45 27 63 64 125 126 91; }; node_128(){
required 82 45 27 63 65 34 29 36 91; }; node_129(){ either 34 16; }; node_130(){
required 129; }; node_131(){ required 82 45 27 63 112 130 91; }; node_132(){
required 82 45 27 66; }; node_133(){ required 82 45 27 67 47; }; node_134(){
either 37 16; }; node_135(){ required 134; }; node_136(){
required 82 45 27 67 112 135; }; node_137(){ optional 119; }; node_138(){
required 82 45 27 38 137; }; node_139(){ required 82 68 47; }; node_140(){
required 82 68 69 39; }; node_141(){ optional 24; }; node_142(){
required 82 68 39 70 98 141; }; node_143(){ required 82 68 39 71; }; node_144(){
required 82 68 39 72; }; node_145(){ optional 41; }; node_146(){ optional 42; }
node_147(){ required 82 73 74 40 145 146; }; node_148(){
required 82 73 48 43 75 33; }; node_149(){ required 82 73 84; }; node_150(){
required 82 73 40 58; }; node_151(){ required 82 73 40 76; }; node_152(){
required 82 73 40 77 85; }; node_153(){ optional 25; }; node_154(){
required 82 78 153; }; node_155(){ required 82 52; }; node_156(){ required 82 79
}; node_157(){ oneormore 44; }; node_158(){ optional 157; }; node_159(){
required 82 80 158; }; node_160(){ required 82; }; node_161(){
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_162(){ required 161; }; cat <<<' docopt_exit() {
[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:368:1925}" >&2
exit 1; }'; unset var___env var___skip_check var___debug var___stack \
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_ \
var__app_ var__service_ var__version_ var__src_ var__dst_ var__backup_file_ \
var__args_ var__secret_ var__cmd_ var__data_ var__volume_ var__command_ \
var__recipe_ var__host_ var__user_ var__port_ var__provider_ var__subcommands_ \
var_app var_list var_ls var_new var_backup var_deploy var_check var_version \
var_config var_cp var_logs var_ps var_restore var_rm var_delete var_run \
var_rollback var_restart var_secret var_generate var_insert var_undeploy \
var_volume var_recipe var_create var_release var_lint var_versions var_server \
var_add var___ var_init var_apps var_upgrade var_doctor var_help; parse 162 "$@"
local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__env" \
"${prefix}__skip_check" "${prefix}__debug" "${prefix}__stack" \
"${prefix}__skip_update" "${prefix}__no_prompt" "${prefix}__branch" \
"${prefix}__verbose" "${prefix}__help" "${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_" \
@ -288,17 +289,17 @@ local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__no_prompt" \
"${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}'
"${prefix}lint" "${prefix}versions" "${prefix}server" "${prefix}add" \
"${prefix}__" "${prefix}init" "${prefix}apps" "${prefix}upgrade" \
"${prefix}doctor" "${prefix}help"; eval "${prefix}"'__env=${var___env:-}'
eval "${prefix}"'__skip_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}"'__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}"'__status=${var___status:-false}'
eval "${prefix}"'__server=${var___server:-}'
eval "${prefix}"'__type=${var___type:-}'
@ -358,6 +359,7 @@ 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}'
@ -367,9 +369,9 @@ eval "${prefix}"'upgrade=${var_upgrade:-false}'
eval "${prefix}"'doctor=${var_doctor:-false}'
eval "${prefix}"'help=${var_help:-false}'; local docopt_i=1
[[ $BASH_VERSION =~ ^4.3 ]] && docopt_i=2; for ((;docopt_i>0;docopt_i--)); do
declare -p "${prefix}__no_prompt" "${prefix}__branch" "${prefix}__verbose" \
"${prefix}__skip_update" "${prefix}__env" "${prefix}__help" "${prefix}__debug" \
"${prefix}__skip_check" "${prefix}__stack" "${prefix}__status" \
declare -p "${prefix}__env" "${prefix}__skip_check" "${prefix}__debug" \
"${prefix}__stack" "${prefix}__skip_update" "${prefix}__no_prompt" \
"${prefix}__branch" "${prefix}__verbose" "${prefix}__help" "${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" \
@ -386,9 +388,9 @@ declare -p "${prefix}__no_prompt" "${prefix}__branch" "${prefix}__verbose" \
"${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; }
"${prefix}lint" "${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")
@ -546,8 +548,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
error "Could not retrieve the $PLUGIN plugin, does it exist?"
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?"
fi
if [[ $(cd "$ABRA_DIR/plugins/$PLUGIN" && git branch --list | wc -l) == "0" ]]; then
@ -677,11 +679,6 @@ pwqgen_native() {
shuf -n 3 /usr/share/dict/words | tr -dc 'a-zA-Z0-9' | tr -d '\n'
}
# FIXME 3wc: update or remove
if [ -z "$ABRA_ENV" ] && [ -f .env ] && type direnv > /dev/null 2>&1 && ! direnv status | grep -q 'Found RC allowed true'; then
error "direnv is blocked, run direnv allow"
fi
###### Parse apps.json
get_recipes() {
@ -700,7 +697,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 | .[]" - | sort)
mapfile -t RECIPE_VERSIONS < <(echo "$recipe_json" | $JQ -r ".versions | .[] | keys | add")
fi
}
@ -835,7 +832,7 @@ ensure_stack_deployed() {
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\")")
healthcheck=$(docker inspect --format "{{ json .State }}" "$service" | $JQ "try(.Health.Status // \"missing\")")
name=$(docker inspect --format '{{ index .Config.Labels "com.docker.swarm.service.name" }}' "$service")
if [[ ${MISSING[*]} =~ ${name} ]] || [[ ${HEALTHY[*]} =~ ${name} ]]; then
@ -1717,7 +1714,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.cloud.autonomic.zone/secrets/ for more on secrets"
warning "See https://docs.coopcloud.tech/secrets/ for more on secrets"
msg_already_outputted="true"
fi
@ -1861,14 +1858,15 @@ sub_app_run(){
fi
debug "Using container ID ${CONTAINER}"
# shellcheck disable=SC2145
debug "Running command: docker exec $RUN_USER $ARGS $CONTAINER $@"
exit
# shellcheck disable=SC2086
if ! docker exec $RUN_USER $ARGS "$CONTAINER" "$@"; then
exit 1
fi
docker exec $RUN_USER $ARGS "$CONTAINER" "$@"
# shellcheck disable=SC2181
if [[ $? != 0 ]]; then exit 1; fi
return
}
@ -2121,6 +2119,126 @@ 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]
@ -2461,7 +2579,7 @@ sub_server_new() {
PROVIDER="$abra__provider_"
if [ "$PROVIDER" != "hetzner" ]; then
if [ "$PROVIDER" != "hetzner" ] && [ "$PROVIDER" != "capsul" ]; then
error "Unknown provider plugin 'abra-${PROVIDER}'"
fi
@ -2532,7 +2650,7 @@ sub_upgrade() {
if [[ "$abra___dev" == "true" ]]; then
curl https://install.abra.coopcloud.tech | bash -s -- --dev --no-deps
else
curl https://install.abra.coopcloud.tech | bash --no-deps
curl https://install.abra.coopcloud.tech | bash -s -- --no-deps
fi
}

View File

@ -14,11 +14,15 @@ 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",
@ -27,11 +31,14 @@ 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")
@ -59,7 +66,7 @@ def _run_cmd(cmd, shell=False, **kwargs):
def get_repos_json():
""" Retrieve repo list from Gitea """
url = "https://git.autonomic.zone/api/v1/orgs/coop-cloud/repos"
url = "https://git.coopcloud.tech/api/v1/orgs/coop-cloud/repos"
log.info(f"Retrieving {url}")

View File

@ -139,8 +139,13 @@ 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)
@ -155,7 +160,7 @@ def get_app_versions(app_path, cached_apps_json):
app_name = basename(app_path)
try:
existing_tags = cached_apps_json[app_name]["versions"].keys()
existing_tags = get_cached_versions(cached_apps_json, app_name)
except KeyError:
existing_tags = []
@ -171,9 +176,8 @@ def get_app_versions(app_path, cached_apps_json):
if service in ("null", "---"):
continue
if (
tag in existing_tags
and service in cached_apps_json[app_name]["versions"][tag]
if tag in existing_tags and service in get_cached_versions(
cached_apps_json, app_name
):
log.info(f"Skipping {tag} because we've already processed it")
existing_versions = cached_apps_json[app_name]["versions"][tag][service]
@ -206,7 +210,7 @@ def get_app_versions(app_path, cached_apps_json):
parsed_services.append(service)
versions[tag] = service_versions
versions.append({tag: service_versions})
_run_cmd(f"git checkout {initial_branch}")
@ -220,7 +224,7 @@ def main():
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:
dump(

View File

@ -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",
)

View File

@ -2,8 +2,8 @@
# shellcheck disable=SC2154,SC2034
ABRA_VERSION="10.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}"
@ -161,7 +161,8 @@ function install_requirements {
sudo apt update && sudo apt install -y \
passwdqc \
pwgen
pwgen \
git
echo "Install Docker (https://docs.docker.com/engine/install/debian/)?"
prompt_confirm
@ -169,7 +170,7 @@ function install_requirements {
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.autonomic.zone/coop-cloud/abra#requirements for more"
echo "See https://git.coopcloud.tech/coop-cloud/abra#requirements for more"
fi
}
@ -206,10 +207,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