From 8f181bdc94ff80c248039d3378318314382cb730 Mon Sep 17 00:00:00 2001 From: Lauren Liberda Date: Thu, 29 Jul 2021 02:25:33 +0200 Subject: [PATCH] fix docker builds (now with frontend!) --- .dockerignore | 2 +- Dockerfile | 4 ++++ package.json | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.dockerignore b/.dockerignore index 8242525..322de07 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,5 @@ node_modules dist -frontend +frontend/src/generated .env schema.graphql \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 5972f2f..983a9c5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,11 @@ RUN yarn install --frozen-lockfile COPY tsconfig.json . COPY tsconfig.build.json . +COPY webpack.config.js . +COPY gql-codegen.yml . +COPY scripts scripts COPY migration migration +COPY frontend frontend COPY src src RUN yarn build diff --git a/package.json b/package.json index baf9f11..b2b877f 100644 --- a/package.json +++ b/package.json @@ -39,9 +39,11 @@ "@nestjs/core": "^7.6.15", "@nestjs/graphql": "^7.11.0", "@nestjs/platform-fastify": "^7.6.18", + "@nestjs/serve-static": "^2.2.2", "@nestjs/typeorm": "^7.1.5", "apollo-server-fastify": "^2.25.2", "dotenv": "^10.0.0", + "fastify-static": "^4.2.2", "graphql": "^15.5.1", "graphql-tools": "^7.0.5", "pg": "^8.6.0", @@ -57,7 +59,6 @@ "@graphql-codegen/typescript": "1.23.0", "@nestjs/cli": "^7.6.0", "@nestjs/schematics": "^7.3.0", - "@nestjs/serve-static": "^2.2.2", "@nestjs/testing": "^7.6.15", "@types/dotenv": "^8.2.0", "@types/jest": "^26.0.22", @@ -71,7 +72,6 @@ "eslint-config-prettier": "^8.1.0", "eslint-plugin-prettier": "^3.3.1", "extract-text-webpack-plugin": "^4.0.0-beta.0", - "fastify-static": "^4.2.2", "graphql": "^15.5.1", "handlebars": "^4.7.7", "handlebars-loader": "^1.7.1",