npm install in Docker

tsg-ut · Oct 26, 2022 · 175a84d · 175a84d
1 parent f60785b
commit 175a84d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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
@@ -1,5 +1,4 @@
 #!/bin/sh
 
 cd `dirname $0`
-npm install
 npm run build