Prefer --fast for skipping all checks

Closes https://git.autonomic.zone/coop-cloud/abra/issues/169

.drone.yml

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

.gitignore

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

CHANGELOG.md

@@ -9,6 +9,19 @@
 
 # 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))
+- Drop `--skip-version-check`/`--no-domain-poll`/`--no-state-poll` in favour of `--fast` ([#169](https://git.autonomic.zone/coop-cloud/abra/issues/169))
+
+# 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))

Dockerfile

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

README.md

@@ -1,11 +1,10 @@
 # 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 cooperative cloud utility belt 🎩🐇
+The Co-op 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.
 
@@ -50,6 +49,14 @@ curl https://install.abra.coopcloud.tech | 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
+```
+
 ## Update
 
 Run `abra upgrade` to automatically download and install the latest release
@@ -67,17 +74,6 @@ The command-line interface is generated via [docopt](http://docopt.org/). If you
 
 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`
@@ -91,11 +87,3 @@ Then run `./bin/app-json.py` ([source](./bin/app-json.py)) and it will spit out
 - `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
-```

abra

@@ -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="8.0.1"
+ABRA_VERSION="9.0.0"
 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] [<version>]
+  abra [options] app <app> deploy [--update] [--force] [--fast] [--chaos] [<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]
+  abra [options] recipe <recipe> release [--force] [--bump]
   abra [options] recipe <recipe> versions
   abra [options] server add <host> [<user>] [<port>]
   abra [options] server new <provider> -- <args>
@@ -167,130 +167,127 @@ 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:2492}
+printf -- "exit %d\n" "$1"; exit "$1"; }; set -e; trimmed_doc=${DOC:1:2451}
-usage=${DOC:40:1883}; digest=f774b
+usage=${DOC:40:1842}; digest=c7bae
-shorts=(-e -s -U -h -C -v -d -n -b '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
+shorts=(-e -b -s -C -U -h -d -v -n '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
-longs=(--env --stack --skip-update --help --skip-check --verbose --debug --no-prompt --branch --status --server --type --domain --app-name --pass --secrets --all --update --force --fast --skip-version-check --no-domain-poll --no-state-poll --volumes --no-tty --user --dev)
+longs=(--env --branch --stack --skip-check --skip-update --help --debug --verbose --no-prompt --status --server --type --domain --app-name --pass --secrets --all --update --force --fast --chaos --volumes --no-tty --user --bump --dev)
-argcounts=(1 1 0 0 0 0 0 0 1 0 1 1 1 1 0 0 0 0 0 0 0 0 0 0 0 1 0); node_0(){
+argcounts=(1 1 1 0 0 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 1 0 0); node_0(){
-value __env 0; }; node_1(){ value __stack 1; }; node_2(){ switch __skip_update 2
+value __env 0; }; node_1(){ value __branch 1; }; node_2(){ value __stack 2; }
-}; node_3(){ switch __help 3; }; node_4(){ switch __skip_check 4; }; node_5(){
+node_3(){ switch __skip_check 3; }; node_4(){ switch __skip_update 4; }
-switch __verbose 5; }; node_6(){ switch __debug 6; }; node_7(){
+node_5(){ switch __help 5; }; node_6(){ switch __debug 6; }; node_7(){
-switch __no_prompt 7; }; node_8(){ value __branch 8; }; node_9(){
+switch __verbose 7; }; node_8(){ switch __no_prompt 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 __fast 19; }; node_20(){ switch __chaos 20; }; node_21(){
-switch __no_domain_poll 21; }; node_22(){ switch __no_state_poll 22; }
+switch __volumes 21; }; node_22(){ switch __no_tty 22; }; node_23(){
-node_23(){ switch __volumes 23; }; node_24(){ switch __no_tty 24; }; node_25(){
+value __user 23; }; node_24(){ switch __bump 24; }; node_25(){ switch __dev 25
-value __user 25; }; node_26(){ switch __dev 26; }; node_27(){ value _type_ a; }
+}; node_26(){ value _type_ a; }; node_27(){ value _app_ a; }; node_28(){
-node_28(){ value _app_ a; }; node_29(){ value _service_ a; }; node_30(){
+value _service_ a; }; node_29(){ value _version_ a; }; node_30(){ value _src_ a
-value _version_ a; }; node_31(){ value _src_ a; }; node_32(){ value _dst_ a; }
+}; node_31(){ value _dst_ a; }; node_32(){ value _backup_file_ a; }; node_33(){
-node_33(){ value _backup_file_ a; }; node_34(){ value _args_ a true; }
+value _args_ a true; }; node_34(){ value _secret_ a; }; node_35(){ value _cmd_ a
-node_35(){ value _secret_ a; }; node_36(){ value _cmd_ a; }; node_37(){
+}; node_36(){ value _data_ a; }; node_37(){ value _volume_ a; }; node_38(){
-value _data_ a; }; node_38(){ value _volume_ a; }; node_39(){ value _command_ a
+value _command_ a; }; node_39(){ value _recipe_ a; }; node_40(){ value _host_ a
-}; node_40(){ value _recipe_ a; }; node_41(){ value _host_ a; }; node_42(){
+}; node_41(){ value _user_ a; }; node_42(){ value _port_ a; }; node_43(){
-value _user_ a; }; node_43(){ value _port_ a; }; node_44(){ value _provider_ a
+value _provider_ a; }; node_44(){ value _subcommands_ a true; }; node_45(){
-}; node_45(){ value _subcommands_ a true; }; node_46(){ _command app; }
+_command app; }; node_46(){ _command list; }; node_47(){ _command ls; }
-node_47(){ _command list; }; node_48(){ _command ls; }; node_49(){ _command new
+node_48(){ _command new; }; node_49(){ _command backup; }; node_50(){
-}; node_50(){ _command backup; }; node_51(){ _command deploy; }; node_52(){
+_command deploy; }; node_51(){ _command check; }; node_52(){ _command version; }
-_command check; }; node_53(){ _command version; }; node_54(){ _command config; }
+node_53(){ _command config; }; node_54(){ _command cp; }; node_55(){
-node_55(){ _command cp; }; node_56(){ _command logs; }; node_57(){ _command ps
+_command logs; }; node_56(){ _command ps; }; node_57(){ _command restore; }
-}; node_58(){ _command restore; }; node_59(){ _command rm; }; node_60(){
+node_58(){ _command rm; }; node_59(){ _command delete; }; node_60(){
-_command delete; }; node_61(){ _command run; }; node_62(){ _command rollback; }
+_command run; }; node_61(){ _command rollback; }; node_62(){ _command secret; }
-node_63(){ _command secret; }; node_64(){ _command generate; }; node_65(){
+node_63(){ _command generate; }; node_64(){ _command insert; }; node_65(){
-_command insert; }; node_66(){ _command undeploy; }; node_67(){ _command volume
+_command undeploy; }; node_66(){ _command volume; }; node_67(){ _command recipe
-}; node_68(){ _command recipe; }; node_69(){ _command create; }; node_70(){
+}; node_68(){ _command create; }; node_69(){ _command release; }; node_70(){
-_command release; }; node_71(){ _command versions; }; node_72(){ _command server
+_command versions; }; node_71(){ _command server; }; node_72(){ _command add; }
-}; node_73(){ _command add; }; node_74(){ _command __ --; }; node_75(){
+node_73(){ _command __ --; }; node_74(){ _command init; }; node_75(){
-_command init; }; node_76(){ _command apps; }; node_77(){ _command upgrade; }
+_command apps; }; node_76(){ _command upgrade; }; node_77(){ _command doctor; }
-node_78(){ _command doctor; }; node_79(){ _command help; }; node_80(){
+node_78(){ _command help; }; node_79(){ optional 0 1 2 3 4 5 6 7 8; }
-optional 0 1 2 3 4 5 6 7 8; }; node_81(){ optional 80; }; node_82(){
+node_80(){ optional 79; }; node_81(){ either 46 47; }; node_82(){ required 81; }
-either 47 48; }; node_83(){ required 82; }; node_84(){ optional 9; }; node_85(){
+node_83(){ optional 9; }; node_84(){ optional 10; }; node_85(){ optional 11; }
-optional 10; }; node_86(){ optional 11; }; node_87(){ required 81 46 83 84 85 86
+node_86(){ required 80 45 82 83 84 85; }; node_87(){ optional 12; }; node_88(){
-}; node_88(){ optional 12; }; node_89(){ optional 13; }; node_90(){ optional 14
+optional 13; }; node_89(){ optional 14; }; node_90(){ optional 15; }; node_91(){
-}; node_91(){ optional 15; }; node_92(){ required 81 46 49 85 88 89 90 91 27; }
+required 80 45 48 84 87 88 89 90 26; }; node_92(){ either 28 16; }; node_93(){
-node_93(){ either 29 16; }; node_94(){ required 93; }; node_95(){
+required 92; }; node_94(){ required 80 45 27 49 93; }; node_95(){ optional 17; }
-required 81 46 28 50 94; }; node_96(){ optional 17; }; node_97(){ optional 18; }
+node_96(){ optional 18; }; node_97(){ optional 19; }; node_98(){ optional 20; }
-node_98(){ optional 19; }; node_99(){ optional 20; }; node_100(){ optional 21; }
+node_99(){ optional 29; }; node_100(){ required 80 45 27 50 95 96 97 98 99; }
-node_101(){ optional 22; }; node_102(){ optional 30; }; node_103(){
+node_101(){ required 80 45 27 51; }; node_102(){ required 80 45 27 52; }
-required 81 46 28 51 96 97 98 99 100 101 102; }; node_104(){
+node_103(){ required 80 45 27 53; }; node_104(){ required 80 45 27 54 30 31; }
-required 81 46 28 52; }; node_105(){ required 81 46 28 53; }; node_106(){
+node_105(){ optional 28; }; node_106(){ required 80 45 27 55 105; }; node_107(){
-required 81 46 28 54; }; node_107(){ required 81 46 28 55 31 32; }; node_108(){
+required 80 45 27 56; }; node_108(){ required 80 45 27 57 93; }; node_109(){
-optional 29; }; node_109(){ required 81 46 28 56 108; }; node_110(){
+either 58 59; }; node_110(){ required 109; }; node_111(){ optional 21; }
-required 81 46 28 57; }; node_111(){ required 81 46 28 58 94; }; node_112(){
+node_112(){ required 80 45 27 110 111 90; }; node_113(){ optional 32; }
-either 59 60; }; node_113(){ required 112; }; node_114(){ optional 23; }
+node_114(){ required 80 45 27 57 28 113; }; node_115(){ optional 22; }
-node_115(){ required 81 46 28 113 114 91; }; node_116(){ optional 33; }
+node_116(){ optional 23; }; node_117(){ oneormore 33; }; node_118(){
-node_117(){ required 81 46 28 58 29 116; }; node_118(){ optional 24; }
+required 80 45 27 60 115 116 28 117; }; node_119(){ required 80 45 27 61 99; }
-node_119(){ optional 25; }; node_120(){ oneormore 34; }; node_121(){
+node_120(){ required 34 29; }; node_121(){ either 120 16; }; node_122(){
-required 81 46 28 61 118 119 29 120; }; node_122(){ required 81 46 28 62 102; }
+required 121; }; node_123(){ optional 35; }; node_124(){
-node_123(){ required 35 30; }; node_124(){ either 123 16; }; node_125(){
+required 80 45 27 62 63 122 123 89; }; node_125(){
-required 124; }; node_126(){ optional 36; }; node_127(){
+required 80 45 27 62 64 34 29 36 89; }; node_126(){ either 34 16; }; node_127(){
-required 81 46 28 63 64 125 126 90; }; node_128(){
+required 126; }; node_128(){ required 80 45 27 62 110 127 89; }; node_129(){
-required 81 46 28 63 65 35 30 37 90; }; node_129(){ either 35 16; }; node_130(){
+required 80 45 27 65; }; node_130(){ required 80 45 27 66 47; }; node_131(){
-required 129; }; node_131(){ required 81 46 28 63 113 130 90; }; node_132(){
+either 37 16; }; node_132(){ required 131; }; node_133(){
-required 81 46 28 66; }; node_133(){ required 81 46 28 67 48; }; node_134(){
+required 80 45 27 66 110 132; }; node_134(){ optional 117; }; node_135(){
-either 38 16; }; node_135(){ required 134; }; node_136(){
+required 80 45 27 38 134; }; node_136(){ required 80 67 47; }; node_137(){
-required 81 46 28 67 113 135; }; node_137(){ optional 120; }; node_138(){
+required 80 67 68 39; }; node_138(){ optional 24; }; node_139(){
-required 81 46 28 39 137; }; node_139(){ required 81 68 48; }; node_140(){
+required 80 67 39 69 96 138; }; node_140(){ required 80 67 39 70; }; node_141(){
-required 81 68 69 40; }; node_141(){ required 81 68 40 70 97; }; node_142(){
+optional 41; }; node_142(){ optional 42; }; node_143(){
-required 81 68 40 71; }; node_143(){ optional 42; }; node_144(){ optional 43; }
+required 80 71 72 40 141 142; }; node_144(){ required 80 71 48 43 73 33; }
-node_145(){ required 81 72 73 41 143 144; }; node_146(){
+node_145(){ required 80 71 82; }; node_146(){ required 80 71 40 58; }
-required 81 72 49 44 74 34; }; node_147(){ required 81 72 83; }; node_148(){
+node_147(){ required 80 71 40 74; }; node_148(){ required 80 71 40 75 83; }
-required 81 72 41 59; }; node_149(){ required 81 72 41 75; }; node_150(){
+node_149(){ optional 25; }; node_150(){ required 80 76 149; }; node_151(){
-required 81 72 41 76 84; }; node_151(){ optional 26; }; node_152(){
+required 80 52; }; node_152(){ required 80 77; }; node_153(){ oneormore 44; }
-required 81 77 151; }; node_153(){ required 81 53; }; node_154(){ required 81 78
+node_154(){ optional 153; }; node_155(){ required 80 78 154; }; node_156(){
-}; node_155(){ oneormore 45; }; node_156(){ optional 155; }; node_157(){
+required 80; }; node_157(){
-required 81 79 156; }; node_158(){ required 81; }; node_159(){
+either 86 91 94 100 101 102 103 104 106 107 108 112 114 118 119 124 125 128 129 130 133 135 136 137 139 140 143 144 145 146 147 148 150 151 152 155 156
-either 87 92 95 103 104 105 106 107 109 110 111 115 117 121 122 127 128 131 132 133 136 138 139 140 141 142 145 146 147 148 149 150 152 153 154 157 158
+}; node_158(){ required 157; }; cat <<<' docopt_exit() {
-}; node_160(){ required 159; }; cat <<<' docopt_exit() {
+[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1842}" >&2
-[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1883}" >&2
+exit 1; }'; unset var___env var___branch var___stack var___skip_check \
-exit 1; }'; unset var___env var___stack var___skip_update var___help \
+var___skip_update var___help var___debug var___verbose var___no_prompt \
-var___skip_check var___verbose var___debug var___no_prompt var___branch \
 var___status var___server var___type var___domain var___app_name var___pass \
-var___secrets var___all var___update var___force var___fast \
+var___secrets var___all var___update var___force var___fast var___chaos \
-var___skip_version_check var___no_domain_poll var___no_state_poll \
+var___volumes var___no_tty var___user var___bump var___dev var__type_ \
-var___volumes var___no_tty var___user var___dev var__type_ var__app_ \
+var__app_ var__service_ var__version_ var__src_ var__dst_ var__backup_file_ \
-var__service_ var__version_ var__src_ var__dst_ var__backup_file_ var__args_ \
+var__args_ var__secret_ var__cmd_ var__data_ var__volume_ var__command_ \
-var__secret_ var__cmd_ var__data_ var__volume_ var__command_ var__recipe_ \
+var__recipe_ var__host_ var__user_ var__port_ var__provider_ var__subcommands_ \
-var__host_ var__user_ var__port_ var__provider_ var__subcommands_ var_app \
+var_app var_list var_ls var_new var_backup var_deploy var_check var_version \
-var_list var_ls var_new var_backup var_deploy var_check var_version var_config \
+var_config var_cp var_logs var_ps var_restore var_rm var_delete var_run \
-var_cp var_logs var_ps var_restore var_rm var_delete var_run var_rollback \
+var_rollback var_secret var_generate var_insert var_undeploy var_volume \
-var_secret var_generate var_insert var_undeploy var_volume var_recipe \
+var_recipe var_create var_release var_versions var_server var_add var___ \
-var_create var_release var_versions var_server var_add var___ var_init \
+var_init var_apps var_upgrade var_doctor var_help; parse 158 "$@"
-var_apps var_upgrade var_doctor var_help; parse 160 "$@"
+local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__env" "${prefix}__branch" \
-local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__env" "${prefix}__stack" \
+"${prefix}__stack" "${prefix}__skip_check" "${prefix}__skip_update" \
-"${prefix}__skip_update" "${prefix}__help" "${prefix}__skip_check" \
+"${prefix}__help" "${prefix}__debug" "${prefix}__verbose" \
-"${prefix}__verbose" "${prefix}__debug" "${prefix}__no_prompt" \
+"${prefix}__no_prompt" "${prefix}__status" "${prefix}__server" \
-"${prefix}__branch" "${prefix}__status" "${prefix}__server" "${prefix}__type" \
+"${prefix}__type" "${prefix}__domain" "${prefix}__app_name" "${prefix}__pass" \
-"${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}__fast" "${prefix}__chaos" "${prefix}__volumes" "${prefix}__no_tty" \
-"${prefix}__no_state_poll" "${prefix}__volumes" "${prefix}__no_tty" \
+"${prefix}__user" "${prefix}__bump" "${prefix}__dev" "${prefix}_type_" \
-"${prefix}__user" "${prefix}__dev" "${prefix}_type_" "${prefix}_app_" \
+"${prefix}_app_" "${prefix}_service_" "${prefix}_version_" "${prefix}_src_" \
-"${prefix}_service_" "${prefix}_version_" "${prefix}_src_" "${prefix}_dst_" \
+"${prefix}_dst_" "${prefix}_backup_file_" "${prefix}_args_" \
-"${prefix}_backup_file_" "${prefix}_args_" "${prefix}_secret_" \
+"${prefix}_secret_" "${prefix}_cmd_" "${prefix}_data_" "${prefix}_volume_" \
-"${prefix}_cmd_" "${prefix}_data_" "${prefix}_volume_" "${prefix}_command_" \
+"${prefix}_command_" "${prefix}_recipe_" "${prefix}_host_" "${prefix}_user_" \
-"${prefix}_recipe_" "${prefix}_host_" "${prefix}_user_" "${prefix}_port_" \
+"${prefix}_port_" "${prefix}_provider_" "${prefix}_subcommands_" \
-"${prefix}_provider_" "${prefix}_subcommands_" "${prefix}app" "${prefix}list" \
+"${prefix}app" "${prefix}list" "${prefix}ls" "${prefix}new" "${prefix}backup" \
-"${prefix}ls" "${prefix}new" "${prefix}backup" "${prefix}deploy" \
+"${prefix}deploy" "${prefix}check" "${prefix}version" "${prefix}config" \
-"${prefix}check" "${prefix}version" "${prefix}config" "${prefix}cp" \
+"${prefix}cp" "${prefix}logs" "${prefix}ps" "${prefix}restore" "${prefix}rm" \
-"${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" \
 "${prefix}server" "${prefix}add" "${prefix}__" "${prefix}init" "${prefix}apps" \
 "${prefix}upgrade" "${prefix}doctor" "${prefix}help"
 eval "${prefix}"'__env=${var___env:-}'
+eval "${prefix}"'__branch=${var___branch:-}'
 eval "${prefix}"'__stack=${var___stack:-}'
+eval "${prefix}"'__skip_check=${var___skip_check:-false}'
 eval "${prefix}"'__skip_update=${var___skip_update:-false}'
 eval "${prefix}"'__help=${var___help:-false}'
-eval "${prefix}"'__skip_check=${var___skip_check:-false}'
-eval "${prefix}"'__verbose=${var___verbose:-false}'
 eval "${prefix}"'__debug=${var___debug:-false}'
+eval "${prefix}"'__verbose=${var___verbose:-false}'
 eval "${prefix}"'__no_prompt=${var___no_prompt:-false}'
-eval "${prefix}"'__branch=${var___branch:-}'
 eval "${prefix}"'__status=${var___status:-false}'
 eval "${prefix}"'__server=${var___server:-}'
 eval "${prefix}"'__type=${var___type:-}'
@@ -302,12 +299,11 @@ 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}"'__chaos=${var___chaos:-false}'
-eval "${prefix}"'__no_domain_poll=${var___no_domain_poll:-false}'
-eval "${prefix}"'__no_state_poll=${var___no_state_poll:-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_:-}'
@@ -359,16 +355,15 @@ 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}__env" "${prefix}__stack" "${prefix}__skip_update" \
+declare -p "${prefix}__env" "${prefix}__branch" "${prefix}__stack" \
-"${prefix}__help" "${prefix}__skip_check" "${prefix}__verbose" \
+"${prefix}__skip_check" "${prefix}__skip_update" "${prefix}__help" \
-"${prefix}__debug" "${prefix}__no_prompt" "${prefix}__branch" \
+"${prefix}__debug" "${prefix}__verbose" "${prefix}__no_prompt" \
 "${prefix}__status" "${prefix}__server" "${prefix}__type" "${prefix}__domain" \
 "${prefix}__app_name" "${prefix}__pass" "${prefix}__secrets" "${prefix}__all" \
-"${prefix}__update" "${prefix}__force" "${prefix}__fast" \
+"${prefix}__update" "${prefix}__force" "${prefix}__fast" "${prefix}__chaos" \
-"${prefix}__skip_version_check" "${prefix}__no_domain_poll" \
+"${prefix}__volumes" "${prefix}__no_tty" "${prefix}__user" "${prefix}__bump" \
-"${prefix}__no_state_poll" "${prefix}__volumes" "${prefix}__no_tty" \
+"${prefix}__dev" "${prefix}_type_" "${prefix}_app_" "${prefix}_service_" \
-"${prefix}__user" "${prefix}__dev" "${prefix}_type_" "${prefix}_app_" \
+"${prefix}_version_" "${prefix}_src_" "${prefix}_dst_" \
-"${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_" \
@@ -604,7 +599,11 @@ 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
   fi
 }
 
@@ -713,6 +712,7 @@ 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"
@@ -754,8 +754,12 @@ 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
+        fi
       else
         if [[ $UNDEPLOYED_STATE == "true" ]]; then
           image=$($YQ e ".services.${SERVICE}.image" "${APP_DIR}/${COMPOSE}" | cut -d':' -f1)
@@ -780,7 +784,8 @@ output_version_summary() {
   else
     if [[ $UNABLE_TO_DETECT == "false" ]] && \
        [[ $UNDEPLOYED_STATE == "false" ]] && \
-       [[ $FORCE_DEPLOY == "false" ]]; then
+       [[ $FORCE_DEPLOY == "false" ]] && \
+       [[ $CHAOS_DEPLOY = "false" ]]; then
       success "Nothing to deploy, you're on latest (use --force to re-deploy anyway)"
       exit 0
     fi
@@ -1304,17 +1309,15 @@ _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] [--fast]
 
 Deploy app <app> to the configured server.
 
 OPTIONS
   --update                Consent to deploying an updated app version
   --force                 Force a deployment regardless of state
-  --skip-version-check    Don't try and detect deployed version
+  --fast                  Run deployment without various safety checks
-  --no-domain-poll        Don't wait for the configured domain to come up
+  --chaos                 Deploy straight from latest Git version (potentially chaotic!)
-  --no-state-poll         Don't watch deployment state for success/failure
-  --fast                  Alias for --skip-version-check --no-domain-poll
 
 POWERED BY
   docker stack deploy -c compose.yml <app>"
@@ -1328,9 +1331,9 @@ sub_app_deploy (){
     NO_DOMAIN_POLL=true
     NO_STATE_POLL=true
   else
-    SKIP_VERSION_CHECK=$abra___skip_version_check
+    SKIP_VERSION_CHECK=false
-    NO_DOMAIN_POLL=$abra___no_domain_poll
+    NO_DOMAIN_POLL=false
-    NO_STATE_POLL=$abra___no_state_poll
+    NO_STATE_POLL=false
   fi
 
   if [ ! "$abra__version_" = "dev" ]; then
@@ -2053,7 +2056,7 @@ sub_recipe_versions() {
 
 ###### .. recipe <recipe> release
 help_recipe_release() {
-  echo "abra [options] recipe <recipe> release
+  echo "abra [options] recipe <recipe> release [--force] [--bump]
 
 (For recipe maintainers)
 
@@ -2066,6 +2069,7 @@ 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
@@ -2080,8 +2084,13 @@ 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"
@@ -2094,24 +2103,31 @@ sub_recipe_release() {
       latest_version_message=$(git show -s --format=%s)
     fi
     info "Latest available version: '$latest_version'"
-    info "Latest verion message: '$latest_version_message'"
+    info "Latest version 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" ]; then
+  if [ "$force" = "false" ] && [ -n "$current_tag" ] && [ "$bump" = "false" ]; then
-    error "$recipe is already on $current_tag, no release needed"
+    success "$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
+      checkout_main_or_master
+    fi
   fi
 
   mapfile -t extra_compose_files < <(ls -- compose.*.yml 2> /dev/null || true)
@@ -2121,7 +2137,12 @@ 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?'
@@ -2197,22 +2218,49 @@ 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
 
     if [ "${choice,,}" != "y" ]; then
       return
     fi
+  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
+  fi
 
+  if [ "$abra___no_prompt" = "false" ]; then
     read -rp "Tag this as \`$new_version\`? [y/N]? " choice
 
     if [ "${choice,,}" != "y" ]; then
       return
     fi
+  fi
 
-  test "$force" = "true" && git tag -d "$new_version"
+  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
 }
 
 #######################################
@@ -2504,8 +2552,7 @@ abra() {
     abra___skip_check abra__backup_file_ abra___verbose abra___debug \
     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__recipe_ abra___fast abra__volume_ abra___bump abra___chaos
-    abra___fast abra__volume_ abra___no_state_poll
 
   if ! type tput > /dev/null 2>&1; then
     tput() {

bin/abralib.py

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

bin/app-json.py

@@ -7,84 +7,24 @@
 # https://apps.coopcloud.tech
 
 from json import dump
-from logging import DEBUG, basicConfig, getLogger
+from os import chdir, getcwd, listdir
-from os import chdir, listdir, mkdir
+from os.path import basename
-from os.path import basename, exists, expanduser
-from pathlib import Path
 from re import findall, search
-from shlex import split
+from subprocess import DEVNULL
-from subprocess import DEVNULL, check_output
-from sys import exit
 
 from requests import get
 
-HOME_PATH = expanduser("~/")
+from abralib import (
-CLONES_PATH = Path(f"{HOME_PATH}/.abra/apps").absolute()
+    CLONES_PATH,
-YQ_PATH = Path(f"{HOME_PATH}/.abra/vendor/yq")
+    JQ_PATH,
-SCRIPT_PATH = Path(__file__).absolute().parent
+    REPOS_TO_SKIP,
-REPOS_TO_SKIP = (
+    YQ_PATH,
-    "abra",
+    _run_cmd,
-    "abra-apps",
+    clone_all_apps,
-    "abra-gandi",
+    get_repos_json,
-    "abra-hetzner",
+    log,
-    "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."""
@@ -99,31 +39,6 @@ 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 = {}
@@ -257,7 +172,7 @@ def get_app_versions(app_path, cached_apps_json):
                 if image in ("null", "---"):
                     continue
 
-                images_cmd = f"skopeo inspect docker://{image} | jq '.Digest'"
+                images_cmd = f"skopeo inspect docker://{image} | {JQ_PATH} '.Digest'"
                 output = _run_cmd(images_cmd, shell=True)
 
                 service_version_info = {
@@ -283,7 +198,7 @@ def main():
     repos_json = get_repos_json()
     clone_all_apps(repos_json)
 
-    target = f"{SCRIPT_PATH}/../deploy/apps.coopcloud.tech/apps.json"
+    target = f"{getcwd()}/apps.json"
     with open(target, "w", encoding="utf-8") as handle:
         dump(
             generate_apps_json(repos_json),

bin/clone-all-apps.py

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

bin/github-sync.py

@@ -0,0 +1,47 @@
+#!/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()

bin/renovate-ls-apps.py

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

deploy/apps.coopcloud.tech/compose.yml

@@ -1,41 +0,0 @@
----
-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:

deploy/apps.coopcloud.tech/nginx.conf

@@ -1,10 +0,0 @@
-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;
-  }
-}

deploy/install.abra.coopcloud.tech/installer

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-ABRA_VERSION="8.0.1"
+ABRA_VERSION="9.0.0"
 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"

makefile

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