Compare commits

..

2 Commits

Author SHA1 Message Date
3wc
2b5d907e0f .. and update CHANGELOG 2021-05-29 23:31:16 +02:00
3wc
fce26a6d52 Add app .. volume commands, working vol deletion
Fixes #161
2021-05-29 23:13:07 +02:00
19 changed files with 2474 additions and 641 deletions

View File

@ -18,61 +18,32 @@ steps:
commands:
- bats tests
- name: publish image
image: plugins/docker
settings:
auto_tag: true
username:
from_secret: docker_reg_username
password:
from_secret: docker_reg_passwd
repo: decentral1se/abra
tags: latest
depends_on:
- run shellcheck
- run flake8
- run unit tests
when:
event:
exclude:
- pull_request
- name: collect code coverage
failure: ignore # until we fix this
image: decentral1se/docker-dind-bats-kcov
commands:
- kcov . bats tests || true
- name: trigger downstream builds
image: plugins/downstream
- name: send code coverage report to codecov
failure: ignore # until we fix this
image: plugins/codecov
settings:
server: https://drone.autonomic.zone
token:
from_secret: decentral1se_token
fork: true
repositories:
- coop-cloud/drone-abra
depends_on:
- run shellcheck
- run flake8
- run unit tests
- publish image
when:
event:
exclude:
- pull_request
from_secret: codecov_token
required: true
- name: notify on failure
image: plugins/matrix
- name: notify rocket chat
image: plugins/slack
settings:
homeserver: https://matrix.autonomic.zone
roomid: "IFazIpLtxiScqbHqoa:autonomic.zone"
userid: "@autono-bot:autonomic.zone"
accesstoken:
from_secret: autono_bot_access_token
depends_on:
- run shellcheck
- run flake8
- run unit tests
- publish image
- trigger downstream builds
webhook:
from_secret: rc_builds_url
username: comradebritney
channel: "internal.builds"
template: "{{repo.owner}}/{{repo.name}} build failed: {{build.link}}"
when:
status:
- failure
trigger:
branch:
- main

3
.gitignore vendored
View File

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

View File

@ -9,36 +9,7 @@
# abra x.x.x (UNRELEASED)
- Add `--bump` to `deploy` command to allow packagers to make minor package related releases ([#173](https://git.autonomic.zone/coop-cloud/abra/issues/173))
# abra 9.0.0 (2021-06-10)
- Add Docker image for `abra` ([64d578cf91](https://git.autonomic.zone/coop-cloud/abra/commit/64d578cf914bd2bad378ea4ef375747d10b33191))
- Support unattended mode for recipe releasing ([3759bcd641](https://git.autonomic.zone/coop-cloud/abra/commit/3759bcd641cf60611c13927e83425e773d2bb629))
- Add Renovate bot configuraiton script ([9fadc430a7](https://git.autonomic.zone/coop-cloud/abra/commit/9fadc430a7bb2d554c0ee26c0f9b6c51dc5b0475))
- Add release automation via [drone-abra](https://git.autonomic.zone/coop-cloud/drone-abra) ([#56](https://git.autonomic.zone/coop-cloud/organising/issues/56))
- Move `apps.json` generation to [auto-apps-json](https://git.autonomic.zone/coop-cloud/auto-apps-json) ([#125](https://git.autonomic.zone/coop-cloud/abra/issues/125))
- Add Github mirroring script ([4ef433312d](https://git.autonomic.zone/coop-cloud/abra/commit/4ef433312dd0b0ace91b3c285f82f3973093d92d))
- Add `--chaos` flag to deploy (always choose latest Git commit) ([#178](https://git.autonomic.zone/coop-cloud/abra/issues/178))
# abra 8.0.1 (2021-05-31)
- Fix help for `... app ... volume ls` ([efad71c470](https://git.autonomic.zone/coop-cloud/abra/commits/branch/main))
- Only output secrets warnings once ([#143](https://git.autonomic.zone/coop-cloud/abra/issues/143))
- Migrate `abra` installation script to `coopcloud.tech` domain ([#150](https://git.autonomic.zone/coop-cloud/abra/issues/150))
- Add `--no-state-poll` to avoid success/failure forecasting on deployment ([#165](https://git.autonomic.zone/coop-cloud/abra/issues/165))
# abra 8.0.0 (2021-05-30)
- Fix secret length generation ([f537417](https://git.autonomic.zone/coop-cloud/abra/commit/1b85bf3d37280e9632c315d759c0f2d09c039fef))
- Fix checking out new apps ([#164](https://git.autonomic.zone/coop-cloud/abra/issues/164)
- Give up if YAML is invalid ([#154](https://git.autonomic.zone/coop-cloud/abra/issues/154))
- Switch from wget to cURL ([fc0caaa](https://git.autonomic.zone/coop-cloud/abra/commit/fc0caaa))
- Add Bash completion for `recipe ..` ([8c93d1a](https://git.autonomic.zone/coop-cloud/abra/commit/8c93d1a))
- Tweak README parsing in `app-json.py` ([b14219b](https://git.autonomic.zone/coop-cloud/abra/commit/b14219b))
- Add fallback names to `app.json` ([#157](https://git.autonomic.zone/coop-cloud/abra/issues/157))
- Remove duplicate message ([#155](https://git.autonomic.zone/coop-cloud/abra/issues/155))
- Add `deploy --fast` ([a7f7c96](https://git.autonomic.zone/coop-cloud/abra/commit/a7f7c96))
- Add `app .. volume` commands, fix volume deletion with `app .. delete --volumes` ([#161](https://git.autonomic.zone/coop-cloud/abra/issues/161))
# abra 0.7.4 (2021-05-10)

View File

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

View File

@ -1,10 +1,11 @@
# 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)
> https://coopcloud.tech
The Co-op 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.
@ -27,35 +28,19 @@ See [CHANGELOG.md](./CHANGELOG.md).
## Install
Requirements:
- `pwqgen` (optional)
- `pwgen` (optional)
- `curl`
- `docker`
- `bash` >= 4
Install the latest stable release:
```sh
curl https://install.abra.coopcloud.tech | bash
curl https://install.abra.autonomic.zone | bash
```
or the bleeding-edge development version:
```sh
curl https://install.abra.coopcloud.tech | bash -s -- --dev
curl https://install.abra.autonomic.zone | bash -s -- --dev
```
The source for this script is [here](./deploy/install.abra.coopcloud.tech/installer).
## Container
An [image](https://hub.docker.com/r/decentral1se/abra) is also provided.
```
docker run decentral1se/abra app ls
```
The source for this script is [here](./deploy/install.abra.autonomic.zone/installer).
## Update
@ -68,22 +53,41 @@ To update the development version, run `abra upgrade --dev`.
It's written in Bash version 4 or greater!
Install it via `curl https://install.abra.coopcloud.tech | bash -s -- --dev`, then you can hack on the source in `~/.abra/src`.
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.coopcloud.tech](https://install.abra.coopcloud.tech)
> [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.coopcloud.tech/installer](./deploy/install.abra.coopcloud.tech/installer)
- 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
```

425
abra
View File

@ -3,7 +3,7 @@
GIT_URL="https://git.autonomic.zone/coop-cloud/"
ABRA_APPS_URL="https://apps.coopcloud.tech"
ABRA_DIR="${ABRA_DIR:-$HOME/.abra}"
ABRA_VERSION="9.0.0"
ABRA_VERSION="0.7.4"
ABRA_BACKUP_DIR="${ABRA_BACKUP_DIR:-$ABRA_DIR/backups}"
ABRA_VENDOR_DIR="$ABRA_DIR/vendor"
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 new [--server=<server>] [--domain=<domain>] [--app-name=<app_name>] [--pass] [--secrets] <type>
abra [options] app <app> backup (<service>|--all)
abra [options] app <app> deploy [--update] [--force] [--fast] [--skip-version-check] [--no-domain-poll] [--no-state-poll] [--chaos] [<version>]
abra [options] app <app> deploy [--update] [--force] [--skip-version-check] [--no-domain-poll] [<version>]
abra [options] app <app> check
abra [options] app <app> version
abra [options] app <app> config
@ -40,7 +40,7 @@ Usage:
abra [options] app <app> <command> [<args>...]
abra [options] recipe ls
abra [options] recipe create <recipe>
abra [options] recipe <recipe> release [--force] [--bump]
abra [options] recipe <recipe> release [--force]
abra [options] recipe <recipe> versions
abra [options] server add <host> [<user>] [<port>]
abra [options] server new <provider> -- <args>
@ -167,110 +167,104 @@ eval "var_$1+=($value)"; else eval "var_$1=$value"; fi; return 0; fi; done
return 1; }; stdout() { printf -- "cat <<'EOM'\n%s\nEOM\n" "$1"; }; stderr() {
printf -- "cat <<'EOM' >&2\n%s\nEOM\n" "$1"; }; error() {
[[ -n $1 ]] && stderr "$1"; stderr "$usage"; _return 1; }; _return() {
printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:2511}
usage=${DOC:40:1902}; digest=145c2
shorts=(-s -d -U -b -h -C -n -v -e '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
longs=(--stack --debug --skip-update --branch --help --skip-check --no-prompt --verbose --env --status --server --type --domain --app-name --pass --secrets --all --update --force --fast --skip-version-check --no-domain-poll --no-state-poll --chaos --volumes --no-tty --user --bump --dev)
argcounts=(1 0 0 1 0 0 0 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0); node_0(){
value __stack 0; }; node_1(){ switch __debug 1; }; node_2(){
switch __skip_update 2; }; node_3(){ value __branch 3; }; node_4(){
switch __help 4; }; node_5(){ switch __skip_check 5; }; node_6(){
switch __no_prompt 6; }; node_7(){ switch __verbose 7; }; node_8(){
value __env 8; }; node_9(){ switch __status 9; }; node_10(){ value __server 10
printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:2465}
usage=${DOC:40:1856}; digest=ec8da
shorts=(-e -U -C -b -v -s -n -d -h '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
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)
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(){
value __env 0; }; node_1(){ switch __skip_update 1; }; node_2(){
switch __skip_check 2; }; node_3(){ value __branch 3; }; node_4(){
switch __verbose 4; }; node_5(){ value __stack 5; }; node_6(){
switch __no_prompt 6; }; node_7(){ switch __debug 7; }; node_8(){
switch __help 8; }; node_9(){ switch __status 9; }; node_10(){ value __server 10
}; node_11(){ value __type 11; }; node_12(){ value __domain 12; }; node_13(){
value __app_name 13; }; node_14(){ switch __pass 14; }; node_15(){
switch __secrets 15; }; node_16(){ switch __all 16; }; node_17(){
switch __update 17; }; node_18(){ switch __force 18; }; node_19(){
switch __fast 19; }; node_20(){ switch __skip_version_check 20; }; node_21(){
switch __no_domain_poll 21; }; node_22(){ switch __no_state_poll 22; }
node_23(){ switch __chaos 23; }; node_24(){ switch __volumes 24; }; node_25(){
switch __no_tty 25; }; node_26(){ value __user 26; }; node_27(){
switch __bump 27; }; node_28(){ switch __dev 28; }; node_29(){ value _type_ a; }
node_30(){ value _app_ a; }; node_31(){ value _service_ a; }; node_32(){
value _version_ a; }; node_33(){ value _src_ a; }; node_34(){ value _dst_ a; }
node_35(){ value _backup_file_ a; }; node_36(){ value _args_ a true; }
node_37(){ value _secret_ a; }; node_38(){ value _cmd_ a; }; node_39(){
value _data_ a; }; node_40(){ value _volume_ a; }; node_41(){ value _command_ a
}; node_42(){ value _recipe_ a; }; node_43(){ value _host_ a; }; node_44(){
value _user_ a; }; node_45(){ value _port_ a; }; node_46(){ value _provider_ a
}; node_47(){ value _subcommands_ a true; }; node_48(){ _command app; }
node_49(){ _command list; }; node_50(){ _command ls; }; node_51(){ _command new
}; node_52(){ _command backup; }; node_53(){ _command deploy; }; node_54(){
_command check; }; node_55(){ _command version; }; node_56(){ _command config; }
node_57(){ _command cp; }; node_58(){ _command logs; }; node_59(){ _command ps
}; node_60(){ _command restore; }; node_61(){ _command rm; }; node_62(){
_command delete; }; node_63(){ _command run; }; node_64(){ _command rollback; }
node_65(){ _command secret; }; node_66(){ _command generate; }; node_67(){
_command insert; }; node_68(){ _command undeploy; }; node_69(){ _command volume
}; node_70(){ _command recipe; }; node_71(){ _command create; }; node_72(){
_command release; }; node_73(){ _command versions; }; node_74(){ _command server
}; node_75(){ _command add; }; node_76(){ _command __ --; }; node_77(){
_command init; }; node_78(){ _command apps; }; node_79(){ _command upgrade; }
node_80(){ _command doctor; }; node_81(){ _command help; }; node_82(){
optional 0 1 2 3 4 5 6 7 8; }; node_83(){ optional 82; }; node_84(){
either 49 50; }; node_85(){ required 84; }; node_86(){ optional 9; }; node_87(){
optional 10; }; node_88(){ optional 11; }; node_89(){ required 83 48 85 86 87 88
}; node_90(){ optional 12; }; node_91(){ optional 13; }; node_92(){ optional 14
}; node_93(){ optional 15; }; node_94(){ required 83 48 51 87 90 91 92 93 29; }
node_95(){ either 31 16; }; node_96(){ required 95; }; node_97(){
required 83 48 30 52 96; }; node_98(){ optional 17; }; node_99(){ optional 18; }
node_100(){ optional 19; }; node_101(){ optional 20; }; node_102(){ optional 21
}; node_103(){ optional 22; }; node_104(){ optional 23; }; node_105(){
optional 32; }; node_106(){ required 83 48 30 53 98 99 100 101 102 103 104 105
}; node_107(){ required 83 48 30 54; }; node_108(){ required 83 48 30 55; }
node_109(){ required 83 48 30 56; }; node_110(){ required 83 48 30 57 33 34; }
node_111(){ optional 31; }; node_112(){ required 83 48 30 58 111; }; node_113(){
required 83 48 30 59; }; node_114(){ required 83 48 30 60 96; }; node_115(){
either 61 62; }; node_116(){ required 115; }; node_117(){ optional 24; }
node_118(){ required 83 48 30 116 117 93; }; node_119(){ optional 35; }
node_120(){ required 83 48 30 60 31 119; }; node_121(){ optional 25; }
node_122(){ optional 26; }; node_123(){ oneormore 36; }; node_124(){
required 83 48 30 63 121 122 31 123; }; node_125(){ required 83 48 30 64 105; }
node_126(){ required 37 32; }; node_127(){ either 126 16; }; node_128(){
required 127; }; node_129(){ optional 38; }; node_130(){
required 83 48 30 65 66 128 129 92; }; node_131(){
required 83 48 30 65 67 37 32 39 92; }; node_132(){ either 37 16; }; node_133(){
required 132; }; node_134(){ required 83 48 30 65 116 133 92; }; node_135(){
required 83 48 30 68; }; node_136(){ required 83 48 30 69 50; }; node_137(){
either 40 16; }; node_138(){ required 137; }; node_139(){
required 83 48 30 69 116 138; }; node_140(){ optional 123; }; node_141(){
required 83 48 30 41 140; }; node_142(){ required 83 70 50; }; node_143(){
required 83 70 71 42; }; node_144(){ optional 27; }; node_145(){
required 83 70 42 72 99 144; }; node_146(){ required 83 70 42 73; }; node_147(){
optional 44; }; node_148(){ optional 45; }; node_149(){
required 83 74 75 43 147 148; }; node_150(){ required 83 74 51 46 76 36; }
node_151(){ required 83 74 85; }; node_152(){ required 83 74 43 61; }
node_153(){ required 83 74 43 77; }; node_154(){ required 83 74 43 78 86; }
node_155(){ optional 28; }; node_156(){ required 83 79 155; }; node_157(){
required 83 55; }; node_158(){ required 83 80; }; node_159(){ oneormore 47; }
node_160(){ optional 159; }; node_161(){ required 83 81 160; }; node_162(){
required 83; }; node_163(){
either 89 94 97 106 107 108 109 110 112 113 114 118 120 124 125 130 131 134 135 136 139 141 142 143 145 146 149 150 151 152 153 154 156 157 158 161 162
}; node_164(){ required 163; }; cat <<<' docopt_exit() {
[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1902}" >&2
exit 1; }'; unset var___stack var___debug var___skip_update var___branch \
var___help var___skip_check var___no_prompt var___verbose var___env \
var___status var___server var___type var___domain var___app_name var___pass \
var___secrets var___all var___update var___force var___fast \
var___skip_version_check var___no_domain_poll var___no_state_poll var___chaos \
var___volumes var___no_tty var___user var___bump var___dev var__type_ \
var__app_ var__service_ var__version_ var__src_ var__dst_ var__backup_file_ \
var__args_ var__secret_ var__cmd_ var__data_ var__volume_ var__command_ \
var__recipe_ var__host_ var__user_ var__port_ var__provider_ var__subcommands_ \
var_app var_list var_ls var_new var_backup var_deploy var_check var_version \
var_config var_cp var_logs var_ps var_restore var_rm var_delete var_run \
var_rollback var_secret var_generate var_insert var_undeploy var_volume \
var_recipe var_create var_release var_versions var_server var_add var___ \
var_init var_apps var_upgrade var_doctor var_help; parse 164 "$@"
local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__stack" "${prefix}__debug" \
"${prefix}__skip_update" "${prefix}__branch" "${prefix}__help" \
"${prefix}__skip_check" "${prefix}__no_prompt" "${prefix}__verbose" \
"${prefix}__env" "${prefix}__status" "${prefix}__server" "${prefix}__type" \
"${prefix}__domain" "${prefix}__app_name" "${prefix}__pass" \
switch __skip_version_check 19; }; node_20(){ switch __no_domain_poll 20; }
node_21(){ switch __volumes 21; }; node_22(){ switch __no_tty 22; }; node_23(){
value __user 23; }; node_24(){ switch __dev 24; }; node_25(){ value _type_ a; }
node_26(){ value _app_ a; }; node_27(){ value _service_ a; }; node_28(){
value _version_ a; }; node_29(){ value _src_ a; }; node_30(){ value _dst_ a; }
node_31(){ value _backup_file_ a; }; node_32(){ value _args_ a true; }
node_33(){ value _secret_ a; }; node_34(){ value _cmd_ a; }; node_35(){
value _data_ a; }; node_36(){ value _volume_ a; }; node_37(){ value _command_ a
}; node_38(){ value _recipe_ a; }; node_39(){ value _host_ a; }; node_40(){
value _user_ a; }; node_41(){ value _port_ a; }; node_42(){ value _provider_ a
}; node_43(){ value _subcommands_ a true; }; node_44(){ _command app; }
node_45(){ _command list; }; node_46(){ _command ls; }; node_47(){ _command new
}; node_48(){ _command backup; }; node_49(){ _command deploy; }; node_50(){
_command check; }; node_51(){ _command version; }; node_52(){ _command config; }
node_53(){ _command cp; }; node_54(){ _command logs; }; node_55(){ _command ps
}; node_56(){ _command restore; }; node_57(){ _command rm; }; node_58(){
_command delete; }; node_59(){ _command run; }; node_60(){ _command rollback; }
node_61(){ _command secret; }; node_62(){ _command generate; }; node_63(){
_command insert; }; node_64(){ _command undeploy; }; node_65(){ _command volume
}; node_66(){ _command recipe; }; node_67(){ _command create; }; node_68(){
_command release; }; node_69(){ _command versions; }; node_70(){ _command server
}; node_71(){ _command add; }; node_72(){ _command __ --; }; node_73(){
_command init; }; node_74(){ _command apps; }; node_75(){ _command upgrade; }
node_76(){ _command doctor; }; node_77(){ _command help; }; node_78(){
optional 0 1 2 3 4 5 6 7 8; }; node_79(){ optional 78; }; node_80(){
either 45 46; }; node_81(){ required 80; }; node_82(){ optional 9; }; node_83(){
optional 10; }; node_84(){ optional 11; }; node_85(){ required 79 44 81 82 83 84
}; node_86(){ optional 12; }; node_87(){ optional 13; }; node_88(){ optional 14
}; node_89(){ optional 15; }; node_90(){ required 79 44 47 83 86 87 88 89 25; }
node_91(){ either 27 16; }; node_92(){ required 91; }; node_93(){
required 79 44 26 48 92; }; node_94(){ optional 17; }; node_95(){ optional 18; }
node_96(){ optional 19; }; node_97(){ optional 20; }; node_98(){ optional 28; }
node_99(){ required 79 44 26 49 94 95 96 97 98; }; node_100(){
required 79 44 26 50; }; node_101(){ required 79 44 26 51; }; node_102(){
required 79 44 26 52; }; node_103(){ required 79 44 26 53 29 30; }; node_104(){
optional 27; }; node_105(){ required 79 44 26 54 104; }; node_106(){
required 79 44 26 55; }; node_107(){ required 79 44 26 56 92; }; node_108(){
either 57 58; }; node_109(){ required 108; }; node_110(){ optional 21; }
node_111(){ required 79 44 26 109 110 89; }; node_112(){ optional 31; }
node_113(){ required 79 44 26 56 27 112; }; node_114(){ optional 22; }
node_115(){ optional 23; }; node_116(){ oneormore 32; }; node_117(){
required 79 44 26 59 114 115 27 116; }; node_118(){ required 79 44 26 60 98; }
node_119(){ required 33 28; }; node_120(){ either 119 16; }; node_121(){
required 120; }; node_122(){ optional 34; }; node_123(){
required 79 44 26 61 62 121 122 88; }; node_124(){
required 79 44 26 61 63 33 28 35 88; }; node_125(){ either 33 16; }; node_126(){
required 125; }; node_127(){ required 79 44 26 61 109 126 88; }; node_128(){
required 79 44 26 64; }; node_129(){ required 79 44 26 65 46; }; node_130(){
either 36 16; }; node_131(){ required 130; }; node_132(){
required 79 44 26 65 109 131; }; node_133(){ optional 116; }; node_134(){
required 79 44 26 37 133; }; node_135(){ required 79 66 46; }; node_136(){
required 79 66 67 38; }; node_137(){ required 79 66 38 68 95; }; node_138(){
required 79 66 38 69; }; node_139(){ optional 40; }; node_140(){ optional 41; }
node_141(){ required 79 70 71 39 139 140; }; node_142(){
required 79 70 47 42 72 32; }; node_143(){ required 79 70 81; }; node_144(){
required 79 70 39 57; }; node_145(){ required 79 70 39 73; }; node_146(){
required 79 70 39 74 82; }; node_147(){ optional 24; }; node_148(){
required 79 75 147; }; node_149(){ required 79 51; }; node_150(){ required 79 76
}; node_151(){ oneormore 43; }; node_152(){ optional 151; }; node_153(){
required 79 77 152; }; node_154(){ required 79; }; 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
}; node_156(){ required 155; }; cat <<<' docopt_exit() {
[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1856}" >&2
exit 1; }'; unset var___env var___skip_update var___skip_check var___branch \
var___verbose var___stack var___no_prompt var___debug var___help var___status \
var___server var___type var___domain var___app_name var___pass var___secrets \
var___all var___update var___force var___skip_version_check \
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__backup_file_ var__args_ var__secret_ var__cmd_ var__data_ var__volume_ \
var__command_ var__recipe_ var__host_ var__user_ var__port_ var__provider_ \
var__subcommands_ var_app var_list var_ls var_new var_backup var_deploy \
var_check var_version var_config var_cp var_logs var_ps var_restore var_rm \
var_delete var_run var_rollback var_secret var_generate var_insert \
var_undeploy var_volume var_recipe var_create var_release var_versions \
var_server var_add var___ var_init var_apps var_upgrade var_doctor var_help
parse 156 "$@"; local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__env" \
"${prefix}__skip_update" "${prefix}__skip_check" "${prefix}__branch" \
"${prefix}__verbose" "${prefix}__stack" "${prefix}__no_prompt" \
"${prefix}__debug" "${prefix}__help" "${prefix}__status" "${prefix}__server" \
"${prefix}__type" "${prefix}__domain" "${prefix}__app_name" "${prefix}__pass" \
"${prefix}__secrets" "${prefix}__all" "${prefix}__update" "${prefix}__force" \
"${prefix}__fast" "${prefix}__skip_version_check" "${prefix}__no_domain_poll" \
"${prefix}__no_state_poll" "${prefix}__chaos" "${prefix}__volumes" \
"${prefix}__no_tty" "${prefix}__user" "${prefix}__bump" "${prefix}__dev" \
"${prefix}__skip_version_check" "${prefix}__no_domain_poll" \
"${prefix}__volumes" "${prefix}__no_tty" "${prefix}__user" "${prefix}__dev" \
"${prefix}_type_" "${prefix}_app_" "${prefix}_service_" "${prefix}_version_" \
"${prefix}_src_" "${prefix}_dst_" "${prefix}_backup_file_" "${prefix}_args_" \
"${prefix}_secret_" "${prefix}_cmd_" "${prefix}_data_" "${prefix}_volume_" \
@ -284,15 +278,15 @@ local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__stack" "${prefix}__debug" \
"${prefix}recipe" "${prefix}create" "${prefix}release" "${prefix}versions" \
"${prefix}server" "${prefix}add" "${prefix}__" "${prefix}init" "${prefix}apps" \
"${prefix}upgrade" "${prefix}doctor" "${prefix}help"
eval "${prefix}"'__stack=${var___stack:-}'
eval "${prefix}"'__debug=${var___debug:-false}'
eval "${prefix}"'__skip_update=${var___skip_update:-false}'
eval "${prefix}"'__branch=${var___branch:-}'
eval "${prefix}"'__help=${var___help:-false}'
eval "${prefix}"'__skip_check=${var___skip_check:-false}'
eval "${prefix}"'__no_prompt=${var___no_prompt:-false}'
eval "${prefix}"'__verbose=${var___verbose:-false}'
eval "${prefix}"'__env=${var___env:-}'
eval "${prefix}"'__skip_update=${var___skip_update:-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}"'__no_prompt=${var___no_prompt:-false}'
eval "${prefix}"'__debug=${var___debug:-false}'
eval "${prefix}"'__help=${var___help:-false}'
eval "${prefix}"'__status=${var___status:-false}'
eval "${prefix}"'__server=${var___server:-}'
eval "${prefix}"'__type=${var___type:-}'
@ -303,15 +297,11 @@ eval "${prefix}"'__secrets=${var___secrets:-false}'
eval "${prefix}"'__all=${var___all:-false}'
eval "${prefix}"'__update=${var___update:-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}"'__no_domain_poll=${var___no_domain_poll:-false}'
eval "${prefix}"'__no_state_poll=${var___no_state_poll:-false}'
eval "${prefix}"'__chaos=${var___chaos:-false}'
eval "${prefix}"'__volumes=${var___volumes:-false}'
eval "${prefix}"'__no_tty=${var___no_tty:-false}'
eval "${prefix}"'__user=${var___user:-}'
eval "${prefix}"'__bump=${var___bump:-false}'
eval "${prefix}"'__dev=${var___dev:-false}'
eval "${prefix}"'_type_=${var__type_:-}'; eval "${prefix}"'_app_=${var__app_:-}'
eval "${prefix}"'_service_=${var__service_:-}'
@ -363,23 +353,22 @@ eval "${prefix}"'upgrade=${var_upgrade:-false}'
eval "${prefix}"'doctor=${var_doctor:-false}'
eval "${prefix}"'help=${var_help:-false}'; local docopt_i=1
[[ $BASH_VERSION =~ ^4.3 ]] && docopt_i=2; for ((;docopt_i>0;docopt_i--)); do
declare -p "${prefix}__stack" "${prefix}__debug" "${prefix}__skip_update" \
"${prefix}__branch" "${prefix}__help" "${prefix}__skip_check" \
"${prefix}__no_prompt" "${prefix}__verbose" "${prefix}__env" \
declare -p "${prefix}__env" "${prefix}__skip_update" "${prefix}__skip_check" \
"${prefix}__branch" "${prefix}__verbose" "${prefix}__stack" \
"${prefix}__no_prompt" "${prefix}__debug" "${prefix}__help" \
"${prefix}__status" "${prefix}__server" "${prefix}__type" "${prefix}__domain" \
"${prefix}__app_name" "${prefix}__pass" "${prefix}__secrets" "${prefix}__all" \
"${prefix}__update" "${prefix}__force" "${prefix}__fast" \
"${prefix}__skip_version_check" "${prefix}__no_domain_poll" \
"${prefix}__no_state_poll" "${prefix}__chaos" "${prefix}__volumes" \
"${prefix}__no_tty" "${prefix}__user" "${prefix}__bump" "${prefix}__dev" \
"${prefix}_type_" "${prefix}_app_" "${prefix}_service_" "${prefix}_version_" \
"${prefix}_src_" "${prefix}_dst_" "${prefix}_backup_file_" "${prefix}_args_" \
"${prefix}_secret_" "${prefix}_cmd_" "${prefix}_data_" "${prefix}_volume_" \
"${prefix}_command_" "${prefix}_recipe_" "${prefix}_host_" "${prefix}_user_" \
"${prefix}_port_" "${prefix}_provider_" "${prefix}_subcommands_" \
"${prefix}app" "${prefix}list" "${prefix}ls" "${prefix}new" "${prefix}backup" \
"${prefix}deploy" "${prefix}check" "${prefix}version" "${prefix}config" \
"${prefix}cp" "${prefix}logs" "${prefix}ps" "${prefix}restore" "${prefix}rm" \
"${prefix}__update" "${prefix}__force" "${prefix}__skip_version_check" \
"${prefix}__no_domain_poll" "${prefix}__volumes" "${prefix}__no_tty" \
"${prefix}__user" "${prefix}__dev" "${prefix}_type_" "${prefix}_app_" \
"${prefix}_service_" "${prefix}_version_" "${prefix}_src_" "${prefix}_dst_" \
"${prefix}_backup_file_" "${prefix}_args_" "${prefix}_secret_" \
"${prefix}_cmd_" "${prefix}_data_" "${prefix}_volume_" "${prefix}_command_" \
"${prefix}_recipe_" "${prefix}_host_" "${prefix}_user_" "${prefix}_port_" \
"${prefix}_provider_" "${prefix}_subcommands_" "${prefix}app" "${prefix}list" \
"${prefix}ls" "${prefix}new" "${prefix}backup" "${prefix}deploy" \
"${prefix}check" "${prefix}version" "${prefix}config" "${prefix}cp" \
"${prefix}logs" "${prefix}ps" "${prefix}restore" "${prefix}rm" \
"${prefix}delete" "${prefix}run" "${prefix}rollback" "${prefix}secret" \
"${prefix}generate" "${prefix}insert" "${prefix}undeploy" "${prefix}volume" \
"${prefix}recipe" "${prefix}create" "${prefix}release" "${prefix}versions" \
@ -496,16 +485,6 @@ require_docker_version() {
done
}
require_valid_json() {
require_jq
$JQ "$1" > /dev/null || error "Invalid JSON '$1'"
}
require_valid_yaml() {
require_yq
$YQ e "$1" > /dev/null || error "Invalid YAML '$1'"
}
###### Download and update data
require_apps_json() {
@ -524,13 +503,13 @@ require_apps_json() {
if [ "$local_ctime" -lt "$remote_ctime" ]; then
info "Downloading new apps.json"
curl -sLo "$ABRA_APPS_JSON" "$ABRA_APPS_URL"
wget -qO "$ABRA_APPS_JSON" "$ABRA_APPS_URL"
else
debug "No apps.json update needed"
fi
else
info "Downloading apps.json"
curl -sLo "$ABRA_APPS_JSON" "$ABRA_APPS_URL"
wget -qO "$ABRA_APPS_JSON" "$ABRA_APPS_URL"
fi
}
@ -573,7 +552,7 @@ require_app (){
fi
# 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?"
fi
@ -608,16 +587,13 @@ require_app_version() {
if [ -z "$VERSION" ]; then
warning "No version specified, dangerously using latest git 😨"
else
if [ "$abra___chaos" = "false" ]; then
git checkout -q "$VERSION" || error "Can't find version $VERSION"
else
warning "Chaos deploy specified, dangerously using latest git 😨"
fi
git checkout -q "$VERSION" || error "Can't find version $VERSION"
fi
}
vendor_binary() {
require_vendor_dir
require_binary wget
local REPO="$1"
local VERSION="$2"
@ -644,7 +620,7 @@ vendor_binary() {
;;
esac
curl -sLo "$ABRA_VENDOR_DIR/$BINARY" "$RELEASE_URL"
wget -qO "$ABRA_VENDOR_DIR/$BINARY" "$RELEASE_URL"
chmod +x "$ABRA_VENDOR_DIR/$BINARY"
success "$BINARY is now vendored ☮"
}
@ -691,7 +667,7 @@ get_recipe_versions() {
get_recipe_version_latest() {
if [ "${#RECIPE_VERSIONS[@]}" = 0 ]; then
VERSION=""
info "No versions found"
warning "No version specified, dangerously using latest git 😨"
else
VERSION="${RECIPE_VERSIONS[-1]}"
info "Chose version $VERSION"
@ -721,7 +697,6 @@ output_version_summary() {
CONSENT_TO_UPDATE=$abra___update
FORCE_DEPLOY=$abra___force
CHAOS_DEPLOY=$abra___chaos
local -a IS_AN_UPDATE="false"
local -a UNABLE_TO_DETECT="false"
@ -734,7 +709,6 @@ output_version_summary() {
IFS=':' read -ra COMPOSE_FILES <<< "$COMPOSE_FILE"
for COMPOSE in "${COMPOSE_FILES[@]}"; do
require_valid_yaml "$APP_DIR/$COMPOSE"
SERVICES=$($YQ e '.services | keys | .[]' "${APP_DIR}/${COMPOSE}")
for SERVICE in $SERVICES; do
@ -763,11 +737,7 @@ output_version_summary() {
if [ "$live_version" != "$service_tag" ] || [ "$live_digest" != "$service_digest" ]; then
IS_AN_UPDATE="true"
fi
if [ "$abra___chaos" = "true" ]; then
echo " to be deployed: $(tput setaf 1)$service_tag ($service_digest) (+ latest git)$(tput sgr0)"
else
echo " to be deployed: $(tput setaf 1)$service_tag ($service_digest)$(tput sgr0)"
fi
echo " to be deployed: $(tput setaf 1)$service_tag ($service_digest)$(tput sgr0)"
fi
else
if [[ $UNDEPLOYED_STATE == "true" ]]; then
@ -793,8 +763,7 @@ output_version_summary() {
else
if [[ $UNABLE_TO_DETECT == "false" ]] && \
[[ $UNDEPLOYED_STATE == "false" ]] && \
[[ $FORCE_DEPLOY == "false" ]] && \
[[ $CHAOS_DEPLOY = "false" ]]; then
[[ $FORCE_DEPLOY == "false" ]]; then
success "Nothing to deploy, you're on latest (use --force to re-deploy anyway)"
exit 0
fi
@ -805,7 +774,7 @@ output_version_summary() {
ensure_stack_deployed() {
STACK_NAME=$1
warning "Polling deploy state to check for success"
info "Waiting for deployment to succeed"
while true; do
all_services_done=1
@ -833,12 +802,10 @@ ensure_stack_deployed() {
if [ "$all_services_done" == "1" ]; then
if [ "$has_errors" == "1" ]; then
warning "Deployment appears to have failed"
warning "Run \"abra app ${STACK_NAME} logs \" to see app logs"
warning "Run \"abra app ${STACK_NAME} ps \" to see app status"
debug "Deployment appears to have failed"
break
else
warning "Deployment appears to have suceeded"
debug "Deployment appears to have suceeded"
break
fi
else
@ -1318,7 +1285,7 @@ _abra_backup_mysql() {
###### .. app deploy
help_app_deploy (){
echo "abra [options] app <app> deploy [--update] [--force] [--fast] [--skip-version-check] [--no-domain-poll] [--no-state-poll]
echo "abra [options] app <app> deploy [--update] [--force] [--skip-version-check] [--no-domain-poll]
Deploy app <app> to the configured server.
@ -1327,9 +1294,6 @@ OPTIONS
--force Force a deployment regardless of state
--skip-version-check Don't try and detect deployed version
--no-domain-poll Don't wait for the configured domain to come up
--no-state-poll Don't watch deployment state for success/failure
--fast Alias for --skip-version-check --no-domain-poll
--chaos Deploy straight from latest Git version (potentially chaotic!)
POWERED BY
docker stack deploy -c compose.yml <app>"
@ -1338,15 +1302,8 @@ POWERED BY
sub_app_deploy (){
require_yq
if [ "$abra___fast" = "true" ]; then
SKIP_VERSION_CHECK=true
NO_DOMAIN_POLL=true
NO_STATE_POLL=true
else
SKIP_VERSION_CHECK=$abra___skip_version_check
NO_DOMAIN_POLL=$abra___no_domain_poll
NO_STATE_POLL=$abra___no_state_poll
fi
SKIP_VERSION_CHECK=$abra___skip_version_check
NO_DOMAIN_POLL=$abra___no_domain_poll
if [ ! "$abra__version_" = "dev" ]; then
get_recipe_versions "$TYPE"
@ -1396,13 +1353,7 @@ sub_app_deploy (){
(cd "$APP_DIR" || error "\$APP_DIR '$APP_DIR' not found")
# shellcheck disable=SC2086
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
if [[ $NO_STATE_POLL == "false" ]]; then
ensure_stack_deployed "$STACK_NAME"
fi
ensure_stack_deployed "$STACK_NAME"
if [ -n "$DOMAIN" ]; then
if [[ $NO_DOMAIN_POLL == "false" ]]; then
ensure_domain_deployed "https://${DOMAIN}"
@ -1630,7 +1581,7 @@ help_app_secret_delete (){
Remove <app>'s Docker secret <secret>.
OPTIONS
PTIONS
--pass Remove secret(s) from \`pass\` as well
--all Delete all secrets for <app>
@ -1684,15 +1635,6 @@ sub_app_secret_generate(){
local secret="$abra__secret_"
local version="$abra__version_"
local length="$abra__length_"
local msg_already_outputted=${msg_already_outputted:-"false"}
if [ "$msg_already_outputted" == "false" ]; then
warning "These generated secrets are now stored as encrypted data on your server"
warning "Please take a moment to make sure you have saved a copy of the passwords"
warning "Abra is not able to show the password values in plain text again"
warning "See https://docs.cloud.autonomic.zone/secrets/ for more on secrets"
msg_already_outputted="true"
fi
if [ "$abra___all" == "true" ]; then
# Note(decentral1se): we need to reset the flag here to avoid the infinite
@ -1727,6 +1669,11 @@ sub_app_secret_generate(){
abra__data_="$PW"
sub_app_secret_insert
warning "These generated secrets are now stored as encrypted data on your server"
warning "Please take a moment to make sure you have saved a copy of the passwords"
warning "Abra is not able to show the password values in plain text again"
warning "See https://docs.docker.com/engine/swarm/secrets/ for more on secrets"
}
###### .. app volume
@ -1745,6 +1692,10 @@ help_app_volume_list (){
Show all volumes associated with <app>.
OPTIONS
<secret> Generate a single secret
--all Auto-generate all secrets
POWERED BY
docker volume ls"
}
@ -1767,7 +1718,7 @@ help_app_volume_delete (){
Remove <app>'s Docker volume <volume>, or all volumes with --all.
OPTIONS
PTIONS
--pass Remove volume(s) from \`pass\` as well
--all Delete all volumes for <app>
@ -2068,7 +2019,7 @@ sub_recipe_versions() {
###### .. recipe <recipe> release
help_recipe_release() {
echo "abra [options] recipe <recipe> release [--force] [--bump]
echo "abra [options] recipe <recipe> release
(For recipe maintainers)
@ -2081,7 +2032,6 @@ any of the images in <recipe>.
OPTIONS
--force Over-write existing tag; use this if you have a git tag for the
recipe version already, to make sure labels are in sync.
--bump Make an n+1 release (packager specific changes to recipe)
POWERED BY
skopeo inspect docker://image:tag
@ -2096,13 +2046,8 @@ sub_recipe_release() {
recipe="$abra__recipe_"
force="$abra___force"
bump="$abra___bump"
recipe_dir="$ABRA_DIR/apps/$recipe"
if [ "$bump" = "true" ] && [ "$force" = "true" ]; then
error "--bump and --force don't play nicely together"
fi
cd "$recipe_dir" || error "Can't find recipe dir '$recipe_dir'"
get_recipe_versions "$recipe"
@ -2115,29 +2060,22 @@ sub_recipe_release() {
latest_version_message=$(git show -s --format=%s)
fi
info "Latest available version: '$latest_version'"
info "Latest version message: '$latest_version_message'"
info "Latest verion message: '$latest_version_message'"
else
latest_version=""
latest_version_message="Initial tagged release"
info "No previous releases found"
if [ "$bump" = "true" ]; then
error "--bump can't do its work when there are no existing release versions"
fi
fi
current_tag=$(git tag --points-at HEAD)
if [ "$force" = "false" ] && [ -n "$current_tag" ] && [ "$bump" = "false" ]; then
success "$recipe is already on $current_tag, no release needed"
if [ "$force" = "false" ] && [ -n "$current_tag" ]; then
error "$recipe is already on $current_tag, no release needed"
fi
if [ "$(git rev-parse --abbrev-ref --symbolic-full-name HEAD)" = "HEAD" ]; then
warning "It looks like $recipe_dir is in 'detached HEAD' state"
if [ "$abra___no_prompt" = "false" ]; then
read -rp "Check out main/master branch first? [Y/n] "
if [ "${choice,,}" != "n" ]; then
checkout_main_or_master
fi
else
read -rp "Check out main/master branch first? [Y/n] "
if [ "${choice,,}" != "n" ]; then
checkout_main_or_master
fi
fi
@ -2149,12 +2087,7 @@ sub_recipe_release() {
new_version="false"
for compose_file in "${compose_files[@]}"; do
if [ "$bump" = "true" ]; then
continue # skip trying to upgrade labels for --bump logic
fi
mapfile -t services < <($YQ e -N '.services | keys | .[]' "$compose_file" | sort -u)
if [ "$compose_file" = "compose.yml" ] && ! printf '%s\0' "${services[@]}" | grep -Fqxz -- "app"; then
# shellcheck disable=SC2016
warning 'No `app` service found; which one should we use for the version number?'
@ -2230,49 +2163,22 @@ sub_recipe_release() {
success "All compose files updated; new version is $new_version"
if [ "$abra___no_prompt" = "false" ]; then
read -rp "Commit your changes to git? [y/N]? " choice
read -rp "Commit your changes to git? [y/N]? " choice
if [ "${choice,,}" != "y" ]; then
return
fi
if [ "${choice,,}" != "y" ]; then
return
fi
if [ "$abra___no_prompt" = "false" ]; then
git commit -avem "Version $new_version; sync labels" || exit
else
git commit -am "Version $new_version; sync labels" || true
git commit -avem "Version $new_version; sync labels" || exit
read -rp "Tag this as \`$new_version\`? [y/N]? " choice
if [ "${choice,,}" != "y" ]; then
return
fi
if [ "$abra___no_prompt" = "false" ]; then
read -rp "Tag this as \`$new_version\`? [y/N]? " choice
if [ "${choice,,}" != "y" ]; then
return
fi
fi
if [ "$force" = "true" ]; then
git tag -d "$new_version" || true
git push origin --delete "$new_version" || true
debug "Deleted local tag and remote tag if present"
fi
if [ "$abra___no_prompt" = "false" ]; then
git tag -aem "$latest_version_message" "$new_version"
else
git tag -am "$latest_version_message" "$new_version" || true
fi
if [ "$abra___no_prompt" = "false" ]; then
read -rp "Git push this new tag? [y/N]? " choice
if [ "${choice,,}" != "y" ]; then
git push && git push --tags
fi
else
git push && git push --tags
fi
test "$force" = "true" && git tag -d "$new_version"
git tag -aem "$latest_version_message" "$new_version"
}
#######################################
@ -2469,9 +2375,9 @@ OPTIONS
sub_upgrade() {
if [[ "$abra___dev" == "true" ]]; then
curl https://install.abra.coopcloud.tech | bash -s -- --dev
curl https://install.abra.autonomic.zone | bash -s -- --dev
else
curl https://install.abra.coopcloud.tech | bash
curl https://install.abra.autonomic.zone | bash
fi
}
@ -2565,8 +2471,7 @@ abra() {
abra___help abra___branch abra___volumes abra__provider_ abra___type \
abra___dev abra___update abra___no_prompt abra___force \
abra___skip_version_check abra__recipe_ abra___no_domain_poll \
abra___fast abra__volume_ abra___no_state_poll abra___bump \
abra___chaos
abra__volume_
if ! type tput > /dev/null 2>&1; then
tput() {

View File

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

View File

@ -7,24 +7,84 @@
# https://apps.coopcloud.tech
from json import dump
from os import chdir, getcwd, listdir
from os.path import basename
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 subprocess import DEVNULL
from shlex import split
from subprocess import DEVNULL, check_output
from sys import exit
from requests import get
from abralib import (
CLONES_PATH,
JQ_PATH,
REPOS_TO_SKIP,
YQ_PATH,
_run_cmd,
clone_all_apps,
get_repos_json,
log,
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."""
@ -39,6 +99,31 @@ def get_published_apps_json():
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 = {}
@ -55,8 +140,7 @@ def generate_apps_json(repos_json):
chdir(app_path)
metadata = get_app_metadata(app_path)
name = metadata.pop("name", app)
name = metadata.pop("name", "")
log.info(f"Processing {app}")
apps_json[app] = {
@ -89,7 +173,7 @@ def get_app_metadata(app_path):
return {}
try:
for match in findall(r"\*\*.*", contents):
for match in findall(r"\*\*.*\s\*", contents):
title = search(r"(?<=\*\*).*(?=\*\*)", match).group().lower()
if title == "image":
@ -172,7 +256,7 @@ def get_app_versions(app_path, cached_apps_json):
if image in ("null", "---"):
continue
images_cmd = f"skopeo inspect docker://{image} | {JQ_PATH} '.Digest'"
images_cmd = f"skopeo inspect docker://{image} | jq '.Digest'"
output = _run_cmd(images_cmd, shell=True)
service_version_info = {
@ -198,7 +282,7 @@ def main():
repos_json = get_repos_json()
clone_all_apps(repos_json)
target = f"{getcwd()}/apps.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),

View File

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

View File

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

View File

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

View File

@ -38,22 +38,6 @@ _abra_complete_apps()
mapfile -t COMPREPLY < <(compgen -W "$(_abra_apps)" -- "$1")
}
_abra_recipes()
{
shopt -s nullglob dotglob
local RECIPES=(~/.abra/apps/*)
shopt -u nullglob dotglob
for RECIPE in "${RECIPES[@]}"; do
_abra_basename "${RECIPE%.env}"
done
}
_abra_complete_recipes()
{
mapfile -t COMPREPLY < <(compgen -W "$(_abra_recipes)" -- "$1")
}
_abra_complete()
{
compopt +o default +o nospace
@ -62,7 +46,6 @@ _abra_complete()
local -r cmds='
app
server
recipe
'
local -r short_opts='-e -h -s -v'
local -r long_opts='--env --help --stack --version'
@ -118,12 +101,6 @@ _abra_complete()
_abra_complete_apps "$cur"
fi
;;
recipe)
# Offer exactly one app completion.
if (( COMP_CWORD == cmd_index + 1 )); then
_abra_complete_recipes "$cur"
fi
;;
#help)
# # Offer exactly one command name completion.
# if (( COMP_CWORD == cmd_index + 1 )); then

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

@ -20,7 +20,7 @@ services:
labels:
- "traefik.enable=true"
- "traefik.http.services.abra-installer.loadbalancer.server.port=80"
- "traefik.http.routers.abra-installer.rule=Host(`install.abra.autonomic.zone`,`install.abra.coopcloud.tech`)"
- "traefik.http.routers.abra-installer.rule=Host(`install.abra.autonomic.zone`)"
- "traefik.http.routers.abra-installer.entrypoints=web-secure"
- "traefik.http.routers.abra-installer.tls.certresolver=production"

View File

@ -1,9 +1,9 @@
#!/bin/bash
ABRA_VERSION="9.0.0"
ABRA_VERSION="0.7.4"
GIT_URL="https://git.autonomic.zone/coop-cloud/abra"
ABRA_SRC="$GIT_URL/raw/tag/$ABRA_VERSION/abra"
ABRA_DIR="${ABRA_DIR:-$HOME/.abra}"
ABRA_DIR="${ABRA_DIR:-$HOME/.abra/}"
function install_abra_release {
mkdir -p "$HOME/.local/bin"

View File

@ -1,6 +1,6 @@
server {
listen 80 default_server;
server_name install.abra.autonomic.zone install.abra.coopcloud.tech;
server_name install.abra.autonomic.zone;
location / {
root /var/www/abra-installer;

View File

@ -1,4 +1,4 @@
.PHONY: test shellcheck docopt release-installer build push
.PHONY: test shellcheck docopt kcov codecov release-installer
test:
@sudo DOCKER_CONTEXT=default docker run \
@ -7,13 +7,13 @@ test:
-d \
--name=abra-test-dind \
-e DOCKER_TLS_CERTDIR="" \
decentral1se/docker-dind-bats-kcov \
@DOCKER_CONTEXT=default sudo docker exec \
decentral1se/docker-dind-bats-kcov
@DOCKER_CONTEXT=default docker exec \
-it \
abra-test-dind \
sh -c "cd /workdir && bats /workdir/tests"
@DOCKER_CONTEXT=default sudo docker stop abra-test-dind
@DOCKER_CONTEXT=default sudo docker rm abra-test-dind
@DOCKER_CONTEXT=default docker stop abra-test-dind
@DOCKER_CONTEXT=default docker rm abra-test-dind
shellcheck:
@docker run \
@ -32,14 +32,27 @@ docopt:
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.coopcloud.tech && \
cd deploy/install.abra.autonomic.zone && \
DOCKER_CONTEXT=swarm.autonomic.zone docker stack deploy -c compose.yml abra-installer-script
build:
@docker build -t decentral1se/abra .
push: build
@docker push decentral1se/abra
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