From 211c571d7eb0b18be76b0df640e01dd0ee5f3761 Mon Sep 17 00:00:00 2001 From: KyoRuMan Date: Wed, 13 Jul 2022 20:55:57 +0900 Subject: [PATCH] set up requirments --- backend/requirements.txt | 3 ++- docker-compose.yml | 10 +--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/backend/requirements.txt b/backend/requirements.txt index 24134be..5837469 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -1,2 +1,3 @@ django==4.0.6 -pillow \ No newline at end of file +Pillow==9.2.0 +django-environ==0.9.0 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 0effc54..49329df 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,18 +8,10 @@ services: - 8080:8080 volumes: - ./backend:/app -<<<<<<< HEAD - -======= ->>>>>>> 02-BE-RDS # frontend: # build: ./frontend # command: ["npm", "start"] # ports: # - 3000:3000 # volumes: -<<<<<<< HEAD -# - ./frontend:/app -======= -# - ./frontend:/app ->>>>>>> 02-BE-RDS +# - ./frontend:/app \ No newline at end of file