Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deployment #159

Merged
merged 5 commits into from
Mar 24, 2024
Merged

Deployment #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
53d6d8b
chore: change deployment branch
Topvennie Mar 23, 2024
34919d0
fix: swagger in production
Topvennie Mar 23, 2024
1f182f1
chore: change default output to frontend and backend
Topvennie Mar 23, 2024
4bad27f
chore: change branch to main
Topvennie Mar 23, 2024
2839a02
Merge branch 'development' into deployment
Topvennie Mar 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/deployement.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ jobs:
script: |
cd UGent-7
docker-compose -f production.yml down
${{ secrets.PULL_SCRIPT }}
git pull
docker-compose -f production.yml build --no-cache
docker-compose -f production.yml up -d
7 changes: 2 additions & 5 deletions backend/ypovoli/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
from drf_yasg.views import get_schema_view
from rest_framework import permissions
from django.http import JsonResponse
from ypovoli.settings import DOMAIN_NAME

schema_view = get_schema_view(
openapi.Info(
Expand All @@ -33,6 +34,7 @@
permission_classes=[
permissions.AllowAny,
],
url=f"https://{DOMAIN_NAME}",
)


Expand All @@ -52,11 +54,6 @@ def swagger_json(request):
path("", include("api.urls")),
# Authentication endpoints.
path("auth/", include("authentication.urls")),
path(
"notifications/",
include("notifications.urls"),
name="notifications",
),
# Swagger documentation.
path(
"swagger/",
Expand Down
6 changes: 3 additions & 3 deletions development.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ echo "Following logs..."
echo "Press CTRL + C to stop all containers"
echo "-------------------------------------"

if [ "$backend" = true ] && [ "$frontend" = true ]; then
docker-compose -f development.yml logs --follow --tail 50 backend frontend
if [ "$backend" = true ]; then
docker-compose -f development.yml logs --follow --tail 50 backend
elif [ "$frontend" = true ]; then
docker-compose -f development.yml logs --follow --tail 50 frontend
else
docker-compose -f development.yml logs --follow --tail 50 frontend
docker-compose -f development.yml logs --follow --tail 50 backend frontend
fi

echo "Cleaning up..."
Expand Down
Loading