diff --git a/.gitea/workflows/ci-cd.yml b/.gitea/workflows/ci-cd.yml index bdfb1c0..c28c5bc 100644 --- a/.gitea/workflows/ci-cd.yml +++ b/.gitea/workflows/ci-cd.yml @@ -123,13 +123,16 @@ jobs: - name: Login to Gitea Container Registry run: | - echo "${{ gitea.token }}" | docker login ${{ vars.GITEA_REGISTRY_URL }} -u ${{ gitea.actor }} --password-stdin + # Извлекаем host:port из GITHUB_SERVER_URL (http://10.10.0.10:3000 -> 10.10.0.10:3000) + REGISTRY_URL=$(echo ${GITHUB_SERVER_URL} | sed 's|.*://||') + echo "${{ gitea.token }}" | docker login ${REGISTRY_URL} -u ${{ gitea.actor }} --password-stdin - name: Build and push images run: | BRANCH_TAG=$(echo ${GITHUB_REF_NAME} | sed 's/\//-/g') SHA_SHORT=$(echo ${GITHUB_SHA} | cut -c1-7) - REGISTRY="${{ vars.GITEA_REGISTRY_URL }}/${{ github.repository_owner }}" + REGISTRY_URL=$(echo ${GITHUB_SERVER_URL} | sed 's|.*://||') + REGISTRY="${REGISTRY_URL}/${{ github.repository_owner }}" # Build and push web image docker build -f ./docker/Dockerfile.web \ @@ -161,4 +164,5 @@ jobs: - name: Image summary run: | - echo "Images pushed to ${{ vars.GITEA_REGISTRY_URL }}/${{ github.repository_owner }}/" + REGISTRY_URL=$(echo ${GITHUB_SERVER_URL} | sed 's|.*://||') + echo "Images pushed to ${REGISTRY_URL}/${{ github.repository_owner }}/"