Compare commits

...

5 Commits
main ... 10.0.3

Author SHA1 Message Date
3wc
1c820c70fb $another_installer_fix 2021-08-11 02:05:05 +02:00
3wc
e92fa554d4 Properly fix abra upgrade 2021-08-11 01:54:48 +02:00
3wc
6ac14f55ca Bump version in installer 2021-08-11 01:48:06 +02:00
3wc
71820f7e0b jq -> $JQ 2021-08-11 01:44:32 +02:00
3wc
207728e1be Also install git 2021-08-10 00:39:05 +02:00
2 changed files with 6 additions and 4 deletions

4
abra
View File

@ -837,7 +837,7 @@ ensure_stack_deployed() {
for service in $(docker ps -f "name=$STACK_NAME" -q); do
debug "Polling $service for deployment status"
healthcheck=$(docker inspect --format "{{ json .State }}" "$service" | jq "try(.Health.Status // \"missing\")")
healthcheck=$(docker inspect --format "{{ json .State }}" "$service" | $JQ "try(.Health.Status // \"missing\")")
name=$(docker inspect --format '{{ index .Config.Labels "com.docker.swarm.service.name" }}' "$service")
if [[ ${MISSING[*]} =~ ${name} ]] || [[ ${HEALTHY[*]} =~ ${name} ]]; then
@ -2655,7 +2655,7 @@ sub_upgrade() {
if [[ "$abra___dev" == "true" ]]; then
curl https://install.abra.coopcloud.tech | bash -s -- --dev --no-deps
else
curl https://install.abra.coopcloud.tech | bash --no-deps
curl https://install.abra.coopcloud.tech | bash -s -- --no-deps
fi
}

View File

@ -2,7 +2,7 @@
# shellcheck disable=SC2154,SC2034
ABRA_VERSION="10.0.1"
ABRA_VERSION="10.0.3"
GIT_URL="https://git.coopcloud.tech/coop-cloud/abra"
ABRA_SRC="$GIT_URL/raw/tag/$ABRA_VERSION/abra"
ABRA_DIR="${ABRA_DIR:-$HOME/.abra}"
@ -161,7 +161,8 @@ function install_requirements {
sudo apt update && sudo apt install -y \
passwdqc \
pwgen
pwgen \
git
echo "Install Docker (https://docs.docker.com/engine/install/debian/)?"
prompt_confirm
@ -175,6 +176,7 @@ function install_requirements {
function install_abra_release {
mkdir -p "$HOME/.local/bin"
set -x
curl "$ABRA_SRC" > "$HOME/.local/bin/abra"
chmod +x "$HOME/.local/bin/abra"
echo "abra installed to $HOME/.local/bin/abra"