feat: try fix
This commit is contained in:
parent
7c2909d3b2
commit
328d64ea2f
|
|
@ -77,7 +77,7 @@ jobs:
|
||||||
host: ${{ secrets.SSH_HOST }}
|
host: ${{ secrets.SSH_HOST }}
|
||||||
username: ${{ secrets.SSH_USER }}
|
username: ${{ secrets.SSH_USER }}
|
||||||
key: ${{ secrets.SSH_PRIVATE_KEY }}
|
key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||||
source: docker-compose.prod.yml,docker/nginx/*
|
source: docker-compose.prod.yml
|
||||||
target: ${{ secrets.DEPLOY_PATH || '/opt/bemeal' }}
|
target: ${{ secrets.DEPLOY_PATH || '/opt/bemeal' }}
|
||||||
|
|
||||||
- name: Deploy via SSH (Blue/Green)
|
- name: Deploy via SSH (Blue/Green)
|
||||||
|
|
@ -86,13 +86,12 @@ jobs:
|
||||||
IMAGE_TAG: ${{ github.sha }}
|
IMAGE_TAG: ${{ github.sha }}
|
||||||
DEPLOY_PATH: ${{ secrets.DEPLOY_PATH }}
|
DEPLOY_PATH: ${{ secrets.DEPLOY_PATH }}
|
||||||
NGINX_CONTAINER: ${{ secrets.NGINX_CONTAINER }}
|
NGINX_CONTAINER: ${{ secrets.NGINX_CONTAINER }}
|
||||||
NGINX_CONF_FILE: ${{ secrets.NGINX_CONF_FILE }}
|
|
||||||
NGINX_UPSTREAM_FILE: ${{ secrets.NGINX_UPSTREAM_FILE }}
|
NGINX_UPSTREAM_FILE: ${{ secrets.NGINX_UPSTREAM_FILE }}
|
||||||
with:
|
with:
|
||||||
host: ${{ secrets.SSH_HOST }}
|
host: ${{ secrets.SSH_HOST }}
|
||||||
username: ${{ secrets.SSH_USER }}
|
username: ${{ secrets.SSH_USER }}
|
||||||
key: ${{ secrets.SSH_PRIVATE_KEY }}
|
key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||||
envs: REGISTRY,IMAGE_NAME,IMAGE_TAG,DEPLOY_PATH,NGINX_CONTAINER,NGINX_CONF_FILE,NGINX_UPSTREAM_FILE
|
envs: REGISTRY,IMAGE_NAME,IMAGE_TAG,DEPLOY_PATH,NGINX_CONTAINER,NGINX_UPSTREAM_FILE
|
||||||
script: |
|
script: |
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
|
|
@ -100,7 +99,6 @@ jobs:
|
||||||
COMPOSE_FILE="docker-compose.prod.yml"
|
COMPOSE_FILE="docker-compose.prod.yml"
|
||||||
COMPOSE_ENV_FILE=".env.prod"
|
COMPOSE_ENV_FILE=".env.prod"
|
||||||
NGINX_CONTAINER="${NGINX_CONTAINER:-nginx-app-1}"
|
NGINX_CONTAINER="${NGINX_CONTAINER:-nginx-app-1}"
|
||||||
NGINX_CONF_FILE="${NGINX_CONF_FILE:-/etc/nginx/conf.d/bemeal.conf}"
|
|
||||||
NGINX_UPSTREAM_FILE="${NGINX_UPSTREAM_FILE:-/etc/nginx/conf.d/bemeal-upstream.inc}"
|
NGINX_UPSTREAM_FILE="${NGINX_UPSTREAM_FILE:-/etc/nginx/conf.d/bemeal-upstream.inc}"
|
||||||
DRAIN_SECONDS="${DRAIN_SECONDS:-20}"
|
DRAIN_SECONDS="${DRAIN_SECONDS:-20}"
|
||||||
|
|
||||||
|
|
@ -178,14 +176,10 @@ jobs:
|
||||||
|
|
||||||
docker exec "$TARGET_SERVICE" wget -qO- http://127.0.0.1/api/health >/dev/null
|
docker exec "$TARGET_SERVICE" wget -qO- http://127.0.0.1/api/health >/dev/null
|
||||||
|
|
||||||
NGINX_CONF_DIR="$(dirname "$NGINX_CONF_FILE")"
|
|
||||||
NGINX_UPSTREAM_DIR="$(dirname "$NGINX_UPSTREAM_FILE")"
|
NGINX_UPSTREAM_DIR="$(dirname "$NGINX_UPSTREAM_FILE")"
|
||||||
docker exec "$NGINX_CONTAINER" sh -c "mkdir -p '$NGINX_CONF_DIR' '$NGINX_UPSTREAM_DIR'"
|
docker exec "$NGINX_CONTAINER" sh -c "mkdir -p '$NGINX_UPSTREAM_DIR'"
|
||||||
docker exec "$NGINX_CONTAINER" sh -c "test ! -f '$NGINX_CONF_FILE' || cp '$NGINX_CONF_FILE' '$NGINX_CONF_FILE.bak'"
|
|
||||||
docker exec "$NGINX_CONTAINER" sh -c "test ! -f '$NGINX_UPSTREAM_FILE' || cp '$NGINX_UPSTREAM_FILE' '$NGINX_UPSTREAM_FILE.bak'"
|
docker exec "$NGINX_CONTAINER" sh -c "test ! -f '$NGINX_UPSTREAM_FILE' || cp '$NGINX_UPSTREAM_FILE' '$NGINX_UPSTREAM_FILE.bak'"
|
||||||
|
|
||||||
docker cp docker/nginx/bemeal.conf "$NGINX_CONTAINER:$NGINX_CONF_FILE"
|
|
||||||
|
|
||||||
printf '%s\n' \
|
printf '%s\n' \
|
||||||
'upstream bemeal_api {' \
|
'upstream bemeal_api {' \
|
||||||
" server $TARGET_HOST:80 max_fails=3 fail_timeout=10s;" \
|
" server $TARGET_HOST:80 max_fails=3 fail_timeout=10s;" \
|
||||||
|
|
@ -196,9 +190,6 @@ jobs:
|
||||||
if docker exec "$NGINX_CONTAINER" sh -c "test -f '$NGINX_UPSTREAM_FILE.bak'" 2>/dev/null; then
|
if docker exec "$NGINX_CONTAINER" sh -c "test -f '$NGINX_UPSTREAM_FILE.bak'" 2>/dev/null; then
|
||||||
docker exec "$NGINX_CONTAINER" sh -c "mv '$NGINX_UPSTREAM_FILE.bak' '$NGINX_UPSTREAM_FILE'"
|
docker exec "$NGINX_CONTAINER" sh -c "mv '$NGINX_UPSTREAM_FILE.bak' '$NGINX_UPSTREAM_FILE'"
|
||||||
fi
|
fi
|
||||||
if docker exec "$NGINX_CONTAINER" sh -c "test -f '$NGINX_CONF_FILE.bak'" 2>/dev/null; then
|
|
||||||
docker exec "$NGINX_CONTAINER" sh -c "mv '$NGINX_CONF_FILE.bak' '$NGINX_CONF_FILE'"
|
|
||||||
fi
|
|
||||||
|
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
@ -206,7 +197,6 @@ jobs:
|
||||||
echo "Switch Nginx traffic to $TARGET"
|
echo "Switch Nginx traffic to $TARGET"
|
||||||
docker exec "$NGINX_CONTAINER" nginx -s reload
|
docker exec "$NGINX_CONTAINER" nginx -s reload
|
||||||
docker exec "$NGINX_CONTAINER" rm -f "$NGINX_UPSTREAM_FILE.bak"
|
docker exec "$NGINX_CONTAINER" rm -f "$NGINX_UPSTREAM_FILE.bak"
|
||||||
docker exec "$NGINX_CONTAINER" rm -f "$NGINX_CONF_FILE.bak"
|
|
||||||
|
|
||||||
echo "Restart workers on the new image"
|
echo "Restart workers on the new image"
|
||||||
$COMPOSE up -d --force-recreate --no-deps horizon scheduler
|
$COMPOSE up -d --force-recreate --no-deps horizon scheduler
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue