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

Fix web docker #1729

Merged
merged 1 commit into from
Feb 12, 2025
Merged

Fix web docker #1729

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
9 changes: 5 additions & 4 deletions web/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,17 @@ services:
frontend:
build: ../frontend
container_name: web-dev-frontend
restart: always
command: npm run dev
volumes:
- ../frontend:/usr/src/frontend
- ./:/usr/src/web

nginx:
build: .
container_name: web-dev-nginx
restart: always
volumes:
- ./:/usr/src/robosats/
- ./:/usr/src/web
- ./nginx.conf:/etc/nginx/nginx.conf
- ./coordinators/:/etc/nginx/conf.d/
ports:
- 80:80
- 8080:80
8 changes: 4 additions & 4 deletions web/nginx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@ http {
server_name robosats_web_client;

location / {
root /usr/src/robosats;
root /usr/src/web;
try_files $uri $uri/ /basic.html;
index basic.html;
}

location /pro {
root /usr/src/robosats;
root /usr/src/web;
try_files $uri $uri/ /pro.html;
index pro.html;
}

location /static/ {
alias /usr/src/robosats/static/;
alias /usr/src/web/static/;
autoindex on;
}

Expand All @@ -53,7 +53,7 @@ http {
}

location = /favicon.ico {
alias /usr/src/robosats/static/assets/images/favicon-96x96.png;
alias /usr/src/web/static/assets/images/favicon-96x96.png;
}
}
}