huangping/starRiverProperty
1
0
Fork 0
mirror of https://github.com/hpd840321/starRiverProperty.git synced 2026-06-09 08:20:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: reuse existing ybs-kafka/ybs-zookeeper, move Consul to 9517, remove ZK/Kafka from compose

Browse Source 
Former-commit-id: c7aff428fd4b259c9795da76ce4a53be29f9fe4d
This commit is contained in:
反编译工作区
2026-05-01 22:57:47 +08:00
parent ef9f38587c
commit 31ec44e21a
3 changed files with 4 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/test-env/config/env.sh
+1 -1
View File
@@ -34,7 +34,7 @@ REDIS_HOST=127.0.0.1
REDIS_PORT=6380 REDIS_PORT=6380
REDIS_PASS="1qaz!QAZ" REDIS_PASS="1qaz!QAZ"
CONSUL_HOST=127.0.0.1 CONSUL_HOST=127.0.0.1
CONSUL_PORT=8500 CONSUL_PORT=9517
KAFKA_HOST=127.0.0.1 KAFKA_HOST=127.0.0.1
KAFKA_PORT=9092 KAFKA_PORT=9092
ZK_HOST=127.0.0.1 ZK_HOST=127.0.0.1
scripts/test-env/docker-compose.infra.yml
+1 -27
View File
@@ -4,7 +4,7 @@ services:
container_name: v2test-consul container_name: v2test-consul
restart: unless-stopped restart: unless-stopped
ports: ports:
- "8500:8500" - "9517:8500"
command: > command: >
agent -server -bootstrap-expect=1 -ui agent -server -bootstrap-expect=1 -ui
-client=0.0.0.0 -bind=0.0.0.0 -client=0.0.0.0 -bind=0.0.0.0
@@ -20,32 +20,6 @@ services:
- "6380:6379" - "6380:6379"
command: redis-server --requirepass "1qaz!QAZ" command: redis-server --requirepass "1qaz!QAZ"
zookeeper:
image: confluentinc/cp-zookeeper:7.5.0
container_name: v2test-zookeeper
restart: unless-stopped
ports:
- "2181:2181"
environment:
ZOOKEEPER_CLIENT_PORT: 2181
ZOOKEEPER_TICK_TIME: 2000
kafka:
image: confluentinc/cp-kafka:7.5.0
container_name: v2test-kafka
restart: unless-stopped
ports:
- "9092:9092"
environment:
KAFKA_BROKER_ID: 1
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
KAFKA_ADVERTISED_LISTENERS: "PLAINTEXT://localhost:9092"
KAFKA_LISTENERS: "PLAINTEXT://:9092"
KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
KAFKA_AUTO_CREATE_TOPICS_ENABLE: "true"
depends_on:
- zookeeper
nginx: nginx:
image: nginx:alpine image: nginx:alpine
container_name: v2test-nginx container_name: v2test-nginx
scripts/test-env/setup.sh
+2 -3
View File
@@ -51,7 +51,7 @@ log_ok "MySQL: $MYSQL_HOST:$MYSQL_PORT OK"
# 端口冲突 # 端口冲突
CONFLICT_PORTS="" CONFLICT_PORTS=""
for port in 8500 6380 9092 2181 8090 18080 18081 16106 17011 3721; do for port in 9517 6380 8090 18080 18081 16106 17011 3721; do
if ss -tlnp 2>/dev/null | grep -q ":$port "; then if ss -tlnp 2>/dev/null | grep -q ":$port "; then
CONFLICT_PORTS="$CONFLICT_PORTS $port" CONFLICT_PORTS="$CONFLICT_PORTS $port"
fi fi
@@ -78,8 +78,7 @@ cd "$SCRIPT_DIR"
# Stop and remove any existing v2test containers and conflicting containers # Stop and remove any existing v2test containers and conflicting containers
log_info "Cleaning up existing containers..." log_info "Cleaning up existing containers..."
docker rm -f v2test-consul v2test-redis v2test-kafka v2test-zookeeper v2test-nginx \ docker rm -f v2test-consul v2test-redis v2test-nginx cw-frontend-local-nginx v2-test-redis 2>/dev/null || true
cw-frontend-local-nginx v2-test-redis 2>/dev/null || true
docker compose -f docker-compose.infra.yml down --remove-orphans 2>/dev/null || true docker compose -f docker-compose.infra.yml down --remove-orphans 2>/dev/null || true
docker compose -f docker-compose.infra.yml up -d docker compose -f docker-compose.infra.yml up -d