Merge branch 'main' of dev.discours.io:discoursio-api into feature/refactoring-services
This commit is contained in:
commit
0e8b39bed6
|
@ -1,7 +1,7 @@
|
||||||
FROM python:slim
|
FROM python:slim
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
EXPOSE 80
|
EXPOSE 8080
|
||||||
# ADD nginx.conf.sigil ./
|
# ADD nginx.conf.sigil ./
|
||||||
COPY requirements.txt .
|
COPY requirements.txt .
|
||||||
RUN apt-get update && apt-get install -y build-essential git
|
RUN apt-get update && apt-get install -y build-essential git
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
from datetime import datetime, timedelta, timezone
|
from datetime import datetime, timedelta, timezone
|
||||||
from sqlalchemy.engine import ObjectKind
|
|
||||||
|
|
||||||
from sqlalchemy.orm import joinedload, aliased
|
from sqlalchemy.orm import joinedload, aliased
|
||||||
from sqlalchemy.sql.expression import (
|
from sqlalchemy.sql.expression import (
|
||||||
desc,
|
desc,
|
||||||
|
@ -15,9 +13,8 @@ from sqlalchemy.sql.expression import (
|
||||||
|
|
||||||
from auth.authenticate import login_required
|
from auth.authenticate import login_required
|
||||||
from auth.credentials import AuthCredentials
|
from auth.credentials import AuthCredentials
|
||||||
from base.exceptions import ObjectNotExist # , OperationNotAllowed
|
from services.db import local_session
|
||||||
from base.orm import local_session
|
from services.schema import query
|
||||||
from base.resolvers import query
|
|
||||||
from orm import TopicFollower
|
from orm import TopicFollower
|
||||||
from orm.reaction import Reaction, ReactionKind
|
from orm.reaction import Reaction, ReactionKind
|
||||||
from orm.shout import Shout, ShoutAuthor, ShoutTopic
|
from orm.shout import Shout, ShoutAuthor, ShoutTopic
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
from os import environ
|
from os import environ
|
||||||
|
|
||||||
PORT = 80
|
PORT = 8080
|
||||||
|
|
||||||
DB_URL = (
|
DB_URL = (
|
||||||
environ.get("DATABASE_URL") or environ.get("DB_URL") or
|
environ.get("DATABASE_URL") or environ.get("DB_URL") or
|
||||||
|
|
Loading…
Reference in New Issue
Block a user