Merge remote-tracking branch 'origin/staging' into staging

backend/Dockerfile

@@ -13,9 +13,7 @@ FROM node:16.15 AS musare_backend
 ARG CONTAINER_MODE=prod
 ENV CONTAINER_MODE=${CONTAINER_MODE}
 
-RUN mkdir -p /opt/types
-
-RUN mkdir -p /opt/app
+RUN mkdir -p /opt/app /opt/types
 WORKDIR /opt/app
 
 COPY . /opt/app

docker-compose.yml

@@ -9,6 +9,7 @@ services:
     volumes:
       - ./.git:/opt/app/.parent_git:ro
       - ./backend/config:/opt/app/config
+      - ./@musare_types:/opt/@musare_types
     environment:
       - CONTAINER_MODE=${CONTAINER_MODE:-prod}
     links:
@@ -30,6 +31,7 @@ services:
     volumes:
       - ./.git:/opt/app/.parent_git:ro
       - ./frontend/dist/config:/opt/app/dist/config
+      - ./@musare_types:/opt/@musare_types
     environment:
       - FRONTEND_MODE=${FRONTEND_MODE:-prod}
       - CONTAINER_MODE=${CONTAINER_MODE:-prod}

frontend/Dockerfile

@@ -18,9 +18,7 @@ ENV NODE_CONFIG_DIR=./dist/config
 RUN apt-get update
 RUN apt-get install nginx -y
 
-RUN mkdir -p /opt/types
-
-RUN mkdir -p /opt/app
+RUN mkdir -p /opt/app /opt/types
 WORKDIR /opt/app
 
 COPY . /opt/app