Compare commits

..

22 Commits

Author SHA1 Message Date
cac13fb64e Getting v8 out
All checks were successful
continuous-integration/drone/push Build is passing
2021-05-30 23:57:09 +02:00
42923ced55 Follow along with the formatting
All checks were successful
continuous-integration/drone/push Build is passing
2021-05-30 22:06:22 +02:00
6a12955649 Merge pull request 'Add app .. volume commands, working vol deletion' (#166) from volume-up into main
All checks were successful
continuous-integration/drone/push Build is passing
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
All checks were successful
continuous-integration/drone/pr Build is passing
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
All checks were successful
continuous-integration/drone/push Build is passing
Closes #147
2021-05-30 21:25:33 +02:00
3wc
c92f80cf7e Upd8 changelog
All checks were successful
continuous-integration/drone/push Build is passing
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
All checks were successful
continuous-integration/drone/push Build is passing
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
All checks were successful
continuous-integration/drone/push Build is passing
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
All checks were successful
continuous-integration/drone/push Build is passing
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
fccd7865f5 Upload latest keycloak tag
Some checks failed
continuous-integration/drone/push Build is failing
2021-05-27 14:10:39 +02:00
4e84664310 Remove weird version
Some checks failed
continuous-integration/drone/push Build is failing
2021-05-17 09:17:39 +02:00
8 changed files with 440 additions and 147 deletions

View File

@ -9,7 +9,17 @@
# abra x.x.x (UNRELEASED) # abra x.x.x (UNRELEASED)
# abra 8.0.0 (2021-05-30)
- Fix secret length generation ([f537417](https://git.autonomic.zone/coop-cloud/abra/commit/1b85bf3d37280e9632c315d759c0f2d09c039fef)) - Fix secret length generation ([f537417](https://git.autonomic.zone/coop-cloud/abra/commit/1b85bf3d37280e9632c315d759c0f2d09c039fef))
- Fix checking out new apps ([#164](https://git.autonomic.zone/coop-cloud/abra/issues/164)
- Give up if YAML is invalid ([#154](https://git.autonomic.zone/coop-cloud/abra/issues/154))
- Switch from wget to cURL ([fc0caaa](https://git.autonomic.zone/coop-cloud/abra/commit/fc0caaa))
- Add Bash completion for `recipe ..` ([8c93d1a](https://git.autonomic.zone/coop-cloud/abra/commit/8c93d1a))
- Tweak README parsing in `app-json.py` ([b14219b](https://git.autonomic.zone/coop-cloud/abra/commit/b14219b))
- 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)) - 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) # abra 0.7.4 (2021-05-10)

View File

@ -28,6 +28,14 @@ See [CHANGELOG.md](./CHANGELOG.md).
## Install ## Install
Requirements:
- `pwqgen` (optional)
- `pwgen` (optional)
- `curl`
- `docker`
- `bash` >= 4
Install the latest stable release: Install the latest stable release:
```sh ```sh

257
abra
View File

@ -3,7 +3,7 @@
GIT_URL="https://git.autonomic.zone/coop-cloud/" GIT_URL="https://git.autonomic.zone/coop-cloud/"
ABRA_APPS_URL="https://apps.coopcloud.tech" ABRA_APPS_URL="https://apps.coopcloud.tech"
ABRA_DIR="${ABRA_DIR:-$HOME/.abra}" ABRA_DIR="${ABRA_DIR:-$HOME/.abra}"
ABRA_VERSION="0.7.4" ABRA_VERSION="8.0.0"
ABRA_BACKUP_DIR="${ABRA_BACKUP_DIR:-$ABRA_DIR/backups}" ABRA_BACKUP_DIR="${ABRA_BACKUP_DIR:-$ABRA_DIR/backups}"
ABRA_VENDOR_DIR="$ABRA_DIR/vendor" ABRA_VENDOR_DIR="$ABRA_DIR/vendor"
ABRA_APPS_JSON="${ABRA_DIR}/apps.json" ABRA_APPS_JSON="${ABRA_DIR}/apps.json"
@ -19,7 +19,7 @@ Usage:
abra [options] app (list|ls) [--status] [--server=<server>] [--type=<type>] abra [options] app (list|ls) [--status] [--server=<server>] [--type=<type>]
abra [options] app new [--server=<server>] [--domain=<domain>] [--app-name=<app_name>] [--pass] [--secrets] <type> abra [options] app new [--server=<server>] [--domain=<domain>] [--app-name=<app_name>] [--pass] [--secrets] <type>
abra [options] app <app> backup (<service>|--all) abra [options] app <app> backup (<service>|--all)
abra [options] app <app> deploy [--update] [--force] [--skip-version-check] [--no-domain-poll] [<version>] abra [options] app <app> deploy [--update] [--force] [--fast] [--skip-version-check] [--no-domain-poll] [<version>]
abra [options] app <app> check abra [options] app <app> check
abra [options] app <app> version abra [options] app <app> version
abra [options] app <app> config abra [options] app <app> config
@ -167,87 +167,88 @@ eval "var_$1+=($value)"; else eval "var_$1=$value"; fi; return 0; fi; done
return 1; }; stdout() { printf -- "cat <<'EOM'\n%s\nEOM\n" "$1"; }; stderr() { return 1; }; stdout() { printf -- "cat <<'EOM'\n%s\nEOM\n" "$1"; }; stderr() {
printf -- "cat <<'EOM' >&2\n%s\nEOM\n" "$1"; }; error() { printf -- "cat <<'EOM' >&2\n%s\nEOM\n" "$1"; }; error() {
[[ -n $1 ]] && stderr "$1"; stderr "$usage"; _return 1; }; _return() { [[ -n $1 ]] && stderr "$1"; stderr "$usage"; _return 1; }; _return() {
printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:2465} printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:2474}
usage=${DOC:40:1856}; digest=ec8da usage=${DOC:40:1865}; digest=c7702
shorts=(-e -U -C -b -v -s -n -d -h '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '') shorts=(-h -U -C -s -v -b -d -n -e '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
longs=(--env --skip-update --skip-check --branch --verbose --stack --no-prompt --debug --help --status --server --type --domain --app-name --pass --secrets --all --update --force --skip-version-check --no-domain-poll --volumes --no-tty --user --dev) longs=(--help --skip-update --skip-check --stack --verbose --branch --debug --no-prompt --env --status --server --type --domain --app-name --pass --secrets --all --update --force --fast --skip-version-check --no-domain-poll --volumes --no-tty --user --dev)
argcounts=(1 0 0 1 0 1 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 1 0); node_0(){ argcounts=(0 0 0 1 0 1 0 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 1 0); node_0(){
value __env 0; }; node_1(){ switch __skip_update 1; }; node_2(){ switch __help 0; }; node_1(){ switch __skip_update 1; }; node_2(){
switch __skip_check 2; }; node_3(){ value __branch 3; }; node_4(){ switch __skip_check 2; }; node_3(){ value __stack 3; }; node_4(){
switch __verbose 4; }; node_5(){ value __stack 5; }; node_6(){ switch __verbose 4; }; node_5(){ value __branch 5; }; node_6(){ switch __debug 6
switch __no_prompt 6; }; node_7(){ switch __debug 7; }; node_8(){ }; node_7(){ switch __no_prompt 7; }; node_8(){ value __env 8; }; node_9(){
switch __help 8; }; node_9(){ switch __status 9; }; node_10(){ value __server 10 switch __status 9; }; node_10(){ value __server 10; }; node_11(){
}; node_11(){ value __type 11; }; node_12(){ value __domain 12; }; node_13(){ value __type 11; }; node_12(){ value __domain 12; }; node_13(){
value __app_name 13; }; node_14(){ switch __pass 14; }; node_15(){ value __app_name 13; }; node_14(){ switch __pass 14; }; node_15(){
switch __secrets 15; }; node_16(){ switch __all 16; }; node_17(){ switch __secrets 15; }; node_16(){ switch __all 16; }; node_17(){
switch __update 17; }; node_18(){ switch __force 18; }; node_19(){ switch __update 17; }; node_18(){ switch __force 18; }; node_19(){
switch __skip_version_check 19; }; node_20(){ switch __no_domain_poll 20; } switch __fast 19; }; node_20(){ switch __skip_version_check 20; }; node_21(){
node_21(){ switch __volumes 21; }; node_22(){ switch __no_tty 22; }; node_23(){ switch __no_domain_poll 21; }; node_22(){ switch __volumes 22; }; node_23(){
value __user 23; }; node_24(){ switch __dev 24; }; node_25(){ value _type_ a; } switch __no_tty 23; }; node_24(){ value __user 24; }; node_25(){ switch __dev 25
node_26(){ value _app_ a; }; node_27(){ value _service_ a; }; node_28(){ }; node_26(){ value _type_ a; }; node_27(){ value _app_ a; }; node_28(){
value _version_ a; }; node_29(){ value _src_ a; }; node_30(){ value _dst_ a; } value _service_ a; }; node_29(){ value _version_ a; }; node_30(){ value _src_ a
node_31(){ value _backup_file_ a; }; node_32(){ value _args_ a true; } }; node_31(){ value _dst_ a; }; node_32(){ value _backup_file_ a; }; node_33(){
node_33(){ value _secret_ a; }; node_34(){ value _cmd_ a; }; node_35(){ value _args_ a true; }; node_34(){ value _secret_ a; }; node_35(){ value _cmd_ a
value _data_ a; }; node_36(){ value _volume_ a; }; node_37(){ value _command_ a }; node_36(){ value _data_ a; }; node_37(){ value _volume_ a; }; node_38(){
}; node_38(){ value _recipe_ a; }; node_39(){ value _host_ a; }; node_40(){ value _command_ a; }; node_39(){ value _recipe_ a; }; node_40(){ value _host_ a
value _user_ a; }; node_41(){ value _port_ a; }; node_42(){ value _provider_ a }; node_41(){ value _user_ a; }; node_42(){ value _port_ a; }; node_43(){
}; node_43(){ value _subcommands_ a true; }; node_44(){ _command app; } value _provider_ a; }; node_44(){ value _subcommands_ a true; }; node_45(){
node_45(){ _command list; }; node_46(){ _command ls; }; node_47(){ _command new _command app; }; node_46(){ _command list; }; node_47(){ _command ls; }
}; node_48(){ _command backup; }; node_49(){ _command deploy; }; node_50(){ node_48(){ _command new; }; node_49(){ _command backup; }; node_50(){
_command check; }; node_51(){ _command version; }; node_52(){ _command config; } _command deploy; }; node_51(){ _command check; }; node_52(){ _command version; }
node_53(){ _command cp; }; node_54(){ _command logs; }; node_55(){ _command ps node_53(){ _command config; }; node_54(){ _command cp; }; node_55(){
}; node_56(){ _command restore; }; node_57(){ _command rm; }; node_58(){ _command logs; }; node_56(){ _command ps; }; node_57(){ _command restore; }
_command delete; }; node_59(){ _command run; }; node_60(){ _command rollback; } node_58(){ _command rm; }; node_59(){ _command delete; }; node_60(){
node_61(){ _command secret; }; node_62(){ _command generate; }; node_63(){ _command run; }; node_61(){ _command rollback; }; node_62(){ _command secret; }
_command insert; }; node_64(){ _command undeploy; }; node_65(){ _command volume node_63(){ _command generate; }; node_64(){ _command insert; }; node_65(){
}; node_66(){ _command recipe; }; node_67(){ _command create; }; node_68(){ _command undeploy; }; node_66(){ _command volume; }; node_67(){ _command recipe
_command release; }; node_69(){ _command versions; }; node_70(){ _command server }; node_68(){ _command create; }; node_69(){ _command release; }; node_70(){
}; node_71(){ _command add; }; node_72(){ _command __ --; }; node_73(){ _command versions; }; node_71(){ _command server; }; node_72(){ _command add; }
_command init; }; node_74(){ _command apps; }; node_75(){ _command upgrade; } node_73(){ _command __ --; }; node_74(){ _command init; }; node_75(){
node_76(){ _command doctor; }; node_77(){ _command help; }; node_78(){ _command apps; }; node_76(){ _command upgrade; }; node_77(){ _command doctor; }
optional 0 1 2 3 4 5 6 7 8; }; node_79(){ optional 78; }; node_80(){ node_78(){ _command help; }; node_79(){ optional 0 1 2 3 4 5 6 7 8; }
either 45 46; }; node_81(){ required 80; }; node_82(){ optional 9; }; node_83(){ node_80(){ optional 79; }; node_81(){ either 46 47; }; node_82(){ required 81; }
optional 10; }; node_84(){ optional 11; }; node_85(){ required 79 44 81 82 83 84 node_83(){ optional 9; }; node_84(){ optional 10; }; node_85(){ optional 11; }
}; node_86(){ optional 12; }; node_87(){ optional 13; }; node_88(){ optional 14 node_86(){ required 80 45 82 83 84 85; }; node_87(){ optional 12; }; node_88(){
}; node_89(){ optional 15; }; node_90(){ required 79 44 47 83 86 87 88 89 25; } optional 13; }; node_89(){ optional 14; }; node_90(){ optional 15; }; node_91(){
node_91(){ either 27 16; }; node_92(){ required 91; }; node_93(){ required 80 45 48 84 87 88 89 90 26; }; node_92(){ either 28 16; }; node_93(){
required 79 44 26 48 92; }; node_94(){ optional 17; }; node_95(){ optional 18; } required 92; }; node_94(){ required 80 45 27 49 93; }; node_95(){ optional 17; }
node_96(){ optional 19; }; node_97(){ optional 20; }; node_98(){ optional 28; } node_96(){ optional 18; }; node_97(){ optional 19; }; node_98(){ optional 20; }
node_99(){ required 79 44 26 49 94 95 96 97 98; }; node_100(){ node_99(){ optional 21; }; node_100(){ optional 29; }; node_101(){
required 79 44 26 50; }; node_101(){ required 79 44 26 51; }; node_102(){ required 80 45 27 50 95 96 97 98 99 100; }; node_102(){ required 80 45 27 51; }
required 79 44 26 52; }; node_103(){ required 79 44 26 53 29 30; }; node_104(){ node_103(){ required 80 45 27 52; }; node_104(){ required 80 45 27 53; }
optional 27; }; node_105(){ required 79 44 26 54 104; }; node_106(){ node_105(){ required 80 45 27 54 30 31; }; node_106(){ optional 28; }
required 79 44 26 55; }; node_107(){ required 79 44 26 56 92; }; node_108(){ node_107(){ required 80 45 27 55 106; }; node_108(){ required 80 45 27 56; }
either 57 58; }; node_109(){ required 108; }; node_110(){ optional 21; } node_109(){ required 80 45 27 57 93; }; node_110(){ either 58 59; }; node_111(){
node_111(){ required 79 44 26 109 110 89; }; node_112(){ optional 31; } required 110; }; node_112(){ optional 22; }; node_113(){
node_113(){ required 79 44 26 56 27 112; }; node_114(){ optional 22; } required 80 45 27 111 112 90; }; node_114(){ optional 32; }; node_115(){
node_115(){ optional 23; }; node_116(){ oneormore 32; }; node_117(){ required 80 45 27 57 28 114; }; node_116(){ optional 23; }; node_117(){
required 79 44 26 59 114 115 27 116; }; node_118(){ required 79 44 26 60 98; } optional 24; }; node_118(){ oneormore 33; }; node_119(){
node_119(){ required 33 28; }; node_120(){ either 119 16; }; node_121(){ required 80 45 27 60 116 117 28 118; }; node_120(){ required 80 45 27 61 100; }
required 120; }; node_122(){ optional 34; }; node_123(){ node_121(){ required 34 29; }; node_122(){ either 121 16; }; node_123(){
required 79 44 26 61 62 121 122 88; }; node_124(){ required 122; }; node_124(){ optional 35; }; node_125(){
required 79 44 26 61 63 33 28 35 88; }; node_125(){ either 33 16; }; node_126(){ required 80 45 27 62 63 123 124 89; }; node_126(){
required 125; }; node_127(){ required 79 44 26 61 109 126 88; }; node_128(){ required 80 45 27 62 64 34 29 36 89; }; node_127(){ either 34 16; }; node_128(){
required 79 44 26 64; }; node_129(){ required 79 44 26 65 46; }; node_130(){ required 127; }; node_129(){ required 80 45 27 62 111 128 89; }; node_130(){
either 36 16; }; node_131(){ required 130; }; node_132(){ required 80 45 27 65; }; node_131(){ required 80 45 27 66 47; }; node_132(){
required 79 44 26 65 109 131; }; node_133(){ optional 116; }; node_134(){ either 37 16; }; node_133(){ required 132; }; node_134(){
required 79 44 26 37 133; }; node_135(){ required 79 66 46; }; node_136(){ required 80 45 27 66 111 133; }; node_135(){ optional 118; }; node_136(){
required 79 66 67 38; }; node_137(){ required 79 66 38 68 95; }; node_138(){ required 80 45 27 38 135; }; node_137(){ required 80 67 47; }; node_138(){
required 79 66 38 69; }; node_139(){ optional 40; }; node_140(){ optional 41; } required 80 67 68 39; }; node_139(){ required 80 67 39 69 96; }; node_140(){
node_141(){ required 79 70 71 39 139 140; }; node_142(){ required 80 67 39 70; }; node_141(){ optional 41; }; node_142(){ optional 42; }
required 79 70 47 42 72 32; }; node_143(){ required 79 70 81; }; node_144(){ node_143(){ required 80 71 72 40 141 142; }; node_144(){
required 79 70 39 57; }; node_145(){ required 79 70 39 73; }; node_146(){ required 80 71 48 43 73 33; }; node_145(){ required 80 71 82; }; node_146(){
required 79 70 39 74 82; }; node_147(){ optional 24; }; node_148(){ required 80 71 40 58; }; node_147(){ required 80 71 40 74; }; node_148(){
required 79 75 147; }; node_149(){ required 79 51; }; node_150(){ required 79 76 required 80 71 40 75 83; }; node_149(){ optional 25; }; node_150(){
}; node_151(){ oneormore 43; }; node_152(){ optional 151; }; node_153(){ required 80 76 149; }; node_151(){ required 80 52; }; node_152(){ required 80 77
required 79 77 152; }; node_154(){ required 79; }; node_155(){ }; node_153(){ oneormore 44; }; node_154(){ optional 153; }; node_155(){
either 85 90 93 99 100 101 102 103 105 106 107 111 113 117 118 123 124 127 128 129 132 134 135 136 137 138 141 142 143 144 145 146 148 149 150 153 154 required 80 78 154; }; node_156(){ required 80; }; node_157(){
}; node_156(){ required 155; }; cat <<<' docopt_exit() { either 86 91 94 101 102 103 104 105 107 108 109 113 115 119 120 125 126 129 130 131 134 136 137 138 139 140 143 144 145 146 147 148 150 151 152 155 156
[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1856}" >&2 }; node_158(){ required 157; }; cat <<<' docopt_exit() {
exit 1; }'; unset var___env var___skip_update var___skip_check var___branch \ [[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1865}" >&2
var___verbose var___stack var___no_prompt var___debug var___help var___status \ exit 1; }'; unset var___help var___skip_update var___skip_check var___stack \
var___verbose var___branch var___debug var___no_prompt var___env var___status \
var___server var___type var___domain var___app_name var___pass var___secrets \ var___server var___type var___domain var___app_name var___pass var___secrets \
var___all var___update var___force var___skip_version_check \ var___all var___update var___force var___fast var___skip_version_check \
var___no_domain_poll var___volumes var___no_tty var___user var___dev \ var___no_domain_poll var___volumes var___no_tty var___user var___dev \
var__type_ var__app_ var__service_ var__version_ var__src_ var__dst_ \ var__type_ var__app_ var__service_ var__version_ var__src_ var__dst_ \
var__backup_file_ var__args_ var__secret_ var__cmd_ var__data_ var__volume_ \ var__backup_file_ var__args_ var__secret_ var__cmd_ var__data_ var__volume_ \
@ -257,12 +258,13 @@ var_check var_version var_config var_cp var_logs var_ps var_restore var_rm \
var_delete var_run var_rollback var_secret var_generate var_insert \ var_delete var_run var_rollback var_secret var_generate var_insert \
var_undeploy var_volume var_recipe var_create var_release var_versions \ var_undeploy var_volume var_recipe var_create var_release var_versions \
var_server var_add var___ var_init var_apps var_upgrade var_doctor var_help var_server var_add var___ var_init var_apps var_upgrade var_doctor var_help
parse 156 "$@"; local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__env" \ parse 158 "$@"; local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__help" \
"${prefix}__skip_update" "${prefix}__skip_check" "${prefix}__branch" \ "${prefix}__skip_update" "${prefix}__skip_check" "${prefix}__stack" \
"${prefix}__verbose" "${prefix}__stack" "${prefix}__no_prompt" \ "${prefix}__verbose" "${prefix}__branch" "${prefix}__debug" \
"${prefix}__debug" "${prefix}__help" "${prefix}__status" "${prefix}__server" \ "${prefix}__no_prompt" "${prefix}__env" "${prefix}__status" \
"${prefix}__type" "${prefix}__domain" "${prefix}__app_name" "${prefix}__pass" \ "${prefix}__server" "${prefix}__type" "${prefix}__domain" \
"${prefix}__secrets" "${prefix}__all" "${prefix}__update" "${prefix}__force" \ "${prefix}__app_name" "${prefix}__pass" "${prefix}__secrets" "${prefix}__all" \
"${prefix}__update" "${prefix}__force" "${prefix}__fast" \
"${prefix}__skip_version_check" "${prefix}__no_domain_poll" \ "${prefix}__skip_version_check" "${prefix}__no_domain_poll" \
"${prefix}__volumes" "${prefix}__no_tty" "${prefix}__user" "${prefix}__dev" \ "${prefix}__volumes" "${prefix}__no_tty" "${prefix}__user" "${prefix}__dev" \
"${prefix}_type_" "${prefix}_app_" "${prefix}_service_" "${prefix}_version_" \ "${prefix}_type_" "${prefix}_app_" "${prefix}_service_" "${prefix}_version_" \
@ -278,15 +280,15 @@ parse 156 "$@"; local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__env" \
"${prefix}recipe" "${prefix}create" "${prefix}release" "${prefix}versions" \ "${prefix}recipe" "${prefix}create" "${prefix}release" "${prefix}versions" \
"${prefix}server" "${prefix}add" "${prefix}__" "${prefix}init" "${prefix}apps" \ "${prefix}server" "${prefix}add" "${prefix}__" "${prefix}init" "${prefix}apps" \
"${prefix}upgrade" "${prefix}doctor" "${prefix}help" "${prefix}upgrade" "${prefix}doctor" "${prefix}help"
eval "${prefix}"'__env=${var___env:-}' eval "${prefix}"'__help=${var___help:-false}'
eval "${prefix}"'__skip_update=${var___skip_update:-false}' eval "${prefix}"'__skip_update=${var___skip_update:-false}'
eval "${prefix}"'__skip_check=${var___skip_check:-false}' eval "${prefix}"'__skip_check=${var___skip_check:-false}'
eval "${prefix}"'__branch=${var___branch:-}'
eval "${prefix}"'__verbose=${var___verbose:-false}'
eval "${prefix}"'__stack=${var___stack:-}' eval "${prefix}"'__stack=${var___stack:-}'
eval "${prefix}"'__no_prompt=${var___no_prompt:-false}' eval "${prefix}"'__verbose=${var___verbose:-false}'
eval "${prefix}"'__branch=${var___branch:-}'
eval "${prefix}"'__debug=${var___debug:-false}' eval "${prefix}"'__debug=${var___debug:-false}'
eval "${prefix}"'__help=${var___help:-false}' eval "${prefix}"'__no_prompt=${var___no_prompt:-false}'
eval "${prefix}"'__env=${var___env:-}'
eval "${prefix}"'__status=${var___status:-false}' eval "${prefix}"'__status=${var___status:-false}'
eval "${prefix}"'__server=${var___server:-}' eval "${prefix}"'__server=${var___server:-}'
eval "${prefix}"'__type=${var___type:-}' eval "${prefix}"'__type=${var___type:-}'
@ -297,6 +299,7 @@ eval "${prefix}"'__secrets=${var___secrets:-false}'
eval "${prefix}"'__all=${var___all:-false}' eval "${prefix}"'__all=${var___all:-false}'
eval "${prefix}"'__update=${var___update:-false}' eval "${prefix}"'__update=${var___update:-false}'
eval "${prefix}"'__force=${var___force:-false}' eval "${prefix}"'__force=${var___force:-false}'
eval "${prefix}"'__fast=${var___fast:-false}'
eval "${prefix}"'__skip_version_check=${var___skip_version_check:-false}' eval "${prefix}"'__skip_version_check=${var___skip_version_check:-false}'
eval "${prefix}"'__no_domain_poll=${var___no_domain_poll:-false}' eval "${prefix}"'__no_domain_poll=${var___no_domain_poll:-false}'
eval "${prefix}"'__volumes=${var___volumes:-false}' eval "${prefix}"'__volumes=${var___volumes:-false}'
@ -353,22 +356,22 @@ eval "${prefix}"'upgrade=${var_upgrade:-false}'
eval "${prefix}"'doctor=${var_doctor:-false}' eval "${prefix}"'doctor=${var_doctor:-false}'
eval "${prefix}"'help=${var_help:-false}'; local docopt_i=1 eval "${prefix}"'help=${var_help:-false}'; local docopt_i=1
[[ $BASH_VERSION =~ ^4.3 ]] && docopt_i=2; for ((;docopt_i>0;docopt_i--)); do [[ $BASH_VERSION =~ ^4.3 ]] && docopt_i=2; for ((;docopt_i>0;docopt_i--)); do
declare -p "${prefix}__env" "${prefix}__skip_update" "${prefix}__skip_check" \ declare -p "${prefix}__help" "${prefix}__skip_update" "${prefix}__skip_check" \
"${prefix}__branch" "${prefix}__verbose" "${prefix}__stack" \ "${prefix}__stack" "${prefix}__verbose" "${prefix}__branch" "${prefix}__debug" \
"${prefix}__no_prompt" "${prefix}__debug" "${prefix}__help" \ "${prefix}__no_prompt" "${prefix}__env" "${prefix}__status" \
"${prefix}__status" "${prefix}__server" "${prefix}__type" "${prefix}__domain" \ "${prefix}__server" "${prefix}__type" "${prefix}__domain" \
"${prefix}__app_name" "${prefix}__pass" "${prefix}__secrets" "${prefix}__all" \ "${prefix}__app_name" "${prefix}__pass" "${prefix}__secrets" "${prefix}__all" \
"${prefix}__update" "${prefix}__force" "${prefix}__skip_version_check" \ "${prefix}__update" "${prefix}__force" "${prefix}__fast" \
"${prefix}__no_domain_poll" "${prefix}__volumes" "${prefix}__no_tty" \ "${prefix}__skip_version_check" "${prefix}__no_domain_poll" \
"${prefix}__user" "${prefix}__dev" "${prefix}_type_" "${prefix}_app_" \ "${prefix}__volumes" "${prefix}__no_tty" "${prefix}__user" "${prefix}__dev" \
"${prefix}_service_" "${prefix}_version_" "${prefix}_src_" "${prefix}_dst_" \ "${prefix}_type_" "${prefix}_app_" "${prefix}_service_" "${prefix}_version_" \
"${prefix}_backup_file_" "${prefix}_args_" "${prefix}_secret_" \ "${prefix}_src_" "${prefix}_dst_" "${prefix}_backup_file_" "${prefix}_args_" \
"${prefix}_cmd_" "${prefix}_data_" "${prefix}_volume_" "${prefix}_command_" \ "${prefix}_secret_" "${prefix}_cmd_" "${prefix}_data_" "${prefix}_volume_" \
"${prefix}_recipe_" "${prefix}_host_" "${prefix}_user_" "${prefix}_port_" \ "${prefix}_command_" "${prefix}_recipe_" "${prefix}_host_" "${prefix}_user_" \
"${prefix}_provider_" "${prefix}_subcommands_" "${prefix}app" "${prefix}list" \ "${prefix}_port_" "${prefix}_provider_" "${prefix}_subcommands_" \
"${prefix}ls" "${prefix}new" "${prefix}backup" "${prefix}deploy" \ "${prefix}app" "${prefix}list" "${prefix}ls" "${prefix}new" "${prefix}backup" \
"${prefix}check" "${prefix}version" "${prefix}config" "${prefix}cp" \ "${prefix}deploy" "${prefix}check" "${prefix}version" "${prefix}config" \
"${prefix}logs" "${prefix}ps" "${prefix}restore" "${prefix}rm" \ "${prefix}cp" "${prefix}logs" "${prefix}ps" "${prefix}restore" "${prefix}rm" \
"${prefix}delete" "${prefix}run" "${prefix}rollback" "${prefix}secret" \ "${prefix}delete" "${prefix}run" "${prefix}rollback" "${prefix}secret" \
"${prefix}generate" "${prefix}insert" "${prefix}undeploy" "${prefix}volume" \ "${prefix}generate" "${prefix}insert" "${prefix}undeploy" "${prefix}volume" \
"${prefix}recipe" "${prefix}create" "${prefix}release" "${prefix}versions" \ "${prefix}recipe" "${prefix}create" "${prefix}release" "${prefix}versions" \
@ -485,6 +488,16 @@ require_docker_version() {
done done
} }
require_valid_json() {
require_jq
$JQ "$1" > /dev/null || error "Invalid JSON '$1'"
}
require_valid_yaml() {
require_yq
$YQ e "$1" > /dev/null || error "Invalid YAML '$1'"
}
###### Download and update data ###### Download and update data
require_apps_json() { require_apps_json() {
@ -503,13 +516,13 @@ require_apps_json() {
if [ "$local_ctime" -lt "$remote_ctime" ]; then if [ "$local_ctime" -lt "$remote_ctime" ]; then
info "Downloading new apps.json" info "Downloading new apps.json"
wget -qO "$ABRA_APPS_JSON" "$ABRA_APPS_URL" curl -sLo "$ABRA_APPS_JSON" "$ABRA_APPS_URL"
else else
debug "No apps.json update needed" debug "No apps.json update needed"
fi fi
else else
info "Downloading apps.json" info "Downloading apps.json"
wget -qO "$ABRA_APPS_JSON" "$ABRA_APPS_URL" curl -sLo "$ABRA_APPS_JSON" "$ABRA_APPS_URL"
fi fi
} }
@ -552,7 +565,7 @@ require_app (){
fi fi
# shellcheck disable=SC2086 # shellcheck disable=SC2086
if ! git clone ${git_extra_args:-} "$GIT_URL/$APP.git" "$ABRA_DIR/apps/$APP" > /dev/null 2>&1 ; then if ! git clone ${git_extra_args:-} "$GIT_URL$APP.git" "$ABRA_DIR/apps/$APP" > /dev/null 2>&1 ; then
error "Could not retrieve app type '$APP', this app type doesn't exist?" error "Could not retrieve app type '$APP', this app type doesn't exist?"
fi fi
@ -593,7 +606,6 @@ require_app_version() {
vendor_binary() { vendor_binary() {
require_vendor_dir require_vendor_dir
require_binary wget
local REPO="$1" local REPO="$1"
local VERSION="$2" local VERSION="$2"
@ -620,7 +632,7 @@ vendor_binary() {
;; ;;
esac esac
wget -qO "$ABRA_VENDOR_DIR/$BINARY" "$RELEASE_URL" curl -sLo "$ABRA_VENDOR_DIR/$BINARY" "$RELEASE_URL"
chmod +x "$ABRA_VENDOR_DIR/$BINARY" chmod +x "$ABRA_VENDOR_DIR/$BINARY"
success "$BINARY is now vendored ☮" success "$BINARY is now vendored ☮"
} }
@ -667,7 +679,7 @@ get_recipe_versions() {
get_recipe_version_latest() { get_recipe_version_latest() {
if [ "${#RECIPE_VERSIONS[@]}" = 0 ]; then if [ "${#RECIPE_VERSIONS[@]}" = 0 ]; then
VERSION="" VERSION=""
warning "No version specified, dangerously using latest git 😨" info "No versions found"
else else
VERSION="${RECIPE_VERSIONS[-1]}" VERSION="${RECIPE_VERSIONS[-1]}"
info "Chose version $VERSION" info "Chose version $VERSION"
@ -709,6 +721,7 @@ output_version_summary() {
IFS=':' read -ra COMPOSE_FILES <<< "$COMPOSE_FILE" IFS=':' read -ra COMPOSE_FILES <<< "$COMPOSE_FILE"
for COMPOSE in "${COMPOSE_FILES[@]}"; do for COMPOSE in "${COMPOSE_FILES[@]}"; do
require_valid_yaml "$APP_DIR/$COMPOSE"
SERVICES=$($YQ e '.services | keys | .[]' "${APP_DIR}/${COMPOSE}") SERVICES=$($YQ e '.services | keys | .[]' "${APP_DIR}/${COMPOSE}")
for SERVICE in $SERVICES; do for SERVICE in $SERVICES; do
@ -1285,7 +1298,7 @@ _abra_backup_mysql() {
###### .. app deploy ###### .. app deploy
help_app_deploy (){ help_app_deploy (){
echo "abra [options] app <app> deploy [--update] [--force] [--skip-version-check] [--no-domain-poll] echo "abra [options] app <app> deploy [--update] [--force] [--fast] [--skip-version-check] [--no-domain-poll]
Deploy app <app> to the configured server. Deploy app <app> to the configured server.
@ -1294,6 +1307,7 @@ OPTIONS
--force Force a deployment regardless of state --force Force a deployment regardless of state
--skip-version-check Don't try and detect deployed version --skip-version-check Don't try and detect deployed version
--no-domain-poll Don't wait for the configured domain to come up --no-domain-poll Don't wait for the configured domain to come up
--fast Alias for --skip-version-check --no-domain-poll
POWERED BY POWERED BY
docker stack deploy -c compose.yml <app>" docker stack deploy -c compose.yml <app>"
@ -1302,8 +1316,13 @@ POWERED BY
sub_app_deploy (){ sub_app_deploy (){
require_yq require_yq
SKIP_VERSION_CHECK=$abra___skip_version_check if [ "$abra___fast" = "true" ]; then
NO_DOMAIN_POLL=$abra___no_domain_poll SKIP_VERSION_CHECK=true
NO_DOMAIN_POLL=true
else
SKIP_VERSION_CHECK=$abra___skip_version_check
NO_DOMAIN_POLL=$abra___no_domain_poll
fi
if [ ! "$abra__version_" = "dev" ]; then if [ ! "$abra__version_" = "dev" ]; then
get_recipe_versions "$TYPE" get_recipe_versions "$TYPE"
@ -1353,6 +1372,10 @@ sub_app_deploy (){
(cd "$APP_DIR" || error "\$APP_DIR '$APP_DIR' not found") (cd "$APP_DIR" || error "\$APP_DIR '$APP_DIR' not found")
# shellcheck disable=SC2086 # shellcheck disable=SC2086
if (cd "$APP_DIR" && docker stack deploy -c ${COMPOSE_FILE//:/ -c } "$STACK_NAME"); then if (cd "$APP_DIR" && docker stack deploy -c ${COMPOSE_FILE//:/ -c } "$STACK_NAME"); then
if [ "$abra___fast" = "true" ]; then
success "Something happened! Hope it was good 🙏"
exit 0
fi
ensure_stack_deployed "$STACK_NAME" ensure_stack_deployed "$STACK_NAME"
if [ -n "$DOMAIN" ]; then if [ -n "$DOMAIN" ]; then
if [[ $NO_DOMAIN_POLL == "false" ]]; then if [[ $NO_DOMAIN_POLL == "false" ]]; then
@ -1581,7 +1604,7 @@ help_app_secret_delete (){
Remove <app>'s Docker secret <secret>. Remove <app>'s Docker secret <secret>.
PTIONS OPTIONS
--pass Remove secret(s) from \`pass\` as well --pass Remove secret(s) from \`pass\` as well
--all Delete all secrets for <app> --all Delete all secrets for <app>
@ -1718,7 +1741,7 @@ help_app_volume_delete (){
Remove <app>'s Docker volume <volume>, or all volumes with --all. Remove <app>'s Docker volume <volume>, or all volumes with --all.
PTIONS OPTIONS
--pass Remove volume(s) from \`pass\` as well --pass Remove volume(s) from \`pass\` as well
--all Delete all volumes for <app> --all Delete all volumes for <app>
@ -2471,7 +2494,7 @@ abra() {
abra___help abra___branch abra___volumes abra__provider_ abra___type \ abra___help abra___branch abra___volumes abra__provider_ abra___type \
abra___dev abra___update abra___no_prompt abra___force \ abra___dev abra___update abra___no_prompt abra___force \
abra___skip_version_check abra__recipe_ abra___no_domain_poll \ abra___skip_version_check abra__recipe_ abra___no_domain_poll \
abra__volume_ abra___fast abra__volume_
if ! type tput > /dev/null 2>&1; then if ! type tput > /dev/null 2>&1; then
tput() { tput() {

View File

@ -140,7 +140,8 @@ def generate_apps_json(repos_json):
chdir(app_path) chdir(app_path)
metadata = get_app_metadata(app_path) metadata = get_app_metadata(app_path)
name = metadata.pop("name", "")
name = metadata.pop("name", app)
log.info(f"Processing {app}") log.info(f"Processing {app}")
apps_json[app] = { apps_json[app] = {
@ -173,7 +174,7 @@ def get_app_metadata(app_path):
return {} return {}
try: try:
for match in findall(r"\*\*.*\s\*", contents): for match in findall(r"\*\*.*", contents):
title = search(r"(?<=\*\*).*(?=\*\*)", match).group().lower() title = search(r"(?<=\*\*).*(?=\*\*)", match).group().lower()
if title == "image": if title == "image":

View File

@ -38,6 +38,22 @@ _abra_complete_apps()
mapfile -t COMPREPLY < <(compgen -W "$(_abra_apps)" -- "$1") 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() _abra_complete()
{ {
compopt +o default +o nospace compopt +o default +o nospace
@ -46,6 +62,7 @@ _abra_complete()
local -r cmds=' local -r cmds='
app app
server server
recipe
' '
local -r short_opts='-e -h -s -v' local -r short_opts='-e -h -s -v'
local -r long_opts='--env --help --stack --version' local -r long_opts='--env --help --stack --version'
@ -101,6 +118,12 @@ _abra_complete()
_abra_complete_apps "$cur" _abra_complete_apps "$cur"
fi fi
;; ;;
recipe)
# Offer exactly one app completion.
if (( COMP_CWORD == cmd_index + 1 )); then
_abra_complete_recipes "$cur"
fi
;;
#help) #help)
# # Offer exactly one command name completion. # # Offer exactly one command name completion.
# if (( COMP_CWORD == cmd_index + 1 )); then # if (( COMP_CWORD == cmd_index + 1 )); then

View File

@ -25,6 +25,7 @@
"source": "own", "source": "own",
"url": "https://hub.docker.com/r/3wordchant/adaptauthoring" "url": "https://hub.docker.com/r/3wordchant/adaptauthoring"
}, },
"sso": "No",
"status": 3, "status": 3,
"tests": "❷💛" "tests": "❷💛"
}, },
@ -126,10 +127,11 @@
"healthcheck": "No", "healthcheck": "No",
"image": { "image": {
"image": "michaelmcandrew/civicrm", "image": "michaelmcandrew/civicrm",
"rating": "3rd party\n*", "rating": "3rd party",
"source": "3rd party", "source": "3rd party",
"url": "https://hub.docker.com/r/michaelmcandrew/civicrm/" "url": "https://hub.docker.com/r/michaelmcandrew/civicrm/"
}, },
"sso": "No",
"status": 4, "status": 4,
"tests": "No" "tests": "No"
}, },
@ -167,10 +169,11 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/r/hackmdio/hackmd/" "url": "https://hub.docker.com/r/hackmdio/hackmd/"
}, },
"sso": "❶💚 (OAuth)",
"status": 2, "status": 2,
"tests": "❷💛" "tests": "❷💛"
}, },
"icon": "", "icon": "https://git.autonomic.zone/repo-avatars/120-41a3ded2e81db68ba898ebd757b32e47",
"name": "CodiMD", "name": "CodiMD",
"repository": "https://git.autonomic.zone/coop-cloud/codimd.git", "repository": "https://git.autonomic.zone/coop-cloud/codimd.git",
"versions": { "versions": {
@ -190,10 +193,24 @@
"website": "https://github.com/hackmdio/codimd" "website": "https://github.com/hackmdio/codimd"
}, },
"collabora": { "collabora": {
"category": "", "category": "Apps",
"default_branch": "main", "default_branch": "main",
"description": "An awesome, Online Office suite image suitable for home use.", "description": "An awesome, Online Office suite image suitable for home use.",
"features": {}, "features": {
"backups": "No",
"category": "Apps",
"email": "❶💚",
"healthcheck": "No",
"image": {
"image": "collabora",
"rating": "❶💚",
"source": "upstream",
"url": "https://hub.docker.com/r/collabora/code"
},
"sso": "No",
"status": 1,
"tests": "❷💛"
},
"icon": "https://git.autonomic.zone/repo-avatars/249-0937028d43099df58d85bc41a7e69fbd", "icon": "https://git.autonomic.zone/repo-avatars/249-0937028d43099df58d85bc41a7e69fbd",
"name": "collabora", "name": "collabora",
"repository": "https://git.autonomic.zone/coop-cloud/collabora.git", "repository": "https://git.autonomic.zone/coop-cloud/collabora.git",
@ -239,6 +256,7 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/_/nginx" "url": "https://hub.docker.com/_/nginx"
}, },
"sso": "No",
"status": 2, "status": 2,
"tests": "❷💛" "tests": "❷💛"
}, },
@ -271,6 +289,7 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/_/registry/" "url": "https://hub.docker.com/_/registry/"
}, },
"sso": "?",
"status": 4, "status": 4,
"tests": "?" "tests": "?"
}, },
@ -281,14 +300,36 @@
"website": "" "website": ""
}, },
"docker-hub-rss": { "docker-hub-rss": {
"category": "", "category": "Utilities",
"default_branch": "main", "default_branch": "main",
"description": "RSS feed for Docker Hub images", "description": "RSS feed for Docker Hub images",
"features": {}, "features": {
"backups": "?",
"category": "Utilities",
"email": "?",
"healthcheck": "?",
"image": {
"image": "docker-hub-rss",
"rating": "❶💚",
"source": "upstream",
"url": "https://hub.docker.com/r/theconnman/docker-hub-rss/"
},
"sso": "?",
"status": 5,
"tests": "?"
},
"icon": "", "icon": "",
"name": "Docker-Hub-Rss", "name": "Docker-Hub-RSS",
"repository": "https://git.autonomic.zone/coop-cloud/docker-hub-rss.git", "repository": "https://git.autonomic.zone/coop-cloud/docker-hub-rss.git",
"versions": {}, "versions": {
"0.4.2": {
"app": {
"digest": "67a5d9f9",
"image": "theconnman/docker-hub-rss",
"tag": "0.4.2"
}
}
},
"website": "" "website": ""
}, },
"drone": { "drone": {
@ -306,6 +347,7 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/r/drone/drone" "url": "https://hub.docker.com/r/drone/drone"
}, },
"sso": "❶💚 (OAuth)",
"status": 5, "status": 5,
"tests": "❷💛" "tests": "❷💛"
}, },
@ -338,6 +380,7 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/r/drone/drone-docker-runner/" "url": "https://hub.docker.com/r/drone/drone-docker-runner/"
}, },
"sso": "?",
"status": 4, "status": 4,
"tests": "?" "tests": "?"
}, },
@ -370,6 +413,7 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/r/afian/filerun" "url": "https://hub.docker.com/r/afian/filerun"
}, },
"sso": "No",
"status": 4, "status": 4,
"tests": "No" "tests": "No"
}, },
@ -394,6 +438,7 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/r/machines/filestash/" "url": "https://hub.docker.com/r/machines/filestash/"
}, },
"sso": "No",
"status": 4, "status": 4,
"tests": "No" "tests": "No"
}, },
@ -437,6 +482,7 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/gitea/gitea" "url": "https://hub.docker.com/gitea/gitea"
}, },
"sso": "❶💚 (OAuth)",
"status": 2, "status": 2,
"tests": "❷💛" "tests": "❷💛"
}, },
@ -535,7 +581,7 @@
"tag": "1.14.1-rootless" "tag": "1.14.1-rootless"
}, },
"db": { "db": {
"digest": "018ee505", "digest": "0c3c5603",
"image": "mariadb", "image": "mariadb",
"tag": "10.5" "tag": "10.5"
} }
@ -558,6 +604,7 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/r/go-neb/go-neb" "url": "https://hub.docker.com/r/go-neb/go-neb"
}, },
"sso": "",
"status": 4, "status": 4,
"tests": "" "tests": ""
}, },
@ -582,6 +629,7 @@
"source": "3rd-party", "source": "3rd-party",
"url": "https://hub.docker.com/r/michaeljefferys/docker-h5ai" "url": "https://hub.docker.com/r/michaeljefferys/docker-h5ai"
}, },
"sso": "No",
"status": 3, "status": 3,
"tests": "No" "tests": "No"
}, },
@ -591,6 +639,17 @@
"versions": {}, "versions": {},
"website": "https://github.com/lrsjng/h5ai" "website": "https://github.com/lrsjng/h5ai"
}, },
"hometown": {
"category": "",
"default_branch": "main",
"description": "A supported fork of Mastodon that provides local posting and a wider range of content types.",
"features": {},
"icon": "https://git.autonomic.zone/repo-avatars/270-8d213bc7168656fd842894218de803ba",
"name": "hometown",
"repository": "https://git.autonomic.zone/coop-cloud/hometown.git",
"versions": {},
"website": ""
},
"invoiceninja": { "invoiceninja": {
"category": "Apps", "category": "Apps",
"default_branch": "master", "default_branch": "master",
@ -606,6 +665,7 @@
"source": "3rd party", "source": "3rd party",
"url": "https://hub.docker.com/r/invoiceninja/invoiceninja" "url": "https://hub.docker.com/r/invoiceninja/invoiceninja"
}, },
"sso": "?",
"status": 4, "status": 4,
"tests": "No" "tests": "No"
}, },
@ -699,6 +759,7 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/r/jboss/keycloak" "url": "https://hub.docker.com/r/jboss/keycloak"
}, },
"sso": "N/A",
"status": 2, "status": 2,
"tests": "❷💛" "tests": "❷💛"
}, },
@ -729,6 +790,18 @@
"image": "mariadb", "image": "mariadb",
"tag": "10.6" "tag": "10.6"
} }
},
"13.0.1": {
"app": {
"digest": "e2a216ff",
"image": "jboss/keycloak",
"tag": "13.0.1"
},
"db": {
"digest": "b4018557",
"image": "mariadb",
"tag": "10.6"
}
} }
}, },
"website": "https://github.com/keycloak/keycloak" "website": "https://github.com/keycloak/keycloak"
@ -748,6 +821,7 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/r/keyoxide/keyoxide" "url": "https://hub.docker.com/r/keyoxide/keyoxide"
}, },
"sso": "N/A",
"status": 2, "status": 2,
"tests": "❷💛" "tests": "❷💛"
}, },
@ -787,6 +861,7 @@
"source": "official", "source": "official",
"url": "https://hub.docker.com/kimai/kimai2" "url": "https://hub.docker.com/kimai/kimai2"
}, },
"sso": "No",
"status": 5, "status": 5,
"tests": "❷💛" "tests": "❷💛"
}, },
@ -824,6 +899,7 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/r/kutt/kutt" "url": "https://hub.docker.com/r/kutt/kutt"
}, },
"sso": "No",
"status": 3, "status": 3,
"tests": "No" "tests": "No"
}, },
@ -852,14 +928,56 @@
"website": "https://github.com/thedevs-network/kutt" "website": "https://github.com/thedevs-network/kutt"
}, },
"loomio": { "loomio": {
"category": "", "category": "Apps",
"default_branch": "main", "default_branch": "main",
"description": "Help people make decisions together ", "description": "Help people make decisions together ",
"features": {}, "features": {
"backups": "No",
"category": "Apps",
"email": "?",
"healthcheck": "No",
"image": {
"image": "loomio/*",
"rating": "❶💚",
"source": "upstream",
"url": "https://hub.docker.com/r/loomio"
},
"sso": "No",
"status": 4,
"tests": "No"
},
"icon": "https://git.autonomic.zone/repo-avatars/251-8127254f041f324f83cbb43074841d34", "icon": "https://git.autonomic.zone/repo-avatars/251-8127254f041f324f83cbb43074841d34",
"name": "", "name": "Loomio",
"repository": "https://git.autonomic.zone/coop-cloud/loomio.git", "repository": "https://git.autonomic.zone/coop-cloud/loomio.git",
"versions": {}, "versions": {
"v2.7.9": {
"app": {
"digest": "8007a47b",
"image": "loomio/loomio",
"tag": "v2.7.9"
},
"channels": {
"digest": "0f331ad6",
"image": "loomio/loomio_channel_server",
"tag": "loomio/loomio_channel_server"
},
"db": {
"digest": "d96835c9",
"image": "postgres",
"tag": "12.2"
},
"redis": {
"digest": "3412d21e",
"image": "redis",
"tag": "5.0"
},
"worker": {
"digest": "8007a47b",
"image": "loomio/loomio",
"tag": "v2.7.9"
}
}
},
"website": "https://github.com/loomio/loomio" "website": "https://github.com/loomio/loomio"
}, },
"mailman3": { "mailman3": {
@ -888,6 +1006,7 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/r/mailu/" "url": "https://hub.docker.com/r/mailu/"
}, },
"sso": "No",
"status": 3, "status": 3,
"tests": "No" "tests": "No"
}, },
@ -903,7 +1022,7 @@
"description": "Your self-hosted, globally interconnected microblogging community", "description": "Your self-hosted, globally interconnected microblogging community",
"features": {}, "features": {},
"icon": "https://git.autonomic.zone/repo-avatars/258-a5a9122d2052bf928aadc5454133685e", "icon": "https://git.autonomic.zone/repo-avatars/258-a5a9122d2052bf928aadc5454133685e",
"name": "", "name": "mastodon",
"repository": "https://git.autonomic.zone/coop-cloud/mastodon.git", "repository": "https://git.autonomic.zone/coop-cloud/mastodon.git",
"versions": {}, "versions": {},
"website": "https://joinmastodon.org" "website": "https://joinmastodon.org"
@ -923,6 +1042,7 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/_/matomo" "url": "https://hub.docker.com/_/matomo"
}, },
"sso": "No",
"status": 3, "status": 3,
"tests": "❷💛" "tests": "❷💛"
}, },
@ -960,6 +1080,7 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/r/matrixdotorg/synapse" "url": "https://hub.docker.com/r/matrixdotorg/synapse"
}, },
"sso": "No",
"status": 4, "status": 4,
"tests": "No" "tests": "No"
}, },
@ -1006,6 +1127,7 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/_/mediawiki" "url": "https://hub.docker.com/_/mediawiki"
}, },
"sso": "❷💛 (OAuth, SAML)",
"status": 3, "status": 3,
"tests": "❷💛" "tests": "❷💛"
}, },
@ -1097,6 +1219,7 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/r/minio/minio" "url": "https://hub.docker.com/r/minio/minio"
}, },
"sso": "❌",
"status": 2, "status": 2,
"tests": "❷💛" "tests": "❷💛"
}, },
@ -1121,6 +1244,7 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/_/nextcloud" "url": "https://hub.docker.com/_/nextcloud"
}, },
"sso": "❸🍎 (OAuth)",
"status": 2, "status": 2,
"tests": "❷💛" "tests": "❷💛"
}, },
@ -1161,16 +1285,30 @@
"description": "Self hosted note taking app stored on S3. ", "description": "Self hosted note taking app stored on S3. ",
"features": {}, "features": {},
"icon": "https://git.autonomic.zone/repo-avatars/253-3c9cb77fc29149a1e34c25664c06f045", "icon": "https://git.autonomic.zone/repo-avatars/253-3c9cb77fc29149a1e34c25664c06f045",
"name": "", "name": "notea",
"repository": "https://git.autonomic.zone/coop-cloud/notea.git", "repository": "https://git.autonomic.zone/coop-cloud/notea.git",
"versions": {}, "versions": {},
"website": "https://github.com/QingWei-Li/notea" "website": "https://github.com/QingWei-Li/notea"
}, },
"onlyoffice": { "onlyoffice": {
"category": "", "category": "Apps",
"default_branch": "main", "default_branch": "main",
"description": "An online office suite comprising viewers and editors for texts, spreadsheets and presentations, fully compatible with Office Open XML formats: .docx, .xlsx, .pptx and enabling collaborative editing in real time.", "description": "An online office suite comprising viewers and editors for texts, spreadsheets and presentations, fully compatible with Office Open XML formats: .docx, .xlsx, .pptx and enabling collaborative editing in real time.",
"features": {}, "features": {
"backups": "No",
"category": "Apps",
"email": "❶💚",
"healthcheck": "No",
"image": {
"image": "onlyoffice",
"rating": "❶💚",
"source": "upstream",
"url": "https://hub.docker.com/r/onlyoffice/documentserver/"
},
"sso": "No",
"status": 1,
"tests": "❷💛"
},
"icon": "", "icon": "",
"name": "onlyoffice", "name": "onlyoffice",
"repository": "https://git.autonomic.zone/coop-cloud/onlyoffice.git", "repository": "https://git.autonomic.zone/coop-cloud/onlyoffice.git",
@ -1185,7 +1323,15 @@
"icon": "https://git.autonomic.zone/repo-avatars/244-4b521501493c7a3e60af4fbd1c1ac918", "icon": "https://git.autonomic.zone/repo-avatars/244-4b521501493c7a3e60af4fbd1c1ac918",
"name": "opencpu-rstudio", "name": "opencpu-rstudio",
"repository": "https://git.autonomic.zone/coop-cloud/opencpu-rstudio.git", "repository": "https://git.autonomic.zone/coop-cloud/opencpu-rstudio.git",
"versions": {}, "versions": {
"2.1.7": {
"app": {
"digest": "c036fae9",
"image": "opencpu/rstudio",
"tag": "2.1.7"
}
}
},
"website": "" "website": ""
}, },
"osticket": { "osticket": {
@ -1203,6 +1349,7 @@
"source": "3rd party", "source": "3rd party",
"url": "https://hub.docker.com/r/osticket/osticket" "url": "https://hub.docker.com/r/osticket/osticket"
}, },
"sso": "",
"status": 4, "status": 4,
"tests": "" "tests": ""
}, },
@ -1213,14 +1360,51 @@
"website": "https://github.com/osTicket/osTicket" "website": "https://github.com/osTicket/osTicket"
}, },
"peertube": { "peertube": {
"category": "", "category": "Applications",
"default_branch": "main", "default_branch": "main",
"description": "An ActivityPub-federated video streaming platform using P2P directly in your web browser.", "description": "An ActivityPub-federated video streaming platform using P2P directly in your web browser.",
"features": {}, "features": {
"backups": "❸🍎",
"category": "Applications",
"email": "❶💚",
"healthcheck": "❶💚",
"image": {
"image": "chocobozzz/peertube",
"rating": "❷💛",
"source": "official",
"url": "https://hub.docker.com/r/chocobozzz/peertube"
},
"sso": "❸🍎",
"status": 2,
"tests": "❌"
},
"icon": "https://git.autonomic.zone/repo-avatars/213-5148e886c39da6c86dace88dfab25877", "icon": "https://git.autonomic.zone/repo-avatars/213-5148e886c39da6c86dace88dfab25877",
"name": "Peertube", "name": "Peertube",
"repository": "https://git.autonomic.zone/coop-cloud/peertube.git", "repository": "https://git.autonomic.zone/coop-cloud/peertube.git",
"versions": {}, "versions": {
"v3.1.0-buster": {
"app": {
"digest": "455af623",
"image": "chocobozzz/peertube",
"tag": "v3.1.0-buster"
},
"cache": {
"digest": "aaf7c123",
"image": "redis",
"tag": "4-alpine"
},
"db": {
"digest": "f2d229fd",
"image": "postgres",
"tag": "10-alpine"
},
"web": {
"digest": "ea4560b8",
"image": "nginx",
"tag": "1.20.0"
}
}
},
"website": "" "website": ""
}, },
"pelican": { "pelican": {
@ -1238,6 +1422,7 @@
"source": "own", "source": "own",
"url": "https://hub.docker.com/r/3wordchant/pelican" "url": "https://hub.docker.com/r/3wordchant/pelican"
}, },
"sso": "No",
"status": 2, "status": 2,
"tests": "❷💛" "tests": "❷💛"
}, },
@ -1266,7 +1451,7 @@
"description": "The Open-Source design & prototyping platform", "description": "The Open-Source design & prototyping platform",
"features": {}, "features": {},
"icon": "https://git.autonomic.zone/repo-avatars/235-2d649ef2cac767f666190ee583a35de5", "icon": "https://git.autonomic.zone/repo-avatars/235-2d649ef2cac767f666190ee583a35de5",
"name": "", "name": "penpot",
"repository": "https://git.autonomic.zone/coop-cloud/penpot.git", "repository": "https://git.autonomic.zone/coop-cloud/penpot.git",
"versions": { "versions": {
"1.4.0-alpha": { "1.4.0-alpha": {
@ -1314,6 +1499,7 @@
"source": "3rd party", "source": "3rd party",
"url": "https://hub.docker.com/r/benoitpodwinski/phpservermon" "url": "https://hub.docker.com/r/benoitpodwinski/phpservermon"
}, },
"sso": "No",
"status": 4, "status": 4,
"tests": "No" "tests": "No"
}, },
@ -1351,6 +1537,7 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/r/portainer/portainer" "url": "https://hub.docker.com/r/portainer/portainer"
}, },
"sso": "No",
"status": 5, "status": 5,
"tests": "❷💛" "tests": "❷💛"
}, },
@ -1388,6 +1575,8 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/r/boky/postfix/" "url": "https://hub.docker.com/r/boky/postfix/"
}, },
"note": "",
"sso": "N/A",
"status": 2, "status": 2,
"tests": "❷💛" "tests": "❷💛"
}, },
@ -1420,6 +1609,7 @@
"source": "3rd party", "source": "3rd party",
"url": "https://hub.docker.com/r/linuxserver/projectsend" "url": "https://hub.docker.com/r/linuxserver/projectsend"
}, },
"sso": "No",
"status": 4, "status": 4,
"tests": "No" "tests": "No"
}, },
@ -1457,6 +1647,7 @@
"source": "3rd party", "source": "3rd party",
"url": "https://hub.docker.com/r/tomsquest/radicale" "url": "https://hub.docker.com/r/tomsquest/radicale"
}, },
"sso": "No",
"status": 4, "status": 4,
"tests": "No" "tests": "No"
}, },
@ -1500,6 +1691,7 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/r/renovate/renovate" "url": "https://hub.docker.com/r/renovate/renovate"
}, },
"sso": "?",
"status": 5, "status": 5,
"tests": "❷💛" "tests": "❷💛"
}, },
@ -1532,6 +1724,7 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/r/rocketchat/rocket.chat/" "url": "https://hub.docker.com/r/rocketchat/rocket.chat/"
}, },
"sso": "❶💚 (OAuth)",
"status": 2, "status": 2,
"tests": "❷💛" "tests": "❷💛"
}, },
@ -1598,8 +1791,8 @@
"default_branch": "main", "default_branch": "main",
"description": "An integrated development environment for R and Python, with a console, syntax-highlighting editor that supports direct code execution, and tools for plotting, history, debugging and workspace management.", "description": "An integrated development environment for R and Python, with a console, syntax-highlighting editor that supports direct code execution, and tools for plotting, history, debugging and workspace management.",
"features": {}, "features": {},
"icon": "https://git.autonomic.zone/repo-avatars/261-359d0c955f531b6a5cca9aacdff3fa53", "icon": "https://git.autonomic.zone/repo-avatars/261-4b521501493c7a3e60af4fbd1c1ac918",
"name": "", "name": "rstudio",
"repository": "https://git.autonomic.zone/coop-cloud/rstudio.git", "repository": "https://git.autonomic.zone/coop-cloud/rstudio.git",
"versions": {}, "versions": {},
"website": "" "website": ""
@ -1619,6 +1812,7 @@
"source": "3rd-party", "source": "3rd-party",
"url": "https://hub.docker.com/r/akito13/selfoss" "url": "https://hub.docker.com/r/akito13/selfoss"
}, },
"sso": "N/A",
"status": 3, "status": 3,
"tests": "❸🍎" "tests": "❸🍎"
}, },
@ -1656,6 +1850,7 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/r/statping/statping" "url": "https://hub.docker.com/r/statping/statping"
}, },
"sso": "No",
"status": 3, "status": 3,
"tests": "No" "tests": "No"
}, },
@ -1688,6 +1883,7 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/r/statuspal/statuspal" "url": "https://hub.docker.com/r/statuspal/statuspal"
}, },
"sso": "No",
"status": 4, "status": 4,
"tests": "No" "tests": "No"
}, },
@ -1725,6 +1921,7 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/r/strapi/strapi" "url": "https://hub.docker.com/r/strapi/strapi"
}, },
"sso": "No",
"status": 3, "status": 3,
"tests": "❷💛" "tests": "❷💛"
}, },
@ -1786,6 +1983,7 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/_/swarmpit" "url": "https://hub.docker.com/_/swarmpit"
}, },
"sso": "N/A",
"status": 2, "status": 2,
"tests": "❷💛" "tests": "❷💛"
}, },
@ -1833,6 +2031,7 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/_/traefik" "url": "https://hub.docker.com/_/traefik"
}, },
"sso": "? (Keycloak)",
"status": 5, "status": 5,
"tests": "❷💛" "tests": "❷💛"
}, },
@ -1865,6 +2064,7 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/r/crazymax/swarm-cronjob/" "url": "https://hub.docker.com/r/crazymax/swarm-cronjob/"
}, },
"sso": "?",
"status": 5, "status": 5,
"tests": "?" "tests": "?"
}, },
@ -1897,6 +2097,7 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/r/wallabag/wallabag" "url": "https://hub.docker.com/r/wallabag/wallabag"
}, },
"sso": "No",
"status": 3, "status": 3,
"tests": "❷💛" "tests": "❷💛"
}, },
@ -1939,6 +2140,7 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/_/wordpress" "url": "https://hub.docker.com/_/wordpress"
}, },
"sso": "No",
"status": 1, "status": 1,
"tests": "❷💛" "tests": "❷💛"
}, },
@ -1993,6 +2195,30 @@
"image": "mariadb", "image": "mariadb",
"tag": "10.6" "tag": "10.6"
} }
},
"5.7.2_1": {
"app": {
"digest": "7caa73eb",
"image": "wordpress",
"tag": "5.7.2"
},
"db": {
"digest": "171746d0",
"image": "mariadb",
"tag": "10.6"
}
},
"5.7.2_2": {
"app": {
"digest": "7caa73eb",
"image": "wordpress",
"tag": "5.7.2"
},
"db": {
"digest": "171746d0",
"image": "mariadb",
"tag": "10.6"
}
} }
}, },
"website": "https://github.com/wordpress/wordpress" "website": "https://github.com/wordpress/wordpress"
@ -2012,6 +2238,7 @@
"source": "upstream", "source": "upstream",
"url": "https://hub.docker.com/r/thecodingmachine/" "url": "https://hub.docker.com/r/thecodingmachine/"
}, },
"sso": "No",
"status": 4, "status": 4,
"tests": "No" "tests": "No"
}, },
@ -2064,6 +2291,7 @@
"source": "3rd party", "source": "3rd party",
"url": "https://hub.docker.com/r/linuxserver/znc" "url": "https://hub.docker.com/r/linuxserver/znc"
}, },
"sso": "No",
"status": 4, "status": 4,
"tests": "No" "tests": "No"
}, },

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
ABRA_VERSION="0.7.4" ABRA_VERSION="8.0.0"
GIT_URL="https://git.autonomic.zone/coop-cloud/abra" GIT_URL="https://git.autonomic.zone/coop-cloud/abra"
ABRA_SRC="$GIT_URL/raw/tag/$ABRA_VERSION/abra" ABRA_SRC="$GIT_URL/raw/tag/$ABRA_VERSION/abra"
ABRA_DIR="${ABRA_DIR:-$HOME/.abra/}" ABRA_DIR="${ABRA_DIR:-$HOME/.abra/}"

View File

@ -8,12 +8,12 @@ test:
--name=abra-test-dind \ --name=abra-test-dind \
-e DOCKER_TLS_CERTDIR="" \ -e DOCKER_TLS_CERTDIR="" \
decentral1se/docker-dind-bats-kcov decentral1se/docker-dind-bats-kcov
@DOCKER_CONTEXT=default docker exec \ @DOCKER_CONTEXT=default sudo docker exec \
-it \ -it \
abra-test-dind \ abra-test-dind \
sh -c "cd /workdir && bats /workdir/tests" sh -c "cd /workdir && bats /workdir/tests"
@DOCKER_CONTEXT=default docker stop abra-test-dind @DOCKER_CONTEXT=default sudo docker stop abra-test-dind
@DOCKER_CONTEXT=default docker rm abra-test-dind @DOCKER_CONTEXT=default sudo docker rm abra-test-dind
shellcheck: shellcheck:
@docker run \ @docker run \