Skip to content

Commit e30fa6a

Browse files
authored
Merge pull request #1729 from RoboSats/fix-web-docker
Fix web docker
2 parents 065ef5f + 48b182a commit e30fa6a

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

web/docker-compose.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,17 @@ services:
55
frontend:
66
build: ../frontend
77
container_name: web-dev-frontend
8-
restart: always
9-
command: npm run dev
8+
volumes:
9+
- ../frontend:/usr/src/frontend
10+
- ./:/usr/src/web
1011

1112
nginx:
1213
build: .
1314
container_name: web-dev-nginx
1415
restart: always
1516
volumes:
16-
- ./:/usr/src/robosats/
17+
- ./:/usr/src/web
1718
- ./nginx.conf:/etc/nginx/nginx.conf
1819
- ./coordinators/:/etc/nginx/conf.d/
1920
ports:
20-
- 80:80
21+
- 8080:80

web/nginx.conf

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,19 @@ http {
3232
server_name robosats_web_client;
3333

3434
location / {
35-
root /usr/src/robosats;
35+
root /usr/src/web;
3636
try_files $uri $uri/ /basic.html;
3737
index basic.html;
3838
}
3939

4040
location /pro {
41-
root /usr/src/robosats;
41+
root /usr/src/web;
4242
try_files $uri $uri/ /pro.html;
4343
index pro.html;
4444
}
4545

4646
location /static/ {
47-
alias /usr/src/robosats/static/;
47+
alias /usr/src/web/static/;
4848
autoindex on;
4949
}
5050

@@ -53,7 +53,7 @@ http {
5353
}
5454

5555
location = /favicon.ico {
56-
alias /usr/src/robosats/static/assets/images/favicon-96x96.png;
56+
alias /usr/src/web/static/assets/images/favicon-96x96.png;
5757
}
5858
}
5959
}

0 commit comments

Comments
 (0)