Merge pull request #90 from 9technologygroup/fix/locks_and_docker

fix: Revert Dockerfile edits and lockfile changes

.github/workflows/docker.yml

@@ -8,6 +8,13 @@ on:
   release:
     types:
       - published
+  workflow_dispatch:
+    inputs:
+      push:
+        description: Push images to registry
+        required: false
+        type: boolean
+        default: false
 
 env:
   REGISTRY: ghcr.io
@@ -30,6 +37,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Log in to Container Registry
+        if: github.event_name != 'workflow_dispatch' || github.event_name == 'workflow_dispatch' && github.event.inputs.push == 'true'
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
@@ -51,6 +59,7 @@ jobs:
             type=raw,value=latest,enable={{is_default_branch}}
 
       - name: Build and push ${{ matrix.image }} image
+        if: github.event_name != 'workflow_dispatch' || github.event_name == 'workflow_dispatch' && github.event.inputs.push == 'true'
         uses: docker/build-push-action@v6
         with:
           context: .

docker/backend.Dockerfile

@@ -4,19 +4,13 @@ RUN apk add --no-cache openssl
 
 WORKDIR /app
 
-# Copy backend package files
-COPY --chown=node:node backend/package*.json /app/backend/
+COPY --chown=node:node package*.json /app/
+COPY --chown=node:node backend/ /app/backend/
 
 WORKDIR /app/backend
 
-# Install backend dependencies (now has its own package-lock.json)
-RUN npm ci --ignore-scripts
-
-# Copy backend source after dependencies are installed
-COPY --chown=node:node backend/ /app/backend/
-
-# Generate Prisma client and clean up
-RUN npx prisma generate &&\
+RUN npm ci --ignore-scripts &&\
+    npx prisma generate &&\
     npm prune --omit=dev &&\
     npm cache clean --force
 
@@ -35,6 +29,7 @@ USER node
 WORKDIR /app
 
 COPY --from=builder /app/backend /app/backend
+COPY --from=builder /app/node_modules /app/node_modules
 COPY --chown=node:node agents ./agents_backup
 COPY --chown=node:node agents ./agents
 COPY --chmod=755 docker/backend.docker-entrypoint.sh ./entrypoint.sh

docker/frontend.Dockerfile

@@ -2,19 +2,14 @@ FROM node:lts-alpine AS builder
 
 WORKDIR /app
 
-# Copy frontend package files
+COPY package*.json ./
 COPY frontend/package*.json ./frontend/
 
-WORKDIR /app/frontend
-
-# Install frontend dependencies (now has its own package-lock.json)
 RUN npm ci --ignore-scripts
 
-# Copy frontend source after dependencies are installed
-COPY frontend/ ./
+COPY frontend/ ./frontend/
 
-# Build the frontend
-RUN npm run build
+RUN npm run build:frontend
 
 FROM nginxinc/nginx-unprivileged:alpine