Update docker-compose.yaml

docker-compose.yaml

@@ -2,9 +2,11 @@ services:
   app:
   app:
     image: dock.nexpie.com/stack/flowengine:1.3.5-2-f633d8d2
     image: dock.nexpie.com/stack/flowengine:1.3.5-2-f633d8d2
     volumes:
     volumes:
-      - /usr/local/flowengine/flowengine-${SH_PROJECTPODID}/flow-data:/usr/local/flowengine
-      - /usr/local/flowengine/flowengine-${SH_PROJECTPODID}/store-data:/usr/local/store-data
+      - ./flow-data:/usr/local/flowengine
+      - ./store-data:/usr/local/store-data
     #   - Gluster/
     #   - Gluster/
+    ports:
+      - 30081:80
     environment:
     environment:
       PROJECT_ID: "${SH_PROJECT_ID}"
       PROJECT_ID: "${SH_PROJECT_ID}"
       OAUTH_LOGIN: "TRUE"
       OAUTH_LOGIN: "TRUE"
@@ -17,59 +19,40 @@ services:
       OAUTH_CLIENT_SECRET: ${SH_OAUTH_CLIENT_SECRET}
       OAUTH_CLIENT_SECRET: ${SH_OAUTH_CLIENT_SECRET}
       TOKEN_ENDPOINT: https://auth.nexiiot.io/oauth/token
       TOKEN_ENDPOINT: https://auth.nexiiot.io/oauth/token
       USERINFO_API_ENDPOINT: https://auth.nexiiot.io/api/userinfo
       USERINFO_API_ENDPOINT: https://auth.nexiiot.io/api/userinfo
-    deploy:
-        resources:
-            limits:
-              cpus: '0.2'
-              memory: '256M'
-            reservations:
-              cpus: '0.1'
-              memory: '128M'
   influxdb:
   influxdb:
     image: docker.io/bitnami/influxdb:2.7.1
     image: docker.io/bitnami/influxdb:2.7.1
-    # ports:
-    #   - 38086:8086
-    #   - 38088:8088
+    ports:
+      - 38087:8086
+      - 38089:8088
     environment:
     environment:
       - INFLUXDB_ADMIN_USER_PASSWORD=nexiiotpassword
       - INFLUXDB_ADMIN_USER_PASSWORD=nexiiotpassword
       - INFLUXDB_ADMIN_USER_TOKEN=nexiiottoken
       - INFLUXDB_ADMIN_USER_TOKEN=nexiiottoken
+      - influxdb_primary_bucket=primary
+      - influxdb_admin_organization=primary
+      - influxdb_retention_period=4320 #24 * 180        อายุข้อมูล
+      - INFLUXDB_MONITOR_STORE_DATABASE="primary"
+      - INFLUXD_UI_DISABLED=false
+      - INFLUXD_REPORTING_DISABLED=false
+      - INFLUXD_NO_TASKS=false
+      - INFLUXD_METRICS_DISABLED=false
     volumes:
     volumes:
-      - /usr/local/flowengine/flowengine-${SH_PROJECTPODID}/influxdb:/bitnami/influxdb
-    deploy:
-        resources:
-            limits:
-              cpus: '0.2'
-              memory: '256M'
-            reservations:
-              cpus: '0.1'
-              memory: '128M'
-# Copyright VMware, Inc.
-# SPDX-License-Identifier: APACHE-2.0
-
+      - influxdb:/bitnami/influxdb
+      - ./bash-influx:/bitnami/
 
 
   grafana:
   grafana:
     image: docker.io/bitnami/grafana:10
     image: docker.io/bitnami/grafana:10
-    # ports:
-    #   - '3000:3000'
+    ports:
+      - '33011:3000'
     environment:
     environment:
       - 'GF_SECURITY_ADMIN_PASSWORD=nexiiot'
       - 'GF_SECURITY_ADMIN_PASSWORD=nexiiot'
     volumes:
     volumes:
       - grafana_data:/opt/bitnami/grafana/data
       - grafana_data:/opt/bitnami/grafana/data
-    deploy:
-        resources:
-            limits:
-              cpus: '0.2'
-              memory: '256M'
-            reservations:
-              cpus: '0.1'
-              memory: '128M'
-      
-networks:
+      - ./grafana/datasources:/opt/bitnami/grafana/conf/provisioning/datasources/
+      - ./grafana/dashboard/templates:/var/lib/dashboards
+      - ./grafana/dashboard/conf:/opt/bitnami/grafana/conf/provisioning/dashboards/
+
+volumes:
+  grafana_data:
+    driver: local
+  influxdb:
+    driver: local
\ No newline at end of file
-  default:
-    name: swarm-flowengine-net
-    external: true
-# Volumes:
-#   flowengine-${SH_PROJECTPODID}:
-#     Driver: glusterfs
-#     Driver_opts:
-#       Endpoint: "glusterfs-node3:/k8s-volume/flowengine"