Skip to content

Commit 211d577

Browse files
NHZEXNHZEX
committed
Update: 测试
1 parent b591a0b commit 211d577

File tree

2 files changed

+144
-4
lines changed

2 files changed

+144
-4
lines changed

‎.github/service/redis-cluster/docker-compose.yml

+135
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
version: '2'
2+
services:
3+
redis-node-0:
4+
image: bitnami/redis-cluster:7.2
5+
volumes:
6+
- "${GITHUB_WORKSPACE}/.github/service/redis-tls/certs:/opt/bitnami/redis/certs"
7+
depends_on:
8+
- redis-node-1
9+
- redis-node-2
10+
- redis-node-3
11+
- redis-node-4
12+
- redis-node-5
13+
environment:
14+
REDIS_PORT_NUMBER: 6379
15+
REDIS_PASSWORD: l83aa26
16+
REDISCLI_AUTH: l83aa26
17+
REDIS_CLUSTER_REPLICAS: 1
18+
REDIS_CLUSTER_CREATOR: yes
19+
REDIS_NODES: redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5
20+
REDIS_TLS_ENABLED: "true"
21+
REDIS_TLS_PORT_NUMBER: 6443
22+
REDIS_TLS_CERT_FILE: "/opt/bitnami/redis/certs/redis.crt"
23+
REDIS_TLS_KEY_FILE: "/opt/bitnami/redis/certs/redis.key"
24+
REDIS_TLS_CA_FILE: "/opt/bitnami/redis/certs/ca.crt"
25+
REDIS_TLS_DH_PARAMS_FILE: "/opt/bitnami/redis/certs/redis.dh"
26+
REDIS_TLS_AUTH_CLIENTS: "yes"
27+
healthcheck:
28+
test: ["CMD-SHELL", "redis-cli -h 127.0.0.1 -p $${REDIS_PORT_NUMBER:-6379} -a $${REDIS_PASSWORD} CLUSTER INFO | grep 'cluster_state:ok'"]
29+
interval: 3s
30+
timeout: 60s
31+
retries: 30
32+
networks:
33+
default:
34+
ipv4_address: 172.10.1.2
35+
36+
redis-node-1:
37+
image: bitnami/redis-cluster:7.2
38+
volumes:
39+
- "${GITHUB_WORKSPACE}/.github/service/redis-tls/certs:/opt/bitnami/redis/certs"
40+
environment:
41+
REDIS_PORT_NUMBER: 6379
42+
REDIS_PASSWORD: l83aa26
43+
REDIS_NODES: redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5
44+
REDIS_TLS_ENABLED: "true"
45+
REDIS_TLS_PORT_NUMBER: 6443
46+
REDIS_TLS_CERT_FILE: "/opt/bitnami/redis/certs/redis.crt"
47+
REDIS_TLS_KEY_FILE: "/opt/bitnami/redis/certs/redis.key"
48+
REDIS_TLS_CA_FILE: "/opt/bitnami/redis/certs/ca.crt"
49+
REDIS_TLS_DH_PARAMS_FILE: "/opt/bitnami/redis/certs/redis.dh"
50+
REDIS_TLS_AUTH_CLIENTS: "yes"
51+
networks:
52+
default:
53+
ipv4_address: 172.10.1.3
54+
55+
redis-node-2:
56+
image: bitnami/redis-cluster:7.2
57+
volumes:
58+
- "${GITHUB_WORKSPACE}/.github/service/redis-tls/certs:/opt/bitnami/redis/certs"
59+
environment:
60+
REDIS_PORT_NUMBER: 6379
61+
REDIS_PASSWORD: l83aa26
62+
REDIS_NODES: redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5
63+
REDIS_TLS_ENABLED: "true"
64+
REDIS_TLS_PORT_NUMBER: 6443
65+
REDIS_TLS_CERT_FILE: "/opt/bitnami/redis/certs/redis.crt"
66+
REDIS_TLS_KEY_FILE: "/opt/bitnami/redis/certs/redis.key"
67+
REDIS_TLS_CA_FILE: "/opt/bitnami/redis/certs/ca.crt"
68+
REDIS_TLS_DH_PARAMS_FILE: "/opt/bitnami/redis/certs/redis.dh"
69+
REDIS_TLS_AUTH_CLIENTS: "yes"
70+
networks:
71+
default:
72+
ipv4_address: 172.10.1.4
73+
74+
redis-node-3:
75+
image: bitnami/redis-cluster:7.2
76+
volumes:
77+
- "${GITHUB_WORKSPACE}/.github/service/redis-tls/certs:/opt/bitnami/redis/certs"
78+
environment:
79+
REDIS_PORT_NUMBER: 6379
80+
REDIS_PASSWORD: l83aa26
81+
REDIS_NODES: redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5
82+
REDIS_TLS_ENABLED: "true"
83+
REDIS_TLS_PORT_NUMBER: 6443
84+
REDIS_TLS_CERT_FILE: "/opt/bitnami/redis/certs/redis.crt"
85+
REDIS_TLS_KEY_FILE: "/opt/bitnami/redis/certs/redis.key"
86+
REDIS_TLS_CA_FILE: "/opt/bitnami/redis/certs/ca.crt"
87+
REDIS_TLS_DH_PARAMS_FILE: "/opt/bitnami/redis/certs/redis.dh"
88+
REDIS_TLS_AUTH_CLIENTS: "yes"
89+
networks:
90+
default:
91+
ipv4_address: 172.10.1.5
92+
93+
redis-node-4:
94+
image: bitnami/redis-cluster:7.2
95+
volumes:
96+
- "${GITHUB_WORKSPACE}/.github/service/redis-tls/certs:/opt/bitnami/redis/certs"
97+
environment:
98+
REDIS_PORT_NUMBER: 6379
99+
REDIS_PASSWORD: l83aa26
100+
REDIS_NODES: redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5
101+
REDIS_TLS_ENABLED: "true"
102+
REDIS_TLS_PORT_NUMBER: 6443
103+
REDIS_TLS_CERT_FILE: "/opt/bitnami/redis/certs/redis.crt"
104+
REDIS_TLS_KEY_FILE: "/opt/bitnami/redis/certs/redis.key"
105+
REDIS_TLS_CA_FILE: "/opt/bitnami/redis/certs/ca.crt"
106+
REDIS_TLS_DH_PARAMS_FILE: "/opt/bitnami/redis/certs/redis.dh"
107+
REDIS_TLS_AUTH_CLIENTS: "yes"
108+
networks:
109+
default:
110+
ipv4_address: 172.10.1.6
111+
112+
redis-node-5:
113+
image: bitnami/redis-cluster:7.2
114+
volumes:
115+
- "${GITHUB_WORKSPACE}/.github/service/redis-tls/certs:/opt/bitnami/redis/certs"
116+
environment:
117+
REDIS_PORT_NUMBER: 6379
118+
REDIS_PASSWORD: l83aa26
119+
REDIS_NODES: redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5
120+
REDIS_TLS_ENABLED: "true"
121+
REDIS_TLS_PORT_NUMBER: 6443
122+
REDIS_TLS_CERT_FILE: "/opt/bitnami/redis/certs/redis.crt"
123+
REDIS_TLS_KEY_FILE: "/opt/bitnami/redis/certs/redis.key"
124+
REDIS_TLS_CA_FILE: "/opt/bitnami/redis/certs/ca.crt"
125+
REDIS_TLS_DH_PARAMS_FILE: "/opt/bitnami/redis/certs/redis.dh"
126+
REDIS_TLS_AUTH_CLIENTS: "yes"
127+
networks:
128+
default:
129+
ipv4_address: 172.10.1.7
130+
131+
networks:
132+
default:
133+
ipam:
134+
config:
135+
- subnet: 172.10.1.0/24

‎.github/workflows/ci.yml

+9-4
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,8 @@ jobs:
151151
shell: bash
152152
run: |
153153
sudo apt update && sudo apt install -y rsync netcat-openbsd tree
154-
docker-compose -f ./.github/docker-compose.yml up -d redis-cluster-node-0 mysql postgres redis redis-new rabbitmq kafka1
154+
docker compose -f ./.github/service/redis-cluster/docker-compose.yml up -d
155+
docker compose -f ./.github/docker-compose.yml up -d redis-cluster-node-0 mysql postgres redis redis-new rabbitmq kafka1
155156
echo "127.0.0.1 kafka1" | sudo tee -a /etc/hosts
156157
- name: Setup swoole-cli
157158
run: .github/script/install-swoole-cli.sh ${{ matrix.swoole-cli }}
@@ -202,21 +203,25 @@ jobs:
202203
echo ">>> ====="
203204
docker logs redis-cluster-node-0
204205
docker logs redis-cluster-node-1
205-
docker logs redis-cluster-node-2
206206
echo ">>> ====="
207207
docker exec redis-cluster-node-0 cat /bitnami/redis/data/nodes.conf
208208
docker exec redis-cluster-node-1 cat /bitnami/redis/data/nodes.conf
209-
docker exec redis-cluster-node-2 cat /bitnami/redis/data/nodes.conf
210209
echo ">>> redis-cluster"
211210
echo -e 'auth l83aa26\r\ninfo server' | nc 127.0.0.1 6479 -w 1
212211
echo -e 'auth l83aa26\r\ncluster info\r\ncluster nodes' | nc 127.0.0.1 6479 -w 1
213212
echo ">>> redis-new"
214213
echo -e 'auth l83aa26\r\ninfo server' | nc 127.0.0.1 6377 -w 1
214+
echo ">>> ====="
215+
docker compose -f ./.github/service/redis-cluster/docker-compose.yml logs
216+
echo ">>> redis-cluster"
217+
echo -e 'auth l83aa26\r\ninfo server' | nc 172.10.1.2 6379 -w 1
218+
echo -e 'auth l83aa26\r\ncluster info\r\ncluster nodes' | nc 172.10.1.2 6379 -w 1
215219
- name: Test
216220
if: ${{ env.test_prepared && always() }}
217221
run: composer test
218222
- name: Test redis
219-
if: ${{ env.test_prepared && always() }}
223+
#if: ${{ env.test_prepared && always() }}
224+
if: false
220225
env:
221226
REDIS_SERVER_CLUSTER_PASSWORD: "l83aa26"
222227
REDIS_SERVER_CLUSTER_SEEDS: "127.0.0.1:6479,127.0.0.1:6480,127.0.0.1:6481,127.0.0.1:6482,127.0.0.1:6483,127.0.0.1:6484"

0 commit comments

Comments
 (0)