mirror of
https://github.com/RoboSats/robosats.git
synced 2025-02-22 05:09:01 +00:00
Merge pull request #1729 from RoboSats/fix-web-docker
Some checks failed
Lint: Python Coordinator / Run linters (push) Has been cancelled
Some checks failed
Lint: Python Coordinator / Run linters (push) Has been cancelled
Fix web docker
This commit is contained in:
commit
e30fa6ab98
@ -5,16 +5,17 @@ services:
|
|||||||
frontend:
|
frontend:
|
||||||
build: ../frontend
|
build: ../frontend
|
||||||
container_name: web-dev-frontend
|
container_name: web-dev-frontend
|
||||||
restart: always
|
volumes:
|
||||||
command: npm run dev
|
- ../frontend:/usr/src/frontend
|
||||||
|
- ./:/usr/src/web
|
||||||
|
|
||||||
nginx:
|
nginx:
|
||||||
build: .
|
build: .
|
||||||
container_name: web-dev-nginx
|
container_name: web-dev-nginx
|
||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
- ./:/usr/src/robosats/
|
- ./:/usr/src/web
|
||||||
- ./nginx.conf:/etc/nginx/nginx.conf
|
- ./nginx.conf:/etc/nginx/nginx.conf
|
||||||
- ./coordinators/:/etc/nginx/conf.d/
|
- ./coordinators/:/etc/nginx/conf.d/
|
||||||
ports:
|
ports:
|
||||||
- 80:80
|
- 8080:80
|
||||||
|
@ -32,19 +32,19 @@ http {
|
|||||||
server_name robosats_web_client;
|
server_name robosats_web_client;
|
||||||
|
|
||||||
location / {
|
location / {
|
||||||
root /usr/src/robosats;
|
root /usr/src/web;
|
||||||
try_files $uri $uri/ /basic.html;
|
try_files $uri $uri/ /basic.html;
|
||||||
index basic.html;
|
index basic.html;
|
||||||
}
|
}
|
||||||
|
|
||||||
location /pro {
|
location /pro {
|
||||||
root /usr/src/robosats;
|
root /usr/src/web;
|
||||||
try_files $uri $uri/ /pro.html;
|
try_files $uri $uri/ /pro.html;
|
||||||
index pro.html;
|
index pro.html;
|
||||||
}
|
}
|
||||||
|
|
||||||
location /static/ {
|
location /static/ {
|
||||||
alias /usr/src/robosats/static/;
|
alias /usr/src/web/static/;
|
||||||
autoindex on;
|
autoindex on;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -53,7 +53,7 @@ http {
|
|||||||
}
|
}
|
||||||
|
|
||||||
location = /favicon.ico {
|
location = /favicon.ico {
|
||||||
alias /usr/src/robosats/static/assets/images/favicon-96x96.png;
|
alias /usr/src/web/static/assets/images/favicon-96x96.png;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user