Skip to content

Commit fa9384b

Browse files
committed
BugFix: fix obkv-redis in docker compose.
1 parent bada84b commit fa9384b

File tree

2 files changed

+45
-40
lines changed

2 files changed

+45
-40
lines changed

docker/docker-compose.middleware.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ services:
5757
volumes:
5858
- ./volumes/oceanbase/obkv_redis/healthcheck.sh:/root/healthcheck.sh
5959
ports:
60-
- "${OCEANBASE_VECTOR_PORT:-2881}:2881"
60+
- "${OBKV_PORT:-2991}:2881"
6161
healthcheck:
6262
test: [ "CMD", "/root/healthcheck.sh" ]
6363
interval: 10s
@@ -71,7 +71,7 @@ services:
7171
environment:
7272
APP_NAME: dify_obproxy
7373
PROXYRO_PASSWORD: 123456
74-
RS_LIST: ${OCEANBASE_IP}:${OCEANBASE_VECTOR_PORT:-2881}
74+
RS_LIST: ${OCEANBASE_IP}:${OBKV_PORT:-2991}
7575
OB_CLUSTER: ${OCEANBASE_CLUSTER_NAME:-difyai}
7676
ports:
7777
- "${OBPROXY_SQL_PORT:-2883}:2883"

docker/docker-compose.yaml

Lines changed: 43 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ x-shared-env: &shared-api-worker-env
7575
REDIS_SENTINEL_SOCKET_TIMEOUT: ${REDIS_SENTINEL_SOCKET_TIMEOUT:-0.1}
7676
REDIS_USE_CLUSTERS: ${REDIS_USE_CLUSTERS:-false}
7777
REDIS_USE_OBKV: ${REDIS_USE_OBKV:-false}
78+
REDIS_SERIALIZATION_PROTOCOL: ${REDIS_SERIALIZATION_PROTOCOL:-2}
7879
REDIS_CLUSTERS: ${REDIS_CLUSTERS:-}
7980
REDIS_CLUSTERS_PASSWORD: ${REDIS_CLUSTERS_PASSWORD:-}
8081
CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://:difyai123456@redis:6379/1}
@@ -514,6 +515,8 @@ services:
514515
condition: service_healthy
515516
redis:
516517
condition: service_started
518+
obproxy:
519+
condition: service_started
517520
volumes:
518521
# Mount the storage directory to the container, for storing user files.
519522
- ./volumes/app/storage:/app/api/storage
@@ -541,6 +544,8 @@ services:
541544
condition: service_healthy
542545
redis:
543546
condition: service_started
547+
obproxy:
548+
condition: service_started
544549
volumes:
545550
# Mount the storage directory to the container, for storing user files.
546551
- ./volumes/app/storage:/app/api/storage
@@ -945,45 +950,45 @@ services:
945950
start_period: 30s
946951
timeout: 10s
947952

948-
obkv_redis:
949-
image: oceanbase/oceanbase-ce:4.2.5.3-103000022025033117
950-
container_name: oceanbase
951-
profiles:
952-
- oceanbase
953-
restart: always
954-
environment:
955-
OB_MEMORY_LIMIT: ${OCEANBASE_MEMORY_LIMIT:-6G}
956-
OB_SYS_PASSWORD: ${OCEANBASE_VECTOR_PASSWORD:-difyai123456}
957-
OB_TENANT_PASSWORD: ${OCEANBASE_VECTOR_PASSWORD:-difyai123456}
958-
OB_CLUSTER_NAME: ${OCEANBASE_CLUSTER_NAME:-difyai}
959-
MODE: MINI
960-
volumes:
961-
- ./volumes/oceanbase/obkv_redis/healthcheck.sh:/root/healthcheck.sh
962-
ports:
963-
- "${OCEANBASE_VECTOR_PORT:-2881}:2881"
964-
healthcheck:
965-
test: [ "CMD", "/root/healthcheck.sh" ]
966-
interval: 10s
967-
retries: 30
968-
start_period: 30s
969-
timeout: 10s
953+
obkv_redis:
954+
image: oceanbase/oceanbase-ce:4.2.5.3-103000022025033117
955+
container_name: obkv_redis
956+
profiles:
957+
- oceanbase
958+
restart: always
959+
environment:
960+
OB_MEMORY_LIMIT: ${OCEANBASE_MEMORY_LIMIT:-6G}
961+
OB_SYS_PASSWORD: ${OCEANBASE_VECTOR_PASSWORD:-difyai123456}
962+
OB_TENANT_PASSWORD: ${OCEANBASE_VECTOR_PASSWORD:-difyai123456}
963+
OB_CLUSTER_NAME: ${OCEANBASE_CLUSTER_NAME:-difyai}
964+
MODE: MINI
965+
volumes:
966+
- ./volumes/oceanbase/obkv_redis/healthcheck.sh:/root/healthcheck.sh
967+
ports:
968+
- "${OBKV_PORT:-2991}:2881"
969+
healthcheck:
970+
test: [ "CMD", "/root/healthcheck.sh" ]
971+
interval: 10s
972+
retries: 30
973+
start_period: 30s
974+
timeout: 10s
970975

971-
obproxy:
972-
image: oceanbase/obproxy-ce:4.3.4.0-1
973-
container_name: obproxy
974-
profiles:
975-
- oceanbase
976-
environment:
977-
APP_NAME: dify_obproxy
978-
PROXYRO_PASSWORD: 123456
979-
RS_LIST: ${OCEANBASE_IP}:${OCEANBASE_VECTOR_PORT:-2881}
980-
OB_CLUSTER: ${OCEANBASE_CLUSTER_NAME:-difyai}
981-
ports:
982-
- "${OBPROXY_SQL_PORT:-2883}:2883"
983-
- "${OBPROXY_RPC_PORT:-2885}:2885"
984-
depends_on:
985-
obkv_redis:
986-
condition: service_healthy
976+
obproxy:
977+
image: oceanbase/obproxy-ce:4.3.4.0-1
978+
container_name: obproxy
979+
profiles:
980+
- oceanbase
981+
environment:
982+
APP_NAME: dify_obproxy
983+
PROXYRO_PASSWORD: 123456
984+
RS_LIST: ${OCEANBASE_IP}:${OBKV_PORT:-2991}
985+
OB_CLUSTER: ${OCEANBASE_CLUSTER_NAME:-difyai}
986+
ports:
987+
- "${OBPROXY_SQL_PORT:-2883}:2883"
988+
- "${OBPROXY_RPC_PORT:-2885}:2885"
989+
depends_on:
990+
obkv_redis:
991+
condition: service_healthy
987992

988993
# Oracle vector database
989994
oracle:

0 commit comments

Comments
 (0)