diff --git a/app/Dockerfile b/app/Dockerfile index dd77845..30a17f7 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -1,14 +1,18 @@ # Build stage FROM node as build-stage WORKDIR /app -COPY app/package.json yarn.lock ./ -RUN yarn install -COPY app . +COPY package.json yarn.lock ./ +COPY app/package.json ./app/package.json +COPY packages/file-graph/package.json ./packages/file-graph/package.json +RUN yarn install --frozen-lockfile + +COPY app ./app +COPY packages/file-graph ./packages/file-graph RUN yarn build # Production stage FROM nginx:stable-alpine as production-stage -COPY --from=build-stage /app/dist /usr/share/nginx/html +COPY --from=build-stage /app/app/dist /usr/share/nginx/html COPY deployment/nginx.conf /etc/nginx/conf.d/default.conf EXPOSE 80 CMD ["nginx", "-g", "daemon off;"] diff --git a/app/Dockerfile.dev b/app/Dockerfile.dev index 61d9568..a58a1cc 100644 --- a/app/Dockerfile.dev +++ b/app/Dockerfile.dev @@ -1,7 +1,10 @@ FROM node WORKDIR /app -COPY app/package.json yarn.lock ./ +COPY package.json yarn.lock ./ +COPY app/package.json ./app/package.json +COPY packages/file-graph/package.json ./packages/file-graph/package.json RUN yarn install --frozen-lockfile -COPY app . + +WORKDIR /app/app CMD [ "yarn", "dev:docker", "--host", "0.0.0.0" ] \ No newline at end of file diff --git a/app/package.json b/app/package.json index d38cd0b..1f168c2 100644 --- a/app/package.json +++ b/app/package.json @@ -11,6 +11,7 @@ "preview": "vite preview" }, "dependencies": { + "@linux-odyssey/file-graph": "*", "@fortawesome/fontawesome-svg-core": "^6.4.0", "@fortawesome/free-brands-svg-icons": "^6.4.0", "@fortawesome/free-regular-svg-icons": "^6.4.0", diff --git a/docker-compose.yml b/docker-compose.yml index d9fc5e2..3492bab 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,8 @@ services: networks: - internal volumes: - - ./app/src:/app/src + - ./app:/app/app + - ./packages/file-graph:/app/packages/file-graph backend: build: context: . diff --git a/package.json b/package.json index 8142c9d..cc4fd76 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "scripts": { "app": "yarn workspace app dev", "app:local": "yarn workspace app dev:local", + "build": "yarn workspace app build", "server": "yarn workspace server dev", "cli": "yarn workspace client start", "lint": "eslint --ext .js,.vue .",