This commit is contained in:
decentral1se
parent
2ca7884bbe
commit
c7f838178c
107
abra
107
abra
@ -169,13 +169,13 @@ 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:2451}
|
||||
usage=${DOC:40:1842}; digest=c7bae
|
||||
shorts=(-e -b -s -C -U -h -d -v -n '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
|
||||
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 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 __branch 1; }; node_2(){ value __stack 2; }
|
||||
node_3(){ switch __skip_check 3; }; node_4(){ switch __skip_update 4; }
|
||||
node_5(){ switch __help 5; }; node_6(){ switch __debug 6; }; node_7(){
|
||||
switch __verbose 7; }; node_8(){ switch __no_prompt 8; }; node_9(){
|
||||
shorts=(-C -n -b -U -h -e -s -v -d '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
|
||||
longs=(--skip-check --no-prompt --branch --skip-update --help --env --stack --verbose --debug --status --server --type --domain --app-name --pass --secrets --all --update --force --fast --chaos --volumes --no-tty --user --bump --dev)
|
||||
argcounts=(0 0 1 0 0 1 1 0 0 0 1 1 1 1 0 0 0 0 0 0 0 0 0 1 0 0); node_0(){
|
||||
switch __skip_check 0; }; node_1(){ switch __no_prompt 1; }; node_2(){
|
||||
value __branch 2; }; node_3(){ switch __skip_update 3; }; node_4(){
|
||||
switch __help 4; }; node_5(){ value __env 5; }; node_6(){ value __stack 6; }
|
||||
node_7(){ switch __verbose 7; }; node_8(){ switch __debug 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(){
|
||||
@ -245,8 +245,8 @@ required 80; }; node_157(){
|
||||
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
|
||||
}; node_158(){ required 157; }; cat <<<' docopt_exit() {
|
||||
[[ -n $1 ]] && printf "%s\n" "$1" >&2; printf "%s\n" "${DOC:40:1842}" >&2
|
||||
exit 1; }'; unset var___env var___branch var___stack var___skip_check \
|
||||
var___skip_update var___help var___debug var___verbose var___no_prompt \
|
||||
exit 1; }'; unset var___skip_check var___no_prompt var___branch \
|
||||
var___skip_update var___help var___env var___stack var___verbose var___debug \
|
||||
var___status var___server var___type var___domain var___app_name var___pass \
|
||||
var___secrets var___all var___update var___force var___fast var___chaos \
|
||||
var___volumes var___no_tty var___user var___bump var___dev var__type_ \
|
||||
@ -258,11 +258,11 @@ 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 158 "$@"
|
||||
local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__env" "${prefix}__branch" \
|
||||
"${prefix}__stack" "${prefix}__skip_check" "${prefix}__skip_update" \
|
||||
"${prefix}__help" "${prefix}__debug" "${prefix}__verbose" \
|
||||
"${prefix}__no_prompt" "${prefix}__status" "${prefix}__server" \
|
||||
"${prefix}__type" "${prefix}__domain" "${prefix}__app_name" "${prefix}__pass" \
|
||||
local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__skip_check" \
|
||||
"${prefix}__no_prompt" "${prefix}__branch" "${prefix}__skip_update" \
|
||||
"${prefix}__help" "${prefix}__env" "${prefix}__stack" "${prefix}__verbose" \
|
||||
"${prefix}__debug" "${prefix}__status" "${prefix}__server" "${prefix}__type" \
|
||||
"${prefix}__domain" "${prefix}__app_name" "${prefix}__pass" \
|
||||
"${prefix}__secrets" "${prefix}__all" "${prefix}__update" "${prefix}__force" \
|
||||
"${prefix}__fast" "${prefix}__chaos" "${prefix}__volumes" "${prefix}__no_tty" \
|
||||
"${prefix}__user" "${prefix}__bump" "${prefix}__dev" "${prefix}_type_" \
|
||||
@ -279,15 +279,15 @@ local prefix=${DOCOPT_PREFIX:-''}; unset "${prefix}__env" "${prefix}__branch" \
|
||||
"${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}"'__no_prompt=${var___no_prompt:-false}'
|
||||
eval "${prefix}"'__branch=${var___branch:-}'
|
||||
eval "${prefix}"'__skip_update=${var___skip_update:-false}'
|
||||
eval "${prefix}"'__help=${var___help:-false}'
|
||||
eval "${prefix}"'__debug=${var___debug:-false}'
|
||||
eval "${prefix}"'__env=${var___env:-}'
|
||||
eval "${prefix}"'__stack=${var___stack:-}'
|
||||
eval "${prefix}"'__verbose=${var___verbose:-false}'
|
||||
eval "${prefix}"'__no_prompt=${var___no_prompt:-false}'
|
||||
eval "${prefix}"'__debug=${var___debug:-false}'
|
||||
eval "${prefix}"'__status=${var___status:-false}'
|
||||
eval "${prefix}"'__server=${var___server:-}'
|
||||
eval "${prefix}"'__type=${var___type:-}'
|
||||
@ -355,10 +355,10 @@ 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}__branch" "${prefix}__stack" \
|
||||
"${prefix}__skip_check" "${prefix}__skip_update" "${prefix}__help" \
|
||||
"${prefix}__debug" "${prefix}__verbose" "${prefix}__no_prompt" \
|
||||
"${prefix}__status" "${prefix}__server" "${prefix}__type" "${prefix}__domain" \
|
||||
declare -p "${prefix}__skip_check" "${prefix}__no_prompt" "${prefix}__branch" \
|
||||
"${prefix}__skip_update" "${prefix}__help" "${prefix}__env" "${prefix}__stack" \
|
||||
"${prefix}__verbose" "${prefix}__debug" "${prefix}__status" \
|
||||
"${prefix}__server" "${prefix}__type" "${prefix}__domain" \
|
||||
"${prefix}__app_name" "${prefix}__pass" "${prefix}__secrets" "${prefix}__all" \
|
||||
"${prefix}__update" "${prefix}__force" "${prefix}__fast" "${prefix}__chaos" \
|
||||
"${prefix}__volumes" "${prefix}__no_tty" "${prefix}__user" "${prefix}__bump" \
|
||||
@ -792,49 +792,36 @@ output_version_summary() {
|
||||
fi
|
||||
}
|
||||
|
||||
# Note(decentral1se): inspired by https://github.com/vitalets/docker-stack-wait-deploy
|
||||
ensure_stack_deployed() {
|
||||
STACK_NAME=$1
|
||||
local stack=$1
|
||||
local deployed=false
|
||||
|
||||
warning "Polling deploy state to check for success"
|
||||
warning "Waiting for new services to come up..."
|
||||
|
||||
local -a UNHEALTHY # mapping
|
||||
|
||||
services=$(docker stack services "${STACK_NAME}" --format "{{.ID}}")
|
||||
echo "$services"
|
||||
|
||||
while true; do
|
||||
all_services_done=1
|
||||
has_errors=0
|
||||
for service in $(docker ps -f "name=$STACK_NAME" -q); do
|
||||
local logs=$(docker inspect --format "{{ if (eq .State.Health.Status \"unhealthy\") }} {{json .State.Health.Log}} {{end}}" "$service")
|
||||
local name=$(docker inspect --format '{{ index .Config.Labels "com.docker.swarm.service.name"}}' $service)
|
||||
|
||||
service_ids=$(docker stack services -q "$STACK_NAME")
|
||||
debug "Processing $service ($name)..."
|
||||
|
||||
for service_id in $service_ids; do
|
||||
# see: https://github.com/moby/moby/issues/28012
|
||||
service_state=$(docker service inspect --format "{{if .UpdateStatus}}{{.UpdateStatus.State}}{{else}}created{{end}}" "$service_id")
|
||||
|
||||
debug "$service_id has state: $service_state"
|
||||
|
||||
case "$service_state" in
|
||||
created|completed)
|
||||
;;
|
||||
paused|rollback_completed)
|
||||
has_errors=1
|
||||
;;
|
||||
*)
|
||||
all_services_done=0
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
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"
|
||||
break
|
||||
else
|
||||
warning "Deployment appears to have suceeded"
|
||||
break
|
||||
if [[ ${UNHEALTHY_SEEN[*]} =~ ${service} ]]; then
|
||||
debug "Already reported $name as failing, skipping..."
|
||||
continue
|
||||
fi
|
||||
else
|
||||
sleep 1
|
||||
fi
|
||||
|
||||
if [[ -n "$logs" ]]; then
|
||||
local exitcode="$(echo $logs | $JQ '.[-1] | .ExitCode')"
|
||||
warning "Healthcheck for new instance of $name is failing (exit code $exitcode)"
|
||||
warning "$(echo $logs | $JQ -r '.[-1] | .Output')"
|
||||
fi
|
||||
done
|
||||
sleep 1
|
||||
done
|
||||
}
|
||||
|
||||
@ -870,7 +857,7 @@ load_instance() {
|
||||
APP="$abra__app_"
|
||||
|
||||
# load all files matching "$APP.env" into ENV_FILES array
|
||||
mapfile -t ENV_FILES < <(find -L "$ABRA_DIR" -name "$APP.env")
|
||||
mapfile -t ENV_FILES < <(find -L "$ABRA_DIR/servers/" -name "$APP.env")
|
||||
# FIXME 3wc: requires bash 4, use for loop instead
|
||||
|
||||
case "${#ENV_FILES[@]}" in
|
||||
|
||||
5
makefile
5
makefile
@ -43,3 +43,8 @@ build:
|
||||
|
||||
push: build
|
||||
@docker push decentral1se/abra
|
||||
|
||||
symlink:
|
||||
@mkdir -p ~/.abra/servers/ && \
|
||||
ln -srf tests/default ~/.abra/servers && \
|
||||
ln -srf tests/apps/* ~/.abra/apps
|
||||
|
||||
31
tests/apps/works/compose.yml
Normal file
31
tests/apps/works/compose.yml
Normal file
@ -0,0 +1,31 @@
|
||||
---
|
||||
version: "3.8"
|
||||
services:
|
||||
r1:
|
||||
image: redis:alpine
|
||||
deploy:
|
||||
update_config:
|
||||
failure_action: rollback
|
||||
order: start-first
|
||||
rollback_config:
|
||||
order: start-first
|
||||
restart_policy:
|
||||
max_attempts: 3
|
||||
healthcheck:
|
||||
test: redis-cli ping
|
||||
r2:
|
||||
image: redis:alpine
|
||||
deploy:
|
||||
update_config:
|
||||
failure_action: rollback
|
||||
order: start-first
|
||||
rollback_config:
|
||||
order: start-first
|
||||
restart_policy:
|
||||
max_attempts: 3
|
||||
healthcheck:
|
||||
test: foobar
|
||||
# test: redis-cli ping
|
||||
start_period: 5s
|
||||
interval: 2s
|
||||
timeout: 3s
|
||||
1
tests/default/works.env
Normal file
1
tests/default/works.env
Normal file
@ -0,0 +1 @@
|
||||
TYPE=works
|
||||
Reference in New Issue
Block a user