Compare commits

..

336 Commits

Author SHA1 Message Date
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 coop-cloud/abra#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 coop-cloud/abra#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 coop-cloud/abra#140.
2021-04-07 13:15:26 +02:00
decentral1se
809ee6e68b
Always inform we're polling the domain
Closes coop-cloud/abra#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: coop-cloud/abra#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 coop-cloud/abra#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 coop-cloud/abra#127.
2021-04-03 20:22:53 +02:00
decentral1se
0369a18c6e
Fix service version collection
Closes coop-cloud/abra#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 coop-cloud/abra#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 coop-cloud/abra#119.
2021-03-26 00:26:34 +01:00
decentral1se
e361b493b1
Recognise undeployed apps when undeploying
Closes coop-cloud/abra#123.
2021-03-26 00:01:07 +01:00
decentral1se
b28460cf84
Add wait and domain check logic
Closes coop-cloud/abra#116.
Also see coop-cloud/abra#113.
2021-03-25 23:56:16 +01:00
decentral1se
07e3678c78
Replace all --force usage with --no-prompt
Closes coop-cloud/abra#118.
2021-03-25 22:47:59 +01:00
decentral1se
c315ebe319
Fix branch handling (again, again)
Closes coop-cloud/abra#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 coop-cloud/abra#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 coop-cloud/abra#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 coop-cloud/abra#111 (comment).
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 coop-cloud/abra#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 coop-cloud/abra#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 coop-cloud/abra#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 coop-cloud/abra#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 coop-cloud/abra#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: coop-cloud/abra#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 coop-cloud/abra#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 coop-cloud/organising#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 coop-cloud/organising#47 (comment).
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 coop-cloud/abra#88.
2021-03-10 23:28:59 +01:00
decentral1se
3276c9fe47
Always choose the default IPv4 address for init'ing
Closes coop-cloud/abra#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 coop-cloud/abra#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 coop-cloud/abra#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 coop-cloud/abra#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 coop-cloud/abra#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 coop-cloud/abra#75.
2021-03-03 17:20:24 +01:00
Luke Murphy
544c4e86ba
Capture output for version checking
Closes coop-cloud/abra#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 coop-cloud/abra#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 coop-cloud/abra#82.
2021-03-02 12:04:25 +01:00
Luke Murphy
b655cf20be
Make README less vague
Closes coop-cloud/abra#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: coop-cloud/abra#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
1c7a51bce1 Merge pull request 'App backup & restore' (#72) from backup_restore into main
Reviewed-on: coop-cloud/abra#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: coop-cloud/abra#73
2021-01-01 18:55:47 +01:00
Luke Murphy
aa59c1ad43
Make secret generation more robust
Closes coop-cloud/abra#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: coop-cloud/abra#64
2021-01-01 17:32:30 +01:00
Luke Murphy
f5c8ee1136
Merge auto/generate and use --secrets
Closes coop-cloud/abra#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 coop-cloud/abra#71.
2021-01-01 13:48:14 +01:00
b79e35f982 Merge pull request 'Add per-subcommand help using abra help <subcommand>' (#61) from command_help_2 into main
Reviewed-on: coop-cloud/abra#61
2021-01-01 13:13:29 +01:00
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 coop-cloud/abra#67.
2020-12-31 18:16:01 +01:00
Luke Murphy
ce0e0e893c
Use plain usage only when erroring out
Closes coop-cloud/abra#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 coop-cloud/abra#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 coop-cloud/abra#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: coop-cloud/abra#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: coop-cloud/abra#55
2020-12-30 11:23:30 +01:00
Luke Murphy
11c50ae98d
Use set -a/+a and docker env file formats
Closes coop-cloud/abra#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: coop-cloud/abra#56
2020-12-30 11:21:46 +01:00
18 changed files with 4231 additions and 398 deletions

View File

@ -6,28 +6,44 @@ steps:
image: koalaman/shellcheck-alpine:v0.7.1 image: koalaman/shellcheck-alpine:v0.7.1
commands: commands:
- shellcheck abra - shellcheck abra
- shellcheck bin/*.sh
- name: run flake8
image: alpine/flake8:3.9.0
commands:
- flake8 --max-line-length 100 bin/app-json.py
- name: run unit tests - name: run unit tests
image: docker:dind image: decentral1se/docker-dind-bats-kcov
commands: commands:
- apk add bats git bash
- bats tests - bats tests
- name: collect code coverage - name: collect code coverage
failure: ignore # until we fix this failure: ignore # until we fix this
image: kcov/kcov:38 image: decentral1se/docker-dind-bats-kcov
commands: commands:
- apt update && apt install -y bats git bash
- kcov . bats tests || true - kcov . bats tests || true
- name: send code coverage report to codecov - name: send code coverage report to codecov
failure: ignore # until we fix this failure: ignore # until we fix this
image: plugins/codecov image: plugins/codecov
settings: settings:
token: token:
from_secret: codecov_token from_secret: codecov_token
required: true required: true
- name: notify rocket chat
image: plugins/slack
settings:
webhook:
from_secret: rc_builds_url
username: comradebritney
channel: "internal.builds"
template: "{{repo.owner}}/{{repo.name}} build failed: {{build.link}}"
when:
status:
- failure
trigger: trigger:
branch: branch:
- main - main

2
.gitignore vendored
View File

@ -1,2 +1,2 @@
coverage/
/.venv /.venv
coverage/

View File

@ -1,10 +1,103 @@
> 🔥 🔥 🔥 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) # abra x.x.x (UNRELEASED)
- 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))
# 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 ([4e94a424e94a42](https://git.autonomic.zone/coop-cloud/abra/commit/4e94a424e94a42))
- Support [abra-hetzner](https://git.autonomic.zone/coop-cloud/abra-hetzner) plugin ([#88](https://git.autonomic.zone/coop-cloud/abra/issues/88))
# abra 0.6.0 (2021-03-17)
- Show version and digest of app if labelled ([98e674b8e8](https://git.autonomic.zone/coop-cloud/abra/commit/98e674b8e83458a83dcbf331e8e34c7188559c4a))
- Implement basic version checking on deployment ([#82](https://git.autonomic.zone/coop-cloud/abra/issues/82))
- New `app-catalogue.sh` script to auto-generate app list for documentation ([f163d4b](https://git.autonomic.zone/coop-cloud/abra/commit/f163d4b0fa920232e9d995a22d20fe78b174b3a9))
- Support app service rollbacks with `abra <app> rollback <service>` ([#76](https://git.autonomic.zone/coop-cloud/abra/issues/76))
- Detect when latest version is deployed and perform a no-op ([#87](https://git.autonomic.zone/coop-cloud/abra/issues/87))
- Allow cloning of app repos with different main branches using `-b, --branch=<branch>` ([#80](https://git.autonomic.zone/coop-cloud/abra/issues/80))
- Protect against lengthy app names which gives Docker trouble later on ([#83](https://git.autonomic.zone/coop-cloud/abra/issues/83))
- Support removal of secrets and volumes when `rm`'ing apps ([#44](https://git.autonomic.zone/coop-cloud/abra/issues/44))
- Always choose the default IPv4 address with `abra server <host> init` ([#91](https://git.autonomic.zone/coop-cloud/abra/issues/91))
- Add `--type=<type>` filtering option to `abra <app> ls` ([0828189](https://git.autonomic.zone/coop-cloud/abra/commit/0828189))
- 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)) - 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)) - 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)) - `new <app>` becomes `new <type>` ([#48](https://git.autonomic.zone/coop-cloud/abra/issues/48))
- `check` is run on `deploy` now and configurable ([77ba5652b2fe15820f5edfa0f642636f7b8eae7e](https://git.autonomic.zone/coop-cloud/abra/commit/77ba5652b2fe15820f5edfa0f642636f7b8eae7e)) - `check` is run on `deploy` now and configurable ([77ba565](https://git.autonomic.zone/coop-cloud/abra/commit/77ba5652b2fe15820f5edfa0f642636f7b8eae7e))
- App configurations are always updated now ([#42](https://git.autonomic.zone/coop-cloud/abra/issues/42)) - 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) # abra 0.4.1 (2020-12-24)
@ -14,7 +107,7 @@
# abra 0.4.0 (2020-12-24) # abra 0.4.0 (2020-12-24)
- New command-line interface based on docopt - New command-line interface based on docopt
- ~/.abra directory instead of expecting local .env files - `~/.abra` directory instead of expecting local `.env` files
- Integration tests & code coverage - Integration tests & code coverage
# abra 0.3.1 (2020-09-27) # abra 0.3.1 (2020-09-27)

View File

@ -1,38 +0,0 @@
.PHONY: test shellcheck docopt kcov codecov
test:
@DOCKER_CONTEXT=default docker run \
-it \
--rm \
-v $$(pwd):/workdir \
docker:dind \
sh -c "apk add bats git bash && cd /workdir && bats /workdir/test.bats"
shellcheck:
@docker run \
-it \
--rm \
-v $$(pwd):/workdir \
koalaman/shellcheck-alpine \
shellcheck /workdir/abra
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
kcov:
@docker run \
-it \
--rm \
-v $$(pwd):/workdir \
kcov/kcov:latest \
sh -c "kcov /workdir/coverage /workdir/abra || true"
codecov: SHELL:=/bin/bash
codecov:
@bash <(curl -s https://codecov.io/bash) \
-s coverage -t $$(pass show hosts/swarm.autonomic.zone/drone/codecov/token)

View File

@ -3,16 +3,91 @@
[![Build Status](https://drone.autonomic.zone/api/badges/coop-cloud/abra/status.svg)](https://drone.autonomic.zone/coop-cloud/abra) [![Build Status](https://drone.autonomic.zone/api/badges/coop-cloud/abra/status.svg)](https://drone.autonomic.zone/coop-cloud/abra)
[![codecov](https://codecov.io/gh/Autonomic-Cooperative/abra/branch/main/graph/badge.svg?token=aX3I5NMRsj)](undefined) [![codecov](https://codecov.io/gh/Autonomic-Cooperative/abra/branch/main/graph/badge.svg?token=aX3I5NMRsj)](undefined)
> https://cloud.autonomic.zone > https://coopcloud.tech
The cooperative cloud utility belt 🎩🐇 The cooperative cloud utility belt 🎩🐇
`abra` is a command-line tool for managing your own [Co-op Cloud](https://coopcloud.tech). It can provision new servers, create applications, deploy them, run backup and restore operations and a whole lot of other things. It is the go-to tool for day-to-day operations when managing a Co-op Cloud instance.
## Change log
> 🔥 🔥 🔥 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).
## Documentation ## Documentation
> [docs.cloud.autonomic.zone](https://docs.cloud.autonomic.zone/) > [docs.coopcloud.tech](https://docs.coopcloud.tech)
## Install ## Install
Install the latest stable release:
```sh ```sh
curl https://install.abra.autonomic.zone | bash curl https://install.abra.autonomic.zone | bash
``` ```
or the bleeding-edge development version:
```sh
curl https://install.abra.autonomic.zone | bash -s -- --dev
```
The source for this script is [here](./deploy/install.abra.autonomic.zone/installer).
## 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.autonomic.zone | bash -s -- --dev`, then you can hack on the source in `~/.abra/src`.
The command-line interface is generated via [docopt](http://docopt.org/). If you add arguments then you need to run `make docopt` ro regenerate the parser.
Please remember to update the [CHANGELOG](./CHANGELOG.md) when you make a change.
## Generating a new apps.json
You'll need to install the following requirements:
- [requests](https://docs.python-requests.org/en/master/) (`apt install python3-requests` / `pip install requests`)
- [skopeo](https://github.com/containers/skopeo) (check [the install docs](https://github.com/containers/skopeo/blob/master/install.md))
- [jq](https://stedolan.github.io/jq/tutorial/) (`sudo apt-get install jq` or see [the install docs](https://stedolan.github.io/jq/download/))
- [yq](https://mikefarah.gitbook.io/yq/) (see [the install docs](https://mikefarah.gitbook.io/yq/#install))
Then run `./bin/app-json.py` ([source](./bin/app-json.py)) and it will spit out the JSON file into [deploy/apps.coopcloud.tech/apps.json](./deploy/apps.coopcloud.tech/apps.json).
## Releasing
### `abra`
> [install.abra.autonomic.zone](https://install.abra.autonomic.zone)
- Change the `x.x.x` header in [CHANGELOG.md](./CHANGELOG.md) to reflect new version and mark date
- Update the version in [abra](./abra)
- Update the version in [deploy/install.abra.autonomic.zone/installer](./deploy/install.abra.autonomic.zone/installer)
- `git commit` the above changes and then tag it with `git tag <your-new-version>`
- `git push` and `git push --tags`
- Deploy a new installer script `make release-installer`
- Tell the world (CoTech forum, Matrix public channel, Autonomic mastodon, etc.)
### apps.coopcloud.tech
> [apps.coopcloud.tech](https://apps.coopcloud.tech)
```bash
$ make release-apps
```

2021
abra

File diff suppressed because it is too large Load Diff

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

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

@ -0,0 +1,298 @@
#!/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
from json import dump
from logging import DEBUG, basicConfig, getLogger
from os import chdir, listdir, mkdir
from os.path import basename, exists, expanduser
from pathlib import Path
from re import findall, search
from shlex import split
from subprocess import DEVNULL, check_output
from sys import exit
from requests import get
HOME_PATH = expanduser("~/")
CLONES_PATH = Path(f"{HOME_PATH}/.abra/apps").absolute()
YQ_PATH = Path(f"{HOME_PATH}/.abra/vendor/yq")
SCRIPT_PATH = Path(__file__).absolute().parent
REPOS_TO_SKIP = (
"abra",
"abra-apps",
"abra-gandi",
"abra-hetzner",
"backup-bot",
"coopcloud.tech",
"coturn",
"docker-cp-deploy",
"docker-dind-bats-kcov",
"docs.coopcloud.tech",
"example",
"gardening",
"organising",
"pyabra",
"radicle-seed-node",
"stack-ssh-deploy",
"swarm-cronjob",
)
log = getLogger(__name__)
basicConfig()
log.setLevel(DEBUG)
def _run_cmd(cmd, shell=False, **kwargs):
"""Run a shell command."""
args = [split(cmd)]
if shell:
args = [cmd]
kwargs = {"shell": shell}
try:
return check_output(*args, **kwargs).decode("utf-8").strip()
except Exception as exception:
log.error(f"Failed to run {cmd}, saw {str(exception)}")
exit(1)
def get_repos_json():
""" Retrieve repo list from Gitea """
url = "https://git.autonomic.zone/api/v1/orgs/coop-cloud/repos"
log.info(f"Retrieving {url}")
repos = []
response = True
page = 1
try:
while response:
log.info(f"Trying to fetch page {page}")
response = get(url + f"?page={page}", timeout=10).json()
repos.extend(response)
page += 1
return repos
except Exception as exception:
log.error(f"Failed to retrieve {url}, saw {str(exception)}")
exit(1)
def get_published_apps_json():
"""Retrieve already published apps json."""
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 clone_all_apps(repos_json):
"""Clone all Co-op Cloud apps to ~/.abra/apps."""
if not exists(CLONES_PATH):
mkdir(CLONES_PATH)
repos = [[p["name"], p["ssh_url"]] for p in repos_json]
for name, url in repos:
if name in REPOS_TO_SKIP:
continue
if not exists(f"{CLONES_PATH}/{name}"):
log.info(f"Retrieving {url}")
_run_cmd(f"git clone {url} {CLONES_PATH}/{name}")
chdir(f"{CLONES_PATH}/{name}")
if not int(_run_cmd("git branch --list | wc -l", shell=True)):
log.info(f"Guessing main branch is HEAD for {name}")
_run_cmd("git checkout main")
else:
log.info(f"Updating {name}")
chdir(f"{CLONES_PATH}/{name}")
_run_cmd("git fetch -a")
def generate_apps_json(repos_json):
"""Generate the abra-apps.json application versions file."""
apps_json = {}
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", "")
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"\*\*.*\s\*", 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 '.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."""
repos_json = get_repos_json()
clone_all_apps(repos_json)
target = f"{SCRIPT_PATH}/../deploy/apps.coopcloud.tech/apps.json"
with open(target, "w", encoding="utf-8") as handle:
dump(
generate_apps_json(repos_json),
handle,
ensure_ascii=False,
indent=4,
sort_keys=True,
)
log.info(f"Successfully generated {target}")
main()

View File

@ -91,7 +91,7 @@ _abra_complete()
case "$cmd" in case "$cmd" in
server) server)
# Offer exactly one server name completion. # Offer exactly one server name completion.
if (( COMP_CWORD == cmd_index + 2 )); then if (( COMP_CWORD == cmd_index + 1 )); then
_abra_complete_servers "$cur" _abra_complete_servers "$cur"
fi fi
;; ;;

File diff suppressed because it is too large Load Diff

View File

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

View File

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

View File

@ -2,7 +2,7 @@
version: "3.8" version: "3.8"
services: services:
abra_installer: app:
image: "nginx:stable" image: "nginx:stable"
configs: configs:
- source: abra_conf - source: abra_conf
@ -26,10 +26,8 @@ services:
configs: configs:
abra_installer: abra_installer:
name: abra_installer_v1
file: installer file: installer
abra_conf: abra_conf:
name: abra_conf_v1
file: nginx.conf file: nginx.conf
networks: networks:

View File

@ -0,0 +1,35 @@
#!/bin/bash
ABRA_VERSION="0.7.3"
GIT_URL="https://git.autonomic.zone/coop-cloud/abra"
ABRA_SRC="$GIT_URL/raw/tag/$ABRA_VERSION/abra"
ABRA_DIR="${ABRA_DIR:-$HOME/.abra/}"
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 {
if [ "$1" = "--dev" ]; then
install_abra_dev
else
install_abra_release
fi
}
run_installation "$@"
exit 0

View File

@ -1,18 +0,0 @@
#!/bin/bash
ABRA_VERSION="0.4.1"
ABRA_SRC="https://git.autonomic.zone/coop-cloud/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

58
makefile Normal file
View File

@ -0,0 +1,58 @@
.PHONY: test shellcheck docopt kcov codecov release-installer
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 docker exec \
-it \
abra-test-dind \
sh -c "cd /workdir && bats /workdir/tests"
@DOCKER_CONTEXT=default docker stop abra-test-dind
@DOCKER_CONTEXT=default docker rm abra-test-dind
shellcheck:
@docker run \
-it \
--rm \
-v $$(pwd):/workdir \
koalaman/shellcheck-alpine \
shellcheck /workdir/abra && \
shellcheck /workdir/bin/*.sh
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
kcov:
@docker run \
-it \
--rm \
-v $$(pwd):/workdir \
kcov/kcov:latest \
sh -c "kcov /workdir/coverage /workdir/abra || true"
codecov: SHELL:=/bin/bash
codecov:
@bash <(curl -s https://codecov.io/bash) \
-s coverage -t $$(pass show hosts/swarm.autonomic.zone/drone/codecov/token)
release-installer:
@DOCKER_CONTEXT=swarm.autonomic.zone \
docker stack rm abra-installer-script && \
cd deploy/install.abra.autonomic.zone && \
DOCKER_CONTEXT=swarm.autonomic.zone docker stack deploy -c compose.yml abra-installer-script
release-apps:
@DOCKER_CONTEXT=swarm.autonomic.zone \
docker stack rm abra-apps-json && \
cd deploy/apps.coopcloud.tech && \
DOCKER_CONTEXT=swarm.autonomic.zone docker stack deploy -c compose.yml abra-apps-json

View File

@ -9,41 +9,48 @@ teardown() {
rm -rf "$ABRA_DIR" rm -rf "$ABRA_DIR"
} }
@test "abra server add/rm works" { abra() {
./abra server add swarm.test.com ./abra -d $@
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 app new/rm works" { @test "abra server (add|rm)" {
./abra app new --server default --domain traefik.test.com traefik abra server add swarm.test.com
[ -f $ABRA_DIR/servers/default/traefik.test.com.env ] 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 # interactive prompt
echo "y" | ./abra app traefik.test.com delete echo "y" | abra app traefik_test_com delete
[ ! -f $ABRA_DIR/servers/default/traefik.test.com.env ] [ ! -f $ABRA_DIR/servers/default/traefik_test_com.env ]
# --force # --no-prompt
./abra app new --server default --domain traefik.test.com traefik abra app new --server default --domain traefik_test_com --app-name traefik_test_com traefik
./abra app traefik.test.com delete --force abra --no-prompt app traefik_test_com delete
[ ! -f $ABRA_DIR/servers/default/traefik.test.com.env ] [ ! -f $ABRA_DIR/servers/default/traefik_test_com.env ]
} }
@test "abra app <domain> secret (insert|generate|rm)" { @test "abra app <domain> secret (insert|generate|rm)" {
# TODO 3wc: mock `server new` so we don't endlessly re-test it abra app new --server default --domain traefik_test_com --app-name traefik_test_com traefik
./abra app new --server default --domain traefik.test.com traefik
./abra app traefik.test.com secret insert foobar v1 "foobar" abra app traefik_test_com secret insert foobar v1 "foobar"
# interactive prompt # interactive prompt
echo "y" | ./abra app traefik.test.com secret rm foobar echo "y" | abra app traefik_test_com secret rm foobar
./abra app traefik.test.com secret insert foobar v1 "foobar" abra app traefik_test_com secret insert foobar v1 "foobar"
# prompt # prompt
./abra app traefik.test.com secret rm foobar --force abra --no-prompt app traefik_test_com secret rm foobar
} }