From dbcaef43d763fd4abc907bb01bc969b60ed3f5c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carl-Gerhard=20Lindesva=CC=88rd?= Date: Tue, 6 Feb 2024 13:12:12 +0100 Subject: [PATCH] update dashboard docker --- apps/web/Dockerfile | 41 +++++++++++++++++-- ...definition => captain-definition-dashboard | 4 +- 2 files changed, 39 insertions(+), 6 deletions(-) rename captain-definition => captain-definition-dashboard (92%) diff --git a/apps/web/Dockerfile b/apps/web/Dockerfile index 7e65edd4..feecd8ff 100644 --- a/apps/web/Dockerfile +++ b/apps/web/Dockerfile @@ -3,6 +3,21 @@ FROM --platform=linux/amd64 node:20-slim AS base ARG DATABASE_URL ENV DATABASE_URL=$DATABASE_URL +ARG CLICKHOUSE_DB +ENV CLICKHOUSE_DB=$CLICKHOUSE_DB + +ARG CLICKHOUSE_PASSWORD +ENV CLICKHOUSE_PASSWORD=$CLICKHOUSE_PASSWORD + +ARG CLICKHOUSE_URL +ENV CLICKHOUSE_URL=$CLICKHOUSE_URL + +ARG CLICKHOUSE_USER +ENV CLICKHOUSE_USER=$CLICKHOUSE_USER + +ARG REDIS_URL +ENV REDIS_URL=$REDIS_URL + ARG NEXTAUTH_SECRET ENV NEXTAUTH_SECRET=$NEXTAUTH_SECRET @@ -30,6 +45,9 @@ COPY package.json package.json COPY pnpm-lock.yaml pnpm-lock.yaml COPY pnpm-workspace.yaml pnpm-workspace.yaml COPY apps/web/package.json apps/web/package.json +COPY packages/db/package.json packages/db/package.json +COPY packages/queue/package.json packages/queue/package.json +COPY packages/common/package.json packages/common/package.json COPY packages/types/package.json packages/types/package.json # BUILD @@ -38,13 +56,13 @@ FROM base AS build WORKDIR /app/apps/web RUN pnpm install --frozen-lockfile --ignore-scripts -WORKDIR /app +WORKDIR /app COPY apps apps COPY packages packages COPY tooling tooling +RUN pnpm db:codegen WORKDIR /app/apps/web -RUN pnpm dlx prisma generate RUN pnpm run build # PROD @@ -58,9 +76,24 @@ FROM base AS runner COPY --from=build /app/package.json /app/package.json COPY --from=prod /app/node_modules /app/node_modules +# Apps COPY --from=build /app/apps/web /app/apps/web +# Apps node_modules COPY --from=prod /app/apps/web/node_modules /app/apps/web/node_modules +# Packages +COPY --from=build /app/packages/db /app/packages/db +COPY --from=build /app/packages/common /app/packages/common +COPY --from=build /app/packages/queue /app/packages/queue +COPY --from=build /app/packages/types /app/packages/types +# Packages node_modules +COPY --from=prod /app/packages/db/node_modules /app/packages/db/node_modules +COPY --from=prod /app/packages/common/node_modules /app/packages/common/node_modules +COPY --from=prod /app/packages/queue/node_modules /app/packages/queue/node_modules + +RUN pnpm db:codegen + WORKDIR /app/apps/web -RUN pnpm dlx prisma generate + EXPOSE 3000 -CMD [ "pnpm", "start" ] \ No newline at end of file + +CMD ["pnpm", "start"] \ No newline at end of file diff --git a/captain-definition b/captain-definition-dashboard similarity index 92% rename from captain-definition rename to captain-definition-dashboard index c0ac234f..3a98786d 100644 --- a/captain-definition +++ b/captain-definition-dashboard @@ -1,4 +1,4 @@ - { +{ "schemaVersion": 2, "dockerfilePath": "./apps/web/Dockerfile" - } \ No newline at end of file +}