Updated env, added sleep in travis

Author: Seluj78

.env.enc

@@ -43,7 +43,9 @@ jobs:
         - docker pull docker.pkg.github.com/seluj78/pymatcha/pymatcha-api:latest
         # run docker on port 80
         # do not forget to add env-file an environment file in Settings/CI CD/Variables
-        - docker run -d -p 5000:5000 --restart always docker.pkg.github.com/seluj78/pymatcha/pymatcha-api:latest
+        - docker run -d -p 5000:5000 --restart always --env-file .env docker.pkg.github.com/seluj78/pymatcha/pymatcha-api:latest
+        # Wait for docker to be up
+        - sleep 10
         # run newman tests
         - newman run --color on 'PyMatcha.postman_collection.json'
       after_script:

.travis.yml

@@ -6,6 +6,5 @@ RUN export $(cat .env | xargs)
 RUN pip install -r requirements.txt
 ADD backend .
 ENV PYTHONDONTWRITEBYTECODE 1
-ENV IS_DOCKER_COMPOSE true
 EXPOSE 5000
-CMD gunicorn --chdir /www app:application -w 2 --threads 2 -b 0.0.0.0:5000
+CMD exec gunicorn --chdir /www --bind :5000 --workers 1 --threads 1 PyMatcha:application

Dockerfile

@@ -70,8 +70,8 @@
 application.config["JWT_SECRET_KEY"] = os.environ.get("FLASK_SECRET_KEY")
 
 logging.debug("Configuring Celery Redis URLs")
-CELERY_BROKER_URL = "redis://localhost:6379/0" if not os.getenv("IS_DOCKER_COMPOSE") else "redis://redis:6379/0"
-CELERY_RESULT_BACKEND = "redis://localhost:6379/0" if not os.getenv("IS_DOCKER_COMPOSE") else "redis://redis:6379/0"
+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 configuration
 application.config["CELERY_BROKER_URL"] = CELERY_BROKER_URL
 application.config["CELERY_RESULT_BACKEND"] = CELERY_RESULT_BACKEND
@@ -150,10 +150,7 @@ def expired_token_callback(expired_token):
 mail = Mail(application)
 
 redis = StrictRedis(
-    host=os.getenv("REDIS_HOST") if not os.getenv("IS_DOCKER_COMPOSE") else "redis",
-    port=os.getenv("REDIS_PORT", 6379),
-    decode_responses=True,
-    db=2,
+    host=os.getenv("REDIS_HOST", "localhost"), port=os.getenv("REDIS_PORT", 6379), decode_responses=True, db=2
 )
 
 redis.flushdb()