From 01af5fb5b4996137befc71684f09393cc5ca2288 Mon Sep 17 00:00:00 2001
From: Alicia Sykes <sykes.alicia@gmail.com>
Date: Sun, 20 Jun 2021 16:58:03 +0100
Subject: [PATCH] :building_construction: Sets environment in Docker, and adds
 recompile watcher to start script

Ensures environment is correctly set to production, and sets build-and-start script to now recompoile when conf.yml is updated
---
 Dockerfile         | 1 +
 docker-compose.yml | 7 ++++++-
 package.json       | 8 ++++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 034d3a49..4495e1ae 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,7 @@ FROM node:lts-alpine
 ENV PORT 80
 ENV DIRECTORY /app
 ENV IS_DOCKER true
+ENV NODE_ENV production
 
 # Create and set the working directory
 WORKDIR ${DIRECTORY}
diff --git a/docker-compose.yml b/docker-compose.yml
index 4e4dce67..5a06d02a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,6 +3,9 @@
 version: "3.8"
 services:
   dashy:
+    # Set any environmental variables
+    environment:
+      NODE_ENV: production
     # To build from source, replace 'image: lissy93/dashy' with 'build: .'
     # build: .
     image: lissy93/dashy
@@ -16,10 +19,12 @@ services:
     # environment:
     #  - UID=1000
     #  - GID=1000
+    # Specify restart policy
     restart: unless-stopped
+    # Configure healthchecks
     healthcheck:
       test: ['CMD', 'node', '/app/services/healthcheck']
       interval: 1m30s
       timeout: 10s
       retries: 3
-      start_period: 40s
\ No newline at end of file
+      start_period: 40s
diff --git a/package.json b/package.json
index f92df0bb..d9ce84b1 100644
--- a/package.json
+++ b/package.json
@@ -7,10 +7,10 @@
     "start": "node server",
     "dev": "vue-cli-service serve",
     "build": "vue-cli-service build",
-    "lint": "vue-cli-service lint --fix",
+    "lint": "vue-cli-service lint",
     "pm2-start": "npx pm2 start server.js",
-    "build-watch": "vue-cli-service build --watch",
-    "build-and-start": "npm-run-all --parallel build start",
+    "build-watch": "vue-cli-service build --watch --mode production",
+    "build-and-start": "npm-run-all --parallel build-watch start",
     "validate-config": "node src/utils/ConfigValidator",
     "health-check": "node services/healthcheck"
   },
@@ -84,4 +84,4 @@
     "> 1%",
     "last 2 versions"
   ]
-}
+}
\ No newline at end of file