dev #9

Merged
avm merged 100 commits from dev into main 2026-03-17 16:06:44 +03:00
Showing only changes of commit 823dc2f83d - Show all commits

View File

@@ -123,13 +123,16 @@ jobs:
- name: Login to Gitea Container Registry - name: Login to Gitea Container Registry
run: | 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 - name: Build and push images
run: | run: |
BRANCH_TAG=$(echo ${GITHUB_REF_NAME} | sed 's/\//-/g') BRANCH_TAG=$(echo ${GITHUB_REF_NAME} | sed 's/\//-/g')
SHA_SHORT=$(echo ${GITHUB_SHA} | cut -c1-7) 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 # Build and push web image
docker build -f ./docker/Dockerfile.web \ docker build -f ./docker/Dockerfile.web \
@@ -161,4 +164,5 @@ jobs:
- name: Image summary - name: Image summary
run: | 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 }}/"