diff --git a/Dockerfile b/Dockerfile index c166b16..f7e6335 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ FROM ghcr.io/diced/prisma-binaries:4.8.x as prisma FROM node:18-alpine3.16 as base # Set the working directory -WORKDIR /app +WORKDIR /zipline # Copy the necessary files from the project COPY prisma ./prisma @@ -48,9 +48,6 @@ FROM base RUN apk add --no-cache perl procps -# Set the working directory -WORKDIR /app - COPY --from=builder /prisma-engines /prisma-engines ENV PRISMA_QUERY_ENGINE_BINARY=/prisma-engines/query-engine \ PRISMA_MIGRATION_ENGINE_BINARY=/prisma-engines/migration-engine \ @@ -61,13 +58,13 @@ ENV PRISMA_QUERY_ENGINE_BINARY=/prisma-engines/query-engine \ NEXT_TELEMETRY_DISABLED=1 # Copy only the necessary files from the previous stage -COPY --from=builder /app/dist ./dist -COPY --from=builder /app/.next ./.next -COPY --from=builder /app/package.json ./package.json +COPY --from=builder /zipline/dist ./dist +COPY --from=builder /zipline/.next ./.next +COPY --from=builder /zipline/package.json ./package.json -COPY --from=builder /tmp/node_modules ./node_modules -COPY --from=builder /app/node_modules/.prisma/client ./node_modules/.prisma/client -COPY --from=builder /app/node_modules/@prisma/client ./node_modules/@prisma/client +COPY --from=builder /zipline/node_modules ./node_modules +COPY --from=builder /zipline/node_modules/.prisma/client ./node_modules/.prisma/client +COPY --from=builder /zipline/node_modules/@prisma/client ./node_modules/@prisma/client # Run the application CMD ["node", "--enable-source-maps", "dist/index.js"] \ No newline at end of file diff --git a/src/lib/config.ts b/src/lib/config.ts index c740c32..fe3fc6d 100644 --- a/src/lib/config.ts +++ b/src/lib/config.ts @@ -5,3 +5,7 @@ import validateConfig from 'config/validateConfig'; if (!global.config) global.config = validateConfig(readConfig()); export default global.config as Config; + +declare global { + var config: Config; +} diff --git a/src/lib/datasource.ts b/src/lib/datasource.ts index 6eb35a8..38e29dd 100644 --- a/src/lib/datasource.ts +++ b/src/lib/datasource.ts @@ -24,3 +24,7 @@ if (!global.datasource) { } export default global.datasource as Datasource; + +declare global { + var datasource: Datasource; +} diff --git a/src/lib/prisma.ts b/src/lib/prisma.ts index e24b45b..162590e 100644 --- a/src/lib/prisma.ts +++ b/src/lib/prisma.ts @@ -5,3 +5,7 @@ if (!global.prisma) { } export default global.prisma as PrismaClient; + +declare global { + var prisma: PrismaClient; +} diff --git a/zip-env.d.ts b/zip-env.d.ts deleted file mode 100644 index ae0f5a9..0000000 --- a/zip-env.d.ts +++ /dev/null @@ -1,17 +0,0 @@ -import type { PrismaClient } from '@prisma/client'; -import type { Datasource } from 'lib/datasources'; -import type { Config } from '.lib/types'; - -declare global { - namespace NodeJS { - interface Global { - prisma: PrismaClient; - config: Config; - datasource: Datasource; - } - - interface ProcessEnv { - ZIPLINE_DOCKER_BUILD: string | '1'; - } - } -}