Merge branch 'julius-dev' of Software_Engineering_I/greenvironment-server into develop

Dockerfile

@@ -0,0 +1,12 @@
+FROM node:current-alpine
+
+COPY . /home/node/green
+WORKDIR /home/node/green
+RUN npm install -g gulp
+RUN npm install --save-dev
+RUN npm rebuild node-sass
+RUN gulp
+COPY . .
+EXPOSE 8080
+EXPOSE 5432
+CMD ["npm" , "run"]

docker-compose.yml

@@ -0,0 +1,15 @@
+version: "3"
+services:
+  greenvironment:
+    build:
+      context: .
+      dockerfile: ./Dockerfile
+    user: "node"
+    working_dir: /home/node/green
+    environment:
+      - NODE_ENV=production
+    volumes:
+      - ./:/home/node/green
+    ports:
+      - "8080:8080"
+    command: "npm start"

package-lock.json

@@ -6934,9 +6934,9 @@
       "dev": true
     },
     "type": {
-      "version": "1.0.3",
+      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-1.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-51IMtNfVcee8+9GJvj0spSuFcZHe9vSib6Xtgsny1Km9ugyz2mbS08I3rsUIRYgJohFRFU1160sgRodYz378Hg==",
+      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
       "dev": true
     },
     "type-is": {

package.json

@@ -4,7 +4,9 @@
   "description": "Server for greenvironment network",
   "main": "./dist/index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build": "gulp",
+    "start": "node ./dist/index.js"
   },
   "repository": {
     "type": "git",