diff --git a/.forgejo/workflows/docker-api.yml b/.forgejo/workflows/docker-api.yml index aa0edd1..8a24eab 100644 --- a/.forgejo/workflows/docker-api.yml +++ b/.forgejo/workflows/docker-api.yml @@ -25,19 +25,22 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Build + push (buildx with registry cache) + - name: Build + push (Docker daemon layer-cache) env: SHA: ${{ github.sha }} + DOCKER_BUILDKIT: '1' run: | - docker buildx create --use --name fmbuilder --driver docker-container 2>/dev/null \ - || docker buildx use fmbuilder - docker buildx build \ + # Используем обычный docker build — у host docker daemon в + # /etc/docker/daemon.json уже прописан 127.0.0.1:5001 как + # insecure-registry, и docker layer-cache между сборками + # дает быстрый dotnet restore/pnpm install при стабильных манифестах. + docker build \ -f deploy/Dockerfile.api \ -t $LOCAL_REGISTRY/food-market-api:$SHA \ -t $LOCAL_REGISTRY/food-market-api:latest \ - --cache-from type=registry,ref=$LOCAL_REGISTRY/food-market-api:buildcache \ - --cache-to type=registry,ref=$LOCAL_REGISTRY/food-market-api:buildcache,mode=max \ - --push . + . + docker push $LOCAL_REGISTRY/food-market-api:$SHA + docker push $LOCAL_REGISTRY/food-market-api:latest deploy: name: Deploy API on stage diff --git a/.forgejo/workflows/docker-web.yml b/.forgejo/workflows/docker-web.yml index be13c08..a091b1c 100644 --- a/.forgejo/workflows/docker-web.yml +++ b/.forgejo/workflows/docker-web.yml @@ -21,19 +21,18 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Build + push (buildx with registry cache) + - name: Build + push (Docker daemon layer-cache) env: SHA: ${{ github.sha }} + DOCKER_BUILDKIT: '1' run: | - docker buildx create --use --name fmbuilder --driver docker-container 2>/dev/null \ - || docker buildx use fmbuilder - docker buildx build \ + docker build \ -f deploy/Dockerfile.web \ -t $LOCAL_REGISTRY/food-market-web:$SHA \ -t $LOCAL_REGISTRY/food-market-web:latest \ - --cache-from type=registry,ref=$LOCAL_REGISTRY/food-market-web:buildcache \ - --cache-to type=registry,ref=$LOCAL_REGISTRY/food-market-web:buildcache,mode=max \ - --push . + . + docker push $LOCAL_REGISTRY/food-market-web:$SHA + docker push $LOCAL_REGISTRY/food-market-web:latest deploy: name: Deploy Web on stage