Merge remote-tracking branch 'origin/main'

moevm · Dec 22, 2024 · 24ac277 · 24ac277
2 parents f7b9ff6 + 7a301eb
commit 24ac277
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 1,143 deletions.
diff --git a/backend/.dockerignore → .dockerignore b/backend/.dockerignore → .dockerignore
@@ -4,5 +4,5 @@ __pycache__
 .git
 .env
 *.log
-.idea
+backend/.idea
 .venv
diff --git a/.github/workflows/5_prototype_analysis.yml b/.github/workflows/5_prototype_analysis.yml
@@ -127,11 +127,11 @@ jobs:
     
       - name: Build docker-compose
         run: |
-          docker-compose build --no-cache
+          docker compose build --no-cache
 
       - name: Run docker-compose
         run: |
-          docker-compose up -d
+          docker compose up -d
           sleep 30
 
       - name: Check containers are alive

diff --git a/README.md b/README.md
@@ -19,9 +19,6 @@
 
 ## Run dev using docker
 ```
-cd deployment/dev/
-```
-```
 docker-compose up -d
 ```
 **Frontend**
@@ -53,7 +50,7 @@ http://localhost:8000/docs
 
 ## Run backend tests using docker
 ```sh
-cd deployment/test/
+cd ./backend
 ```
 ```
 docker-compose up -d

diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -4,9 +4,7 @@ WORKDIR /app
 
 COPY . .
 
-RUN python -m venv /.venv
-
-RUN /.venv/bin/pip install --no-cache-dir -r requirements.txt
+RUN python -m venv /.venv && /.venv/bin/pip install --no-cache-dir -r requirements.txt
 
 ENV PATH="/.venv/bin:$PATH"
 ENV ENV="dev"
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,5 +4,5 @@ __pycache__ @@
     .git
     .env
     *.log
-    .idea
+    backend/.idea
     .venv