diff --git a/.gitea/workflows/build-and-push.yml b/.gitea/workflows/build-and-push.yml index f47c5a3..134970a 100644 --- a/.gitea/workflows/build-and-push.yml +++ b/.gitea/workflows/build-and-push.yml @@ -13,26 +13,20 @@ jobs: - name: Checkout code uses: actions/checkout@v4 - - name: Setup Local Bridge - run: | - # Очищаем старые контейнеры - docker rm -f bridge || true - # Создаем туннель localhost:8080 -> Gitea:3000 - # Мы используем localhost, чтобы обойти проверку HTTPS - docker run -d --name bridge --network host --rm alpine sh -c "apk add socat && socat TCP-LISTEN:8080,fork,reuseaddr TCP:172.17.0.6:3000" - sleep 5 + - name: Log in to Gitea Container Registry + uses: docker/login-action@v3 + with: + # Теперь используем ваш красивый домен + registry: dungeonsiege.synology.me + username: ${{ secrets.GIT_USERNAME }} + password: ${{ secrets.GIT_TOKEN }} - - name: Log in to Gitea Registry - run: | - # Теперь, благодаря LOCAL_ROOT_URL, Gitea пришлет токен по внутреннему адресу - echo "${{ secrets.GIT_TOKEN }}" | docker login localhost:8080 -u ${{ secrets.GIT_USERNAME }} --password-stdin - - - name: Build and Push - run: | - # Сборка и отправка - docker build -t localhost:8080/poignatov/play-life:latest . - docker push localhost:8080/poignatov/play-life:latest - - # Дополнительный тег с SHA коммита - docker tag localhost:8080/poignatov/play-life:latest localhost:8080/poignatov/play-life:${{ github.sha }} - docker push localhost:8080/poignatov/play-life:${{ github.sha }} \ No newline at end of file + - name: Build and push Docker image + uses: docker/build-push-action@v5 + with: + context: . + file: ./Dockerfile + push: true + tags: | + dungeonsiege.synology.me/poignatov/play-life:latest + dungeonsiege.synology.me/poignatov/play-life:${{ github.sha }} \ No newline at end of file