Fix app structure for Docker

akelsch · Jun 20, 2020 · 72591f3 · 72591f3
1 parent 43047af
commit 72591f3
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,7 @@
 FROM node:14
 
+ENV NODE_ENV=production
+
 WORKDIR /usr/src/app
 
 COPY package*.json ./
@@ -8,4 +10,4 @@ RUN npm install
 COPY . .
 
 EXPOSE 3000
-CMD [ "node", "server.js" ]
+CMD [ "npm", "start" ]
diff --git a/src/algorithms.js → lib/algorithms.js b/src/algorithms.js → lib/algorithms.js
diff --git a/src/server.js → lib/app.js b/src/server.js → lib/app.js
diff --git a/src/database.js → lib/database.js b/src/database.js → lib/database.js
diff --git a/src/init.js → lib/init.js b/src/init.js → lib/init.js
@@ -1,9 +1,9 @@
 import axios from 'axios'
 
 import connection from './database.js'
-import Mapdata from './models/mapdata.js'
-import './models/case.js'
-import './models/option.js'
+import Mapdata from './models/Mapdata.js'
+import './models/Case.js'
+import './models/Option.js'
 
 // Quelle: https://npgeo-corona-npgeo-de.hub.arcgis.com/datasets/917fc37a709542548cc3be077a786c17_0
 const url = 'https://services7.arcgis.com/mOBPykOjAyBO2ZKk/arcgis/rest/services/RKI_Landkreisdaten/FeatureServer/0/query?where=1%3D1&outFields=OBJECTID,BL_ID&outSR=4326&f=geojson'

diff --git a/src/models/Case.js → lib/models/Case.js b/src/models/Case.js → lib/models/Case.js
diff --git a/src/models/Mapdata.js → lib/models/Mapdata.js b/src/models/Mapdata.js → lib/models/Mapdata.js
diff --git a/src/models/Option.js → lib/models/Option.js b/src/models/Option.js → lib/models/Option.js
diff --git a/src/routes/cases.js → lib/routes/cases.js b/src/routes/cases.js → lib/routes/cases.js
diff --git a/src/routes/mapdata.js → lib/routes/mapdata.js b/src/routes/mapdata.js → lib/routes/mapdata.js
@@ -1,5 +1,5 @@
 import { douglasPeucker, webMercator } from '../algorithms.js'
-import Mapdata from '../models/mapdata.js'
+import Mapdata from '../models/Mapdata.js'
 
 import express from 'express'
 import sequelize from 'sequelize'

diff --git a/src/routes/options.js → lib/routes/options.js b/src/routes/options.js → lib/routes/options.js
diff --git a/package.json b/package.json
@@ -3,11 +3,11 @@
   "version": "1.0.0",
   "description": "",
   "type": "module",
-  "main": "src/server.js",
+  "main": "./lib/app.js",
   "scripts": {
-    "start": "node src/server.js",
-    "init": "node src/server.js init",
-    "watch": "nodemon src/server.js",
+    "start": "node lib/app.js",
+    "init": "node lib/app.js init",
+    "watch": "nodemon lib/app.js",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "",