Update: Docker test

This commit is contained in:
Yûki VACHOT 2022-01-18 17:59:00 +01:00
parent 0d6fde6aba
commit ad6c6fbd76
3 changed files with 39 additions and 23 deletions

View file

@ -3,5 +3,4 @@ WORKDIR /data/backend
COPY requirements.txt requirements.txt
RUN pip install --upgrade pip
RUN pip install -r requirements.txt
COPY . .
CMD [ "python", "-m" , "flask", "run", "--host=0.0.0.0"]
COPY . .

View file

@ -1,25 +1,21 @@
import os
import sys
sys.path.append("../application")
from application.users_model import Users
from application.api_functions import hash_password
TAB_USER_WITH_PASSWORD = [
{
"id": 1,
"email": "riri@gmail.com",
"nickname": "Riri",
"password": "ririPass",
"is_admin": False
"id": 1,
"email": "riri@gmail.com",
"nickname": "Riri",
"password": "ririPass",
"is_admin": False
},
{
"id": 2,
"email": "fifi@gmail.com",
"nickname": "Fifi",
"password": "fifiPass",
"is_admin": False
"is_admin": False
},
{
"id": 3,
@ -27,26 +23,25 @@ TAB_USER_WITH_PASSWORD = [
"nickname": "Donald",
"password": "donaldPass",
"is_admin": False
},
},
{
"id": 4,
"email": "daisy@gmail.com",
"nickname": "Daisy",
"password": "daisyPass",
"is_admin": True
},
},
]
# Convert user with passord (uwp) to user
def uwp_to_user(uwp):
salt0 = os.urandom(32)
hash_pass0 = hash_password(salt0, uwp["password"])
return Users(
email = uwp["email"],
nickname = uwp["nickname"],
hash_pass = hash_pass0,
salt = salt0,
is_admin = uwp["is_admin"]
)
email=uwp["email"],
nickname=uwp["nickname"],
hash_pass=hash_pass0,
salt=salt0,
is_admin=uwp["is_admin"]
)

View file

@ -34,6 +34,7 @@ services:
backend:
container_name: backend
build: ./backend
command: python -m flask run --host=0.0.0.0
ports:
- "5000:5000"
volumes:
@ -58,14 +59,35 @@ services:
container_name: frontend
build: ./frontend
command: npm start
ports:
- "4200:4200"
volumes:
- ./frontend:/data/frontend
- ./frontend/node_modules:/data/frontend/node_modules
ports:
- "4200:4200"
depends_on:
- backend
links:
- backend
environment:
- NODE_ENV=development
test:
container_name: test
build: ./backend
command: python test.py
volumes:
- ./backend:/data/backend
depends_on:
- flaskaled-srv1
- flaskaled-srv2
links:
- flaskaled-srv1
- flaskaled-srv2
environment:
- FLASK_APP=app.py
- FLASK_ENV=test
- FLASK_DEBUG=0
- PYTHONUNBUFFERED=1
- DATABASE_URL_USERS=postgresql://flaskaled1:aled1@flaskaled-srv1/flaskaledDb1
- DATABASE_URL_LOGS=postgresql://flaskaled2:aled2@flaskaled-srv2/flaskaledDb2
- SECRET_KEY=default_secret_key