diff --git a/.env.example b/.env.example index 59166c3..dce6653 100644 --- a/.env.example +++ b/.env.example @@ -23,7 +23,7 @@ DB_ENGINE=django.db.backends.postgresql_psycopg2 DB_NAME=django DB_USER=postgres DB_PASSWORD=2309 -DB_HOST=db +DB_HOST=postgres DB_PORT=5432 # Cache diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index e83c205..a653c05 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -151,6 +151,11 @@ jobs: git fetch origin main git reset --hard origin/main - cp .env.example .env + if [ ! -f .env ]; then + cp .env.example .env + echo ".env yaratildi, production qiymatlarini kiriting!" + fi + export PORT=8085 + docker pull ${{ secrets.DOCKER_USERNAME }}/${{ env.PROJECT_NAME }}:${{ github.run_number }} docker stack deploy -c stack.yaml ${{ env.PROJECT_NAME }} --with-registry-auth diff --git a/config/urls.py b/config/urls.py index 2ef339d..d1143f2 100644 --- a/config/urls.py +++ b/config/urls.py @@ -13,7 +13,7 @@ from config.env import env def home(request): - return HttpResponse("OK: #65ab51e65224a92a4b6d488d3e8f9b21d3256876") + return HttpResponse("OK: #62f65385e1dada519459965e9e24cfdd20a41e26") urlpatterns = [ diff --git a/core/apps/tasks/views/board.py b/core/apps/tasks/views/board.py index 755089e..0d0573b 100644 --- a/core/apps/tasks/views/board.py +++ b/core/apps/tasks/views/board.py @@ -5,6 +5,8 @@ from core.apps.tasks.serializers.board import BoardSerializer from core.apps.tasks.models import Column +#test commit + class BoardListView(generics.ListAPIView): queryset = Column.objects.order_by('id') serializer_class = BoardSerializer diff --git a/stack.yaml b/stack.yaml index 5680f4c..7bfa4ac 100644 --- a/stack.yaml +++ b/stack.yaml @@ -84,7 +84,7 @@ services: max-file: "5" web: - image: husanjon/sifatbaho:147 + image: husanjon/sifatbaho:150 env_file: - .env environment: @@ -129,7 +129,7 @@ services: max-file: "5" celery: - image: husanjon/sifatbaho:147 + image: husanjon/sifatbaho:150 env_file: - .env environment: