Skip to content
This repository has been archived by the owner on Jul 17, 2024. It is now read-only.

Commit

Permalink
Update deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
Rados13 committed Jul 9, 2024
1 parent 8619b96 commit 21db93c
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 7 deletions.
11 changes: 11 additions & 0 deletions assets/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,17 @@ server {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
}


location /grafana {
proxy_pass_request_headers on;
proxy_pass_request_body on;
proxy_pass http://grafana:3000;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
}

location / {
root /usr/share/nginx/html/;
Expand Down
7 changes: 3 additions & 4 deletions docker-compose-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
depends_on:
- backend
ports:
- "5005:5005"
- "127.0.0.1:5005:5005"

backend:
build:
Expand All @@ -31,15 +31,15 @@ services:
BE_JF_ADDRESS: ${BE_JF_ADDRESS}
restart: unless-stopped
ports:
- "5004:5004"
- "127.0.0.1:5004:5004"

grafana:
build:
context: ./infra/grafana/
dockerfile: Dockerfile
container_name: grafana
ports:
- "3000:3000"
- "127.0.0.1:3000:3000"
environment:
GF_SECURITY_ADMIN_PASSWORD: "${GF_SECURITY_ADMIN_PASSWORD}"
GF_SECURITY_ADMIN_USER: "${GF_SECURITY_ADMIN_USER}"
Expand Down Expand Up @@ -69,5 +69,4 @@ services:
- '${ALLOY_CONFIG_PATH}/${ALLOY_CONFIG_FILE}'

volumes:
grafana-storage:
loki-data:
6 changes: 3 additions & 3 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ services:
- fishjam1
- fishjam2
ports:
- "5005:5005"
- "127.0.0.1:5005:5005"

backend:
build:
Expand All @@ -78,15 +78,15 @@ services:
- fishjam1
- fishjam2
ports:
- "5004:5004"
- "127.0.0.1:5004:5004"

grafana:
build:
context: ./infra/grafana/
dockerfile: Dockerfile
container_name: grafana
ports:
- "3000:3000"
- "127.0.0.1:3000:3000"
environment:
GF_SECURITY_ADMIN_PASSWORD: "${GF_SECURITY_ADMIN_PASSWORD}"
GF_SECURITY_ADMIN_USER: "${GF_SECURITY_ADMIN_USER}"
Expand Down

0 comments on commit 21db93c

Please sign in to comment.