diff --git a/.gitea/workflows/ci-cd.yml b/.gitea/workflows/ci-cd.yml index 41f9865..f4e4805 100644 --- a/.gitea/workflows/ci-cd.yml +++ b/.gitea/workflows/ci-cd.yml @@ -182,7 +182,7 @@ jobs: docker save state_corp-web:local -o /tmp/web.tar ./crane push --insecure /tmp/web.tar "${REGISTRY}/state_corp-web:${BRANCH_TAG}" ./crane push --insecure /tmp/web.tar "${REGISTRY}/state_corp-web:${BRANCH_TAG}-${SHA_SHORT}" - if [ "${GITHUB_REF_NAME}" = "main" ]; then + if [ "${GITHUB_REF_NAME}" = "dev" ]; then ./crane push --insecure /tmp/web.tar "${REGISTRY}/state_corp-web:latest" fi @@ -190,7 +190,7 @@ jobs: docker save state_corp-celery:local -o /tmp/celery.tar ./crane push --insecure /tmp/celery.tar "${REGISTRY}/state_corp-celery:${BRANCH_TAG}" ./crane push --insecure /tmp/celery.tar "${REGISTRY}/state_corp-celery:${BRANCH_TAG}-${SHA_SHORT}" - if [ "${GITHUB_REF_NAME}" = "main" ]; then + if [ "${GITHUB_REF_NAME}" = "dev" ]; then ./crane push --insecure /tmp/celery.tar "${REGISTRY}/state_corp-celery:latest" fi @@ -231,9 +231,11 @@ jobs: set -euo pipefail cd /opt/state-corp-backend echo '${REGISTRY_PASSWORD}' | docker login --username '${REGISTRY_USER}' --password-stdin 10.10.0.10:3000 - export IMAGE_TAG=${BRANCH_TAG} - docker compose -f docker-compose.prod.yml pull web celery_worker celery_beat - docker compose -f docker-compose.prod.yml down --remove-orphans || true - docker compose -f docker-compose.prod.yml up -d + REGISTRY=10.10.0.10:3000/${{ github.repository_owner }} + export WEB_IMAGE=\${REGISTRY}/state_corp-web:${BRANCH_TAG} + export CELERY_IMAGE=\${REGISTRY}/state_corp-celery:${BRANCH_TAG} + docker compose --env-file .env.prod -f docker-compose.prod.yml pull web celery_worker celery_beat + docker compose --env-file .env.prod -f docker-compose.prod.yml down --remove-orphans || true + docker compose --env-file .env.prod -f docker-compose.prod.yml up -d docker image prune -f "