Schema unification across app and cron

.dockerignore

@@ -0,0 +1,21 @@
+**/.git
+**/.gitignore
+**/.idea
+**/.vscode
+**/.DS_Store
+**/node_modules
+.env
+.env.*
+!.env.example
+secrets/
+
+# App-specific
+app/.svelte-kit
+app/build
+app/.npmrc
+app/.prettierignore
+app/.prettierrc
+app/.eslintignore
+app/.eslintrc.cjs
+app/npm-debug.log
+

app/Dockerfile

@@ -1,20 +1,18 @@
 # Builder image
 FROM node:lts AS builder
 
-# Set environment variables
 ARG NODE_ENV=development
 
-# Set working directory
 WORKDIR /usr/src/app
 
-# Copy package.json and package-lock.json
-COPY package*.json ./
+# Copy package.json from app subdirectory
+COPY app/package*.json ./
 
-# Install dependencies
 RUN npm ci
 
-# Copy source code
-COPY . .
+# Copy app source and shared schema
+COPY app/ .
+COPY classes-prisma/ /usr/src/classes-prisma/
 
 # Add build secrets
 RUN --mount=type=secret,id=postgres-user \
@@ -23,13 +21,10 @@ RUN --mount=type=secret,id=postgres-user \
 RUN --mount=type=secret,id=postgres-pass \
   POSTGRES_PASS=$(cat /run/secrets/postgres-pass)
 
-# Generate Prisma Client for build
 RUN npx prisma generate
 
-# Build the app
 RUN npm run build
 
-# Remove dev dependencies
 RUN npm prune --production
 
 # Running image
@@ -39,20 +34,17 @@ RUN apt-get update && apt-get upgrade -y
 
 ENV NODE_ENV=production
 
-# Set working directory
 WORKDIR /usr/src/app
 
-# Copy package.json
-COPY  --chown=node:node package*.json ./
+COPY --chown=node:node app/package*.json ./
 
-#Copy prisma files
-COPY --chown=node:node ./prisma ./prisma
+# Copy shared Prisma schema and migrations
+COPY --chown=node:node classes-prisma/ /usr/src/classes-prisma/
 
-# Copy built assets
 COPY --chown=node:node --from=builder /usr/src/app/build ./build
 COPY --chown=node:node --from=builder /usr/src/app/node_modules ./node_modules
 
-COPY --chown=node:node ./wait-for-it.sh /wait-for-it.sh
+COPY --chown=node:node app/wait-for-it.sh /wait-for-it.sh
 RUN chmod +x /wait-for-it.sh
 
 USER node

app/Dockerfile.dev

@@ -7,31 +7,27 @@ ENV NODE_ENV=development
 # Set working directory
 WORKDIR /usr/src/app
 
-# Copy package.json and package-lock.json
-COPY package*.json ./
+# Copy package.json from app subdirectory
+COPY app/package*.json ./
 
 # Install dependencies
 RUN npm install
 
-# Copy source code
-COPY . .
-
-# Build the app
-# RUN npm run build
+# Copy app source and shared schema
+COPY app/ .
+COPY classes-prisma/ /usr/src/classes-prisma/
 
 # Expose ports for SvelteKit and Vite's HMR
 EXPOSE 5173
 EXPOSE 24678
 EXPOSE 5555
 
-COPY ./entrypoint.sh /entrypoint.sh
-COPY ./wait-for-it.sh /wait-for-it.sh
+COPY app/entrypoint.sh /entrypoint.sh
+COPY app/wait-for-it.sh /wait-for-it.sh
 RUN chmod +x /entrypoint.sh \
     && chmod +x /wait-for-it.sh
 
 ENTRYPOINT [ "/wait-for-it.sh", "db:5432", "-t", "10", "-s" , "--", "/entrypoint.sh" ]
 
 # Start SvelteKit development server
 CMD ["npm", "run", "deploy:dev"]
-
-#CMD ["npx", "prisma", "studio", "--port", "5555"]

app/package.json

@@ -48,7 +48,6 @@
 	},
 	"type": "module",
 	"prisma": {
-		"seed": "vite-node ./prisma/seed.js",
-		"schema": "./prisma/schema.prisma"
+		"schema": "../classes-prisma/schema.prisma"
 	}
 }

compose.dev.yaml

@@ -25,8 +25,8 @@ services:
     env_file:
       - .env
     build:
-      context: ./app
-      dockerfile: Dockerfile.dev
+      context: .
+      dockerfile: app/Dockerfile.dev
       secrets:
         - postgres-user
         - postgres-password
@@ -44,6 +44,7 @@ services:
     volumes:
       - ./app:/usr/src/app
       - /usr/src/app/node_modules
+      - ./classes-prisma:/usr/src/classes-prisma
     environment:
       DEVELOPMENT: "true"
       TZ: "America/Chicago"
@@ -55,13 +56,16 @@ services:
   cron:
     env_file:
       - .env
-    build: ./cron-service
+    build:
+      context: .
+      dockerfile: cron-service/Dockerfile
     depends_on:
       - db
     restart: unless-stopped
     volumes:
       - ./cron-service:/var/task
       - /var/task/node_modules
+      - ./classes-prisma:/classes-prisma
     networks:
       - backend
 

compose.yaml

@@ -44,7 +44,9 @@ services:
   cron:
     env_file:
       - .env
-    build: ./cron-service
+    build:
+      context: .
+      dockerfile: cron-service/Dockerfile
     depends_on:
       - db
     restart: unless-stopped

cron-service/Dockerfile

@@ -1,22 +1,20 @@
 FROM public.ecr.aws/lambda/nodejs:22 AS builder
 
-# Set environment variables
-# ENV NODE_ENV=production
+COPY cron-service/package*.json ${LAMBDA_TASK_ROOT}/
 
-# Copy package.json and package-lock.json
-COPY package*.json ${LAMBDA_TASK_ROOT}
-
-# Install dependencies
 RUN npm ci --omit=dev
 
 FROM public.ecr.aws/lambda/nodejs:22 AS final
 
 COPY --from=builder /var/task/node_modules /var/task/node_modules
 
-COPY ./prisma ${LAMBDA_TASK_ROOT}/prisma
-COPY ./handler.js ${LAMBDA_TASK_ROOT}/handler.js
+COPY cron-service/prisma ${LAMBDA_TASK_ROOT}/prisma
+COPY cron-service/handler.js ${LAMBDA_TASK_ROOT}/handler.js
+COPY cron-service/package.json ${LAMBDA_TASK_ROOT}/package.json
 
-COPY ./package.json ${LAMBDA_TASK_ROOT}/package.json
+# Copy shared Prisma schema and migrations
+# schema path "../classes-prisma/schema.prisma" relative to /var/task resolves to /classes-prisma
+COPY classes-prisma/ /classes-prisma/
 
 # Generate Prisma Client for build
 RUN npx prisma generate

cron-service/package.json

@@ -12,6 +12,6 @@
 	"main": "handler.js",
 	"prisma": {
 		"seed": "node ./prisma/seed.js",
-		"schema": "./prisma/schema.prisma"
+		"schema": "../classes-prisma/schema.prisma"
 	}
 }