Added dockerfile and fixed issues with packaging

Author: tommy-lettieri

.dockerignore

@@ -0,0 +1,8 @@
+# If we don't include this it will be copied over with docker
+node_modules
+ts-built
+logs
+*.DS_Store
+tmp
+build
+package-outputs

Dockerfile

@@ -0,0 +1,36 @@
+
+# The instructions for the first stage
+FROM node:14.15.3-alpine as builder
+
+# set to production to run build
+#ARG NODE_ENV=development
+
+# set working directory
+WORKDIR /app
+
+# install app dependencies
+# package.json is copied over before source so that docker can appropriately use cache
+COPY package.json ./
+COPY package-lock.json ./
+RUN npm install --silent
+
+# This would be a problem if node_modules wasn't docker ignored
+COPY . ./
+
+# This would ordinarilly be run with npm install
+# However we don't copy over the schema file so it can't run this
+# We could copy this ahead of time with `COPY prisma ./` alongside the package.json but that would mess with cache
+RUN npx prisma generate
+
+# Builds and creates the package, does not create an archive
+RUN REDERLY_PACKAGER_ARCHIVE=false npm run build:package
+
+# The instructions for second stage
+FROM node:14.15.3-alpine
+
+#WORKDIR /app
+COPY --from=builder /app/build ./rederly
+COPY --from=builder /app/.env ./rederly/
+
+WORKDIR /rederly
+CMD npm run run:build

package.json

@@ -13,6 +13,7 @@
     "clean": "if [ -d ts-built ]; then rm -r ts-built; fi;",
     "lint": "eslint src/ --ext .ts",
     "build": "npm run clean && tsc",
+    "run:build": "node ts-built/app-scripts/index.js",
     "package": "node ./utility-scripts/package.js",
     "build:package": "npm run build && npm run package"
   },

src/routes/index.ts

@@ -1,4 +1,5 @@
 import * as express from 'express';
+import { Request, Response, NextFunction } from 'express';
 import httpResponse from '../utilities/http-response';
 const router = express.Router();
 import { PrismaClient } from '@prisma/client';
@@ -24,7 +25,7 @@ const filterNaN = (arr: number[]) => _.filter(arr, _.negate(_.isNaN));
 
 const getNumberArrayFromQuery = (value: string | string[] | undefined) =>  filterNaN(stringArrayToNumberArray(getQueryParamArray(value)));
 
-router.get('/subjects', async (_req, _res, next) => {
+router.get('/subjects', async (_req: Request, _res: Response, next: NextFunction) => {
     try {
         const subjects = await prisma.opl_dbsubject.findMany();
         logger.debug(`Subject count: ${subjects.length}`);
@@ -36,7 +37,7 @@ router.get('/subjects', async (_req, _res, next) => {
     }
 });
 
-router.get('/chapters', async (req, _res, next) => {
+router.get('/chapters', async (req: Request, _res: Response, next: NextFunction) => {
     const subjectId: number | undefined = getNumberArrayFromQuery(req.query.subjectId as string | string[] | undefined)[0];
 
     try {
@@ -54,7 +55,7 @@ router.get('/chapters', async (req, _res, next) => {
     }
 });
 
-router.get('/sections', async (req, _res, next) => {
+router.get('/sections', async (req: Request, _res: Response, next: NextFunction) => {
     const chapterId: number | undefined = getNumberArrayFromQuery(req.query.chapterId as string | string[] | undefined)[0];
 
     try {
@@ -73,7 +74,7 @@ router.get('/sections', async (req, _res, next) => {
 });
 
 
-router.get('/search', async (req, _res, next) => {
+router.get('/search', async (req: Request, _res: Response, next: NextFunction) => {
     const subjectId: number | undefined = getNumberArrayFromQuery(req.query.subjectId as string | string[] | undefined)[0];
     const chapterId: number | undefined = getNumberArrayFromQuery(req.query.chapterId as string | string[] | undefined)[0];
     const sectionId: number | undefined = getNumberArrayFromQuery(req.query.sectionId as string | string[] | undefined)[0];

utility-scripts/package.js

@@ -57,6 +57,7 @@ console.log(`Starting to package project into ${destFile}`);
         recursive: true
     });
     const filesToCopy = [
+        'prisma',
         builtDirectory,
         'package.json',
         'package-lock.json'