From fe3c7ab12e4c1153eedce629640c70bd6ba06357 Mon Sep 17 00:00:00 2001
From: Darren <27513732@qq.com>
Date: Thu, 7 Mar 2024 17:27:22 +0800
Subject: [PATCH] fix redash

---
 apps/redash/.env               | 25 ++++++++++++++++++---
 apps/redash/Notes.md           |  9 +++++++-
 apps/redash/docker-compose.yml | 41 ++++++++++++++++++++--------------
 3 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/apps/redash/.env b/apps/redash/.env
index dd4cd78a2..a8895d1e3 100644
--- a/apps/redash/.env
+++ b/apps/redash/.env
@@ -1,5 +1,24 @@
-
-W9_NAME=redash
+W9_DIST=community
+W9_REPO=redash/redash
 W9_VERSION=latest
-W9_HTTP_PORT=9001
+W9_POWER_PASSWORD=1PrMxExC45LsCT
+
+W9_ID=redash
+W9_HTTP_PORT_SET=9001
+W9_HTTP_PORT=5000
+
+W9_URL=appname.example.com
+
 W9_NETWORK=websoft9
+
+# environments from Redash
+# refer to: https://github.com/getredash/setup/blob/master/setup.sh
+# refer to: https://redash.io/help/open-source/setup#-Setup
+
+PYTHONUNBUFFERED=0
+REDASH_LOG_LEVEL=INFO
+REDASH_REDIS_URL=redis://${W9_ID}-redis:6379/0
+POSTGRES_PASSWORD=$W9_POWER_PASSWORD
+REDASH_COOKIE_SECRET=$W9_POWER_PASSWORD
+REDASH_SECRET_KEY=$W9_POWER_PASSWORD
+REDASH_DATABASE_URL="postgresql://postgres:${POSTGRES_PASSWORD}@postgres/postgres"
\ No newline at end of file
diff --git a/apps/redash/Notes.md b/apps/redash/Notes.md
index 3b84476d4..0bda27d70 100644
--- a/apps/redash/Notes.md
+++ b/apps/redash/Notes.md
@@ -1 +1,8 @@
-# Redash
\ No newline at end of file
+# Redash
+
+- environments is get from setup.sh
+- after docker compose up, should run at redash container (the same with 【sudo docker-compose run --rm server create_db】), why?
+  ```
+  ./manage.py database create_tables
+  ```
+- Nginx container is not need
\ No newline at end of file
diff --git a/apps/redash/docker-compose.yml b/apps/redash/docker-compose.yml
index 9d7a40a66..893e063c0 100644
--- a/apps/redash/docker-compose.yml
+++ b/apps/redash/docker-compose.yml
@@ -1,59 +1,66 @@
-# compose from: https://github.com/getredash/setup/blob/master/data/docker-compose.yml
+# compose: https://github.com/getredash/setup/blob/master/data/docker-compose.yml
+# image: https://hub.docker.com/r/redash/redash
+# docs: https://github.com/getredash/setup/blob/master/setup.sh
 
 version: "3.8"
 x-redash-service: &redash-service
-  image: redash/redash:8.0.0.b32245
+  image: ${W9_REPO}:${W9_VERSION}
   depends_on:
     - postgres
     - redis
-  env_file: /opt/redash/env
-  restart: always
+  env_file: .env
+  restart: unless-stopped
   
 services:
   server:
     <<: *redash-service
     command: server
+    container_name: ${W9_ID}
     ports:
-      - "5000:5000"
+      - ${W9_HTTP_PORT_SET}:5000
     environment:
       REDASH_WEB_WORKERS: 4
+
   scheduler:
     <<: *redash-service
     command: scheduler
     environment:
       QUEUES: "celery"
       WORKERS_COUNT: 1
+
   scheduled_worker:
     <<: *redash-service
     command: worker
     environment:
       QUEUES: "scheduled_queries,schemas"
-      WORKERS_COUNT: 1
+      WORKERS_COUNT: 
+      
   adhoc_worker:
     <<: *redash-service
     command: worker
     environment:
       QUEUES: "queries"
       WORKERS_COUNT: 2
+
   redis:
     image: redis:5.0-alpine
+    container_name: ${W9_ID}-redis
     restart: always
+    volumes:
+      - redis:/data
+
   postgres:
     image: postgres:9.6-alpine
-    env_file: /opt/redash/env
+    container_name: ${W9_ID}-postgres
+    env_file: .env
     volumes:
-      - /opt/redash/postgres-data:/var/lib/postgresql/data
-    restart: always
-  nginx:
-    image: redash/nginx:latest
-    ports:
-      - "80:80"
-    depends_on:
-      - server
-    links:
-      - server:redash
+      - postgres:/var/lib/postgresql/data
     restart: always
 
+volumes:
+  postgres:
+  redis:
+
 networks:
   default:
     name: ${W9_NETWORK}