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

sync dev #18

Merged
merged 18 commits into from
Sep 23, 2024
Merged

sync dev #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
403b980
Trigger pipeline
rojenarda Sep 20, 2024
8e5797f
Trigger pipeline
rojenarda Sep 20, 2024
892286a
Update workflow
rojenarda Sep 20, 2024
a994b51
Update workflow
rojenarda Sep 20, 2024
4fdb1bd
UPDATE WORKFLOW?????
rojenarda Sep 20, 2024
2e7a3d2
UPDATE WORKFLOW :((((
rojenarda Sep 20, 2024
97594a9
EVET
rojenarda Sep 20, 2024
ac117be
Print allowed origins, disable cache on docker build
rojenarda Sep 20, 2024
799c5f7
Update config.py
hasanaliozdemir Sep 23, 2024
7894167
Update config.py
hasanaliozdemir Sep 23, 2024
38fe9ff
Update config.py
hasanaliozdemir Sep 23, 2024
43bdbe3
Update config.py
hasanaliozdemir Sep 23, 2024
46167bf
Update workflow
rojenarda Sep 23, 2024
b40a361
Test
rojenarda Sep 23, 2024
2836d45
TEST
rojenarda Sep 23, 2024
1858c93
TEST
rojenarda Sep 23, 2024
2be0937
sikerler
rojenarda Sep 23, 2024
9d39128
oops
rojenarda Sep 23, 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
3 changes: 2 additions & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- run: docker compose -f docker-compose.yml build
- run: cp /home/hasan/ituacm_website_backend/.env ./
- run: docker compose -f docker-compose.yml build --no-cache
- run: docker compose -f docker-compose.yml up -d
2 changes: 1 addition & 1 deletion backend/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ COPY ./prestart.sh /app/

COPY ./tests-start.sh /app/

COPY ./app /app/app
COPY ./app /app/app
12 changes: 12 additions & 0 deletions backend/app/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,18 @@ def custom_generate_unique_id(route: APIRoute) -> str:

# Set all CORS enabled origins
if settings.BACKEND_CORS_ORIGINS:
settings.BACKEND_CORS_ORIGINS = [
'http://localhost',
'http://localhost:5173',
'https://localhost',
'https://localhost:5173',
'https://ituacm.com',
'https://api.ituacm.com',
'https://adminer.ituacm.com',
'https://admin.ituacm.com',
'http://admin.ituacm.com'
]
print(settings.BACKEND_CORS_ORIGINS)
app.add_middleware(
CORSMiddleware,
allow_origins=[
Expand Down