diff --git a/.gitea/workflows/prod-deploy.yml b/.gitea/workflows/prod-deploy.yml index 6de58eb..2ce2c7f 100644 --- a/.gitea/workflows/prod-deploy.yml +++ b/.gitea/workflows/prod-deploy.yml @@ -6,55 +6,47 @@ on: - production env: - REGISTRY: gitea-svc:3000 - EXTERNAL_REGISTRY: git.foursat.afrino.co + REGISTRY: 194.5.195.53:30080 IMAGE_NAME: admin/backoffice-bff + K8S_SERVER: 45.149.79.127 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' { - "insecure-registries": ["git.foursat.afrino.co", "gitea-svc:3000"] + "insecure-registries": ["194.5.195.53:30080", "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 + echo "🚀 Starting Docker daemon..." dockerd & - for i in $(seq 1 30); do docker info >/dev/null 2>&1 && break || sleep 2; done - + + 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" + exit 1 + fi + - name: Checkout code run: | git clone --depth 1 --branch production http://gitea-svc:3000/admin/BackOffice.BFF.git . - git log -1 --format="%H %s" - name: Build Docker Image run: | @@ -62,22 +54,15 @@ jobs: docker build -f BackOffice.BFF.WebApi/Dockerfile \ -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }} \ -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:prod \ - -t ${{ env.EXTERNAL_REGISTRY }}/${{ env.IMAGE_NAME }}:prod \ - --build-arg HTTP_PROXY=http://proxyuser:87zH26nbqT2@46.249.98.211:3128 \ - --build-arg HTTPS_PROXY=http://proxyuser:87zH26nbqT2@46.249.98.211:3128 \ . - name: Push to Registry run: | - echo "87zH26nbqT" | docker login ${{ env.REGISTRY }} -u admin --password-stdin + echo "${{ secrets.REGISTRY_PASSWORD }}" | 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/backoffice-bff || echo "Deployment not found" - kubectl rollout status deployment/backoffice-bff --timeout=5m || echo "Rollout pending" + sshpass -p "${{ secrets.K8S_SSH_PASSWORD }}" ssh -o StrictHostKeyChecking=no root@${{ env.K8S_SERVER }} \ + "kubectl rollout restart deployment/backoffice-bff && kubectl rollout status deployment/backoffice-bff --timeout=5m" || echo "Deployment pending" diff --git a/src/BackOffice.BFF.WebApi/Dockerfile b/src/BackOffice.BFF.WebApi/Dockerfile index 8a4808e..c67a93f 100644 --- a/src/BackOffice.BFF.WebApi/Dockerfile +++ b/src/BackOffice.BFF.WebApi/Dockerfile @@ -1,10 +1,10 @@ -FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base +FROM 194.5.195.53:32082/dotnet/aspnet:9.0 AS base USER $APP_UID WORKDIR /app EXPOSE 8080 EXPOSE 8081 -FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build +FROM 194.5.195.53:32082/dotnet/sdk:9.0 AS build ARG BUILD_CONFIGURATION=Release WORKDIR /src COPY ["BackOffice.BFF.WebApi/NuGet.config", "NuGet.config"]