From 175a84d82a1be3e06e5be7845a6c892b9948f6d3 Mon Sep 17 00:00:00 2001
From: cookie-s <kcz@kcz.sh>
Date: Tue, 25 Oct 2022 20:11:49 -0400
Subject: [PATCH] npm install in Docker

---
 logger/Dockerfile | 2 +-
 viewer/Dockerfile | 6 +++++-
 viewer/setup.sh   | 1 -
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/logger/Dockerfile b/logger/Dockerfile
index 522ba73..08ece28 100644
--- a/logger/Dockerfile
+++ b/logger/Dockerfile
@@ -16,9 +16,9 @@ RUN set -x && \
 
 COPY Gemfile ${SRCDIR}/
 COPY Gemfile.lock ${SRCDIR}/
+RUN cd ${SRCDIR} && bundle install
 
 WORKDIR ${SRCDIR}
 
-RUN bundle install
 
 CMD /wait-for-it.sh -t 0 mongo:27017 -- /wait-for-it.sh -t 0 elasticsearch:9200 -- bundle exec ruby logger/logger.rb
diff --git a/viewer/Dockerfile b/viewer/Dockerfile
index 156e46c..50fa7b2 100644
--- a/viewer/Dockerfile
+++ b/viewer/Dockerfile
@@ -14,10 +14,14 @@ RUN set -x && \
 
 COPY Gemfile ${SRCDIR}/
 COPY Gemfile.lock ${SRCDIR}/
+RUN cd ${SRCDIR} && bundle install
 
 WORKDIR ${SRCDIR}
 
-RUN bundle install
+COPY viewer/package.json ${SRCDIR}/viewer/
+COPY viewer/package-lock.json ${SRCDIR}/viewer/
+RUN cd ${SRCDIR}/viewer && npm install
+
 
 CMD ./viewer/setup.sh && bundle exec puma viewer/config.ru -C viewer/puma.rb -p 9292
 
diff --git a/viewer/setup.sh b/viewer/setup.sh
index 08bc028..4a32253 100755
--- a/viewer/setup.sh
+++ b/viewer/setup.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
 
 cd `dirname $0`
-npm install
 npm run build