From 25e6e61d10971a8a84438e89c0c581cc87aee14c Mon Sep 17 00:00:00 2001
From: Dave Richer <dave@imexsystems.ca>
Date: Fri, 11 Oct 2024 22:59:44 -0400
Subject: [PATCH] release/2024-10-11: Final touchups

Signed-off-by: Dave Richer <dave@imexsystems.ca>
---
 .dockerignore      |  2 +-
 Dockerfile         |  4 ++--
 docker-compose.yml | 15 ++++++++++-----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index b6ef4a047..17605d357 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -7,7 +7,7 @@ _reference
 client
 redis/dockerdata
 hasura
-
+node_modules
 # Files to exclude
 .ebignore
 .editorconfig
diff --git a/Dockerfile b/Dockerfile
index 01a1522cd..27a8254e9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,13 +29,13 @@ WORKDIR /app
 RUN git config --global --add safe.directory /app
 
 # Copy package.json and package-lock.json
-COPY package*.json ./
+COPY package.json ./
 
 # Install Nodemon
 RUN npm install -g nodemon
 
 # Install dependencies
-RUN npm ci
+RUN npm i --no-package-lock
 
 # Copy the rest of your application code
 COPY . .
diff --git a/docker-compose.yml b/docker-compose.yml
index dd8dac175..8b38349fc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,7 +14,7 @@ services:
       context: ./redis
     container_name: redis-node-1
     hostname: redis-node-1
-    restart: always
+    restart: unless-stopped
     networks:
       - redis-cluster-net
     volumes:
@@ -32,7 +32,7 @@ services:
       context: ./redis
     container_name: redis-node-2
     hostname: redis-node-2
-    restart: always
+    restart: unless-stopped
     networks:
       - redis-cluster-net
     volumes:
@@ -50,7 +50,7 @@ services:
       context: ./redis
     container_name: redis-node-3
     hostname: redis-node-3
-    restart: always
+    restart: unless-stopped
     networks:
       - redis-cluster-net
     volumes:
@@ -70,7 +70,7 @@ services:
     hostname: localstack
     networks:
       - redis-cluster-net
-    restart: always
+    restart: unless-stopped
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     environment:
@@ -134,6 +134,11 @@ services:
         condition: service_completed_successfully
     ports:
       - "4000:4000"
+    develop:
+      watch:
+        # rebuild image and recreate service
+        - path: package.json
+          action: rebuild
     volumes:
       - .:/app
       - node-app-npm-cache:/app/node_modules
@@ -152,7 +157,7 @@ services:
 #    image: redislabs/redisinsight:latest
 #    container_name: redis-insight
 #    hostname: redis-insight
-#    restart: always
+#    restart: unless-stopped
 #    ports:
 #      - "3334:5540"
 #    networks: