From 1b928eb87b729ef4dfe0bb6e458b860126a8d20e Mon Sep 17 00:00:00 2001 From: Scott Kirkland Date: Mon, 27 Jan 2025 14:22:49 -0800 Subject: [PATCH] allow us to set the OSRM data location also don't copy into the dist folder any more. let data stay separate --- Dockerfile | 3 +-- index.ts | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index a04c720..69ac2d4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,8 +20,7 @@ COPY package*.json ./ RUN npm ci COPY . . RUN npm run build -# Copy OSRM data from previous stage into newly created dist folder (where we run the app) -COPY --from=osrm-processor /app/data ./dist/data +COPY --from=osrm-processor /app/data ./data EXPOSE 3000 CMD ["npm", "start"] \ No newline at end of file diff --git a/index.ts b/index.ts index 3961e47..578fd12 100644 --- a/index.ts +++ b/index.ts @@ -12,8 +12,8 @@ import OSRM from '@project-osrm/osrm'; import { performance } from 'perf_hooks'; import pg, { Connection } from 'pg'; import swaggerUi from 'swagger-ui-express'; -import saveModels from './saveModels' -import saveUserDetails from './saveUserDetails' +import saveModels from './saveModels'; +import saveUserDetails from './saveUserDetails'; import { getFrcsInputsTest } from './frcsInputCalculations'; import { setupAppInsights, trackMetric } from './logging'; @@ -75,7 +75,7 @@ hookupKnexTiming(db); console.log('connected to db. connecting to osrm...'); -const osrm = new OSRM('./data/california-latest.osrm'); +const osrm = new OSRM(process.env.OSRM_FILE || './data/california-latest.osrm'); console.log('connected to osrm'); // allow cors