Skip to content

Commit f68f676

Browse files
Hopefully fixing workflow
1 parent 2ca2ecc commit f68f676

4 files changed

Lines changed: 13 additions & 7 deletions

File tree

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ COPY package*.json ./
1010
# Install dependencies (including dev dependencies for build)
1111
RUN npm ci
1212

13-
# Copy prisma schema
13+
# Copy prisma schema and TypeScript files
1414
COPY prisma ./prisma/
1515

1616
# Generate Prisma client
@@ -20,7 +20,7 @@ RUN npx prisma generate
2020
COPY tsconfig.json ./
2121
COPY src ./src/
2222

23-
# Build the TypeScript application
23+
# Build the TypeScript application (this will compile both src/ and prisma/)
2424
RUN npm run build
2525

2626
# Production stage

docker-compose.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ version: '3.8'
33
services:
44
app:
55
image: cornellappdev/eatery-blue-dev:${IMAGE_TAG}
6-
volumes:
7-
- ./firebase-service-account.json:/app/firebase-service-account.json:ro
6+
configs:
7+
- source: firebase_service_account
8+
target: /app/firebase-service-account.json
89
env_file: .env
910
networks:
1011
- eatery-network
@@ -23,3 +24,7 @@ services:
2324
networks:
2425
eatery-network:
2526
driver: overlay
27+
28+
configs:
29+
firebase_service_account:
30+
file: ./firebase-service.account.json

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
"version": "1.0.0",
44
"type": "module",
55
"description": "",
6-
"main": "dist/server.js",
6+
"main": "dist/src/server.js",
77
"scripts": {
88
"build": "tsc",
9-
"start": "NODE_ENV=production node dist/server.js",
10-
"start:dev": "NODE_ENV=development node dist/server.js",
9+
"start": "NODE_ENV=production node dist/src/server.js",
10+
"start:dev": "NODE_ENV=development node dist/src/server.js",
1111
"dev": "NODE_ENV=development nodemon -x tsx src/server.ts",
1212
"lint": "eslint '{src,test}/**/*.ts' --fix",
1313
"format": "prettier --write '{src,test}/**/*.ts'",

tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"module": "NodeNext",
55
"moduleResolution": "NodeNext",
66
"lib": ["es2020"],
7+
"rootDir": ".",
78
"outDir": "./dist",
89
"esModuleInterop": true,
910
"resolveJsonModule": true,

0 commit comments

Comments
 (0)