From f0d1156457b21145798f6798abca769085255c0d Mon Sep 17 00:00:00 2001 From: masoodafar-web Date: Wed, 11 Feb 2026 00:41:38 +0330 Subject: [PATCH] fix: update Docker daemon startup options and improve readiness checks in deployment workflows --- .gitea/workflows/kub-deploy.yml | 10 ++-- .gitea/workflows/prod-deploy.yml | 88 ++++++++++++++------------------ 2 files changed, 44 insertions(+), 54 deletions(-) diff --git a/.gitea/workflows/kub-deploy.yml b/.gitea/workflows/kub-deploy.yml index bc3d1ae..606a25a 100644 --- a/.gitea/workflows/kub-deploy.yml +++ b/.gitea/workflows/kub-deploy.yml @@ -26,7 +26,7 @@ jobs: } DAEMON echo "🚀 Starting Docker daemon..." - dockerd & + dockerd --iptables=false --ip6tables=false --bridge=none --storage-driver=vfs & # Wait up to 3 minutes for Docker to be ready for i in $(seq 1 90); do @@ -50,14 +50,18 @@ jobs: run: | git clone --depth 1 --branch kub-stage http://gitea-svc:3000/admin/FrontOffice.git . + - name: Login to Docker registries + run: | + echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login 194.5.195.53:32082 -u admin --password-stdin + echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login ${{ env.REGISTRY }} -u admin --password-stdin + - name: Build Docker Image run: | cd src - docker build -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest -f FrontOffice.Main/Dockerfile . + DOCKER_BUILDKIT=0 docker build --network host -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest -f FrontOffice.Main/Dockerfile . - name: Push to Registry run: | - echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login ${{ env.REGISTRY }} -u admin --password-stdin docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest - name: Deploy to Kubernetes diff --git a/.gitea/workflows/prod-deploy.yml b/.gitea/workflows/prod-deploy.yml index fdcc1b0..5e7ada2 100644 --- a/.gitea/workflows/prod-deploy.yml +++ b/.gitea/workflows/prod-deploy.yml @@ -6,84 +6,70 @@ on: - production env: - REGISTRY: gitea-svc:3000 -<<<<<<< HEAD - EXTERNAL_REGISTRY: 194.5.195.53:30080 -======= - EXTERNAL_REGISTRY: git.kbs1.ir ->>>>>>> production + REGISTRY: 194.5.195.53:30080 IMAGE_NAME: admin/frontoffice + K8S_SERVER: 194.5.195.53 jobs: build-and-deploy: runs-on: ubuntu-latest container: - image: docker:latest + image: 194.5.195.53:32082/docker-sshpass:latest options: --privileged - env: - HTTP_PROXY: http://proxyuser:87zH26nbqT2@46.249.98.211:3128 - HTTPS_PROXY: http://proxyuser:87zH26nbqT2@46.249.98.211:3128 - NO_PROXY: localhost,127.0.0.1,gitea-svc,45.149.79.127,194.5.195.53,10.0.0.0/8 steps: - # - name: Install dependencies - # run: | - # apk add --no-cache git curl - # curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" - # chmod +x kubectl - # mv kubectl /usr/local/bin/ - - name: Start Docker daemon run: | mkdir -p /etc/docker cat > /etc/docker/daemon.json << 'DAEMON' { -<<<<<<< HEAD - "insecure-registries": ["194.5.195.53:30080", "gitea-svc:3000"] -======= - "insecure-registries": ["194.5.195.53:32082", "git.kbs1.ir", "gitea-svc:3000"] ->>>>>>> production + "insecure-registries": ["194.5.195.53:30080", "194.5.195.53:32500", "194.5.195.53:32082"] } DAEMON - mkdir -p ~/.docker - cat > ~/.docker/config.json << 'CONF' - { - "proxies": { - "default": { - "httpProxy": "http://proxyuser:87zH26nbqT2@46.249.98.211:3128", - "httpsProxy": "http://proxyuser:87zH26nbqT2@46.249.98.211:3128", - "noProxy": "localhost,127.0.0.1,gitea-svc,194.5.195.53,10.0.0.0/8" - } - } - } - CONF - dockerd & - for i in $(seq 1 30); do docker info >/dev/null 2>&1 && break || sleep 2; done - + echo "🚀 Starting Docker daemon..." + dockerd --iptables=false --ip6tables=false --bridge=none --storage-driver=vfs & + + for i in $(seq 1 90); do + if docker info >/dev/null 2>&1; then + echo "✅ Docker daemon is ready (attempt $i)" + docker version + break + else + echo "⏳ Waiting for Docker daemon... (attempt $i/90)" + sleep 2 + fi + done + + if ! docker info >/dev/null 2>&1; then + echo "❌ Docker daemon failed to start after 3 minutes" + exit 1 + fi + - name: Checkout code run: | git clone --depth 1 --branch production http://gitea-svc:3000/admin/FrontOffice.git . - git log -1 --format="%H %s" + + - name: Login to Docker registries + run: | + echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login 194.5.195.53:32082 -u admin --password-stdin + echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login ${{ env.REGISTRY }} -u admin --password-stdin - name: Build Docker Image run: | cd src - docker build -f FrontOffice.Main/Dockerfile \ - -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }} \ + DOCKER_BUILDKIT=0 docker build --network host -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }} \ -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:prod \ - -t ${{ env.EXTERNAL_REGISTRY }}/${{ env.IMAGE_NAME }}:prod \ - . + -f FrontOffice.Main/Dockerfile . - name: Push to Registry run: | - echo "87zH26nbqT" | docker login ${{ env.REGISTRY }} -u admin --password-stdin docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }} docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:prod - echo "87zH26nbqT" | docker login ${{ env.EXTERNAL_REGISTRY }} -u admin --password-stdin - docker push ${{ env.EXTERNAL_REGISTRY }}/${{ env.IMAGE_NAME }}:prod - + - name: Deploy to Production run: | - mkdir -p ~/.kube - echo "${{ secrets.KUBECONFIG_PROD }}" | base64 -d > ~/.kube/config - kubectl rollout restart deployment/frontoffice || echo "Deployment not found" - kubectl rollout status deployment/frontoffice --timeout=5m || echo "Rollout pending" + export SSHPASS="${{ secrets.SERVER_PASSWORD }}" + sshpass -e ssh -o StrictHostKeyChecking=no root@${{ env.K8S_SERVER }} " + kubectl rollout restart deployment/frontoffice + kubectl rollout status deployment/frontoffice --timeout=300s + " + echo "✅ Deployed to Production!"