Browse Source

refactor: Docker setup tweaks

Owen Diffey 1 year ago
parent
commit
9216dd022c
4 changed files with 8 additions and 4 deletions
  1. 4 1
      backend/Dockerfile
  2. 2 1
      docker-compose.yml
  3. 1 1
      frontend/Dockerfile
  4. 1 1
      frontend/entrypoint.sh

+ 4 - 1
backend/Dockerfile

@@ -10,13 +10,16 @@ RUN npm install --silent
 
 FROM node:16.15 AS musare_backend
 
+ARG CONTAINER_MODE=prod
+ENV CONTAINER_MODE=${CONTAINER_MODE}
+
 RUN mkdir -p /opt/app
 WORKDIR /opt/app
 
 COPY . /opt/app
 COPY --from=backend_node_modules /opt/app/node_modules node_modules
 
-ENTRYPOINT npm run docker:dev
+ENTRYPOINT bash -c '([[ "${CONTAINER_MODE}" == "dev" ]] && npm install --silent); npm run docker:dev'
 
 EXPOSE 8080/tcp
 EXPOSE 8080/udp

+ 2 - 1
docker-compose.yml

@@ -8,8 +8,9 @@ services:
     restart: ${RESTART_POLICY:-unless-stopped}
     volumes:
       - ./.git:/opt/app/.parent_git:ro
-      - /opt/app/node_modules
       - ./backend/config:/opt/app/config
+    environment:
+      - CONTAINER_MODE=${CONTAINER_MODE:-prod}
     links:
       - mongo
       - redis

+ 1 - 1
frontend/Dockerfile

@@ -26,7 +26,7 @@ COPY --from=frontend_node_modules /opt/app/node_modules node_modules
 
 RUN mkdir -p /run/nginx
 
-RUN bash -c '[[ "${FRONTEND_MODE}" = "prod" ]] && npm run prod' || exit 0
+RUN bash -c '([[ "${FRONTEND_MODE}" == "dev" ]] && exit 0) || npm run prod'
 
 RUN chmod u+x entrypoint.sh
 

+ 1 - 1
frontend/entrypoint.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 if [[ "${CONTAINER_MODE}" == "dev" ]]; then
-    npm install
+    npm install --silent
 fi
 
 if [[ "${FRONTEND_MODE}" == "prod" ]]; then