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

front done #94

Merged
merged 1 commit into from
Mar 1, 2024
Merged

front done #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,5 +102,5 @@ jobs:
sudo docker compose -f docker-compose-prod.yaml up -d
sudo docker compose -f docker-compose-prod.yaml exec backend python manage.py migrate
sudo docker compose -f docker-compose-prod.yaml exec backend python manage.py collectstatic --no-input
sudo docker compose -f docker-compose-prod.yaml exec backend cp -r static/. /backend_static/
sudo docker compose -f docker-compose-prod.yaml exec backend cp -r static/. /backend_static/static/
sudo docker system prune -f
1 change: 0 additions & 1 deletion infra/docker-compose-prod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ services:
frontend:
image: ${DOCKERHUB_USERNAME_FRONT}/${PROJECT_NAME}_frontend:latest
env_file: .env
command: cp -r .next/. /frontend_static/
ports:
- "3000:3000"
volumes:
Expand Down
7 changes: 3 additions & 4 deletions infra/nginx/nginx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
server {
listen 80;
listen [::]:80;
server_name 89.23.117.80 devcodepet.tw1.ru 89.23.117.168 testcodepet.tw1.ru localhost;
server_name 89.23.117.80 devcodepet.tw1.ru 89.23.117.168 testcodepet.tw1.ru;

location /api/v1/ {
proxy_set_header Host $http_host;
Expand All @@ -12,8 +12,7 @@ server {
proxy_pass http://backend:8000/admin/;
}
location / {
alias /staticfiles/;
index index.html;
try_files $uri $uri/ /index.html;
proxy_set_header Host $http_host;
proxy_pass http://frontend:3000/;
}
}