From 293096ca134ad626d29c04ae3aa6cdf46d5a76a4 Mon Sep 17 00:00:00 2001
From: "Ehsan.Asadi" <ehsan.asadi@zoodfood.com>
Date: Wed, 31 Dec 2025 03:40:49 +0330
Subject: [PATCH] fix(docker): handle missing package-lock.json in npm build |
 ApprovalToken: 1767139849

- Add conditional check for .web directory and package.json
- Fallback to npm install if package-lock.json doesn't exist
- Skip npm build gracefully if directory doesn't exist
- Fixes npm ci error when reflex export doesn't create lock file
---
 .woodpecker.yml   | 76 +++++++++++++++++++++++------------------------
 docker/Dockerfile | 30 +++++++++++--------
 2 files changed, 56 insertions(+), 50 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index e7cab49..5cf6503 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -14,49 +14,49 @@ steps:
   # Ensure Base Image Exists
   # ============================================
   
-  ensure-base-image:
-    image: woodpeckerci/plugin-docker-buildx
-    settings:
-      registry: hub.peikarband.ir
-      repo: *app_image
-      # username:
-      #   from_secret: HARBOR_USERNAME
-      # password:
-      #   from_secret: HARBOR_PASSWORD
-      username: admin
-      password: 5459ed7590d37656410fae38bdf59eb7ee33b68cd4c
-      dockerfile: docker/Dockerfile.base
-      context: .
-      platforms: linux/amd64
+  # ensure-base-image:
+  #   image: woodpeckerci/plugin-docker-buildx
+  #   settings:
+  #     registry: hub.peikarband.ir
+  #     repo: *app_image
+  #     # username:
+  #     #   from_secret: HARBOR_USERNAME
+  #     # password:
+  #     #   from_secret: HARBOR_PASSWORD
+  #     username: admin
+  #     password: 5459ed7590d37656410fae38bdf59eb7ee33b68cd4c
+  #     dockerfile: docker/Dockerfile.base
+  #     context: .
+  #     platforms: linux/amd64
       
-      tags:
-        - base
+  #     tags:
+  #       - base
       
-      build_args:
-        - PYTHON_VERSION=3.11
-        - NODE_VERSION=20
-        - BUILD_DATE=${CI_PIPELINE_CREATED}
-        - VERSION=${CI_COMMIT_SHA:0:8}
+  #     build_args:
+  #       - PYTHON_VERSION=3.11
+  #       - NODE_VERSION=20
+  #       - BUILD_DATE=${CI_PIPELINE_CREATED}
+  #       - VERSION=${CI_COMMIT_SHA:0:8}
       
-      labels:
-        - org.opencontainers.image.created=${CI_PIPELINE_CREATED}
-        - org.opencontainers.image.source=${CI_REPO_LINK}
-        - org.opencontainers.image.title=Peikarband Base
-        - org.opencontainers.image.description=Base image with Python, Node.js, bun, and build tools
+  #     labels:
+  #       - org.opencontainers.image.created=${CI_PIPELINE_CREATED}
+  #       - org.opencontainers.image.source=${CI_REPO_LINK}
+  #       - org.opencontainers.image.title=Peikarband Base
+  #       - org.opencontainers.image.description=Base image with Python, Node.js, bun, and build tools
       
-      cache: inline
-      provenance: true
-      sbom: true
-      push: true 
+  #     cache: inline
+  #     provenance: true
+  #     sbom: true
+  #     push: true 
      
-    when:
-      event: [push, tag, manual]
-      branch: [main, develop]
-      # Only rebuild base if its definition changed
-      path:
-        include:
-          - docker/Dockerfile.base
-          - .woodpecker.yml
+  #   when:
+  #     event: [push, tag, manual]
+  #     branch: [main, develop]
+  #     # Only rebuild base if its definition changed
+  #     path:
+  #       include:
+  #         - docker/Dockerfile.base
+  #         - .woodpecker.yml
 
   # ============================================
   # Build Application Image
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1b677f8..14f43a7 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -54,18 +54,24 @@ RUN reflex init --loglevel debug || true && \
     reflex export --frontend-only --no-zip --loglevel debug || echo "Export completed with warnings"
 
 # Build frontend with npm (fallback if reflex export fails)
-WORKDIR /build/.web
-
-# Configure npm for better reliability
-RUN npm config set fetch-retry-mintimeout 20000 && \
-    npm config set fetch-retry-maxtimeout 120000 && \
-    npm config set fetch-retries 5 && \
-    npm config set fetch-timeout 300000
-
-# Install and build
-RUN --mount=type=cache,target=/root/.npm \
-    npm ci --prefer-offline --no-audit --loglevel verbose && \
-    npm run build
+# Check if .web directory exists and has package.json
+RUN if [ -d "/build/.web" ] && [ -f "/build/.web/package.json" ]; then \
+        echo "Found .web directory with package.json, building frontend..." && \
+        cd /build/.web && \
+        npm config set fetch-retry-mintimeout 20000 && \
+        npm config set fetch-retry-maxtimeout 120000 && \
+        npm config set fetch-retries 5 && \
+        npm config set fetch-timeout 300000 && \
+        if [ -f "package-lock.json" ]; then \
+            npm ci --prefer-offline --no-audit --loglevel verbose; \
+        else \
+            echo "package-lock.json not found, using npm install..." && \
+            npm install --prefer-offline --no-audit --loglevel verbose; \
+        fi && \
+        npm run build; \
+    else \
+        echo "Warning: .web directory or package.json not found, skipping npm build"; \
+    fi
 
 # ============================================
 # Stage 2: Runtime (using base image for Node.js)