Browse Source

refactor: Renamed musare_types to @musare_types and mounted in docker

Owen Diffey 2 years ago
parent
commit
12ed3f22da

+ 0 - 0
musare_types/actions/BaseActions.ts → @musare_types/actions/BaseActions.ts


+ 0 - 0
musare_types/actions/NewsActions.ts → @musare_types/actions/NewsActions.ts


+ 0 - 0
musare_types/actions/UsersActions.ts → @musare_types/actions/UsersActions.ts


+ 0 - 0
musare_types/models/News.ts → @musare_types/models/News.ts


+ 0 - 0
musare_types/models/User.ts → @musare_types/models/User.ts


+ 1 - 1
backend/Dockerfile

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

+ 2 - 0
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}

+ 1 - 1
frontend/Dockerfile

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

+ 1 - 1
frontend/tsconfig.json

@@ -10,7 +10,7 @@
     "baseUrl": ".",
     "paths": {
       "@musare_types/*": [
-        "../musare_types/*"
+        "../@musare_types/*"
       ],
       "@/*": [
         "./src/*"

+ 1 - 1
frontend/vite.config.js

@@ -145,7 +145,7 @@ export default {
 		alias: [
 			{
 				find: "@musare_types",
-				replacement: path.resolve(__dirname, "../musare_types")
+				replacement: path.resolve(__dirname, "../@musare_types")
 			},
 			{
 				find: "@",