diff --git a/deploy.sh b/deploy.sh index f1e7e5c..83260bf 100755 --- a/deploy.sh +++ b/deploy.sh @@ -7,6 +7,18 @@ DOCKER_REGISTRY="docker.kvacek.cz" CONTAINER_IMAGE="$DOCKER_REGISTRY/$IMAGE_NAME:$TAG" docker login $DOCKER_REGISTRY - docker build -t $CONTAINER_IMAGE . docker push $CONTAINER_IMAGE + +# TODO: nahravat i config pro apache? + + +scp docker-compose.prod.yml michal@kvacek.cz:/var/www/poletani.cz/api/docker-compose.yml + +ssh -t michal@kvacek.cz << EOF + cd /var/www/poletani.cz/api + docker-compose pull + docker-compose down --remove-orphans + docker-compose up -d + docker-compose exec -T api alembic upgrade head +EOF \ No newline at end of file diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 05aac65..9662e61 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -1,10 +1,11 @@ version: "3.3" + +# testovaci koment + services: api: image: "docker.kvacek.cz/poletani/api:latest" - ports: - - 8000:8000 - command: "uvicorn src.asgi:app --port=8000 --host=0.0.0.0 -k uvicorn.workers.UvicornWorker" + command: "uvicorn src.asgi:app --port=8000 --host=0.0.0.0 --workers 4" network_mode: "host" restart: "always" env_file: diff --git a/src/graphql_schema/entities/flight.py b/src/graphql_schema/entities/flight.py index 8925a21..a6580bc 100644 --- a/src/graphql_schema/entities/flight.py +++ b/src/graphql_schema/entities/flight.py @@ -105,7 +105,7 @@ def get_base_query(user_id: Optional[int], username: Optional[str] = None, is_au query = ( select(models.Flight) .filter(models.Flight.deleted.is_(False)) - .order_by(models.Flight.id.desc()) + .order_by(models.Flight.takeoff_datetime.desc()) ) if user_id: