Some deployment fixes

.dockerignore

@@ -0,0 +1 @@
+node_modules/

Dockerfile

@@ -1,7 +1,19 @@
-FROM node:14.4.0
+FROM node:alpine AS builder
-USER root
 WORKDIR /backend
-COPY . /backend
+COPY package.json /backend/package.json
 RUN yarn
+COPY . /backend
+RUN yarn codegen
+RUN yarn prisma generate
 RUN yarn build
-CMD [ "node", "./dist/index.js" ]
+
+FROM node:alpine
+WORKDIR /backend
+COPY --from=builder /backend/dist /backend
+COPY package.json /backend/package.json
+RUN yarn install --prod
+COPY --from=builder /backend/node_modules/@prisma/client /backend/node_modules/@prisma/client
+COPY --from=builder /backend/node_modules/.prisma/client/ /backend/node_modules/.prisma/client/
+COPY --from=builder /backend/prisma /backend/prisma
+USER node
+CMD [ "node", "./index.js" ]

package.json

@@ -18,7 +18,7 @@
   "scripts": {
     "dev": "nodemon",
     "start": "ts-node src/index.ts",
-    "copy-assets": "cp src/typeDefs/typeDefs.gql dist/typeDefs/typeDefs.gql && cp .env.example dist/.env && vi dist/.env",
+    "copy-assets": "cp src/typeDefs/typeDefs.gql dist/typeDefs/typeDefs.gql",
     "build": "tsc && yarn copy-assets",
     "codegen": "graphql-codegen --config codegen.yml",
     "lint": "eslint",
@@ -32,6 +32,7 @@
     "@types/dotenv": "^8.2.0",
     "dotenv": "^8.2.0",
     "ts-node": "^9.0.0",
-    "typescript": "^4.0.3"
+    "typescript": "^4.0.3",
+    "@prisma/cli": "2.8.1"
   }
 }

src/controllers/auth.ts

@@ -6,8 +6,6 @@ import {
 } from 'apollo-server-express'
 import { PrismaClient } from '@prisma/client'
 
-require('dotenv').config()
-
 import { CheckRightsAndResolve } from './types'
 import { getDBFormAuthor } from '../db'
 import { sendToken } from './mailer'

src/controllers/mailer.ts

@@ -1,7 +1,5 @@
 import sgMail from '@sendgrid/mail'
 
-require('dotenv').config()
-
 sgMail.setApiKey('' + process.env.SENDGRID_API_KEY)
 
 const sendToken = (username: string, email: string, token: string) => {

src/index.ts

@@ -6,8 +6,6 @@ import { ApolloContextType, JwtPayloadType } from './types'
 import { ApolloServer, makeExecutableSchema } from 'apollo-server-express'
 import { PrismaClient } from '@prisma/client'
 
-require('dotenv').config()
-
 const app = express()
 
 app.use(