diff --git a/.gitea/workflows/ci-cd.yml b/.gitea/workflows/ci-cd.yml index 2de4369..0c5ce3f 100644 --- a/.gitea/workflows/ci-cd.yml +++ b/.gitea/workflows/ci-cd.yml @@ -24,7 +24,8 @@ concurrency: env: PYTHON_VERSION: "3.11" - REGISTRY_HOST: "10.10.0.50" + REGISTRY_API_URL: "https://registry.dev.nii-ecos.ru/v2/" + REGISTRY_HOST: "registry.dev.nii-ecos.ru" REGISTRY_NAMESPACE: "${{ github.repository_owner }}" WEB_IMAGE: "mostovik-backend-web" CELERY_IMAGE: "mostovik-backend-celery" @@ -162,7 +163,7 @@ jobs: fi echo "${REGISTRY_PASSWORD}" \ - | ./crane auth login --insecure "${REGISTRY_HOST}" \ + | ./crane auth login "${REGISTRY_HOST}" \ -u "${REGISTRY_USER}" \ --password-stdin @@ -175,10 +176,10 @@ jobs: -t "${WEB_IMAGE}:local" . docker save "${WEB_IMAGE}:local" -o /tmp/web.tar - ./crane push --insecure /tmp/web.tar "${WEB_REF}:${BRANCH_TAG}" - ./crane push --insecure /tmp/web.tar "${WEB_REF}:${BRANCH_TAG}-${SHA_SHORT}" + ./crane push /tmp/web.tar "${WEB_REF}:${BRANCH_TAG}" + ./crane push /tmp/web.tar "${WEB_REF}:${BRANCH_TAG}-${SHA_SHORT}" if [ "${GITHUB_REF_NAME}" = "main" ]; then - ./crane push --insecure /tmp/web.tar "${WEB_REF}:latest" + ./crane push /tmp/web.tar "${WEB_REF}:latest" fi docker build \ @@ -190,13 +191,14 @@ jobs: -t "${CELERY_IMAGE}:local" . docker save "${CELERY_IMAGE}:local" -o /tmp/celery.tar - ./crane push --insecure /tmp/celery.tar "${CELERY_REF}:${BRANCH_TAG}" - ./crane push --insecure /tmp/celery.tar "${CELERY_REF}:${BRANCH_TAG}-${SHA_SHORT}" + ./crane push /tmp/celery.tar "${CELERY_REF}:${BRANCH_TAG}" + ./crane push /tmp/celery.tar "${CELERY_REF}:${BRANCH_TAG}-${SHA_SHORT}" if [ "${GITHUB_REF_NAME}" = "main" ]; then - ./crane push --insecure /tmp/celery.tar "${CELERY_REF}:latest" + ./crane push /tmp/celery.tar "${CELERY_REF}:latest" fi { + echo "Registry API: ${REGISTRY_API_URL}" echo "Pushed images:" echo "- ${WEB_REF}:${BRANCH_TAG}" echo "- ${WEB_REF}:${BRANCH_TAG}-${SHA_SHORT}" @@ -321,8 +323,8 @@ jobs: "actor": os.environ.get("GITHUB_ACTOR"), "target": os.environ.get("CURRENT_DOKPLOY_TARGET"), "images": { - "web": "10.10.0.50/avm/mostovik-backend-web:dev", - "celery": "10.10.0.50/avm/mostovik-backend-celery:dev", + "web": "registry.dev.nii-ecos.ru/avm/mostovik-backend-web:dev", + "celery": "registry.dev.nii-ecos.ru/avm/mostovik-backend-celery:dev", }, } print(json.dumps(payload, ensure_ascii=True, separators=(",", ":"))) @@ -367,6 +369,7 @@ jobs: { echo "Dokploy dev trigger completed." echo "Target: ${TARGET}" - echo "Web image: 10.10.0.50/avm/mostovik-backend-web:dev" - echo "Celery image: 10.10.0.50/avm/mostovik-backend-celery:dev" + echo "Registry API: ${REGISTRY_API_URL}" + echo "Web image: registry.dev.nii-ecos.ru/avm/mostovik-backend-web:dev" + echo "Celery image: registry.dev.nii-ecos.ru/avm/mostovik-backend-celery:dev" } >> "${GITHUB_STEP_SUMMARY:-/dev/stdout}"