From 8c238ad864544e29b5360fa62a4ee8123682d971 Mon Sep 17 00:00:00 2001
From: deflax <daniel@deflax.net>
Date: Sat, 4 May 2024 02:28:50 +0300
Subject: [PATCH] change services path

---
 docker-compose.yml       | 6 ++----
 rfront/Dockerfile        | 4 ++--
 rfront/webpack.config.js | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index bec92a2..be7c07e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,7 +32,7 @@ services:
     depends_on:
       - "db"
     build: 
-      context: ./src/forest
+      context: ./forest
       dockerfile: Dockerfile
     image: forest:latest
     volumes:
@@ -49,11 +49,9 @@ services:
 
   rfront:
     build:
-      context: ./src/rfront
+      context: ./rfront
       dockerfile: Dockerfile
     image: rfront:latest
-    volumes:
-      - "./src/rfront/front:/app"
     ports:
       - 3000:3000
     environment:
diff --git a/rfront/Dockerfile b/rfront/Dockerfile
index c277f82..fc9cda7 100644
--- a/rfront/Dockerfile
+++ b/rfront/Dockerfile
@@ -12,8 +12,8 @@ ADD package.json /app
 ADD package-lock.json /app
 RUN npm ci
 
-ADD front /app/front
-#ADD front/config.js /app/src/config.js
+ADD src /app/src
+#ADD src/config.js /app/src/config.js
 ADD public /app/public
 ADD ["webpack.config.js", ".babelrc", "/app/"]
 
diff --git a/rfront/webpack.config.js b/rfront/webpack.config.js
index db4ee12..ce72e41 100644
--- a/rfront/webpack.config.js
+++ b/rfront/webpack.config.js
@@ -3,7 +3,7 @@ const config = require('./config');
 
 module.exports = {
   mode: config.debug ? 'development' : 'production',
-  entry: `${__dirname}/front/index.js`,
+  entry: `${__dirname}/src/index.js`,
   module: {
     rules: [
       {