Compare commits

...

673 Commits

Author SHA1 Message Date
nicksellen 3ab85e4291 Update abra git repo url 2021-07-30 16:48:29 +00:00
decentral1se e012de44d7
Skip that repo too 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 2021-07-11 11:10:50 +02:00
decentral1se 3d5d3ff3ac
Attempt to unbork interactive breakage
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"
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 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 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 2021-07-06 12:34:15 +02:00
decentral1se cdd196346a
Add label generation checking
Closes https://git.autonomic.zone/coop-cloud/abra/issues/186.
2021-07-06 12:27:06 +02:00
decentral1se 78287fec37
Add change log entry 2021-07-06 11:51:03 +02:00
decentral1se 4b820457de
Output diff before committing changes
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 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 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
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 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
Reviewed-on: https://git.autonomic.zone/coop-cloud/abra/pulls/198
2021-07-05 23:49:26 +02:00
decentral1se 6c7b53f585
Install requirements via install script
Closes https://git.autonomic.zone/coop-cloud/abra/issues/196.
2021-07-05 23:48:03 +02:00
decentral1se 32bf28e7a9
Follow our usual convention of writing it now 2021-07-05 23:41:45 +02:00
decentral1se 624815e5b1
Use global ignore and avoid this hack 2021-07-05 23:35:48 +02:00
decentral1se e9fb9e56ad
Drop pwgen/pwqgen requirements
Closes https://git.autonomic.zone/coop-cloud/abra/issues/167.
2021-07-04 23:06:20 +02:00
decentral1se 283eb21e29
Add log entry 2021-07-04 22:42:44 +02:00
decentral1se 92f49d56dd
Use case insensitive awk/sed
Closes https://git.autonomic.zone/coop-cloud/abra/issues/170.
2021-07-04 22:41:48 +02:00
decentral1se d9ff48b55b
Add change log entry 2021-07-04 22:14:42 +02:00
decentral1se 3d8ce3492e
Reflect chaos deploy when selecting recipe version
Closes https://git.autonomic.zone/coop-cloud/abra/issues/185.
2021-07-04 22:13:57 +02:00
decentral1se 07696760b7
Output all elements when debugging 2021-07-04 21:59:47 +02:00
decentral1se 43b4a01f8a
Make logging reflect reality + do more debugging
See https://git.autonomic.zone/coop-cloud/abra/issues/193.
2021-07-04 21:51:55 +02:00
decentral1se bb3b324e07
Add change log entry 2021-07-04 21:45:02 +02:00
decentral1se eb9d1b883b
Ignore this warning for now 2021-07-04 21:44:13 +02:00
3wordchant 6f6140ced2 Merge pull request 'Don't generate commented out secrets. Throw an error when can't put the secret in docker' (#195) from knoflook/abra:main into main
Reviewed-on: https://git.autonomic.zone/coop-cloud/abra/pulls/195
2021-07-04 21:18:13 +02:00
knoflook cb225908d0 Don't generate commented out secrets. Throw an error when can't put the secret in docker 2021-07-03 19:43:42 +02:00
decentral1se f2892bad6f
Fix that sentence [ci skip] 2021-06-27 21:14:19 +02:00
decentral1se 480b1453ec
Add change log entry [ci skip] 2021-06-27 21:13:21 +02:00
decentral1se 0ab2b3a652 Merge pull request 'Make ensure_stack_deployed more reliable' (#177) from improved-stack-deploy-guarantees into main
Reviewed-on: https://git.autonomic.zone/coop-cloud/abra/pulls/177
2021-06-27 21:03:48 +02:00
decentral1se 93714a593b
`ensure_stack_deployed` is now somewhat more reliable
Closes https://git.autonomic.zone/coop-cloud/abra/issues/165.
2021-06-27 21:03:24 +02:00
decentral1se 57f3f96bbc
Use new name 2021-06-17 21:48:55 +02:00
decentral1se e1959506c7
Add change log entry [ci skip] 2021-06-17 21:42:33 +02:00
decentral1se 7482362af1
Support logging in via Skopeo
See https://git.autonomic.zone/coop-cloud/auto-apps-json/issues/1.
2021-06-17 21:40:58 +02:00
decentral1se e8510c8aeb
Add change log and --output for app-json.py
Closes https://git.autonomic.zone/coop-cloud/auto-apps-json/issues/2.
2021-06-17 21:25:29 +02:00
decentral1se 4042e10985
Use new image 2021-06-17 21:00:43 +02:00
decentral1se f7cd0eb54c
Use new name 2021-06-17 16:34:03 +02:00
decentral1se a571b839a8
Use proper jq path
Closes https://git.autonomic.zone/coop-cloud/abra/issues/184.
2021-06-17 09:34:36 +02:00
decentral1se fae13d9af8
Define our own repos to skip here for mirroring 2021-06-17 07:54:54 +02:00
decentral1se 9c9f7225e7
Use new user/org for mirroring 2021-06-17 07:43:00 +02:00
3wc 352cc0939b Fix typo in missing version error message 2021-06-13 20:48:20 +02:00
decentral1se 2ca7884bbe
Fix bump releases
Closes https://git.autonomic.zone/coop-cloud/abra/issues/180.
2021-06-11 00:36:40 +02:00
decentral1se fa54705f79 Merge pull request 'Prefer --fast for skipping all checks' (#175) from prefer-fast-option into main
Reviewed-on: https://git.autonomic.zone/coop-cloud/abra/pulls/175
2021-06-11 00:29:20 +02:00
decentral1se 8d802c78aa
Prefer --fast for skipping all checks
Closes https://git.autonomic.zone/coop-cloud/abra/issues/169
2021-06-11 00:27:50 +02:00
decentral1se 1c022fb616 Merge pull request 'Add --bump release logic' (#176) from add-bump-logic into main
Reviewed-on: https://git.autonomic.zone/coop-cloud/abra/pulls/176
2021-06-10 12:19:35 +02:00
decentral1se 0655c03434
Add --bump release logic
Closes https://git.autonomic.zone/coop-cloud/abra/issues/173.
2021-06-10 12:18:27 +02:00
decentral1se f6bdf596f5
Bump to next version 2021-06-10 11:43:00 +02:00
decentral1se 6c6e6808c9 Merge pull request 'Add --chaos flag' (#179) from chaos-deploy-flag into main
Reviewed-on: https://git.autonomic.zone/coop-cloud/abra/pulls/179
2021-06-10 11:41:26 +02:00
decentral1se a3ffd7f239
Add --chaos flag
Closes https://git.autonomic.zone/coop-cloud/abra/issues/178.
2021-06-10 11:40:25 +02:00
decentral1se a019417fd2
Avoid PR publishing 2021-06-08 12:27:50 +02:00
decentral1se 743600b94e
Use access token for pushing 2021-06-05 22:54:16 +02:00
decentral1se f4c2da894b
Add change log entry [ci skip] 2021-06-05 22:43:50 +02:00
decentral1se 4ef433312d
Add mirroring script 2021-06-05 22:41:50 +02:00
decentral1se 9f69532dca
Use vendored JQ 2021-06-05 08:57:35 +02:00
decentral1se 3a97358f30
Vendor later versions of jq/yq 2021-06-05 08:51:10 +02:00
decentral1se 1e19805757
Drop trailing slash 2021-06-05 08:51:02 +02:00
decentral1se 389ad9d049
Drop non-existant flag 2021-06-05 08:41:14 +02:00
decentral1se 93ffc633f3
Prepare more things for this image 2021-06-05 08:39:13 +02:00
decentral1se b61c9410a0
Drop the apps.json in the cwd 2021-06-05 08:26:43 +02:00
decentral1se bbab900ebc
Move apps.json generation stuff out of abra
See https://git.autonomic.zone/coop-cloud/abra/issues/125.
2021-06-05 08:22:01 +02:00
decentral1se 36d4dbc5cf
Ignore that new repo 2021-06-05 08:15:11 +02:00
decentral1se a4ade1463f
Copy over app-json script 2021-06-05 08:05:40 +02:00
decentral1se 20af4666c6
Remove and ignore pycache folders 2021-06-05 08:05:29 +02:00
decentral1se d15b031f33
Ignore those pyc files 2021-06-05 08:04:58 +02:00
decentral1se a7f0bbde62
Add openssh machinery 2021-06-05 08:03:42 +02:00
decentral1se 76d5a1026a
Support HTTPS/SSH cloning 2021-06-05 07:58:24 +02:00
decentral1se 7b0fb50e7f
Abstract common functions into a library 2021-06-05 07:55:05 +02:00
decentral1se f92364af80
Run downstream builds
See https://git.autonomic.zone/coop-cloud/abra/issues/171.
2021-06-05 07:25:41 +02:00
decentral1se ca2a3c8b58
Add notify failures 2021-06-03 23:31:31 +02:00
decentral1se a5c5526948
Add log entry [ci skip] 2021-06-03 23:15:08 +02:00
decentral1se d16eb0e309
Drop force and keep going on non-interctive git stuff 2021-06-03 22:12:47 +02:00
decentral1se 3cff8aaada
Better grep and apps folder 2021-06-03 21:52:51 +02:00
decentral1se 4ff4c83154
Use dev all the time 2021-06-03 21:04:58 +02:00
decentral1se f953743a7c
Let the plugin do tagging for us as well 2021-06-03 21:01:39 +02:00
decentral1se e84062e67c
Use success instead (helpful for automation) 2021-06-03 20:58:38 +02:00
decentral1se e573794367
Skip those repos too 2021-06-03 11:45:30 +02:00
decentral1se 87f9c16db4
Add log entry [ci skip] 2021-06-03 11:41:47 +02:00
decentral1se 9fadc430a7
Add renovate script 2021-06-03 11:40:55 +02:00
decentral1se 53cec2469b
Handle forcing re-upload 2021-06-03 10:34:19 +02:00
decentral1se a1de7f10cb
Don't edit git stuff when running non-interactively 2021-06-03 10:17:09 +02:00
decentral1se ece968478d
Add log entry 2021-06-03 10:07:23 +02:00
decentral1se 3759bcd641
Support unattended mode for recipe releasing 2021-06-03 10:06:40 +02:00
decentral1se 0ff08b5d34
Add missing dep and make special place in docs 2021-06-03 09:58:28 +02:00
decentral1se 8b541623ad
Add change log entry [ci skip] 2021-06-03 09:55:35 +02:00
decentral1se f24259dbfc
Sort on lines [ci skip] 2021-06-03 09:54:32 +02:00
decentral1se 40259f5e97
Add git also 2021-06-03 09:53:56 +02:00
decentral1se fd471eb3f1
Install dependencies 2021-06-03 09:52:14 +02:00
decentral1se a4633f06bd
Add note about container [ci skip] 2021-06-03 09:47:46 +02:00
decentral1se 0d6031fef9
Also depend on tests [ci skip] 2021-06-03 09:44:47 +02:00
decentral1se 64d578cf91
Add docker image publishing 2021-06-03 09:43:44 +02:00
decentral1se e216fe290b
Actually use that image as it is required 2021-06-03 09:11:50 +02:00
decentral1se 207278af75
Use same language 2021-06-03 09:09:44 +02:00
decentral1se ff309182ea
Drop kcov/codecov for now, use upstream bats 2021-06-03 09:07:55 +02:00
decentral1se 542cf793d2
Remove app which is gone away now 2021-06-01 00:08:21 +02:00
decentral1se ad1fe2b8d7
Bump new patch release 2021-05-31 23:59:38 +02:00
decentral1se 0771d58b69
Fix typo and add help fix commit 2021-05-31 23:58:25 +02:00
decentral1se b24cdce354
Add --no-state-poll
See https://git.autonomic.zone/coop-cloud/abra/issues/165.
2021-05-31 23:23:14 +02:00
decentral1se 499cc46583
Migrate `abra` installer to coopcloud.tech domain
Closes https://git.autonomic.zone/coop-cloud/abra/issues/150.
2021-05-31 21:10:51 +02:00
decentral1se 0af0ea096f
Add change log entry 2021-05-31 21:01:21 +02:00
decentral1se 925df196fc
Only ouput secrets warning once
Closes https://git.autonomic.zone/coop-cloud/abra/issues/143.
2021-05-31 21:00:40 +02:00
3wc efad71c470 Fix help for `.. app .. volume ls` 2021-05-31 12:16:27 +02:00
decentral1se cac13fb64e
Getting v8 out 2021-05-30 23:57:09 +02:00
decentral1se 42923ced55
Follow along with the formatting 2021-05-30 22:06:22 +02:00
decentral1se 6a12955649 Merge pull request 'Add `app .. volume` commands, working vol deletion' (#166) from volume-up into main
Reviewed-on: https://git.autonomic.zone/coop-cloud/abra/pulls/166
2021-05-30 22:04:35 +02:00
3wc ceccb28380
.. and update CHANGELOG and fix typos 2021-05-30 22:03:43 +02:00
3wc b033fe9450
Add `app .. volume` commands, working vol deletion
Fixes #161
2021-05-30 22:00:59 +02:00
3wc 0e29e78144 List some requirements in README
Closes #147
2021-05-30 21:25:33 +02:00
3wc c92f80cf7e Upd8 changelog 2021-05-30 20:16:55 +02:00
3wc a7f7c965c4 `deploy --fast` (The Homer Simpson way)
"Like the wrong way, but faster"
2021-05-30 20:14:41 +02:00
3wc e04c5228de Downgrade duplicate message about versions to info
Fixes #155
2021-05-30 20:12:35 +02:00
3wc 6c9dff0eed change.log 2021-05-30 19:53:35 +02:00
3wc c45598d7b4 Update apps.json 2021-05-30 19:51:04 +02:00
3wc 4e1c3bfe2f Fallback app name in app.json creation
Fixes #157
2021-05-30 19:49:54 +02:00
3wc 615c6b0614 CHANGELOG++ 2021-05-30 14:37:09 +02:00
3wc b14219b492 Tweak regex for README metadata-parsing..
..to allow use of `- `-style Markdown lists (e.g. Wordpress).

Bonus: adds "sso" key to features data.
2021-05-30 14:35:18 +02:00
3wc 8c93d1ae88 Add Bash completion for `abra recipe ..` 2021-05-30 14:33:57 +02:00
3wc cf2ae05dfd Update CHANGELOG 2021-05-30 00:21:04 +02:00
3wc 70974690f9 Switch from wget to cURL 2021-05-30 00:21:04 +02:00
3wc a4f3fc5ce2 Bad YAML = showstopper
Fixes #154
2021-05-30 00:20:59 +02:00
3wc 8a4f82ba84 Sprinkle some `sudo` 2021-05-29 23:37:31 +02:00
3wc a1534a244a Remove bogus slash in GIT_URL
Fixes #164
2021-05-29 23:37:31 +02:00
decentral1se fccd7865f5
Upload latest keycloak tag 2021-05-27 14:10:39 +02:00
decentral1se 4e84664310
Remove weird version 2021-05-17 09:17:39 +02:00
3wc 047c0e6d47 Update apps.json 2021-05-15 23:18:38 +02:00
decentral1se fc2d770099
Add log entry 2021-05-14 16:12:00 +02:00
decentral1se 1b85bf3d37
Fix secret length generation 2021-05-14 16:11:10 +02:00
roxxers 2d6a08a671 Merge pull request 'refactor: changed misc prompts to convention' (#163) from prompt-cleanup into main
Reviewed-on: https://git.autonomic.zone/coop-cloud/abra/pulls/163
2021-05-12 16:40:17 +02:00
Roxie Gibson 316bcd5a68
Merge branch 'prompt-cleanup' of ssh://git.autonomic.zone:2222/coop-cloud/abra into prompt-cleanup 2021-05-12 15:39:26 +01:00
Roxie Gibson 1a4cf9be17
refactor: changed misc prompts to convention
Missed issue beore since I only changed the function, not these strays
Contiunation of PR #162
2021-05-12 15:37:42 +01:00
Roxie Gibson eadb353c2e
refactor: changed misc prompts to convention
Missed issue beore since I only changed the function, not these strays
Contiunation of PR #162
2021-05-11 14:40:02 +01:00
decentral1se f374b1bfa1
New patch release 2021-05-10 10:39:57 +02:00
decentral1se 0e6b0e0879
Add change log entry 2021-05-10 10:38:02 +02:00
decentral1se 3a353f4062
Possible fix to `invalid length "20"`?
See https://git.autonomic.zone/coop-cloud/abra/pulls/160.
2021-05-10 10:36:23 +02:00
decentral1se e0258d397b Merge pull request 'feat: switches to conventional confirmation prompt' (#162) from roxxers/abra:prompt into main
Reviewed-on: https://git.autonomic.zone/coop-cloud/abra/pulls/162
2021-05-10 10:26:09 +02:00
Roxie Gibson e8ac353453
feat: switches to conventional confirmation prompt 2021-05-08 21:45:52 +01:00
3wc 552abdd980 Don't clobber global $DOMAIN variable
Closes #156
2021-05-06 00:43:16 +02:00
3wc 935007dd86 Improve `recipe new` subcommand 2021-05-03 03:22:32 +02:00
decentral1se 2cd1d053f0
Update change log 2021-05-02 22:18:04 +02:00
decentral1se a1c8620cc0
Sort the JSON 2021-05-02 22:14:22 +02:00
decentral1se 39a7fc04fb
Sort that JSON 2021-05-02 22:14:15 +02:00
decentral1se a8b5fb5c1e
Cut a new release of the apps.json 2021-05-02 22:11:12 +02:00
decentral1se 18e22b24ea
Don't explode if missing the README 2021-05-02 22:10:58 +02:00
decentral1se b53a3ed3f7
Exclude that repo too 2021-05-02 21:58:02 +02:00
decentral1se 112787b3aa
Add gardening to exluded repos list 2021-05-02 21:48:35 +02:00
decentral1se 4f46ff7ee6
Remove that 2021-05-02 21:44:11 +02:00
decentral1se 845de093ba
Let the formatter run at that 2021-05-02 21:42:55 +02:00
decentral1se 65e83ed885
Exclude more repos 2021-05-02 21:42:34 +02:00
decentral1se b98d69b33e
Remove slightly off-topic comment 2021-05-02 20:30:09 +02:00
decentral1se d159b98c3c
Add other plugin repos 2021-05-02 20:30:08 +02:00
decentral1se 1ef5c3980d
Use new name of repos and sort 2021-05-02 20:30:08 +02:00
3wc ffc569e275 Further fix to #151 2021-04-30 22:55:59 +02:00
3wc 0e28af9eb1 app-json.py: parse emoji status scores into digits 2021-04-30 22:55:59 +02:00
decentral1se 4aec218719
Publish 0.7.3 2021-04-28 10:46:38 +02:00
decentral1se 07a9b3bd81
Another run at the abra apps JSON 2021-04-28 10:44:46 +02:00
decentral1se 78b9b8589e
Run formatter over this 2021-04-28 10:35:01 +02:00
3wc be3fd59c8c Fix minor version increment in `recipe .. release`
Closes #145
2021-04-27 19:30:47 +02:00
3wc 6480f5e5ff Update CHANGELOG 2021-04-27 19:18:58 +02:00
3wc 280238d95d Make `recipe .. release` handle missing `app` service
Closes #151
2021-04-27 19:09:39 +02:00
3wc 44b378abba apps-json.py: more metadata, skip abra-apps, pagination 2021-04-25 12:05:49 +02:00
3wc a6d7972bef Add more metadata to apps.json 2021-04-25 12:04:56 +02:00
decentral1se 625d9848a5
Add URL also 2021-04-18 17:48:36 +02:00
decentral1se 3bcb9ea13a
Remove abra there 2021-04-18 17:46:33 +02:00
decentral1se 72a30b9144
Fix typo 2021-04-18 17:44:44 +02:00
decentral1se f0019ea983
Fix path 2021-04-18 17:43:37 +02:00
decentral1se d15aad7bcf
Migrate URLs to coopcloud.tech 2021-04-18 17:42:42 +02:00
decentral1se e351615a69
Migrate to apps.json naming 2021-04-18 17:42:32 +02:00
decentral1se 2296ef52fa
Re-add entry 2021-04-18 17:27:32 +02:00
decentral1se 850c4894e7
Fix commit link 2021-04-18 17:26:42 +02:00
3wc edf443bed5 Update changelog
[ci skip]
2021-04-18 12:24:02 +02:00
3wc 6cb6ee6952 app-json: use parsed app category, cache repo list..
.. and add icons
2021-04-18 03:44:30 +02:00
3wc 762d12b61e More consistent debugging output 2021-04-18 03:44:30 +02:00
3wc 0e6aa957a4 Update CHANGELOG
[ci skip]
2021-04-18 03:44:28 +02:00
3wc 150c54da40 Add `recipe create`; tweak recipe version handling 2021-04-18 03:44:08 +02:00
3wc 75bd599a33 Update abra for new apps URL 2021-04-18 03:44:08 +02:00
3wc f0c80ee5b8 Domain switchover; accidental apps.json update 2021-04-18 03:44:07 +02:00
decentral1se 41573c3260
Add state debug for deployment checking 2021-04-18 00:12:11 +02:00
decentral1se 037e08a41a
Bump version to match latest release
Woops.
2021-04-18 00:05:51 +02:00
decentral1se f1b76d4313
Add change log entry [ci skip] 2021-04-17 23:54:45 +02:00
decentral1se c19c4db897
Choose latest commit message for new tags
Closes https://git.autonomic.zone/coop-cloud/abra/issues/144.
2021-04-17 23:54:06 +02:00
3wc 31fdbccfad Update CHANGELOG
[ci skip]
2021-04-17 12:31:19 +02:00
3wc 208b11af0a Only check for pw(q)gen if we're tryna use them
Ref #147
2021-04-17 12:31:19 +02:00
decentral1se 5649730446
Add additional Gitea versions 2021-04-13 10:51:11 +02:00
3wc 90eda1dfc1 Add traefik-forward-auth version to apps.json 2021-04-08 20:00:36 +02:00
decentral1se fd97d41524
Ensure services are also present within a tag 2021-04-08 14:53:50 +02:00
decentral1se abbe6ddd1a
Add missing ) 2021-04-07 21:33:09 +02:00
decentral1se acdfa20b2b
Mark new version in installer 2021-04-07 21:10:37 +02:00
decentral1se 34dc33a01d
Add change log entry 2021-04-07 21:08:46 +02:00
decentral1se 4747d9b7fb
Fix typo (thanks bash)
Follows 8f2fadb3c4.
2021-04-07 21:06:26 +02:00
decentral1se 35f553ae5a
Release patch fix 2021-04-07 21:00:08 +02:00
3wc 8f2fadb3c4 Fix ABRA_DIR for dev install 2021-04-07 20:57:56 +02:00
decentral1se 8e6b620e8c
Release latest version 2021-04-07 20:54:16 +02:00
3wc 523fc2850c Make --no-prompt more consistent 2021-04-07 20:47:11 +02:00
decentral1se 968d3809a5
Add change log entry 2021-04-07 20:09:45 +02:00
decentral1se 2ccef8948d
Support abra-hetzner
Closes https://git.autonomic.zone/coop-cloud/abra/issues/88.
2021-04-07 20:09:00 +02:00
decentral1se 08de1e0676
Fix plugin require logic 2021-04-07 19:54:48 +02:00
decentral1se b2e66a01fc
Require JQ for abra-hetzner 2021-04-07 19:51:24 +02:00
3wc 23f8cfc8dd Download apps.json for `app new` 2021-04-07 18:32:04 +02:00
3wc 878a26a411 Update CHANGELOG
[ci skip]
2021-04-07 18:32:01 +02:00
3wc 656dd829ca Support ABRA_DIR in installer 2021-04-07 18:31:42 +02:00
decentral1se 10bcb68c9d
Appease shellcheck 2021-04-07 13:18:55 +02:00
decentral1se e0c9c4e5b3
Add log entries 2021-04-07 13:16:26 +02:00
decentral1se d936080393
Allow skipping domain polling
Closes https://git.autonomic.zone/coop-cloud/abra/issues/140.
2021-04-07 13:15:26 +02:00
decentral1se 809ee6e68b
Always inform we're polling the domain
Closes https://git.autonomic.zone/coop-cloud/abra/issues/141.
2021-04-07 13:14:53 +02:00
3wc e0b185b5ef Add debugging for tests 2021-04-07 01:29:43 +02:00
3wc 9815230eba Handle missing app versions during `.. new`
Closes #138
2021-04-07 01:28:33 +02:00
3wc 8cb556275f Make sure to get apps.json for `recipe` subcommands
Closes #136
2021-04-05 16:11:50 +02:00
decentral1se 48a7bb8c2d Merge pull request 'Use apps.json to power upgrade / rollback, add helper commands' (#135) from apps-json into main
Reviewed-on: https://git.autonomic.zone/coop-cloud/abra/pulls/135
2021-04-05 15:50:57 +02:00
3wc a26a0d27d7 Reduce noise from app-json.py 2021-04-05 13:26:49 +02:00
3wc 028c7dbde5 Tweak `recipe .. release` docs 2021-04-05 13:26:49 +02:00
3wc 103a4941c7 Reliability improvements to `recipe .. release` 2021-04-05 13:26:49 +02:00
3wc a261114bbc Add --force to `recipe .. release` 2021-04-05 13:26:49 +02:00
3wc e2640fac08 Add `.. recipe .. release` subcommand
Closes #134
2021-04-05 13:26:49 +02:00
3wc 33280f90b3 Rejig rollback, add <version> to deploy
Ref #132
2021-04-05 13:26:49 +02:00
3wc 8b60ece3d4 Add "recipe" commands, rejig vendoring, vendor jq 2021-04-05 13:26:49 +02:00
3wc 47efae4e6c Keep a fresh copy of apps.json
Ref #132
2021-04-05 13:26:49 +02:00
3wc 25d15c9596 Update abra-apps.json for new Rocket.chat version 2021-04-05 12:58:53 +02:00
3wc 515bd7789d Provide DOCKER_CONTEXT for `make release..` cmds 2021-04-05 12:34:06 +02:00
3wc 6abb5db6ee Update abra-apps.json 2021-04-05 12:32:18 +02:00
3wc 699c4e76d5 Add a little more logging, fix typo 2021-04-05 00:07:03 +02:00
3wc 703889d4ea Disco app JSON update 2021-04-05 00:07:03 +02:00
3wc 05cf00d272 Clean-up; require_binary, comments, shellcheck 2021-04-05 00:07:03 +02:00
decentral1se c531faec52
Appease flake8 on the linting 2021-04-04 21:15:00 +02:00
decentral1se 4e9aefcafd
Appease shellcheck for app-catalogue script 2021-04-04 21:13:18 +02:00
decentral1se fb338b414b
Fix typo 2021-04-04 21:11:25 +02:00
3wc f1bdbf21c2 Update CHANGELOG 2021-04-04 14:31:02 +02:00
3wc c3e3f0a1f8 Use version info from compose file(s) not abra.sh
Ref #131
2021-04-04 14:29:29 +02:00
3wc df4e5045be Add --skip-version-check option to `app ... deploy` 2021-04-04 14:28:00 +02:00
3wc 4a0889138f app-version.sh to slurp versions into compose files
Ref #131
2021-04-04 14:25:49 +02:00
3wc f717c53e8b Gracefully handle README-parsing failures 2021-04-04 10:27:02 +02:00
3wc 0206279894 Use abra's vendored copy of yq instead of system 2021-04-04 10:26:59 +02:00
decentral1se fbb1081ed5
Remove two old scripts 2021-04-03 21:31:12 +02:00
decentral1se aad6f1db6e
Remove unused import 2021-04-03 21:07:32 +02:00
decentral1se 2599cff4cb
Fix handling of existing tags 2021-04-03 21:07:03 +02:00
decentral1se 25b916d969
Grab latest tags also 2021-04-03 20:54:16 +02:00
decentral1se 37600727a4
Use the utility here 2021-04-03 20:54:11 +02:00
decentral1se f4860ec662
Commit latest generation attempt for abra apps json 2021-04-03 20:51:48 +02:00
decentral1se 20e56a755e
Fix key error when missing the cache 2021-04-03 20:46:34 +02:00
decentral1se c60265791e
Wipe borked abra apps in preperation for a new run 2021-04-03 20:44:19 +02:00
decentral1se 2e159050e9
Grab published abra apps json file 2021-04-03 20:42:28 +02:00
decentral1se 25090a8129
Drop timeout value 2021-04-03 20:42:21 +02:00
decentral1se be5383b164
Make use of caching for speeding up tags generation
See https://git.autonomic.zone/coop-cloud/abra/issues/129.
2021-04-03 20:42:02 +02:00
decentral1se 3720ef838d
Track branch state when parsing versions 2021-04-03 20:28:31 +02:00
decentral1se 071fcbb96b
Don't deal with branches on feature parsing 2021-04-03 20:28:14 +02:00
decentral1se abfb1c6404
Support multiple compose files for app json generation
Closes https://git.autonomic.zone/coop-cloud/abra/issues/127.
2021-04-03 20:22:53 +02:00
decentral1se 0369a18c6e
Fix service version collection
Closes https://git.autonomic.zone/coop-cloud/abra/issues/128.
2021-04-03 20:18:31 +02:00
decentral1se 57f74b0d46
Update with latest generated file 2021-04-03 20:14:00 +02:00
decentral1se 93142ba305
Fix tag generation for underlying services 2021-04-02 21:26:25 +02:00
decentral1se f289f79ec3
Add change log entry 2021-04-02 21:21:28 +02:00
decentral1se 6b0f8a3d45
Fix loads of bugs and generate apps JSON again 2021-04-02 21:00:55 +02:00
decentral1se 6f776a8c51
Take a cleanup pass on generation script 2021-04-02 20:40:31 +02:00
decentral1se 55dc3a1d2a
Add versions listing script 2021-04-02 17:24:15 +02:00
decentral1se 91ccc819d5
Fix URL 2021-04-02 17:03:58 +02:00
decentral1se bf0ed8fd1c
Fix folder path 2021-04-02 16:55:16 +02:00
decentral1se 8a54fa3f27
Only gather image names and fix generator 2021-04-02 16:54:40 +02:00
decentral1se 26f9e1747f
Fix domain 2021-04-02 16:47:06 +02:00
decentral1se 4a3c4ce0c5
Fix path 2021-04-02 16:46:48 +02:00
decentral1se 903b286d3f
Fix URL 2021-04-02 16:46:31 +02:00
decentral1se f4ab771e2a
First working generation (woohoo) 2021-04-02 16:43:43 +02:00
decentral1se cd647f090b
Further fixes to apps json generator 2021-04-02 16:35:29 +02:00
decentral1se 85670538c6
Hashed out a very broken tags gathering logic 2021-04-02 16:28:56 +02:00
decentral1se 90780eab91
More dependencies! 2021-04-02 16:13:07 +02:00
decentral1se 1fabae0f48
Add jq dep docs 2021-04-02 16:11:36 +02:00
decentral1se 75af48bc5d
Add docs and remove unused import 2021-04-02 16:05:31 +02:00
decentral1se 0323fbe1c8
It ain't the final step 2021-04-02 15:56:15 +02:00
decentral1se dbb61b9a46
Merge those two sections again 2021-04-02 15:55:29 +02:00
decentral1se 3a40d27778
Expand release docs 2021-04-02 15:53:08 +02:00
decentral1se 1d1329b77e
Wire up correct save path for deployment 2021-04-02 15:49:18 +02:00
decentral1se d9374dc48e
Don't ignore JSON, we'll need it 2021-04-02 15:49:08 +02:00
decentral1se a760ef7869
Fix service name to match existing convention 2021-04-02 15:44:37 +02:00
decentral1se 3b9d6a7eb2
Fix copy/pasta for apps json deployer 2021-04-02 15:44:24 +02:00
decentral1se 663ba19c8b
Run flake8 against python scripts 2021-04-02 15:42:28 +02:00
decentral1se 70b2a68f34
Add newline 2021-04-02 15:39:15 +02:00
decentral1se 2b0f691d5f
Get shellcheck working for the bin/ scripts 2021-04-02 15:39:02 +02:00
decentral1se 18f8ea982e
Add abra-apps releaser docs and target 2021-04-02 15:38:49 +02:00
decentral1se d6cec2ff1a
Update installer paths 2021-04-01 22:34:51 +02:00
decentral1se 29e0077edb
Move installer script to more general deploy folder 2021-04-01 22:33:19 +02:00
decentral1se 73c1290c52
Move to bin/ folder 2021-04-01 22:33:05 +02:00
decentral1se 26e839ea7b
Get this JSON generator over the line 2021-04-01 21:40:38 +02:00
decentral1se e881f8007e
Take a very sloppy regex mania pass on apps.json generation 2021-03-28 11:40:49 +02:00
decentral1se 6f3f4b6779
Flesh out more of this generation script 2021-03-26 20:48:08 +01:00
decentral1se a5274f123c
Fix non-master branch switching for repos 2021-03-26 20:21:37 +01:00
decentral1se fc12634fbb
Fix change log entries 2021-03-26 01:17:06 +01:00
decentral1se a5ce75a29b
First stab at the apps JSON generation script
See https://git.autonomic.zone/coop-cloud/abra/issues/121.
2021-03-26 01:14:14 +01:00
decentral1se 701784930b
Reinstate --force for the deploy command
Follow up to 07e3678c78.

Also remove bad docs for commands without `--force` now.
2021-03-26 00:40:23 +01:00
decentral1se aa717c2323
Fix tests 2021-03-26 00:28:47 +01:00
decentral1se 9836d27052
Add abra doctor command
Closes https://git.autonomic.zone/coop-cloud/abra/issues/119.
2021-03-26 00:26:34 +01:00
decentral1se e361b493b1
Recognise undeployed apps when undeploying
Closes https://git.autonomic.zone/coop-cloud/abra/issues/123.
2021-03-26 00:01:07 +01:00
decentral1se b28460cf84
Add wait and domain check logic
Closes https://git.autonomic.zone/coop-cloud/abra/issues/116.
Also see https://git.autonomic.zone/coop-cloud/abra/issues/113.
2021-03-25 23:56:16 +01:00
decentral1se 07e3678c78
Replace all --force usage with --no-prompt
Closes https://git.autonomic.zone/coop-cloud/abra/issues/118.
2021-03-25 22:47:59 +01:00
decentral1se c315ebe319
Fix branch handling (again, again)
Closes https://git.autonomic.zone/coop-cloud/abra/issues/122.
2021-03-25 22:13:08 +01:00
3wc 36dd6b5eff Simplify `require_foo` commands 2021-03-20 23:17:05 +02:00
decentral1se 2f1f51bad1
Check for docker version
Closes https://git.autonomic.zone/coop-cloud/abra/issues/15.
2021-03-20 22:00:02 +01:00
decentral1se bada24f3f6
Add warning to README too 2021-03-20 21:44:26 +01:00
decentral1se 2d5afd8149
Bump warning to the top and use emojis 2021-03-20 21:43:35 +01:00
decentral1se dfb949eecc
Specify and wrap 2021-03-20 21:42:04 +01:00
decentral1se 49771980a6
Add changes warning 2021-03-20 21:41:27 +01:00
decentral1se 7e31184bd6
Add add version check command
Closes https://git.autonomic.zone/coop-cloud/abra/issues/108.
2021-03-20 21:35:28 +01:00
decentral1se 49226f1640
Change warning to reflect version check scenarioj 2021-03-20 21:35:13 +01:00
decentral1se 4251c32b30
Re-word new app language to emphasise config editing
See https://git.autonomic.zone/coop-cloud/abra/issues/111#issuecomment-4407.
2021-03-20 21:24:38 +01:00
decentral1se ece5385a38
Merge branch 'fix-subcommand-select' into main
Fix merge conflict in docopt generation + change log entry.
2021-03-20 21:18:34 +01:00
3wc 35d5df14aa Fix subcommand selection..
..by sorting the list of subcommand function names in descending order
of how many '_' are in them. This means that `abra app <app> version`
will always be matched before `abra version`.

Ref #108
2021-03-20 19:07:02 +02:00
decentral1se 1c437b99eb
Fix status checking 2021-03-18 20:10:42 +01:00
decentral1se 9580b2dd7d
Add entry 2021-03-18 19:46:43 +01:00
decentral1se f382765f29
Show correct status for missing contexts
Closes https://git.autonomic.zone/coop-cloud/abra/issues/99.
2021-03-18 19:45:30 +01:00
decentral1se f5951add54
Fix variables in print statement 2021-03-18 19:09:34 +01:00
decentral1se 2b4efc2c61
Quote that 2021-03-18 18:57:00 +01:00
decentral1se 8ab854c822
Add log entry 2021-03-18 18:55:44 +01:00
decentral1se 005323ff3c
Add debug for SSH connect on init
Closes https://git.autonomic.zone/coop-cloud/abra/issues/109.
2021-03-18 18:55:04 +01:00
decentral1se 390e918417
Add missing `it` 2021-03-18 18:54:53 +01:00
decentral1se c5ccfa0fa1
Add entry 2021-03-18 18:47:13 +01:00
decentral1se 87b71cb9d4
Show connection details on `abra server ls`
Closes https://git.autonomic.zone/coop-cloud/abra/issues/110.
2021-03-18 18:46:33 +01:00
decentral1se 89bd18a76b
Add change log entries 2021-03-18 17:21:16 +01:00
decentral1se 6e61c08b2c
Handle undeployed state for version output summary
Closes https://git.autonomic.zone/coop-cloud/abra/issues/104.
2021-03-18 17:20:54 +01:00
decentral1se 54b6acc46c
Fix output for stack name 2021-03-18 17:19:43 +01:00
decentral1se e5e98d536a
Add --force for undeploy 2021-03-18 17:18:35 +01:00
decentral1se 8df91de3af
Add --force to deploy command
Closes https://git.autonomic.zone/coop-cloud/abra/issues/105.
2021-03-18 14:12:18 +01:00
decentral1se 7557966c98
Add debug logging for STACK_NAME 2021-03-17 14:12:59 +01:00
decentral1se fa5d3ae3a1
Document release process 2021-03-17 12:59:09 +01:00
decentral1se d68444be9e
Mark release 2021-03-17 12:54:29 +01:00
decentral1se f7bc8efabe
Update to latest when upgrading 2021-03-17 12:53:02 +01:00
decentral1se f5284ba725
Point to installer for hacking 2021-03-17 12:50:02 +01:00
decentral1se 293d3ff558 Merge pull request 'Show git digest in `abra version` if we're running a development version' (#103) from digest-version into main
Reviewed-on: https://git.autonomic.zone/coop-cloud/abra/pulls/103
2021-03-17 12:48:45 +01:00
3wc c00319ab01 Update CHANGELOG 2021-03-16 12:55:47 +02:00
3wc 8b4141670c Include git digest in dev `version` output
Re: #100
2021-03-16 12:54:42 +02:00
decentral1se 23c852125d
Listen to shellcheck and do things 2021-03-16 10:13:15 +01:00
decentral1se b4eae2e5e5
Add missing quote 2021-03-16 09:24:21 +01:00
decentral1se 9e953319cf
Get label parsing done correctly 2021-03-16 09:23:13 +01:00
decentral1se 0814fa9146
Add export to the output also 2021-03-16 09:04:42 +01:00
decentral1se 0e1b6c858b
Add change log entry 2021-03-16 08:58:12 +01:00
decentral1se 28618bd3ac
Add packager helper script 2021-03-16 08:57:05 +01:00
decentral1se b04bfea1c7
Use local marker and scan services only once 2021-03-16 08:38:11 +01:00
decentral1se bc0ef0d6fc
Fix deployments when versions are missing 2021-03-16 07:32:31 +01:00
decentral1se 16c91fedd1
Add newline back 2021-03-16 07:00:23 +01:00
decentral1se 9f5945094c
Document new dev update command 2021-03-16 06:59:35 +01:00
decentral1se 76513a1f35
Add change log entry 2021-03-16 06:51:35 +01:00
decentral1se 86eb8d7fde
Handle existing files use-case for dev installer
Closes https://git.autonomic.zone/coop-cloud/abra/issues/98.
2021-03-16 06:51:10 +01:00
decentral1se e31b3d3173
Add change log entry 2021-03-16 06:25:29 +01:00
decentral1se 58b13d7528
Use app type naming and use yellow 2021-03-16 06:22:32 +01:00
decentral1se b0fca49ecb
Generalise top level deploy output 2021-03-16 06:19:52 +01:00
decentral1se 79dacf557e
Implement edge-case handling for versioning 2021-03-16 06:19:37 +01:00
decentral1se d6caf03301
Spacing for readability 2021-03-16 05:58:08 +01:00
decentral1se 9b90712d28
Look up image name and show it also 2021-03-16 05:57:01 +01:00
decentral1se 1dd3fe6fcd
Use COMPOSE var here 2021-03-16 05:56:52 +01:00
decentral1se 29953c17d9
Add change log entry 2021-03-16 05:48:08 +01:00
decentral1se 3b59adfe34
Vendor yq program 2021-03-16 05:47:13 +01:00
decentral1se 00c8a988e1
Fix parsing of stack_name/service concatenation 2021-03-16 05:04:05 +01:00
decentral1se 524fb6a44c
Use STACK_NAME instead of Gitea 2021-03-15 18:56:26 +01:00
decentral1se e99bedf9e4
WIP version output summary which handles services
See https://git.autonomic.zone/coop-cloud/organising/issues/47.
2021-03-15 18:30:37 +01:00
decentral1se 0d98c442a2
Add change log entry 2021-03-15 17:04:14 +01:00
decentral1se bcc15ecdb0
Support dev upgrades on the CLI also 2021-03-15 17:03:01 +01:00
decentral1se a617629a7a
Lowercase that 2021-03-15 16:54:54 +01:00
decentral1se f7ae400eb3
Use makefile for releasing installer 2021-03-15 16:54:33 +01:00
decentral1se 7141d364e1
Zomg lol fix my typo 2021-03-15 10:07:17 +01:00
decentral1se 057ce223f1
Fix link 2021-03-15 10:06:50 +01:00
3wc 7511b25e47 Update installation docs, release new installer
[ci skip]
2021-03-15 10:35:06 +02:00
3wc 62b447d61f Update changelog
[ci skip]
2021-03-14 14:40:57 +02:00
3wc 88d2a75575 Add --dev to installer, to grab git version 2021-03-14 14:39:11 +02:00
3wc 8cb6617a0f Automatically truncate suggested app name
Ref #83
2021-03-14 03:33:33 +02:00
3wc 1a649c56cb Docs & comments 2021-03-14 03:33:22 +02:00
3wc fd655274f8 Bomb out with Bash < 4
Ref #96
2021-03-14 03:24:13 +02:00
decentral1se 946d1a068d
Drop current version handling logic for deploy
New logic coming soon.

See https://git.autonomic.zone/coop-cloud/organising/issues/47#issuecomment-4231.
2021-03-13 20:23:53 +01:00
3wc e8651976ca Only load apps once, exciting 2× speed increase 2021-03-13 20:15:54 +02:00
3wc af52ba1fec Clean-up 🧹 2021-03-12 13:13:17 +02:00
3wc 499c08c374 Update CHANGELOG 2021-03-12 13:10:50 +02:00
3wc 08281891a1 Add --type filter to `abra <app> ls` 2021-03-12 13:10:35 +02:00
decentral1se 5bce042922
First steps to enable abra-hetzner
See https://git.autonomic.zone/coop-cloud/abra/issues/88.
2021-03-10 23:28:59 +01:00
decentral1se 3276c9fe47
Always choose the default IPv4 address for init'ing
Closes https://git.autonomic.zone/coop-cloud/abra/issues/91.
2021-03-10 22:23:38 +01:00
Luke Murphy 040374e781
List volumes/secrets when removing 2021-03-05 12:53:21 +01:00
Luke Murphy 621c8cd5c4
Fix volume/secret deletion logic
- Fix escaping of quotes
- Dont delete things unless options are passed
2021-03-04 19:21:38 +01:00
Luke Murphy 7434b67c34
Fix parens and ignore quote warning 2021-03-04 16:59:36 +01:00
Luke Murphy 17306a753b
Support volume and secret removal 2021-03-04 16:55:24 +01:00
Luke Murphy 2e3f4cabd8
Warn if unable to find version 2021-03-04 16:40:35 +01:00
Luke Murphy cf2308cdd7
Point to script 2021-03-04 16:31:18 +01:00
Luke Murphy eec49d6dd1
Guard against length errors in app names
Closes https://git.autonomic.zone/coop-cloud/abra/issues/83.
2021-03-04 16:25:21 +01:00
Luke Murphy d6195ad6d7
Undercore `-` values in the domain too 2021-03-04 16:19:55 +01:00
Luke Murphy fd04c5a6e9
Support branch selection for app repo clones
Closes https://git.autonomic.zone/coop-cloud/abra/issues/80.
2021-03-04 16:01:56 +01:00
Luke Murphy 1c9d7282b2
Revert "Sort commands listing"
This reverts commit 99ab5bf369.

Woops, they cannot be sorted this way. Ignore me.
2021-03-04 15:50:27 +01:00
Luke Murphy dd9c485c66
Fix wording and wrap 2021-03-04 15:48:53 +01:00
Luke Murphy 99ab5bf369
Sort commands listing 2021-03-04 15:38:09 +01:00
Luke Murphy 25a0afed65
Fix indentation and, document local options only 2021-03-04 15:35:18 +01:00
Luke Murphy 44e22db11b
Add change log entry 2021-03-04 13:27:32 +01:00
Luke Murphy 3321010089
Add change log README entry 2021-03-04 13:24:13 +01:00
Luke Murphy e04c4626f2
Update change log 2021-03-04 13:22:57 +01:00
Luke Murphy 65ce949e03
Bail out if versions match
Closes https://git.autonomic.zone/coop-cloud/abra/issues/87.
2021-03-04 13:20:58 +01:00
Luke Murphy 5931cbd791
Only throw away error but keep stdout 2021-03-04 13:20:45 +01:00
Luke Murphy 0bbff91722
Add service rollback
Closes https://git.autonomic.zone/coop-cloud/abra/issues/76.
2021-03-04 13:10:51 +01:00
Luke Murphy 7f5e753dfd
Re-factor version output logic and fix bug
It was showing empty strings for deployed versions it could not find.
Now, it will not change messages to output if it can not detect the
versions deployed (containers dont have the tag).
2021-03-04 13:10:00 +01:00
Luke Murphy d3776f4424
Warn on secret storage after generation
Closes https://git.autonomic.zone/coop-cloud/abra/issues/75.
2021-03-03 17:20:24 +01:00
Luke Murphy 544c4e86ba
Capture output for version checking
Closes https://git.autonomic.zone/coop-cloud/abra/issues/85.
2021-03-03 16:56:47 +01:00
Luke Murphy 516309b478
Show command to run 2021-03-03 16:54:01 +01:00
Luke Murphy dfd7e29a30
Give spacing to blocks 2021-03-03 16:51:25 +01:00
Luke Murphy bb30fa28da
Fix wording 2021-03-03 16:50:59 +01:00
Luke Murphy 044de5824b
Drop whitespace 2021-03-03 16:49:58 +01:00
3wc 00cdce7bd2 Update CHANGELOG
[ci skip]
2021-03-02 20:34:35 +02:00
3wc f163d4b0fa Add script to auto-generate app catalogue 2021-03-02 20:33:14 +02:00
Luke Murphy e0032fb74a
Add change log entry 2021-03-02 13:07:00 +01:00
Luke Murphy 152dfe9349
Support basic version checking
Closes https://git.autonomic.zone/coop-cloud/abra/issues/82.
2021-03-02 13:06:56 +01:00
Luke Murphy 5a95ae97a0
Add changelog entry 2021-03-02 12:06:14 +01:00
Luke Murphy 98e674b8e8
Add version and digest showing
See https://git.autonomic.zone/coop-cloud/abra/issues/82.
2021-03-02 12:04:25 +01:00
Luke Murphy b655cf20be
Make README less vague
Closes https://git.autonomic.zone/coop-cloud/abra/issues/79.
2021-03-02 11:53:55 +01:00
Luke Murphy 5bc702bf96
Propagate new version around 2021-03-01 11:44:58 +01:00
Luke Murphy 4bd842db66
Mark new release of abra 2021-03-01 11:41:44 +01:00
Luke Murphy a8f7faddb9
Fix typo 2021-03-01 11:38:31 +01:00
3wc e5b2a426f0 Add shared backup helpers 2021-02-24 17:03:28 +02:00
3wc 29b22fe162 Display subcommand help with -h/--help
Closes #78
2021-02-11 15:02:37 +02:00
Luke Murphy c082645da0
Remove test commit 2021-02-09 08:35:52 +01:00
decentral1se 156d5d8fba Merge pull request 'abra-commands.sh → abra.sh, make configs type-level' (#77) from move-configs into main
Reviewed-on: https://git.autonomic.zone/coop-cloud/abra/pulls/77
2021-02-09 08:31:45 +01:00
3wc d2cdb11fcc Tweak INFO messages, update CHANGELOG 2021-02-08 13:43:39 +02:00
3wc cef06a82a6 abra-commands.sh → abra.sh 2021-01-30 16:10:40 +02:00
3wc 9a630a0440 Prevent accidental `cd` when loading app vars 2021-01-30 16:10:40 +02:00
3wc 1c6651b18b Fix `secret generate` help
[ci skip]
2021-01-30 16:10:13 +02:00
3wc 5f7df4694f Test failed drone build 2021-01-29 14:02:26 +02:00
3wc 7feeab24ec Add RocketChat notifications for failed builds 2021-01-29 13:44:55 +02:00
3wc 1a6688cfbf Merge branch 'debug_logging' into main 2021-01-24 21:51:59 +02:00
3wc f90e1d154c Add container IDs to debug log 2021-01-24 19:11:22 +02:00
3wc 6cc265e931 Tweak info/debug output 2021-01-24 19:11:22 +02:00
3wc 854ae23f60 Initial --verbose / --debug 2021-01-24 19:11:22 +02:00
3wc 43e7672725 Prevent accidental `cd` when loading app vars 2021-01-24 19:11:11 +02:00
Luke Murphy 4e913c426d
Follow same style 2021-01-09 20:07:16 +01:00
3wc 8a08de51e4 Alert on missing secrets, re-add . → _ STACK_NAME 2021-01-09 15:07:39 +02:00
3wordchant 1c7a51bce1 Merge pull request 'App backup & restore' (#72) from backup_restore into main
Reviewed-on: https://git.autonomic.zone/coop-cloud/abra/pulls/72
2021-01-09 12:36:50 +01:00
3wc 5d84cef63c `app restore` 2021-01-09 13:36:32 +02:00
3wc eda5198904 Add scaffolding for per-app `backup` commands
See #70
2021-01-09 13:36:32 +02:00
3wc a4a3dccd66 Add global --skip-check / --skip-update commands 2021-01-09 13:36:32 +02:00
3wc a2d249e3a1 Fix `abra app ls` with `*` server 2021-01-02 00:34:44 +02:00
Luke Murphy dc83baea12
Remove tab 2021-01-01 22:44:21 +01:00
3wc d6b4a4744f Fix `abra app ls` for app → type 2021-01-01 23:00:20 +02:00
Luke Murphy 6ba2657dc1
Use short hash convention 2021-01-01 18:59:19 +01:00
Luke Murphy ac6b805cbf
Follow parens convention 2021-01-01 18:57:39 +01:00
decentral1se d4e52a9de3 Merge pull request 'Make secret generation more robust' (#73) from simplify-secret-logic into main
Reviewed-on: https://git.autonomic.zone/coop-cloud/abra/pulls/73
2021-01-01 18:55:47 +01:00
Luke Murphy aa59c1ad43
Make secret generation more robust
Closes https://git.autonomic.zone/coop-cloud/abra/issues/68.
2021-01-01 18:54:41 +01:00
decentral1se 36f1d679ae Merge pull request 'Merging auto functionality into generate command' (#64) from app-auto-merge into main
Reviewed-on: https://git.autonomic.zone/coop-cloud/abra/pulls/64
2021-01-01 17:32:30 +01:00
Luke Murphy f5c8ee1136
Merge auto/generate and use --secrets
Closes https://git.autonomic.zone/coop-cloud/abra/issues/58.
2021-01-01 17:31:21 +01:00
3wc 9a17817cc8 Tiny tweak to `abra help` advice 2021-01-01 17:57:36 +02:00
3wc b2e3292453 Add `version` subcommand to CHANGELOG 2021-01-01 17:55:45 +02:00
Luke Murphy 13fafb5929
Fix typo and link to commit 2021-01-01 14:18:30 +01:00
3wc 114f99ae2e Update CHANGELOG 2021-01-01 15:11:04 +02:00
3wc fff4b10a41 Gettin some help_
See #50
2021-01-01 15:09:49 +02:00
Luke Murphy ab1353603d
Use homebrewed image for CI too 2021-01-01 13:49:19 +01:00
Luke Murphy 1600b6277f
Use the One True Way for testing
Closes https://git.autonomic.zone/coop-cloud/abra/issues/71.
2021-01-01 13:48:14 +01:00
3wordchant b79e35f982 Merge pull request 'Add per-subcommand help using `abra help <subcommand>`' (#61) from command_help_2 into main
Reviewed-on: https://git.autonomic.zone/coop-cloud/abra/pulls/61
2021-01-01 13:13:29 +01:00
3wordchant 703dbe0a0f Merge branch 'main' into command_help_2 2021-01-01 13:09:57 +01:00
Luke Murphy 7abb0191e1
Use upstream CI image
See https://git.autonomic.zone/coop-cloud/docker-dind-bats-kcov.
2021-01-01 12:26:50 +01:00
3wc 886ae5b7f2 Fix help function names 2021-01-01 01:46:09 +02:00
3wc 5411c85793 Don't require weird app_ls format for abra help 2021-01-01 01:42:17 +02:00
3wc caa315e361 Add per-subcommand help 2021-01-01 01:13:17 +02:00
3wc e6b24fe65c Change -v option to `version` subcommand 2021-01-01 01:10:03 +02:00
3wc 81782bb5f0 make test → test_local, test_docker, test_dind
test_local: run `bats tests/`. Requires `bats`.

test_docker: run docker and install bats in it.

Both of these options require that your local Docker daemon is running
in swarm mode.

test_dind: starts a Docker daemon and runs tests in that. Requires sudo
2020-12-31 22:10:52 +02:00
Luke Murphy 406b9e374e
Only output length if using it
Closes https://git.autonomic.zone/coop-cloud/abra/issues/67.
2020-12-31 18:16:01 +01:00
Luke Murphy ce0e0e893c
Use plain usage only when erroring out
Closes https://git.autonomic.zone/coop-cloud/abra/issues/65.
2020-12-31 18:12:01 +01:00
Luke Murphy fac45f276e
Add entry 2020-12-31 18:11:22 +01:00
Luke Murphy 44d3ac3a1c
Support pwqgen/pwgen checking
Closes https://git.autonomic.zone/coop-cloud/abra/issues/66.
2020-12-31 18:10:13 +01:00
Luke Murphy 5da9f26076
Remove old function
Follow on from 3936d6afc0.
2020-12-31 18:06:20 +01:00
Luke Murphy 4e99cf1ded
Add log entry 2020-12-31 16:57:10 +01:00
Luke Murphy 55324524ca
Don't cut since `export ...` isn't in the env file
Closes https://git.autonomic.zone/coop-cloud/abra/issues/69.
2020-12-31 16:55:33 +01:00
Luke Murphy b6928959cb
Fix test target path 2020-12-31 13:50:10 +01:00
3wc 8ddb290683 Further update to tests for #47 2020-12-31 14:34:52 +02:00
Luke Murphy 2cb1134a54
Use `_` now 2020-12-31 13:26:25 +01:00
Luke Murphy c4b1ac482e
Update change log 2020-12-31 13:22:26 +01:00
3wc 29cc392dff Prompt on `app .. config` if $EDITOR is un-set
Closes #41
2020-12-31 12:52:44 +02:00
3wc 8839bd4595 Fix `server` bash completion
Ref #45
2020-12-31 11:47:14 +02:00
3wc 0179f600f5 Change -v option to `version` subcommand 2020-12-31 11:47:12 +02:00
decentral1se 15f0233351 Merge pull request '<domain> → <app>, APP → TYPE' (#60) from domain_to_app into main
Reviewed-on: https://git.autonomic.zone/coop-cloud/abra/pulls/60
2020-12-30 22:22:11 +01:00
3wc bbaacb7b9f Update tests for app-name 2020-12-30 21:56:52 +02:00
3wc 6761574d74 Add "app name" concept, and rename APP → TYPE
Ref #47
2020-12-30 21:26:17 +02:00
3wc 8384af8b95 First foray into <domain> → <app> 2020-12-30 13:47:41 +02:00
3wc b9e97688d6 ... and update docopt 2020-12-30 13:43:17 +02:00
3wc 1055805c8d Merge duplicate `run` commands
Closes #57
2020-12-30 13:33:57 +02:00
decentral1se 678906cb39 Merge pull request 'Use set -a/+a and docker env file formats' (#55) from use-set-a into main
Reviewed-on: https://git.autonomic.zone/coop-cloud/abra/pulls/55
2020-12-30 11:23:30 +01:00
Luke Murphy 11c50ae98d
Use set -a/+a and docker env file formats
Closes https://git.autonomic.zone/coop-cloud/abra/issues/40.
2020-12-30 11:22:58 +01:00
decentral1se e911ab246b Merge pull request 'Merge logs/multilogs and avoid multitail external' (#56) from merge-logging into main
Reviewed-on: https://git.autonomic.zone/coop-cloud/abra/pulls/56
2020-12-30 11:21:46 +01:00
decentral1se 34775f306b Merge branch 'main' into merge-logging 2020-12-30 11:21:03 +01:00
Luke Murphy 375a4dd29d
Re-add require_app_latest for custom commands
Revision of 67cce192df.

See https://git.autonomic.zone/coop-cloud/abra/pulls/54#issuecomment-2300.
2020-12-30 11:19:55 +01:00
Luke Murphy 2b951e9f54
Mark minor 2020-12-30 11:18:32 +01:00
3wc 01184c313a Add missing CHANGELOG entries
Closes #46
2020-12-30 00:43:52 +02:00
Luke Murphy 3936d6afc0
Merge logs/multilogs and avoid multitail external 2020-12-29 23:22:46 +01:00
Luke Murphy 407744827f
Add change log entry for #42
See https://git.autonomic.zone/coop-cloud/abra/issues/42.
2020-12-29 17:11:30 +01:00
decentral1se b634b4c668 Merge pull request 'Make sure to `git pull` latest changes on ~/.abra/apps side' (#54) from latest-checks into main
Reviewed-on: https://git.autonomic.zone/coop-cloud/abra/pulls/54
2020-12-29 17:10:16 +01:00
Luke Murphy 67cce192df
Don't do more cloning that necessary 2020-12-29 17:06:49 +01:00
Luke Murphy 3a9e141b24
Pull latest changes
Closes https://git.autonomic.zone/coop-cloud/abra/issues/42.
2020-12-29 17:06:32 +01:00
Luke Murphy ebfe7ca4e8
Suppress output of clone and do better logging 2020-12-29 17:05:30 +01:00
Luke Murphy fff2fbe819
Prepare function name for new functionality 2020-12-29 17:05:00 +01:00
Luke Murphy f213c3df5f
Follow convention and show type of message 2020-12-29 17:04:17 +01:00
Luke Murphy 9b1be33018
Mark as quote and not as entry 2020-12-29 15:11:15 +01:00
Luke Murphy 6ecf4f287a
Add missing ) 2020-12-29 15:10:57 +01:00
Luke Murphy e1d6ff8b73
Add docs link 2020-12-29 15:10:05 +01:00
Luke Murphy 07d4815a74
Start 0.5.0 change log 2020-12-29 15:08:42 +01:00
decentral1se 33315f6b43 Merge pull request '<app> -> <type>' (#53) from app-goes-to-type into main
Reviewed-on: https://git.autonomic.zone/coop-cloud/abra/pulls/53
2020-12-29 15:03:43 +01:00
Luke Murphy f017324431
<app> -> <type>
Closes https://git.autonomic.zone/coop-cloud/abra/issues/48.
2020-12-29 14:56:50 +01:00
decentral1se 4339c91cf3 Merge pull request 'Remove `abra server use`' (#52) from server-use-remove into main
Reviewed-on: https://git.autonomic.zone/coop-cloud/abra/pulls/52
2020-12-29 14:26:39 +01:00
Luke Murphy 592f515ec4
Remove `abra server use` 2020-12-29 14:24:50 +01:00
3wc 77ba5652b2 Run "check" during "deploy", + "--skip-check" 2020-12-29 11:15:14 +02:00
3wc fdf6334ed3 Use temporary ABRA_DIr in tests 2020-12-27 21:53:44 +02:00
3wc 73e5e64b9a Bump version 2020-12-27 21:45:37 +02:00
Luke Murphy 3f9b4477cd
Swap args around 2020-12-27 13:11:22 +01:00
3wc 412729aac9 Fix calling `logs` with no arguments
Closes #31
2020-12-27 12:23:16 +02:00
3wc 8022a2cb41 Add cheeky `network` command 2020-12-27 12:07:10 +02:00
3wc 35182ed260 Get both `.. volume ..` and custom commands working 2020-12-27 12:07:10 +02:00
3wc d90c6ef361 Add `--no-tty` option to `app run` 2020-12-27 12:07:10 +02:00
3wc 40ca8dfe93 Add --server filter to `app list`..
.. and add `server <host> apps` as an alias.
2020-12-27 12:07:10 +02:00
3wc 7f009f927b Fix `app ls --status`
Closes #35
2020-12-27 12:06:39 +02:00
3wc e222f4152b Pin kcov version 2020-12-24 01:07:01 +02:00
3wc 893150cdd9 Pin shellcheck version 2020-12-24 00:55:57 +02:00
3wc 61126f16e1 Update installer 2020-12-24 00:50:50 +02:00
3wc 63c982c550 Fix custom commands loading 2020-12-17 13:38:30 +02:00
3wc 0d202eedfc Reënable custom per-stack commands 2020-12-14 12:33:22 +02:00
3wc cb2d563ea0 Fix status header 2020-11-18 01:06:07 +02:00
3wc 059968a8cf Fix `abra app ls --status` 2020-11-18 00:40:26 +02:00
3wc c57069e0af Use ABRA_DIR instead of hard-coding .abra 2020-11-18 00:39:41 +02:00
3wc 946a527baa Add `app ... ps` command, and some comments 2020-11-16 17:29:35 +02:00
Luke Murphy 89d530a553
Use printf instead of echo like docker docs do 2020-11-08 16:40:45 +01:00
Luke Murphy 25fe6808ad
Use one line and strip newlines on generation 2020-11-08 16:34:26 +01:00
Luke Murphy 28b2d8ecc7
Strip whitespace 2020-11-08 16:34:21 +01:00
3wc fd735a1310 Add `app <domain> check` to sniff out missing vars
Re #36
2020-11-06 23:14:26 +02:00
3wc e307286db7 Add `--status` option to `app ls`
Closes #35
2020-11-06 22:35:48 +02:00
Luke Murphy dd570e224b
Ignore those build failures 2020-11-05 16:02:21 +01:00
Luke Murphy f495ec0d94
Appease shellcheck 2020-11-05 16:00:50 +01:00
decentral1se b75bce531b Merge pull request 'PASSWORD/KEY distinction+match for secret generation' (#33) from new-pass-keys-generation into main
Reviewed-on: https://git.autonomic.zone/coop-cloud/abra/pulls/33
2020-11-05 15:57:39 +01:00
decentral1se 0d62f01d5a Merge branch 'main' into new-pass-keys-generation 2020-11-05 15:57:32 +01:00
Luke Murphy eec55896a4
Implement password/key handling 2020-11-05 15:56:31 +01:00
Luke Murphy c2a56c6c09
Drop this broken catch-all
Closes https://git.autonomic.zone/coop-cloud/abra/issues/29.
2020-11-01 21:15:06 +01:00
Luke Murphy 74dfd75fb1
Use same [] style once more 2020-11-01 20:55:47 +01:00
Luke Murphy e8c0efa91e
Add --auto to app new for generation
Step one of https://git.autonomic.zone/coop-cloud/abra/issues/32.
2020-11-01 20:54:43 +01:00
Luke Murphy 6bae48431c
Use same style as other [] options 2020-11-01 20:41:58 +01:00
3wc 543072ab37 Add zsh completion, remove compat hacks from bash
Ref #5
2020-11-01 21:09:33 +02:00
Luke Murphy 57e3a34133
Make sure to clone on deploy as well 2020-11-01 17:08:44 +01:00
Luke Murphy 33a49a8457
Trim whitespace 2020-11-01 17:05:13 +01:00
Luke Murphy 5806e40c1c
Add require_app_clone 2020-11-01 17:05:10 +01:00
3wc 0d24a8e5cc Tryna fix Drone CI 2020-11-01 16:52:36 +02:00
3wc e01f06423e Whoops! (Actual `compopt` fix
Ref #5
2020-11-01 15:22:45 +02:00
3wc 80f06ba0e1 Support >2 COMPOSE_FILEs 2020-10-31 17:51:56 +02:00
3wc f8306b282d Split tests into separate files, add secret tests 2020-10-31 17:06:54 +02:00
3wc 2bdfe8baa8 Handle missing `compopt`
Ref #5
2020-10-30 21:40:59 +02:00
3wc b226396764 Consistent y/n confirmation prompts 2020-10-30 20:57:13 +02:00
3wc a3cd6d2281 Add git and bash to Drone test env 2020-10-30 18:32:01 +02:00
3wc 50651aeea1 Mollify shellcheck 2020-10-30 18:30:53 +02:00
3wc 57e24eaf0a Always run tests on local Docker 2020-10-30 18:30:43 +02:00
3wc 50ca4f8029 Tighten up options for `secret` commands 2020-10-30 18:24:22 +02:00
3wc 0433da3689 Fix subcommand -> function mapper 2020-10-30 18:17:06 +02:00
3wc 3e0b9e9475 Working completion `app` and `server` 2020-10-30 17:52:47 +02:00
3wc c6b841de6c First stab 2020-10-30 17:52:47 +02:00
3wc 2daffc8694 Use bash `select`, tweak args 2020-10-30 17:52:46 +02:00
Luke Murphy b15a214049
WIP: app secret rm 2020-10-30 02:09:59 +01:00
Luke Murphy 8d7194fcce
Add quotes 2020-10-30 00:39:24 +01:00
Luke Murphy 188dc56dd1
Also run via sh 2020-10-30 00:34:37 +01:00
Luke Murphy dbfe6f8097
Add initial CLI parsing for secret deletion 2020-10-30 00:32:03 +01:00
Luke Murphy 26b994ab84
Add --pass for new apps command
See https://git.autonomic.zone/coop-cloud/abra/issues/25.
2020-10-30 00:04:53 +01:00
3wc dba3c391bd Handle missing `tput` gracefully 2020-10-29 19:40:19 +02:00
3wc 5a72ed0cfb Make `config` more chill, small gardening 2020-10-29 19:39:51 +02:00
3wc b5d84d5e0d Test for git, container, and test `app new ...` 2020-10-29 19:38:42 +02:00
3wc e3983c2440 Run bats in `dind` container, add git & bash 2020-10-29 19:38:15 +02:00
3wc 85b8a4f459 Add config command 2020-10-29 19:35:59 +02:00
3wc 6e38dc35e5 Fix `run` subcommand 2020-10-29 19:35:57 +02:00
Luke Murphy 841e4fc61a
Explode if can't clone the app 2020-10-28 18:24:28 +01:00
Luke Murphy c1d12eacc5
Fix typo 2020-10-28 18:24:15 +01:00
Luke Murphy 3b730d314b
Use basename when listing servers for `abra new` 2020-10-28 18:05:53 +01:00
Luke Murphy 5df3a9fffb
Account for 0 or 1 servers 2020-10-28 17:33:48 +01:00
Luke Murphy 3e3fe0e349
Create under servers directory 2020-10-28 17:32:38 +01:00
Luke Murphy db766f4aec
Don't explode if you already have the context 2020-10-28 17:32:30 +01:00
3wc 8909a46d8c Add --force option to app .. delete 2020-10-28 01:52:27 +02:00
3wc 8d139d4d28 Add undeploy/delete commands
Ref #4
2020-10-28 01:40:35 +02:00
3wc b6b80298c2 Add `.. secret auto` command 2020-10-28 00:29:40 +02:00
3wc b1e8ac4498 Local server list, more tidying 2020-10-27 23:46:03 +02:00
3wc c5785089d6 Tidy up CLI commands, add `app list` 2020-10-27 21:38:20 +02:00
3wc bec3272a41 .abra dir, `abra new`
Closes #24

Ref #21
2020-10-27 17:58:34 +02:00
Luke Murphy dc3b772b72
Use server naming 2020-10-26 18:40:04 +01:00
Luke Murphy 07d4f8cbdf
Remove abra.yml / yq stuff for now 2020-10-26 18:36:28 +01:00
Luke Murphy 37c59a53ef
Drop interactive flags 2020-10-26 18:31:03 +01:00
Luke Murphy 87a54594f6
Fix typo, clean up after 2020-10-26 18:25:40 +01:00
Luke Murphy e2e76edaaf
Remove old test file 2020-10-26 18:19:41 +01:00
Luke Murphy ab7772e8f7
Shuffle that 2020-10-26 18:16:54 +01:00
Luke Murphy 7304612f5f
Use actual plugin 2020-10-26 18:14:41 +01:00
Luke Murphy 5a07f08ab3
Use new syntax 2020-10-26 18:13:23 +01:00
Luke Murphy 1e158cce55
Use cwd for coverage 2020-10-26 18:09:39 +01:00
Luke Murphy 2102193df1
Fix syntax 2020-10-26 18:05:27 +01:00
Luke Murphy 1b4258f1ea
Add shellcheck target, drop default 2020-10-26 18:04:14 +01:00
Luke Murphy cc060b8546
Fix error code 2020-10-26 18:02:24 +01:00
Luke Murphy dce46603bf
Add codecov target too 2020-10-26 18:01:12 +01:00
Luke Murphy 64d04a29ab
Run full kcov 2020-10-26 18:01:00 +01:00
Luke Murphy db7eb30447
Drop curl 2020-10-26 17:50:06 +01:00
Luke Murphy f648b251bf
Remove yq target and newline test target 2020-10-26 17:49:21 +01:00
Luke Murphy 86a790bbe4
Make tests run locally isolated 2020-10-26 17:48:19 +01:00
Luke Murphy b423d61fce
Remove install targets 2020-10-26 17:48:12 +01:00
Luke Murphy f03c509552
Use shellcheck image 2020-10-26 17:40:02 +01:00
Luke Murphy e6458e5e60
Update parser once more 2020-10-26 17:30:37 +01:00
Luke Murphy 9580199616
Remove extra secrets help 2020-10-26 17:19:32 +01:00
3wc b59e902d18 Fix `logs`, `cp`, `multilogs
Ref #18
2020-10-26 16:55:43 +02:00
3wc c50b1d8760 Goodbye, parse_subcommand! 👋
Ref #18
2020-10-26 16:08:15 +02:00
3wc b49b510c43 Load custom commands in a function 2020-10-26 13:46:54 +02:00
3wc b68bfdfb43 Regnerate Docopt 2020-10-26 13:35:58 +02:00
3wc 983e4af08c Use docopts variables
Ref #18
2020-10-26 13:34:49 +02:00
3wc 6cf7cf843a Update server subcommands 2020-10-26 13:34:30 +02:00
3wc d37d8a0c66 Add default --tail option to `abra logs` 2020-10-26 13:33:56 +02:00
Luke Murphy da33064a5f
Add codecov badge 2020-10-26 11:49:06 +01:00
Luke Murphy be2fffd858
Run plain bin 2020-10-26 11:40:41 +01:00
Luke Murphy 38f0c92bc7
Try avoid error exit code 2020-10-26 11:38:32 +01:00
Luke Murphy c1fbb75657
Wait a sec, collect, not just report 2020-10-26 11:37:13 +01:00
Luke Murphy 33fd0eeb8d
Point codecov at report folder 2020-10-26 11:36:12 +01:00
Luke Murphy 5955505752
Get reports only 2020-10-26 11:36:04 +01:00
Luke Murphy e022fe2310
Use kcov image 2020-10-26 11:28:19 +01:00
Luke Murphy 02fa9025dc
Install kcov directly now 2020-10-26 11:26:28 +01:00
Luke Murphy 2250713c05
Split up codecov steps 2020-10-26 11:25:55 +01:00
Luke Murphy 2b77cfebf9
Disable failing test for now 2020-10-26 11:25:39 +01:00
Luke Murphy aff01e6741
Install kcov holding package 2020-10-26 11:24:05 +01:00
Luke Murphy 0eb5d14ad8
Drop unit tests temporarily 2020-10-26 11:21:58 +01:00
Luke Murphy 6d6208a63c
Add code coverage CI 2020-10-26 11:20:17 +01:00
Luke Murphy 1e059ffe7f
Add coverage target 2020-10-26 11:20:09 +01:00
Luke Murphy eb12f2392c
Ignore coverage folder 2020-10-26 11:19:38 +01:00
Luke Murphy a13e58c6c0
Finally work out subcommands 2020-10-26 10:05:03 +01:00
Luke Murphy 44c41830a7
Finalise docopt parser integration 2020-10-26 09:46:14 +01:00
Luke Murphy ae6c2c26ae
A first stab at docopt-sh integration 2020-10-25 21:41:17 +01:00
Luke Murphy dad72c820a
Re-jig names and add test target in Makefile 2020-10-25 21:31:41 +01:00
Luke Murphy eec9a8ba1a
Add link to site 2020-10-25 21:22:29 +01:00
Luke Murphy bf44270b3d
Make CI zippier with alpine 2020-10-25 21:19:14 +01:00
Luke Murphy 4bf1dbd7eb
Spacing and naming 2020-10-25 21:17:01 +01:00
Luke Murphy 4ca1026c2c
Don't test against dir that doesnt exist 2020-10-25 21:16:42 +01:00
Luke Murphy 891b2cc6c9
Add place holders for change log 2020-10-25 21:13:33 +01:00
Luke Murphy 4de7f24d8e
Start moving installer scripts over 2020-10-25 21:08:08 +01:00
Luke Murphy ad1063a0cc
Trim down README for now 2020-10-25 21:08:03 +01:00
3wc 4cfe143326 Install docker using convenience script 2020-10-23 05:13:06 +02:00
3wc 16cc5d9cf7 Fix tests 2020-10-23 05:04:35 +02:00
3wc 9d22797dc8 Attempt to test using bats / drone 2020-10-23 05:03:01 +02:00
3wc 16a09887e6 Rename `abra context` to `abra server` 2020-10-23 05:02:39 +02:00
3wc b7757b51b1 Fix `abra run` if there are 2 containers up 2020-10-23 03:58:55 +02:00
3wordchant 3c7c7694bf Merge pull request 'Adapt --help output to Click-like format' (#20) from new-help into main
Reviewed-on: https://git.autonomic.zone/autonomic-cooperative/abra/pulls/20
2020-10-23 03:56:50 +02:00
Luke Murphy f15dfd9f5f
First stab at new help 2020-10-22 21:16:30 +02:00
3wc 66dcaedfd0 Add `stack` and `volume` as shortcuts to docker 2020-10-06 20:27:50 +02:00
3wc 6598aabc37 Work even if a local path contains $SERVICE 2020-10-01 01:08:29 +02:00
3wc 6759e6a175 Show multiple COMPOSE_FILEs better
Fixes #16
2020-09-29 00:17:26 +02:00
3wc 8735362580 Load custom commands from $ABRA_STACK_DIR too 2020-09-28 15:02:18 +02:00
3wc 7223dca951 Re-enable running commands as another user
Fixes #14
2020-09-27 23:45:39 +02:00
3wc dd9444b036 Add `context init` command to set up remote swarm 2020-09-27 13:26:27 +02:00
3wc 81e24b6f72 Remove debugging from secret_generate 2020-09-27 13:26:15 +02:00
Luke Murphy 16292df5f6
Fix installer and mark new patch 2020-09-27 08:20:36 +02:00
Luke Murphy 92c91ddbb0
Add log entry 2020-09-27 08:17:00 +02:00
Luke Murphy cff9b13f60
Remove quote 2020-09-27 08:04:22 +02:00
Luke Murphy 0444991636
Fix ticks 2020-09-27 08:04:03 +02:00
Luke Murphy 28ba33b18e
Fix indentation 2020-09-27 08:03:39 +02:00
3wc 77eb83b128 Add credit to sub_multilogs 2020-09-25 00:48:46 +02:00
3wc ff7fcf2201 Combined logging
Closes #8
2020-09-25 00:36:23 +02:00
3wc b0d525a980 Tweak usage text 2020-09-24 21:19:40 +02:00
3wc aa1ffd5d8a Add success() method & `secret insert` subcommand 2020-09-24 21:17:08 +02:00
3wc 5627e67bf7 Bail if we can't load the specified $ABRA_ENV 2020-09-24 14:47:00 +02:00
3wc 29343369f3 Further tidy-up (+ add warning()) 2020-09-24 14:47:00 +02:00
3wc 427ed97678 Update README and tweak default STACK_DIR 2020-09-24 14:47:00 +02:00
3wc b01fee3c86 Add -e, -c and ABRA_STACK_DIR options..
..and tidy up a little
2020-09-24 14:46:57 +02:00
Luke Murphy 949246821f
Clarify versioning 2020-09-24 09:19:58 +02:00
Luke Murphy 60f2892acd
Fix CI 2020-09-24 09:18:31 +02:00
Luke Murphy 0268685cfa
Declare minor bump 2020-09-24 09:09:46 +02:00
Luke Murphy dd4f31d9a1
Switch over to scripts.d 2020-09-24 09:03:25 +02:00
25 changed files with 4337 additions and 281 deletions

View File

@ -3,11 +3,86 @@ kind: pipeline
name: linters
steps:
- name: run shellcheck
image: koalaman/shellcheck-alpine
commands:
- shellcheck abra
- shellcheck bin/*.sh
- shellcheck deploy/install.abra.coopcloud.tech/installer
- name: run flake8
image: alpine/flake8
commands:
- flake8 --max-line-length 100 bin/*.py
- name: run unit tests
image: decentral1se/docker-dind-bats-kcov
commands:
- bats tests
- name: test installation script
image: debian:buster
commands:
- apt update
- apt install -y shellcheck
- shellcheck abra installer
- apt update && apt install -yqq sudo lsb-release
- deploy/install.abra.coopcloud.tech/installer --no-prompt
- ~/.local/bin/abra version
- name: publish image
image: plugins/docker
settings:
auto_tag: true
username: thecoopcloud
password:
from_secret: thecoopcloud_password
repo: thecoopcloud/abra
tags: latest
depends_on:
- run shellcheck
- run flake8
- run unit tests
- test installation script
when:
event:
exclude:
- pull_request
- name: trigger downstream builds
image: plugins/downstream
settings:
server: https://drone.autonomic.zone
token:
from_secret: decentral1se_token
fork: true
repositories:
- coop-cloud/drone-abra
depends_on:
- run shellcheck
- run flake8
- run unit tests
- test installation script
- publish image
when:
event:
exclude:
- pull_request
- name: notify on failure
image: plugins/matrix
settings:
homeserver: https://matrix.autonomic.zone
roomid: "IFazIpLtxiScqbHqoa:autonomic.zone"
userid: "@autono-bot:autonomic.zone"
accesstoken:
from_secret: autono_bot_access_token
depends_on:
- run shellcheck
- run flake8
- run unit tests
- test installation script
- publish image
- trigger downstream builds
when:
status:
- failure
trigger:
branch:
- main

5
.gitignore vendored Normal file
View File

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

View File

@ -1,3 +1,184 @@
> 🔥 🔥 🔥 Please note, while we are still in
> [public alpha](https://docs.cloud.autonomic.zone/roadmap/), the `abra` release
> versioning scheme is not following [semver](https://semver.org/) conventions
> because we are still in the exploratory phases of building this tool. Please
> read the changes before upgrading your `abra` installation as there are
> **most likely** breaking changes coming each release. Sorry for any
> inconvenience caused, we're working hard to make this tool stable. Semver
> will be respected when we reach public beta. 🔥 🔥 🔥
# abra x.x.x (UNRELEASED)
- 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))
# abra 10.0.0 (2021-07-06)
- Add `--bump` to `deploy` command to allow packagers to make minor package related releases ([#173](https://git.autonomic.zone/coop-cloud/abra/issues/173))
- Drop `--skip-version-check`/`--no-domain-poll`/`--no-state-poll` in favour of `--fast` ([#169](https://git.autonomic.zone/coop-cloud/abra/issues/169))
- Move `abra` image under the new `thecoopcloud/...` namespace ([#1](https://git.autonomic.zone/coop-cloud/auto-apps-json/issues/1))
- Add a `--output` flag to the `app-json.py` app generator for the CI environment ([#2](https://git.autonomic.zone/coop-cloud/auto-apps-json/issues/2))
- Support logging in as new `thecoopcloud` Docker account via `skopeo` when generating new `apps.json` ([`7482362`](https://git.autonomic.zone/coop-cloud/abra/commit/7482362af1d01cc02828abd45b1222fa643d1f80))
- App deployment checks are somewhat more reliable (see [#193](https://git.autonomic.zone/coop-cloud/abra/issues/193) for remaining work) ([#165](https://git.autonomic.zone/coop-cloud/abra/issues/165))
- Skip generation of commented out secrets and correctly fail deploy when secret generation fails ([#133](https://git.autonomic.zone/coop-cloud/abra/issues/133))
- Fix logging for chaos deploys and recipe selection logic ([#185](https://git.autonomic.zone/coop-cloud/abra/issues/185))
- Improve reliability of selecting when to download a new `apps.json` ([#170](https://git.autonomic.zone/coop-cloud/abra/issues/170))
- Implement `pwgen`/`pwqgen` native fallback for password generation ([#167](https://git.autonomic.zone/coop-cloud/abra/issues/167) / [#197](https://git.autonomic.zone/coop-cloud/abra/issues/197))
- `abra` installer script will now try to install system requirements ([#196](https://git.autonomic.zone/coop-cloud/abra/issues/196))
- Use latest [v4.9.6](https://github.com/mikefarah/yq/releases/tag/v4.9.6) install of `yq` for vendoring (**upgrade HOWTO:** `rm -rf ~/.abra/vendor/*`)
- Support overriding `$ARGS` from `abra.sh` custom commands and error out correctly when these commands fail ([#1](https://github.com/Coop-Cloud/peertube/issues/1))
- Add `abra <app> restart <service>` to support restarting individual services ([#200](https://git.autonomic.zone/coop-cloud/abra/issues/200))
- Output diff of proposed changes when asking to commit during release logic ([`4b82045`](https://git.autonomic.zone/coop-cloud/abra/commit/4b820457defe1511208b6caa8b9feb9603ffc8be))
- Add validation for generated output when making new release labels ([#186](https://git.autonomic.zone/coop-cloud/abra/issues/186))
# abra 9.0.0 (2021-06-10)
- Add Docker image for `abra` ([`64d578cf`](https://git.autonomic.zone/coop-cloud/abra/commit/64d578cf914bd2bad378ea4ef375747d10b33191))
- 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 ([`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` ([`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 checking out new apps ([#164](https://git.autonomic.zone/coop-cloud/abra/issues/164)
- Give up if YAML is invalid ([#154](https://git.autonomic.zone/coop-cloud/abra/issues/154))
- Switch from wget to cURL ([`fc0caaa`](https://git.autonomic.zone/coop-cloud/abra/commit/fc0caaa))
- Add Bash completion for `recipe ..` ([`8c93d1a`](https://git.autonomic.zone/coop-cloud/abra/commit/8c93d1a))
- Tweak README parsing in `app-json.py` ([`b14219b`](https://git.autonomic.zone/coop-cloud/abra/commit/b14219b))
- Add fallback names to `app.json` ([#157](https://git.autonomic.zone/coop-cloud/abra/issues/157))
- Remove duplicate message ([#155](https://git.autonomic.zone/coop-cloud/abra/issues/155))
- Add `deploy --fast` ([`a7f7c96`](https://git.autonomic.zone/coop-cloud/abra/commit/a7f7c96))
- Add `app .. volume` commands, fix volume deletion with `app .. delete --volumes` ([#161](https://git.autonomic.zone/coop-cloud/abra/issues/161))
# abra 0.7.4 (2021-05-10)
- Sort `apps.json` when publishing ([`39a7fc0`](https://git.autonomic.zone/coop-cloud/abra/commit/39a7fc04fb5df1a6d78b84f51838530ab3eb76db))
- Fix publishing of rating for new apps ([`0e28af9`](https://git.autonomic.zone/coop-cloud/abra/commit/0e28af9eb1af6c6da705b4614ddd173c60576629))
- Detect compose filenames in `n+1` release generation ([`ffc569e`](https://git.autonomic.zone/coop-cloud/abra/commit/ffc569e275df7ca784a4db1a3331e17975fd8c87))
- Fix secret generation when specifying length ([`3a353f4`](https://git.autonomic.zone/coop-cloud/abra/commit/3a353f4062baccde2c9f175b03afb2db6d462ae4))
# abra 0.7.3 (2021-04-28)
- Only check for pw(q)gen if we're actually trying to use them ([#147](https://git.autonomic.zone/coop-cloud/abra/issues/147))
- Use apps.coopcloud.tech for app data hosting & download ([`75bd599`](https://git.autonomic.zone/coop-cloud/abra/commit/75bd599))
- Choose latest commit messages for new tags ([#144](https://git.autonomic.zone/coop-cloud/abra/issues/144))
- Handle recipes without an `app` service in `recipe .. release` ([#151](https://git.autonomic.zone/coop-cloud/abra/issues/151))
# abra 0.7.2 (2021-04-07)
- Fix installation script development installs (again! Thanks Bash!) ([`4747d9b7`](https://git.autonomic.zone/coop-cloud/abra/commit/4747d9b7fb5fba914f210b6570bfe2db0b53da23))
# abra 0.7.1 (2021-04-07)
- 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))
- 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))
- Search for subcommands in descending order of how many components there are ([#108](https://git.autonomic.zone/coop-cloud/abra/issues/108))
- Add specific app version checking command (`abra app <app> version`) ([#108](https://git.autonomic.zone/coop-cloud/abra/issues/108))
- Add docker version check (guestimating < v19 is a bad idea) ([#15](https://git.autonomic.zone/coop-cloud/abra/issues/15))
- Fix git branch handling when not passing `-b <branch>` ([#122](https://git.autonomic.zone/coop-cloud/abra/issues/122))
- Add work-around to correctly git clone non-master default branch app repositories ([#122](https://git.autonomic.zone/coop-cloud/abra/issues/122))
- Replace `--force` (except for the `deploy` command) with a global `--no-prompt` for avoiding interactive questions ([#118](https://git.autonomic.zone/coop-cloud/abra/issues/118))
- Use [docker-stack-wait-deploy](https://github.com/vitalets/docker-stack-wait-deploy) inspired logic to deploy apps ([#116](https://git.autonomic.zone/coop-cloud/abra/issues/116))
- Add a domain polling check when deploying apps ([#113](https://git.autonomic.zone/coop-cloud/abra/issues/113))
- 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))
- Look up local available version from compose files instead of `abra.sh` ([#131](https://git.autonomic.zone/coop-cloud/abra/issues/131))
- Improve domain polling logging and allow to skip the check altogether with `--no-domain-poll` ([#140](https://git.autonomic.zone/coop-cloud/abra/issues/140), [#141](https://git.autonomic.zone/coop-cloud/abra/issues/141))
- Support `ABRA_DIR` in the installer script ([`4e94a424e`](https://git.autonomic.zone/coop-cloud/abra/commit/4e94a424e94a42))
- Support [abra-hetzner](https://git.autonomic.zone/coop-cloud/abra-hetzner) plugin ([#88](https://git.autonomic.zone/coop-cloud/abra/issues/88))
# abra 0.6.0 (2021-03-17)
- Show version and digest of app if labelled ([`98e674b8e`](https://git.autonomic.zone/coop-cloud/abra/commit/98e674b8e83458a83dcbf331e8e34c7188559c4a))
- Implement basic version checking on deployment ([#82](https://git.autonomic.zone/coop-cloud/abra/issues/82))
- New `app-catalogue.sh` script to auto-generate app list for documentation ([`f163d4b0f`](https://git.autonomic.zone/coop-cloud/abra/commit/f163d4b0fa920232e9d995a22d20fe78b174b3a9))
- 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))
- 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))
- 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))
# 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))
- 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))
- 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))
- 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))
- `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))
# abra 0.4.1 (2020-12-24)
- Bug-fixes on `app ls --status` & custom commands
- Add `app ls --server=...` and alias
# abra 0.4.0 (2020-12-24)
- New command-line interface based on docopt
- `~/.abra` directory instead of expecting local `.env` files
- Integration tests & code coverage
# abra 0.3.1 (2020-09-27)
- Fix installer version
# abra 0.3.0 (2020-09-27)
- Add multilogs stack logs implementation ([#8](https://git.autonomic.zone/compose-stacks/abra/issues/8))
- Add beginnings of "monorepo" functionality
# abra 0.2.0 (2020-09-24)
- Prepare for swarm install script using script.d ([#12](https://git.autonomic.zone/compose-stacks/planning/issues/12))
# abra 0.1.2 (2020-09-22)
- Add upgrade command ([#10](https://git.autonomic.zone/autonomic-cooperative/abra/issues/10))

33
Dockerfile Normal file
View File

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

View File

@ -1,14 +0,0 @@
default: install
dev_install:
ln -sf $(PWD)/abra ~/.local/bin
install:
install abra /usr/bin/abra
get_yq:
wget https://github.com/mikefarah/yq/releases/download/3.3.2/yq_linux_amd64 && \
chmod +x yq_linux_amd64 && \
mv yq_linux_amd64 yq
.PHONY: dev_install install get_yq

View File

@ -1,31 +1,92 @@
# abra
[![Build Status](https://drone.autonomic.zone/api/badges/autonomic-cooperative/abra/status.svg)](https://drone.autonomic.zone/autonomic-cooperative/abra)
[![Build Status](https://drone.autonomic.zone/api/badges/coop-cloud/abra/status.svg)](https://drone.autonomic.zone/coop-cloud/abra)
Docker stack magic 🎩🐇
> https://coopcloud.tech
## Install
The Co-op Cloud utility belt 🎩🐇
```sh
curl -fsSL https://install.abra.autonomic.zone | bash
```
`abra` is a command-line tool for managing your own [Co-op Cloud](https://coopcloud.tech). It can provision new servers, create applications, deploy them, run backup and restore operations and a whole lot of other things. It is the go-to tool for day-to-day operations when managing a Co-op Cloud instance.
Specific releases are available via the project [release page](https://git.autonomic.zone/autonomic-cooperative/abra/releases).
## Change log
## Changes
> 🔥 🔥 🔥 Please note, while we are still in [public
> alpha](https://docs.coopcloud.tech/roadmap/), the `abra` release
> versioning scheme is not following [semver](https://semver.org/) conventions
> because we are still in the exploratory phases of building this tool. Please
> read the changes before upgrading your `abra` installation as there are
> **most likely** breaking changes coming each release. Sorry for any
> inconvenience caused, we're working hard to make this tool stable. Semver
> will be respected when we reach public beta. 🔥 🔥 🔥
See [CHANGELOG.md](./CHANGELOG.md).
## Hacking
## Documentation
> [docs.coopcloud.tech](https://docs.coopcloud.tech)
## Requirements
- `curl`
- `docker`
- `bash` >= 4
## Install
Install the latest stable release:
```sh
git clone ssh://git@git.autonomic.zone:2222/autonomic-cooperative/abra.git
cd abra
make dev_install
curl https://install.abra.coopcloud.tech | bash
```
See [autonomic-cooperative/installer-scripts](https://git.autonomic.zone/autonomic-cooperative/installer-scripts) for the installer script deployment. To make a release, just add an entry to [CHANGELOG.md](./CHANGELOG.md) and the [installer](./installer) (following [semver](https://semver.org/) please) and then `git tag x.x.x && git push origin main --tags`. If you want the [installer-scripts](https://git.autonomic.zone/autonomic-cooperative/installer-scripts) deployment to pick that up, you'll need to change the version number in the [Makefile](https://git.autonomic.zone/autonomic-cooperative/installer-scripts/src/branch/main/Makefile) and run `make` in that repository and push the changes.
The source for this script is [here](./deploy/install.abra.coopcloud.tech/installer).
## Examples
You can pass options to the script like so (e.g. install the bleeding edge development version):
- `abra run mariadb mysqldump gitea -p'GdIbMeS09SURRktBnm3jcTufsL5z0MPd' | gzip > ../git.autonomic.zone_mariadb_`date +%F`.sql.gz`
```sh
curl https://install.abra.coopcloud.tech | bash -s -- --dev
```
Other options available are as follows:
- **--no-prompt**: non-interactive installation
- **--no-deps**: do not attempt to install [requirements](#requirements)
## Container
An [image](https://hub.docker.com/r/thecoopcloud/abra) is also provided.
```
docker run thecoopcloud/abra app ls
```
## Update
Run `abra upgrade` to automatically download and install the latest release
version.
To update the development version, run `abra upgrade --dev`.
## Hack
It's written in Bash version 4 or greater!
Install it via `curl https://install.abra.coopcloud.tech | bash -s -- --dev`, then you can hack on the source in `~/.abra/src`.
The command-line interface is generated via [docopt](http://docopt.org/). If you add arguments then you need to run `make docopt` ro regenerate the parser.
Please remember to update the [CHANGELOG](./CHANGELOG.md) when you make a change.
## Releasing
### `abra`
> [install.abra.coopcloud.tech](https://install.abra.coopcloud.tech)
- Change the `x.x.x` header in [CHANGELOG.md](./CHANGELOG.md) to reflect new version and mark date
- Update the version in [abra](./abra)
- Update the version in [deploy/install.abra.coopcloud.tech/installer](./deploy/install.abra.coopcloud.tech/installer)
- `git commit` the above changes and then tag it with `git tag <your-new-version>`
- `git push` and `git push --tags`
- Deploy a new installer script `make release-installer`
- Tell the world (CoTech forum, Matrix public channel, Autonomic mastodon, etc.)

2977
abra

File diff suppressed because it is too large Load Diff

112
bin/abralib.py Normal file
View File

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

103
bin/app-catalogue.sh Executable file
View File

@ -0,0 +1,103 @@
#!/bin/bash
# shellcheck disable=SC2119
# Usage: ./app-catalogue.sh
#
# Gather metadata from Co-op Cloud apps in $ABRA_DIR/apps (default
# ~/.abra/apps), and format it as a Markdown table for this page:
# https://docs.cloud.autonomic.zone/apps/
stack_dir="${ABRA_DIR:-$HOME/.abra}/apps/"
cd "$stack_dir" || exit
# load all README files into ENV_FILES array
mapfile -t readmes < <(find -L . -name "README.md")
# FIXME 3wc: requires bash 4, use for loop instead
base_url="https://git.autonomic.zone/coop-cloud"
cat_apps=()
cat_development=()
cat_utilities=()
cat_graveyard=()
get_var() {
echo "$1" | grep "$2" | sed 's/^[^:]*: //'
}
# shellcheck disable=SC2120
trim() {
# accept input as argument or from STDIN, see here:
# https://zwbetz.com/passing-input-to-a-bash-function-via-arguments-or-stdin/
# shellcheck disable=SC2155
local input="$([[ -p /dev/stdin ]] && cat - || echo "$@")"
[[ -z "$input" ]] && return 1
echo "$input" | tr -d ' '
}
# shellcheck disable=SC2120
prettify() {
# as above
# shellcheck disable=SC2155
local input="$([[ -p /dev/stdin ]] && cat - || echo "$@")"
[[ -z "$input" ]] && return 1
echo "$input" | sed -e 's/Yes/✅/' -e 's/No/❌/' -e 's/N\/A/⛔/'
}
for readme in "${readmes[@]}"; do
type="$(basename "${readme%README.md}")"
if [ "$type" = "example" ]; then
continue
fi
title="$(grep '^# ' "$type/README.md" | sed 's/^# //' )"
# find section between 'metadata' and 'endmetadata' comments
metadata="$(awk '/-- metadata --/,/-- endmetadata --/' "$type/README.md")"
status="$(get_var "$metadata" "Status")"
category="$(get_var "$metadata" "Category" | cut -d',' -f2 | trim)"
if [ -z "$category" ]; then
echo "ERROR: missing category for $type"
continue
fi
image="$(get_var "$metadata" "Image" | cut -d',' -f2 | trim)"
healthcheck="$(get_var "$metadata" "Healthcheck" | prettify)"
backups="$(get_var "$metadata" "Backups" | prettify)"
email="$(get_var "$metadata" "Email" | prettify)"
tests="$(get_var "$metadata" "Tests" | prettify)"
sso="$(get_var "$metadata" "SSO" | prettify)"
row="| [$title]($base_url/$type) | $status | $image | $healthcheck | $backups | $email | $tests | $sso |"
category_lower="$(echo "$category" | tr '[:upper:]' '[:lower:]')"
eval "cat_$category_lower+=( '$row' )"
done
headers="
| **Name** | **Status** | **Image** | **Healtcheck** | **Backups** | **Email** | **CI** | **Single-Sign-On** |
| --- | --- | --- | --- | --- | --- | --- | --- |"
echo "## Applications"
echo "$headers"
printf '%s\n' "${cat_apps[@]}" | sort
echo
echo "## Developer tools"
echo "$headers"
printf '%s\n' "${cat_development[@]}" | sort
echo
echo "## Utilities"
echo "$headers"
printf '%s\n' "${cat_utilities[@]}" | sort
echo
echo "## Graveyard"
echo "$headers"
printf '%s\n' "${cat_graveyard[@]}" | sort

237
bin/app-json.py Executable file
View File

@ -0,0 +1,237 @@
#!/usr/bin/env python3
# Usage: ./app-json.py
#
# Gather metadata from Co-op Cloud apps in $ABRA_DIR/apps (default
# ~/.abra/apps), and format it as JSON so that it can be hosted here:
# https://apps.coopcloud.tech
import argparse
from json import dump
from os import chdir, environ, getcwd, listdir
from os.path import basename
from pathlib import Path
from re import findall, search
from subprocess import DEVNULL
from requests import get
from abralib import (
CLONES_PATH,
JQ_PATH,
REPOS_TO_SKIP,
YQ_PATH,
_run_cmd,
clone_all_apps,
get_repos_json,
log,
)
parser = argparse.ArgumentParser(description="Generate a new apps.json")
parser.add_argument("--output", type=Path, default=f"{getcwd()}/apps.json")
def skopeo_login():
"""Log into the docker registry to avoid rate limits."""
user = environ.get("SKOPEO_USER")
password = environ.get("SKOPEO_PASSWORD")
registry = environ.get("SKOPEO_REGISTRY", "docker.io")
if not user or not password:
log.info("Failed to log in via Skopeo due to missing env vars")
return
login_cmd = f"skopeo login {registry} -u {user} -p {password}"
output = _run_cmd(login_cmd, shell=True)
log.info(f"Skopeo login attempt: {output}")
def get_published_apps_json():
"""Retrieve already published apps json."""
url = "https://apps.coopcloud.tech"
log.info(f"Retrieving {url}")
try:
return get(url, timeout=5).json()
except Exception as exception:
log.error(f"Failed to retrieve {url}, saw {str(exception)}")
return {}
def generate_apps_json(repos_json):
"""Generate the abra-apps.json application versions file."""
apps_json = {}
cached_apps_json = get_published_apps_json()
for app in listdir(CLONES_PATH):
if app in REPOS_TO_SKIP:
log.info(f"Skipping {app}")
continue
repo_details = next(filter(lambda x: x["name"] == app, repos_json), {})
app_path = f"{CLONES_PATH}/{app}"
chdir(app_path)
metadata = get_app_metadata(app_path)
name = metadata.pop("name", app)
log.info(f"Processing {app}")
apps_json[app] = {
"name": name,
"category": metadata.get("category", ""),
"repository": repo_details.get("clone_url", ""),
"default_branch": repo_details.get("default_branch", ""),
"description": repo_details.get("description", ""),
"website": repo_details.get("website", ""),
"features": metadata,
"versions": get_app_versions(app_path, cached_apps_json),
"icon": repo_details.get("avatar_url", ""),
}
return apps_json
def get_app_metadata(app_path):
"""Parse metadata from app repo README files."""
metadata = {}
chdir(app_path)
try:
with open(f"{app_path}/README.md", "r") as handle:
log.info(f"{app_path}/README.md")
contents = handle.read()
except Exception:
log.info(f"No {app_path}/README.md discovered, moving on")
return {}
try:
for match in findall(r"\*\*.*", contents):
title = search(r"(?<=\*\*).*(?=\*\*)", match).group().lower()
if title == "image":
value = {
"image": search(r"(?<=`).*(?=`)", match).group(),
"url": search(r"(?<=\().*(?=\))", match).group(),
"rating": match.split(",")[1].strip(),
"source": match.split(",")[-1].replace("*", "").strip(),
}
elif title == "status":
value = {"❶💚": 1, "❷💛": 2, "❸🍎": 3, "❹💣": 4, "?": 5, "": 5}[
match.split(":")[-1].replace("*", "").strip()
]
else:
value = match.split(":")[-1].replace("*", "").strip()
metadata[title] = value
metadata["name"] = findall(r"^# (.*)", contents)[0]
except (IndexError, AttributeError):
log.info(f"Can't parse {app_path}/README.md")
return {}
finally:
_run_cmd("git checkout HEAD")
log.info(f"Parsed {metadata}")
return metadata
def get_app_versions(app_path, cached_apps_json):
versions = {}
chdir(app_path)
tags = _run_cmd("git tag --list").split()
if not tags:
log.info("No tags discovered, moving on")
return {}
initial_branch = _run_cmd("git rev-parse --abbrev-ref HEAD")
app_name = basename(app_path)
try:
existing_tags = cached_apps_json[app_name]["versions"].keys()
except KeyError:
existing_tags = []
for tag in tags:
_run_cmd(f"git checkout {tag}", stderr=DEVNULL)
services_cmd = f"{YQ_PATH} e '.services | keys | .[]' compose*.yml"
services = _run_cmd(services_cmd, shell=True).split()
parsed_services = []
service_versions = {}
for service in services:
if service in ("null", "---"):
continue
if (
tag in existing_tags
and service in cached_apps_json[app_name]["versions"][tag]
):
log.info(f"Skipping {tag} because we've already processed it")
existing_versions = cached_apps_json[app_name]["versions"][tag][service]
service_versions[service] = existing_versions
_run_cmd(f"git checkout {initial_branch}")
continue
if service in parsed_services:
log.info(f"Skipped {service}, we've already parsed it locally")
continue
services_cmd = f"{YQ_PATH} e '.services.{service}.image' compose*.yml"
images = _run_cmd(services_cmd, shell=True).split()
for image in images:
if image in ("null", "---"):
continue
images_cmd = f"skopeo inspect docker://{image} | {JQ_PATH} '.Digest'"
output = _run_cmd(images_cmd, shell=True)
service_version_info = {
"image": image.split(":")[0],
"tag": image.split(":")[-1],
"digest": output.split(":")[-1][:8],
}
log.info(f"Parsed {service_version_info}")
service_versions[service] = service_version_info
parsed_services.append(service)
versions[tag] = service_versions
_run_cmd(f"git checkout {initial_branch}")
return versions
def main():
"""Run the script."""
args = parser.parse_args()
skopeo_login()
repos_json = get_repos_json()
clone_all_apps(repos_json)
with open(args.output, "w", encoding="utf-8") as handle:
dump(
generate_apps_json(repos_json),
handle,
ensure_ascii=False,
indent=4,
sort_keys=True,
)
log.info(f"Successfully generated {args.output}")
main()

16
bin/clone-all-apps.py Executable file
View File

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

49
bin/github-sync.py Executable file
View File

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

20
bin/renovate-ls-apps.py Executable file
View File

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

52
completion/_abra Normal file
View File

@ -0,0 +1,52 @@
#compdef abra
_abra () {
local context state line curcontext="$curcontext" ret=1
_arguments -n : \
{-h,--help}'[Help message]' \
'1:commands:(app server)' \
'*::arguments:->arguments' \
&& ret=0
case $state in
(arguments)
curcontext="${curcontext%:*:*}:abra-arguments-$words[1]:"
case $words[1] in
(app)
_arguments \
'1: :_abra_apps' \
&& ret=0
;;
(server)
_arguments \
'1:servers:_abra_servers' \
&& ret=0
;;
esac
;;
esac
return ret
}
_abra_servers() {
_path_files -/W $HOME/.abra/servers
}
_abra_apps()
{
local newapps apps=($HOME/.abra/servers/*/*.env)
typeset -a apps
newapps=()
for app in $apps; do
newapps+=($(_abra_basename "${app}"))
done
_describe -t apps 'app' newapps
}
_abra_basename()
{
printf -- "${1##*/}"
}
_abra "$@"

140
completion/abra.bash Normal file
View File

@ -0,0 +1,140 @@
#!/usr/bin/env bash
_abra_basename()
{
echo "${1##*/}"
}
_abra_servers()
{
# FIXME 3wc: copied from abra/get_servers()
shopt -s nullglob dotglob
local SERVERS=(~/.abra/servers/*)
shopt -u nullglob dotglob
for SERVER in "${SERVERS[@]}"; do
_abra_basename "${SERVER}"
done
}
_abra_complete_servers()
{
mapfile -t COMPREPLY < <(compgen -W "$(_abra_servers)" -- "$1")
}
_abra_apps()
{
shopt -s nullglob dotglob
local APPS=(~/.abra/servers/*/*.env)
shopt -u nullglob dotglob
for APP in "${APPS[@]}"; do
_abra_basename "${APP%.env}"
done
}
_abra_complete_apps()
{
mapfile -t COMPREPLY < <(compgen -W "$(_abra_apps)" -- "$1")
}
_abra_recipes()
{
shopt -s nullglob dotglob
local RECIPES=(~/.abra/apps/*)
shopt -u nullglob dotglob
for RECIPE in "${RECIPES[@]}"; do
_abra_basename "${RECIPE%.env}"
done
}
_abra_complete_recipes()
{
mapfile -t COMPREPLY < <(compgen -W "$(_abra_recipes)" -- "$1")
}
_abra_complete()
{
compopt +o default +o nospace
COMPREPLY=()
local -r cmds='
app
server
recipe
'
local -r short_opts='-e -h -s -v'
local -r long_opts='--env --help --stack --version'
# Scan through the command line and find the abra command
# (if present), as well as its expected position.
local cmd
local cmd_index=1 # Expected index of the command token.
local i
for (( i = 1; i < ${#COMP_WORDS[@]}; i++ )); do
local word="${COMP_WORDS[i]}"
case "$word" in
-*)
((cmd_index++))
;;
*)
cmd="$word"
break
;;
esac
done
local cur="${COMP_WORDS[COMP_CWORD]}"
if (( COMP_CWORD < cmd_index )); then
# Offer option completions.
case "$cur" in
--*)
mapfile -t COMPREPLY < <(compgen -W "$long_opts" -- "$cur")
;;
-*)
mapfile -t COMPREPLY < <(compgen -W "$short_opts" -- "$cur")
;;
*)
# Skip completion; we should never get here.
;;
esac
elif (( COMP_CWORD == cmd_index )); then
# Offer command name completions.
mapfile -t COMPREPLY < <(compgen -W "$cmds" -- "$cur")
else
# Offer command argument completions.
case "$cmd" in
server)
# Offer exactly one server name completion.
if (( COMP_CWORD == cmd_index + 1 )); then
_abra_complete_servers "$cur"
fi
;;
app)
# Offer exactly one app completion.
if (( COMP_CWORD == cmd_index + 1 )); then
_abra_complete_apps "$cur"
fi
;;
recipe)
# Offer exactly one app completion.
if (( COMP_CWORD == cmd_index + 1 )); then
_abra_complete_recipes "$cur"
fi
;;
#help)
# # Offer exactly one command name completion.
# if (( COMP_CWORD == cmd_index + 1 )); then
# COMPREPLY=($(compgen -W "$cmds" -- "$cur"))
# fi
# ;;
*)
# Unknown command or unknowable argument.
;;
esac
fi
}
complete -o default -F _abra_complete abra

View File

@ -0,0 +1,38 @@
---
version: "3.8"
services:
app:
image: "nginx:stable"
configs:
- source: abra_conf
target: /etc/nginx/conf.d/abra.conf
- source: abra_installer
target: /var/www/abra-installer/installer
volumes:
- "public:/var/www/abra-installer"
networks:
- proxy
deploy:
update_config:
failure_action: rollback
order: start-first
labels:
- "traefik.enable=true"
- "traefik.http.services.abra-installer.loadbalancer.server.port=80"
- "traefik.http.routers.abra-installer.rule=Host(`install.abra.autonomic.zone`,`install.abra.coopcloud.tech`)"
- "traefik.http.routers.abra-installer.entrypoints=web-secure"
- "traefik.http.routers.abra-installer.tls.certresolver=production"
configs:
abra_installer:
file: installer
abra_conf:
file: nginx.conf
networks:
proxy:
external: true
volumes:
public:

View File

@ -0,0 +1,217 @@
#!/usr/bin/env bash
# shellcheck disable=SC2154,SC2034
ABRA_VERSION="10.0.0"
GIT_URL="https://git.coopcloud.tech/coop-cloud/abra"
ABRA_SRC="$GIT_URL/raw/tag/$ABRA_VERSION/abra"
ABRA_DIR="${ABRA_DIR:-$HOME/.abra}"
DOC="
abra command-line installer script
Usage:
installer [options]
Options:
-h, --help Show this message and exit
-d, --dev Install bleeding edge development version
-n, --no-prompt Don't prompt for input and run non-interactively
-p, --no-deps Don't attempt to install system dependencies
"
# docopt parser below, refresh this parser with `docopt.sh installer`
# shellcheck disable=2016,1075
docopt() { parse() { if ${DOCOPT_DOC_CHECK:-true}; then local doc_hash
if doc_hash=$(printf "%s" "$DOC" | (sha256sum 2>/dev/null || shasum -a 256)); then
if [[ ${doc_hash:0:5} != "$digest" ]]; then
stderr "The current usage doc (${doc_hash:0:5}) does not match \
what the parser was generated with (${digest})
Run \`docopt.sh\` to refresh the parser."; _return 70; fi; fi; fi
local root_idx=$1; shift; argv=("$@"); parsed_params=(); parsed_values=()
left=(); testdepth=0; local arg; while [[ ${#argv[@]} -gt 0 ]]; do
if [[ ${argv[0]} = "--" ]]; then for arg in "${argv[@]}"; do
parsed_params+=('a'); parsed_values+=("$arg"); done; break
elif [[ ${argv[0]} = --* ]]; then parse_long
elif [[ ${argv[0]} = -* && ${argv[0]} != "-" ]]; then parse_shorts
elif ${DOCOPT_OPTIONS_FIRST:-false}; then for arg in "${argv[@]}"; do
parsed_params+=('a'); parsed_values+=("$arg"); done; break; else
parsed_params+=('a'); parsed_values+=("${argv[0]}"); argv=("${argv[@]:1}"); fi
done; local idx; if ${DOCOPT_ADD_HELP:-true}; then
for idx in "${parsed_params[@]}"; do [[ $idx = 'a' ]] && continue
if [[ ${shorts[$idx]} = "-h" || ${longs[$idx]} = "--help" ]]; then
stdout "$trimmed_doc"; _return 0; fi; done; fi
if [[ ${DOCOPT_PROGRAM_VERSION:-false} != 'false' ]]; then
for idx in "${parsed_params[@]}"; do [[ $idx = 'a' ]] && continue
if [[ ${longs[$idx]} = "--version" ]]; then stdout "$DOCOPT_PROGRAM_VERSION"
_return 0; fi; done; fi; local i=0; while [[ $i -lt ${#parsed_params[@]} ]]; do
left+=("$i"); ((i++)) || true; done
if ! required "$root_idx" || [ ${#left[@]} -gt 0 ]; then error; fi; return 0; }
parse_shorts() { local token=${argv[0]}; local value; argv=("${argv[@]:1}")
[[ $token = -* && $token != --* ]] || _return 88; local remaining=${token#-}
while [[ -n $remaining ]]; do local short="-${remaining:0:1}"
remaining="${remaining:1}"; local i=0; local similar=(); local match=false
for o in "${shorts[@]}"; do if [[ $o = "$short" ]]; then similar+=("$short")
[[ $match = false ]] && match=$i; fi; ((i++)) || true; done
if [[ ${#similar[@]} -gt 1 ]]; then
error "${short} is specified ambiguously ${#similar[@]} times"
elif [[ ${#similar[@]} -lt 1 ]]; then match=${#shorts[@]}; value=true
shorts+=("$short"); longs+=(''); argcounts+=(0); else value=false
if [[ ${argcounts[$match]} -ne 0 ]]; then if [[ $remaining = '' ]]; then
if [[ ${#argv[@]} -eq 0 || ${argv[0]} = '--' ]]; then
error "${short} requires argument"; fi; value=${argv[0]}; argv=("${argv[@]:1}")
else value=$remaining; remaining=''; fi; fi; if [[ $value = false ]]; then
value=true; fi; fi; parsed_params+=("$match"); parsed_values+=("$value"); done
}; parse_long() { local token=${argv[0]}; local long=${token%%=*}
local value=${token#*=}; local argcount; argv=("${argv[@]:1}")
[[ $token = --* ]] || _return 88; if [[ $token = *=* ]]; then eq='='; else eq=''
value=false; fi; local i=0; local similar=(); local match=false
for o in "${longs[@]}"; do if [[ $o = "$long" ]]; then similar+=("$long")
[[ $match = false ]] && match=$i; fi; ((i++)) || true; done
if [[ $match = false ]]; then i=0; for o in "${longs[@]}"; do
if [[ $o = $long* ]]; then similar+=("$long"); [[ $match = false ]] && match=$i
fi; ((i++)) || true; done; fi; if [[ ${#similar[@]} -gt 1 ]]; then
error "${long} is not a unique prefix: ${similar[*]}?"
elif [[ ${#similar[@]} -lt 1 ]]; then
[[ $eq = '=' ]] && argcount=1 || argcount=0; match=${#shorts[@]}
[[ $argcount -eq 0 ]] && value=true; shorts+=(''); longs+=("$long")
argcounts+=("$argcount"); else if [[ ${argcounts[$match]} -eq 0 ]]; then
if [[ $value != false ]]; then
error "${longs[$match]} must not have an argument"; fi
elif [[ $value = false ]]; then
if [[ ${#argv[@]} -eq 0 || ${argv[0]} = '--' ]]; then
error "${long} requires argument"; fi; value=${argv[0]}; argv=("${argv[@]:1}")
fi; if [[ $value = false ]]; then value=true; fi; fi; parsed_params+=("$match")
parsed_values+=("$value"); }; required() { local initial_left=("${left[@]}")
local node_idx; ((testdepth++)) || true; for node_idx in "$@"; do
if ! "node_$node_idx"; then left=("${initial_left[@]}"); ((testdepth--)) || true
return 1; fi; done; if [[ $((--testdepth)) -eq 0 ]]; then
left=("${initial_left[@]}"); for node_idx in "$@"; do "node_$node_idx"; done; fi
return 0; }; optional() { local node_idx; for node_idx in "$@"; do
"node_$node_idx"; done; return 0; }; switch() { local i
for i in "${!left[@]}"; do local l=${left[$i]}
if [[ ${parsed_params[$l]} = "$2" ]]; then
left=("${left[@]:0:$i}" "${left[@]:((i+1))}")
[[ $testdepth -gt 0 ]] && return 0; if [[ $3 = true ]]; then
eval "((var_$1++))" || true; else eval "var_$1=true"; fi; return 0; fi; done
return 1; }; stdout() { printf -- "cat <<'EOM'\n%s\nEOM\n" "$1"; }; stderr() {
printf -- "cat <<'EOM' >&2\n%s\nEOM\n" "$1"; }; error() {
[[ -n $1 ]] && stderr "$1"; stderr "$usage"; _return 1; }; _return() {
printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:333}
usage=${DOC:37:28}; digest=36916; shorts=(-h -d -n -p)
longs=(--help --dev --no-prompt --no-deps); argcounts=(0 0 0 0); node_0(){
switch __help 0; }; node_1(){ switch __dev 1; }; node_2(){ switch __no_prompt 2
}; node_3(){ switch __no_deps 3; }; node_4(){ optional 0 1 2 3; }; node_5(){
optional 4; }; node_6(){ required 5; }; node_7(){ required 6; }
cat <<<' docopt_exit() { [[ -n $1 ]] && printf "%s\n" "$1" >&2
printf "%s\n" "${DOC:37:28}" >&2; exit 1; }'; unset var___help var___dev \
var___no_prompt var___no_deps; parse 7 "$@"; local prefix=${DOCOPT_PREFIX:-''}
unset "${prefix}__help" "${prefix}__dev" "${prefix}__no_prompt" \
"${prefix}__no_deps"; eval "${prefix}"'__help=${var___help:-false}'
eval "${prefix}"'__dev=${var___dev:-false}'
eval "${prefix}"'__no_prompt=${var___no_prompt:-false}'
eval "${prefix}"'__no_deps=${var___no_deps:-false}'; local docopt_i=1
[[ $BASH_VERSION =~ ^4.3 ]] && docopt_i=2; for ((;docopt_i>0;docopt_i--)); do
declare -p "${prefix}__help" "${prefix}__dev" "${prefix}__no_prompt" \
"${prefix}__no_deps"; done; }
# docopt parser above, complete command for generating this parser is `docopt.sh installer`
function prompt_confirm {
if [ "$no_prompt" == "true" ]; then
return
fi
read -rp "Continue? [y/N]? " choice
case "$choice" in
y|Y ) return ;;
* ) exit;;
esac
}
function show_banner {
echo ""
echo " ____ ____ _ _ "
echo " / ___|___ ___ _ __ / ___| | ___ _ _ __| |"
echo " | | / _ \ _____ / _ \| '_ \ | | | |/ _ \| | | |/ _' |"
echo " | |__| (_) |_____| (_) | |_) | | |___| | (_) | |_| | (_| |"
echo " \____\___/ \___/| .__/ \____|_|\___/ \__,_|\__,_|"
echo " |_|"
echo ""
}
function install_docker {
sudo apt-get remove docker docker-engine docker.io containerd runc
sudo apt-get install -yq \
apt-transport-https \
ca-certificates \
gnupg \
lsb-release
curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
echo \
"deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian \
$(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
sudo apt-get update
sudo apt-get install -yq docker-ce docker-ce-cli containerd.io
}
function install_requirements {
if [ -f "/etc/debian_version" ]; then
echo "Detected Debian based distribution, attempting to install system requirements..."
sudo apt update && sudo apt install -y \
passwdqc \
pwgen
echo "Install Docker (https://docs.docker.com/engine/install/debian/)?"
prompt_confirm
install_docker
else
echo "Sorry, we only support Debian based distributions at the moment"
echo "You'll have to install the requirements manually for your distribution"
echo "See https://git.autonomic.zone/coop-cloud/abra#requirements for more"
fi
}
function install_abra_release {
mkdir -p "$HOME/.local/bin"
curl "$ABRA_SRC" > "$HOME/.local/bin/abra"
chmod +x "$HOME/.local/bin/abra"
echo "abra installed to $HOME/.local/bin/abra"
}
function install_abra_dev {
mkdir -p "$ABRA_DIR/"
if [[ ! -d "$ABRA_DIR/src" ]]; then
git clone "$GIT_URL" "$ABRA_DIR/src"
fi
(cd "$ABRA_DIR/src" && git pull origin main && cd - || exit)
mkdir -p "$HOME/.local/bin"
ln -sf "$ABRA_DIR/src/abra" "$HOME/.local/bin/abra"
echo "abra installed to $HOME/.local/bin/abra (development bleeding edge)"
}
function run_installation {
show_banner
DOCOPT_PREFIX=installer_
DOCOPT_ADD_HELP=false
eval "$(docopt "$@")"
dev="$installer___dev"
no_prompt="$installer___no_prompt"
no_deps="$installer___no_deps"
if [ "$no_deps" == "false" ]; then
install_requirements
fi
if [ "$dev" == "true" ]; then
install_abra_dev
else
install_abra_release
fi
}
run_installation "$@"
exit 0

View File

@ -0,0 +1,10 @@
server {
listen 80 default_server;
server_name install.abra.autonomic.zone install.abra.coopcloud.tech;
location / {
root /var/www/abra-installer;
add_header Content-Type text/plain;
index installer;
}
}

View File

@ -1,18 +0,0 @@
#!/bin/bash
ABRA_VERSION="0.1.2"
ABRA_SRC="https://git.autonomic.zone/autonomic-cooperative/abra/raw/tag/$ABRA_VERSION/abra"
function install_abra {
mkdir -p "$HOME/.local/bin"
curl "$ABRA_SRC" > "$HOME/.local/bin/abra"
chmod +x "$HOME/.local/bin/abra"
echo "abra installed to $HOME/.loca/bin/abra"
}
function run_installation {
install_abra
}
run_installation
exit 0

59
makefile Normal file
View File

@ -0,0 +1,59 @@
.PHONY: test shellcheck docopt release-installer build push deploy-docopt symlink
test:
@sudo DOCKER_CONTEXT=default docker run \
-v $$(pwd):/workdir \
--privileged \
-d \
--name=abra-test-dind \
-e DOCKER_TLS_CERTDIR="" \
decentral1se/docker-dind-bats-kcov \
@DOCKER_CONTEXT=default sudo docker exec \
-it \
abra-test-dind \
sh -c "cd /workdir && bats /workdir/tests"
@DOCKER_CONTEXT=default sudo docker stop abra-test-dind
@DOCKER_CONTEXT=default sudo docker rm abra-test-dind
shellcheck:
@docker run \
-it \
--rm \
-v $$(pwd):/workdir \
koalaman/shellcheck-alpine \
sh -c "shellcheck /workdir/abra && \
shellcheck /workdir/bin/*.sh && \
shellcheck /workdir/deploy/install.abra.coopcloud.tech/installer"
docopt:
@if [ ! -d ".venv" ]; then \
python3 -m venv .venv && \
.venv/bin/pip install -U pip setuptools wheel && \
.venv/bin/pip install docopt-sh; \
fi
.venv/bin/docopt.sh abra
deploy-docopt:
@if [ ! -d ".venv" ]; then \
python3 -m venv .venv && \
.venv/bin/pip install -U pip setuptools wheel && \
.venv/bin/pip install docopt-sh; \
fi
.venv/bin/docopt.sh deploy/install.abra.coopcloud.tech/installer
release-installer:
@DOCKER_CONTEXT=swarm.autonomic.zone \
docker stack rm abra-installer-script && \
cd deploy/install.abra.coopcloud.tech && \
DOCKER_CONTEXT=swarm.autonomic.zone docker stack deploy -c compose.yml abra-installer-script
build:
@docker build -t thecoopcloud/abra .
push: build
@docker push thecoopcloud/abra
symlink:
@mkdir -p ~/.abra/servers/ && \
ln -srf tests/default ~/.abra/servers && \
ln -srf tests/apps/* ~/.abra/apps

View File

@ -1,7 +0,0 @@
---
name: mystack
secrets:
foo:
bar:
baz:
length: 128

17
tests/01_environment.bats Normal file
View File

@ -0,0 +1,17 @@
#!/usr/bin/env bats
@test "docker is available" {
command -v docker
}
@test "abra is executable" {
./abra --help
}
@test "git is available" {
command -v git
}
@test "running in a container" {
ls /etc/alpine-release
}

56
tests/02_abra.bats Normal file
View File

@ -0,0 +1,56 @@
#!/usr/bin/env bats
setup() {
export ABRA_DIR=$(mktemp -d)
mkdir -p $ABRA_DIR/servers/default
}
teardown() {
rm -rf "$ABRA_DIR"
}
abra() {
./abra -d $@
}
@test "abra server (add|rm)" {
abra server add swarm.test.com
docker context ls | grep swarm.test.com
[ -d $ABRA_DIR/servers/swarm.test.com ]
abra server swarm.test.com rm
abra server add swarm.test.com foobar 12345
[ -d $ABRA_DIR/servers/swarm.test.com ]
abra server swarm.test.com rm
}
@test "abra server init" {
abra server default init
}
@test "abra app (new|rm)" {
abra app new --server default --domain traefik.test.com --app-name traefik_test_com traefik
[ -f $ABRA_DIR/servers/default/traefik_test_com.env ]
# interactive prompt
echo "y" | abra app traefik_test_com delete
[ ! -f $ABRA_DIR/servers/default/traefik_test_com.env ]
# --no-prompt
abra app new --server default --domain traefik_test_com --app-name traefik_test_com traefik
abra --no-prompt app traefik_test_com delete
[ ! -f $ABRA_DIR/servers/default/traefik_test_com.env ]
}
@test "abra app <domain> secret (insert|generate|rm)" {
abra app new --server default --domain traefik_test_com --app-name traefik_test_com traefik
abra app traefik_test_com secret insert foobar v1 "foobar"
# interactive prompt
echo "y" | abra app traefik_test_com secret rm foobar
abra app traefik_test_com secret insert foobar v1 "foobar"
# prompt
abra --no-prompt app traefik_test_com secret rm foobar
}

View File

@ -0,0 +1,84 @@
---
# The goal of this compose file is to have a testing ground for understanding
# what cases we need to handle to get stable deployments. For that, we need to
# work with healthchecks and deploy configurations quite closely. If you run
# the `make symlink` target then this will be loaded into a "fake" app on your
# local machine which you can deploy with `abra`.
version: "3.8"
services:
r1_should_work:
image: redis:alpine
deploy:
update_config:
failure_action: rollback
order: start-first
rollback_config:
order: start-first
restart_policy:
max_attempts: 1
healthcheck:
test: redis-cli ping
interval: 2s
retries: 3
start_period: 1s
timeout: 3s
r2_broken_health_check:
image: redis:alpine
deploy:
update_config:
failure_action: rollback
order: start-first
rollback_config:
order: start-first
restart_policy:
max_attempts: 3
healthcheck:
test: foobar
interval: 2s
retries: 3
start_period: 1s
timeout: 3s
r3_no_health_check:
image: redis:alpine
deploy:
update_config:
failure_action: rollback
order: start-first
rollback_config:
order: start-first
restart_policy:
max_attempts: 3
r4_disabled_health_check:
image: redis:alpine
deploy:
update_config:
failure_action: rollback
order: start-first
rollback_config:
order: start-first
restart_policy:
max_attempts: 3
healthcheck:
disable: true
r5_should_also_work:
image: redis:alpine
deploy:
update_config:
failure_action: rollback
order: start-first
rollback_config:
order: start-first
restart_policy:
max_attempts: 1
healthcheck:
test: redis-cli ping
interval: 2s
retries: 3
start_period: 1s
timeout: 3s

1
tests/default/works.env Normal file
View File

@ -0,0 +1 @@
TYPE=works