ci: образы собирает CI и пушит в Nexus-реестр, прод-деплой = pull
- main.yml: новый job images (docker build + push, теги prod + sha-<7>, DOCKER_BUILDKIT=0 — daemon за раннером podman); deploy: needs images, restart.sh --deploy, .rollback.env без PREV_COMMIT (git-клон src на проде больше не нужен); rollback: retag image ID на реестровые :prod - GITEA-vars.md: Secrets REGISTRY_USER/REGISTRY_PASSWORD, Variable REGISTRY - AGENTS.md: CI/CD и Деплой переписаны под pull-поток
This commit is contained in:
@@ -56,19 +56,72 @@ jobs:
|
||||
working-directory: wordpdf-web
|
||||
run: npm run lint
|
||||
|
||||
deploy:
|
||||
images:
|
||||
runs-on: ubuntu-latest
|
||||
needs: [java, web]
|
||||
steps:
|
||||
- uses: actions/checkout@v5
|
||||
|
||||
- name: Check registry vars and secret
|
||||
env:
|
||||
REGISTRY: ${{ vars.REGISTRY }}
|
||||
REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
|
||||
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
|
||||
run: |
|
||||
[ -n "$REGISTRY" ] && [ -n "$REGISTRY_USER" ] && [ -n "$REGISTRY_PASSWORD" ] || {
|
||||
echo "Задайте Actions Variable REGISTRY и Secrets REGISTRY_USER/REGISTRY_PASSWORD — см. GITEA-vars.md" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
- name: Docker auth
|
||||
env:
|
||||
REGISTRY: ${{ vars.REGISTRY }}
|
||||
REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
|
||||
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
|
||||
run: |
|
||||
mkdir -p ~/.docker
|
||||
printf '{"auths":{"%s":{"auth":"%s"}}}' "$REGISTRY" \
|
||||
"$(printf '%s:%s' "$REGISTRY_USER" "$REGISTRY_PASSWORD" | base64 -w0)" > ~/.docker/config.json
|
||||
|
||||
- name: Build and push app image
|
||||
env:
|
||||
REGISTRY: ${{ vars.REGISTRY }}
|
||||
run: |
|
||||
sha="${GITHUB_SHA:0:7}"
|
||||
# DOCKER_BUILDKIT=0: daemon за раннером — podman, BuildKit-сессий нет,
|
||||
# только classic /build (buildah).
|
||||
DOCKER_BUILDKIT=0 docker build -f Containerfile \
|
||||
-t "$REGISTRY/wordpdf-app:prod" -t "$REGISTRY/wordpdf-app:sha-$sha" .
|
||||
docker push "$REGISTRY/wordpdf-app:prod"
|
||||
docker push "$REGISTRY/wordpdf-app:sha-$sha"
|
||||
|
||||
- name: Build and push web image
|
||||
env:
|
||||
REGISTRY: ${{ vars.REGISTRY }}
|
||||
run: |
|
||||
sha="${GITHUB_SHA:0:7}"
|
||||
# VITE_BASE прод-префикса пёкся раньше build-аргом в прод-compose;
|
||||
# теперь он здесь — образ из реестра едет на прод как есть.
|
||||
DOCKER_BUILDKIT=0 docker build -f wordpdf-web/Containerfile \
|
||||
--build-arg VITE_BASE=/pdf-converter/ \
|
||||
-t "$REGISTRY/wordpdf-web:prod" -t "$REGISTRY/wordpdf-web:sha-$sha" wordpdf-web
|
||||
docker push "$REGISTRY/wordpdf-web:prod"
|
||||
docker push "$REGISTRY/wordpdf-web:sha-$sha"
|
||||
|
||||
deploy:
|
||||
runs-on: ubuntu-latest
|
||||
needs: images
|
||||
steps:
|
||||
- name: Check deploy vars and secret
|
||||
env:
|
||||
DEPLOY_HOST: ${{ vars.DEPLOY_HOST }}
|
||||
DEPLOY_USER: ${{ vars.DEPLOY_USER }}
|
||||
DEPLOY_DIR: ${{ vars.DEPLOY_DIR }}
|
||||
REGISTRY: ${{ vars.REGISTRY }}
|
||||
DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
|
||||
run: |
|
||||
[ -n "$DEPLOY_HOST" ] && [ -n "$DEPLOY_USER" ] && [ -n "$DEPLOY_DIR" ] && [ -n "$DEPLOY_SSH_KEY" ] || {
|
||||
echo "Задайте Actions Variables DEPLOY_HOST/DEPLOY_USER/DEPLOY_DIR и Secret DEPLOY_SSH_KEY — см. GITEA-vars.md" >&2
|
||||
[ -n "$DEPLOY_HOST" ] && [ -n "$DEPLOY_USER" ] && [ -n "$DEPLOY_DIR" ] && [ -n "$REGISTRY" ] && [ -n "$DEPLOY_SSH_KEY" ] || {
|
||||
echo "Задайте Actions Variables DEPLOY_HOST/DEPLOY_USER/DEPLOY_DIR/REGISTRY и Secret DEPLOY_SSH_KEY — см. GITEA-vars.md" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
@@ -86,9 +139,8 @@ jobs:
|
||||
{
|
||||
echo "PREV_APP=$(podman inspect -f '{{.Image}}' wordpdf-prod-app-1)"
|
||||
echo "PREV_WEB=$(podman inspect -f '{{.Image}}' wordpdf-prod-web-1)"
|
||||
echo "PREV_COMMIT=$(git -C src rev-parse HEAD)"
|
||||
} > .rollback.env
|
||||
./restart.sh --build
|
||||
./restart.sh --deploy
|
||||
|
||||
autotests:
|
||||
runs-on: ubuntu-latest
|
||||
@@ -139,9 +191,8 @@ jobs:
|
||||
exit 1
|
||||
fi
|
||||
. ./.rollback.env
|
||||
podman tag "$PREV_APP" wordpdf-app:prod
|
||||
podman tag "$PREV_WEB" wordpdf-web:prod
|
||||
git -C src reset --hard "$PREV_COMMIT"
|
||||
podman tag "$PREV_APP" "${{ vars.REGISTRY }}/wordpdf-app:prod"
|
||||
podman tag "$PREV_WEB" "${{ vars.REGISTRY }}/wordpdf-web:prod"
|
||||
podman-compose up -d --force-recreate app web
|
||||
for _ in $(seq 1 60); do
|
||||
[ "$(podman inspect -f '{{.State.Health.Status}}' wordpdf-prod-app-1)" = healthy ] && break
|
||||
|
||||
Reference in New Issue
Block a user