Razeni letu podle vzletu
This commit is contained in:
@@ -7,6 +7,18 @@ DOCKER_REGISTRY="docker.kvacek.cz"
|
|||||||
CONTAINER_IMAGE="$DOCKER_REGISTRY/$IMAGE_NAME:$TAG"
|
CONTAINER_IMAGE="$DOCKER_REGISTRY/$IMAGE_NAME:$TAG"
|
||||||
|
|
||||||
docker login $DOCKER_REGISTRY
|
docker login $DOCKER_REGISTRY
|
||||||
|
|
||||||
docker build -t $CONTAINER_IMAGE .
|
docker build -t $CONTAINER_IMAGE .
|
||||||
docker push $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
|
||||||
@@ -1,10 +1,11 @@
|
|||||||
version: "3.3"
|
version: "3.3"
|
||||||
|
|
||||||
|
# testovaci koment
|
||||||
|
|
||||||
services:
|
services:
|
||||||
api:
|
api:
|
||||||
image: "docker.kvacek.cz/poletani/api:latest"
|
image: "docker.kvacek.cz/poletani/api:latest"
|
||||||
ports:
|
command: "uvicorn src.asgi:app --port=8000 --host=0.0.0.0 --workers 4"
|
||||||
- 8000:8000
|
|
||||||
command: "uvicorn src.asgi:app --port=8000 --host=0.0.0.0 -k uvicorn.workers.UvicornWorker"
|
|
||||||
network_mode: "host"
|
network_mode: "host"
|
||||||
restart: "always"
|
restart: "always"
|
||||||
env_file:
|
env_file:
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ def get_base_query(user_id: Optional[int], username: Optional[str] = None, is_au
|
|||||||
query = (
|
query = (
|
||||||
select(models.Flight)
|
select(models.Flight)
|
||||||
.filter(models.Flight.deleted.is_(False))
|
.filter(models.Flight.deleted.is_(False))
|
||||||
.order_by(models.Flight.id.desc())
|
.order_by(models.Flight.takeoff_datetime.desc())
|
||||||
)
|
)
|
||||||
|
|
||||||
if user_id:
|
if user_id:
|
||||||
|
|||||||
Reference in New Issue
Block a user