Modified env files and moved dockerfiles

Author: Seluj78

.env.ci

@@ -0,0 +1,24 @@
+FLASK_PORT=5000
+FLASK_DEBUG=true
+FLASK_HOST=0.0.0.0
+FLASK_SECRET_KEY=ThisIsADevelopmentKey
+
+ENABLE_LOGGING=true
+
+CELERY_BROKER_URL=redis://host.docker.internal:6379/0
+CELERY_RESULT_BACKEND=redis://host.docker.internal:6379/0
+
+DB_HOST=host.docker.internal
+DB_PORT=3306
+DB_USER=root
+DB_PASSWORD=
+DB_NAME=pymatcha
+
+REDIS_HOST=host.docker.internal
+REDIS_PORT=6379
+
+MAIL_PASSWORD=obnmvqjhkjvfygnr
+
+DEBUG_AUTH_TOKEN=xX69jules69Xx
+
+FRONTEND_BASE_URL=localhost:8080

.env.dev

@@ -0,0 +1,24 @@
+FLASK_PORT=5000
+FLASK_DEBUG=true
+FLASK_HOST=0.0.0.0
+FLASK_SECRET_KEY=ThisIsADevelopmentKey
+
+ENABLE_LOGGING=true
+
+CELERY_BROKER_URL=redis://localhost:6379/0
+CELERY_RESULT_BACKEND=redis://localhost:6379/0
+
+DB_HOST=localhost
+DB_PORT=3306
+DB_USER=root
+DB_PASSWORD=selujroot
+DB_NAME=pymatcha
+
+REDIS_HOST=localhost
+REDIS_PORT=6379
+
+MAIL_PASSWORD=obnmvqjhkjvfygnr
+
+DEBUG_AUTH_TOKEN=xX69jules69Xx
+
+FRONTEND_BASE_URL=localhost:8080

.env.docker

@@ -0,0 +1,24 @@
+FLASK_PORT=5000
+FLASK_DEBUG=true
+FLASK_HOST=0.0.0.0
+FLASK_SECRET_KEY=ThisIsADevelopmentKey
+
+ENABLE_LOGGING=true
+
+CELERY_BROKER_URL=redis://redis:6379/0
+CELERY_RESULT_BACKEND=redis://redis:6379/0
+
+DB_HOST=mysql
+DB_PORT=3306
+DB_USER=matcha
+DB_PASSWORD=matcha
+DB_NAME=pymatcha
+
+REDIS_HOST=redis
+REDIS_PORT=6379
+
+MAIL_PASSWORD=obnmvqjhkjvfygnr
+
+DEBUG_AUTH_TOKEN=xX69jules69Xx
+
+FRONTEND_BASE_URL=frontend:8080

.env.enc

@@ -11,6 +11,9 @@ services:
   - mysql
   - redis
 
+before_install:
+  - mysql -e 'CREATE DATABASE pymatcha;'
+
 # TODO: Reformat file as it is ugly. separatee jobs in yml, and lint as the last job to run
 
 jobs:
@@ -21,7 +24,7 @@ jobs:
         # login to github registry
         - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin docker.pkg.github.com
         # build image
-        - docker build -t docker.pkg.github.com/seluj78/pymatcha/pymatcha-api:latest .
+        - docker build -t docker.pkg.github.com/seluj78/pymatcha/pymatcha-api:latest . -f backend.Dockerfile
         # push image
         - docker push docker.pkg.github.com/seluj78/pymatcha/pymatcha-api:latest
 #    - stage: test

.travis.yml

@@ -1 +1 @@
-jlasne gmorer
+jlasne lskrauci

auteur

@@ -1,10 +1,10 @@
 FROM python:3.8.3-buster
 WORKDIR /www
 ADD backend/requirements.txt .
-ADD .env .
-RUN export $(cat .env | xargs)
 RUN pip install -r requirements.txt
 ADD backend .
 ENV PYTHONDONTWRITEBYTECODE 1
 EXPOSE 5000
+ADD .env .
+RUN export $(cat .env | xargs)
 CMD exec gunicorn --chdir /www --bind :5000 --workers 1 --threads 1 PyMatcha:application

Dockerfile backend.DockerfileDockerfile renamed to backend.Dockerfile

@@ -38,17 +38,23 @@
 load_dotenv(dotenv_path)
 
 REQUIRED_ENV_VARS = [
+    "FLASK_PORT",
     "FLASK_DEBUG",
+    "FLASK_HOST",
     "FLASK_SECRET_KEY",
-    "FRONT_STATIC_FOLDER",
+    "ENABLE_LOGGING",
+    "CELERY_BROKER_URL",
+    "CELERY_RESULT_BACKEND",
     "DB_HOST",
     "DB_PORT",
     "DB_USER",
     "DB_PASSWORD",
+    "DB_NAME",
     "MAIL_PASSWORD",
-    "APP_URL",
-    "ENABLE_LOGGING",
+    "REDIS_HOST",
+    "REDIS_PORT",
     "DEBUG_AUTH_TOKEN",
+    "FRONTEND_BASE_URL",
 ]
 
 for item in REQUIRED_ENV_VARS:
@@ -70,8 +76,8 @@
 application.config["JWT_SECRET_KEY"] = os.environ.get("FLASK_SECRET_KEY")
 
 logging.debug("Configuring Celery Redis URLs")
-CELERY_BROKER_URL = os.getenv("CELERY_BROKER_URL", "redis://localhost:6379/0")
-CELERY_RESULT_BACKEND = os.getenv("CELERY_RESULT_BACKEND", "redis://localhost:6379/0")
+CELERY_BROKER_URL = os.getenv("CELERY_BROKER_URL")
+CELERY_RESULT_BACKEND = os.getenv("CELERY_RESULT_BACKEND")
 # Celery configuration
 application.config["CELERY_BROKER_URL"] = CELERY_BROKER_URL
 application.config["CELERY_RESULT_BACKEND"] = CELERY_RESULT_BACKEND
@@ -149,9 +155,7 @@ def expired_token_callback(expired_token):
 logging.debug("Configuring mail")
 mail = Mail(application)
 
-redis = StrictRedis(
-    host=os.getenv("REDIS_HOST", "localhost"), port=os.getenv("REDIS_PORT", 6379), decode_responses=True, db=2
-)
+redis = StrictRedis(host=os.getenv("REDIS_HOST"), port=os.getenv("REDIS_PORT"), decode_responses=True, db=2)
 
 redis.flushdb()
 

backend/PyMatcha/__init__.py

@@ -90,7 +90,7 @@ def request_new_email_conf():
         else:
             current_app.logger.debug("/auth/confirm/new -> User found, sending new confirmation email")
             token = generate_confirmation_token(email=email, token_type="confirm")
-            link = os.getenv("APP_URL") + "/auth/confirm/" + token
+            link = os.getenv("FRONTEND_BASE_URL") + "/auth/confirm/" + token
             rendered_html = render_template("confirm_email.html", link=link)
             send_mail_html.delay(dest=data["email"], subject="Confirm your email on PyMatcha", html=rendered_html)
     current_app.logger.debug("/auth/confirm/new -> New confirmation email sent if user exists in database")

backend/PyMatcha/routes/api/auth/email.py

@@ -55,8 +55,7 @@ def forgot_password():
         pass
     else:
         token = generate_confirmation_token(email=data["email"], token_type="reset")
-        # link = os.getenv("APP_URL") + "/auth/password/forgot/" + token
-        link = f"{os.getenv('FRONT_URL')}/accounts/password/reset?token={token}"
+        link = f"{os.getenv('FRONTEND_BASE_URL')}/accounts/password/reset?token={token}"
         rendered_html = render_template("password_reset.html", link=link)
         current_app.logger.debug("/auth/password/forgot -> Sending worker request to send email")
         send_mail_html.delay(dest=data["email"], subject="Reset your password on PyMatcha", html=rendered_html)