Skip to content

Commit

Permalink
Some tweaks (docker still not working)
Browse files Browse the repository at this point in the history
  • Loading branch information
dcramer committed May 10, 2023
1 parent 9392a9a commit 42dfe61
Show file tree
Hide file tree
Showing 4 changed files with 208 additions and 2,176 deletions.
7 changes: 4 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ FROM node:18-alpine as base
# set for base and all layer that inherit from it
ENV NODE_ENV production

RUN npm -i -g pnpm
RUN npm install -g pnpm

FROM base as deps

WORKDIR /app

ADD package.json pnpm-lock.yaml .
ADD package.json pnpm-lock.yaml pnpm-workspace.yaml .
ADD packages ./packages
ADD apps/web/package.json ./apps/web/package.json
ADD apps/api/package.json ./apps/api/package.json
Expand Down Expand Up @@ -39,8 +39,8 @@ ARG GOOGLE_CLIENT_ID
ENV GOOGLE_CLIENT_ID $GOOGLE_CLIENT_ID

COPY --from=deps /app/node_modules ./node_modules
COPY --from=deps /app/apps/web/node_modules ./node_modules
COPY --from=deps /app/packages/shared ./node_modules/@peated/shared

ADD apps/web/ .

RUN --mount=type=secret,id=SENTRY_AUTH_TOKEN \
Expand All @@ -53,6 +53,7 @@ FROM base as build-api
WORKDIR /app

COPY --from=deps /app/node_modules ./node_modules
COPY --from=deps /app/apps/api/node_modules ./node_modules
COPY --from=deps /app/packages/shared ./node_modules/@peated/shared

ADD apps/api/ .
Expand Down
4 changes: 1 addition & 3 deletions apps/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,7 @@
"ts-node": "^10.9.1",
"typescript": "^5.0.3",
"vite-tsconfig-paths": "^4.0.8",
"vitest": "^0.29.8"
},
"devDependencies": {
"vitest": "^0.29.8",
"@types/pg": "^8.6.6",
"drizzle-kit": "^0.17.6"
}
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"dotenv": "^16.0.3",
"dotenv-cli": "^7.1.0",
"foreman": "^3.0.1",
"npm-run-all": "^4.1.5",
"pnpm": "^8.5.0"
},
"engines": {
Expand Down
Loading

0 comments on commit 42dfe61

Please sign in to comment.