deploy

go-park-mail-ru · Nov 19, 2023 · 7da6110 · 7da6110
1 parent 3cb2924
commit 7da6110
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/CD.yaml b/.github/workflows/CD.yaml
@@ -94,7 +94,7 @@ jobs:
           username: ${{ secrets.DEPLOY_USERNAME }}
           key: ${{ secrets.SSHKEY }}
           rm: true
-          source: docker-compose.yml, build/schema/initdb.sql, metrics/prometheus/prometheus.yml, metrics/grafana/grafana.ini
+          source: docker-compose.yml, build/schema/initdb.sql, metrics/prometheus/prometheus.yml
           target: ~/${{ env.FOLDER_COMPOSE }}
 
       - name: Get docker form dockerhub via SSH action

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -67,7 +67,7 @@ services:
       - hamster-net
     ports:
       - "${REDIS_PORT}:6379"
-  
+
 
   hammywallet-api:
     container_name: ${CONTAINER_NAME}
@@ -115,14 +115,16 @@ services:
     container_name: grafana
     image: grafana/grafana-oss:9.4.3
     user: '0'
+    environment:
+      GF_SERVER_SERVE_FROM_SUB_PATH: "true"
+      GF_SERVER_ROOT_URL: "https://hammywallet.ru/grafana/"
     ports:
-      - "3001:3000"
+      - "8015:3000"
     volumes:
       - type: bind
         source: /home/ubuntu/grafana_metrics
         target: /var/lib/grafana
-      #- ./metrics/grafana/:/etc/grafana/
     networks:
     - hamster-net
 volumes:
-  api-logs:
+  api-logs:
diff --git a/metrics/grafana/grafana.ini b/metrics/grafana/grafana.ini