update install script and dev environement (#136)

Author: Thoonsen Maxime

Makefile

@@ -33,9 +33,7 @@ frontend/start:
 .env: .env.example
 	@if [ -f .env ]; \
 	then\
-		echo '\033[1;41m/!\ The .env.example file has changed. Please check your .env file (this message will not be displayed again).\033[0m';\
-		touch .env;\
-		exit 1;\
+		echo '\033[1;41m/!\ You already have created .env file. You should have a look at the .env.example file to ensure you have set all required environment variables for docker-compose.\033[0m';\
 	else\
 		echo cp .env.example .env;\
 		cp .env.example .env;\
@@ -44,9 +42,7 @@ frontend/start:
 frontend/.env: frontend/.env.example
 	@if [ -f frontend/.env ]; \
 	then\
-		echo '\033[1;41m/!\ The frontend/.env.example file has changed. Please check your frontend/.env file (this message will not be displayed again).\033[0m';\
-		touch frontend/.env;\
-		exit 1;\
+		echo '\033[1;41m/!\ You already have created a .env file for the frontend. You should have a look at the frontend/.env.example to ensure you have set all required environment variables to make the frontend work (this message will not be displayed again).\033[0m';\
 	else\
 		echo cp frontend/.env.example frontend/.env;\
 		cp frontend/.env.example frontend/.env;\

docker-compose.yml

@@ -4,9 +4,14 @@ services:
   db:
     image: postgres:10
     ports:
-      - "5432:5432"
+      # We changed the default port so people having already a postgres instance running on port 5432 won't have a port conflict
+      - "5433:5432"
     volumes:
       - ./postgres-data:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_PASSWORD=password
+      - POSTGRES_USER=postgres
+      - POSTGRES_DB=postgres
 
   backend:
     build: ./backend
@@ -22,7 +27,7 @@ services:
     env_file:
       - .env
     environment:
-      DATABASE_URL: "postgres://postgres@db:5432/postgres"
+      DATABASE_URL: "postgres://postgres:password@db:5432/postgres"
 
   redis:
     image: redis
@@ -37,7 +42,7 @@ services:
     env_file:
       - .env
     environment:
-      DATABASE_URL: "postgres://postgres@db:5432/postgres"
+      DATABASE_URL: "postgres://postgres:password@db:5432/postgres"
     command: celery worker -A root.celery -B -l INFO --scheduler django_celery_beat.schedulers:DatabaseScheduler -c 4
 
 networks:

hooks/pre-commit

@@ -34,7 +34,7 @@ else
 fi
 
 # Run black and get the output and return code
-black=$(black --exclude venv --diff --check backend/.)
+black=$(docker-compose exec -T backend black --diff --check .)
 ret_code=$?
 
 if [ $ret_code != 0 ]; then
@@ -46,7 +46,7 @@ else
 fi
 
 # Run flake8 and get the output and return code
-flake=$(flake8 backend/. --exclude backend/venv/)
+flake=$(docker-compose exec -T backend flake8 . --exclude ./venv/)
 ret_code=$?
 
 if [ $ret_code != 0 ]; then