Merge branch 'main' into monorepo

This commit is contained in:
3wc 2020-09-22 16:15:33 +02:00
commit 3d3d6b9b67
5 changed files with 53 additions and 7 deletions

View File

@ -7,7 +7,7 @@ steps:
commands: commands:
- apt update - apt update
- apt install -y shellcheck - apt install -y shellcheck
- shellcheck abra - shellcheck abra installer
trigger: trigger:
branch: branch:
- main - main

11
CHANGELOG.md Normal file
View File

@ -0,0 +1,11 @@
# abra 0.1.2 (2020-09-22)
- Add upgrade command ([#10](https://git.autonomic.zone/autonomic-cooperative/abra/issues/10))
# abra 0.1.1 (2020-09-22)
- Add installer script ([#9](https://git.autonomic.zone/autonomic-cooperative/abra/issues/9))
# abra 0.1.0 (2020-09-22)
- Initial pre-alpha release

View File

@ -4,13 +4,27 @@
Docker stack magic 🎩🐇 Docker stack magic 🎩🐇
## Installing ## Install
`make install` ```sh
curl -fsSL https://install.abra.autonomic.zone | bash
```
Specific releases are available via the project [release page](https://git.autonomic.zone/autonomic-cooperative/abra/releases).
## Changes
See [CHANGELOG.md](./CHANGELOG.md).
## Hacking ## Hacking
`make dev_install` ```sh
git clone ssh://git@git.autonomic.zone:2222/autonomic-cooperative/abra.git
cd abra
make dev_install
```
See [autonomic-cooperative/installer-scripts](https://git.autonomic.zone/autonomic-cooperative/installer-scripts) for the installer script deployment. To make a release, just add an entry to [CHANGELOG.md](./CHANGELOG.md) and the [installer](./installer) (following [semver](https://semver.org/) please) and then `git tag x.x.x && git push origin main --tags`. If you want the [installer-scripts](https://git.autonomic.zone/autonomic-cooperative/installer-scripts) deployment to pick that up, you'll need to change the version number in the [Makefile](https://git.autonomic.zone/autonomic-cooperative/installer-scripts/src/branch/main/Makefile) and run `make` in that repository and push the changes.
## Specify what to deploy where ## Specify what to deploy where
@ -39,6 +53,4 @@ You can use `abra` in one of 2 ways:
## Examples ## Examples
``` - `abra run mariadb mysqldump gitea -p'GdIbMeS09SURRktBnm3jcTufsL5z0MPd' | gzip > ../git.autonomic.zone_mariadb_`date +%F`.sql.gz`
abra run mariadb mysqldump gitea -p'GdIbMeS09SURRktBnm3jcTufsL5z0MPd' | gzip > ../git.autonomic.zone_mariadb_`date +%F`.sql.gz
```

5
abra
View File

@ -125,6 +125,7 @@ sub_help() {
echo " run SERVICE CMD run a command in the specified service's container" echo " run SERVICE CMD run a command in the specified service's container"
echo " run_args SERVICE ARGS CMD run, passing extra args to docker exec" echo " run_args SERVICE ARGS CMD run, passing extra args to docker exec"
echo " secret [--help] [SUBCOMMAND] manage secrets" echo " secret [--help] [SUBCOMMAND] manage secrets"
echo " upgrade upgrade to the latest version"
echo " ... (custom commands)" echo " ... (custom commands)"
echo "" echo ""
echo "Make sure \$STACK_NAME is set using direnv, -a, -e or -c" echo "Make sure \$STACK_NAME is set using direnv, -a, -e or -c"
@ -314,6 +315,10 @@ sub_context_use() {
docker context use "$1" docker context use "$1"
} }
sub_upgrade() {
curl -fsSL https://install.abra.autonomic.zone | bash
}
sub_context() { sub_context() {
SUBCOMMAND2=$1 SUBCOMMAND2=$1
shift shift

18
installer Executable file
View File

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