Skip to content

Commit 74bfa68

Browse files
NHZEXNHZEX
committed
Update: 迁移使用 redis 新容器
1 parent 20b6e6f commit 74bfa68

File tree

4 files changed

+36
-29
lines changed

4 files changed

+36
-29
lines changed

‎.github/actions/ci-prepare/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ runs:
1414
run: |
1515
docker network create imi-ci-service-network --subnet 172.10.12.0/24
1616
docker compose -f ./.github/service/redis-cluster/docker-compose.yml up -d
17-
docker compose -f ./.github/docker-compose.yml up -d ${{ inputs.env }} redis-new
17+
docker compose -f ./.github/docker-compose.yml up -d ${{ inputs.env }}
1818
docker exec ${{ inputs.env }} php -v
1919
docker exec ${{ inputs.env }} php -m
2020
docker exec ${{ inputs.env }} php --ri redis

‎.github/docker-compose.yml

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -40,28 +40,30 @@ services:
4040
volumes:
4141
- "${GITHUB_WORKSPACE}:/imi:rw"
4242

43-
redis:
44-
image: redis:6-alpine
45-
container_name: redis
46-
depends_on:
47-
- shared-tmp
48-
command: redis-server /etc/redis.conf
49-
volumes:
50-
- ./redis.conf:/etc/redis.conf
51-
- /run/shared:/run/shared
52-
ports:
53-
- 6379:6379
43+
# redis:
44+
# image: redis:6-alpine
45+
# container_name: redis
46+
# depends_on:
47+
# - shared-tmp
48+
# command: redis-server /etc/redis.conf
49+
# volumes:
50+
# - ./redis.conf:/etc/redis.conf
51+
# - /run/shared:/run/shared
52+
# ports:
53+
# - 6379:6379
5454

55-
redis-new:
55+
redis:
5656
image: bitnami/redis:7.2
57-
container_name: redis-new
57+
container_name: redis
5858
depends_on:
5959
- shared-tmp
6060
volumes:
6161
- "${GITHUB_WORKSPACE}/.github/service/redis-tls/certs:/opt/bitnami/redis/certs"
62+
- "${GITHUB_WORKSPACE}/.github/service/redis-tls/redis-overrides.conf:/opt/bitnami/redis/redis-overrides.conf"
6263
- /run/shared:/run/shared
6364
environment:
64-
REDIS_PORT_NUMBER: 6377
65+
REDIS_OVERRIDES_FILE: "/opt/bitnami/redis/redis-overrides.conf"
66+
REDIS_PORT_NUMBER: 6379
6567
REDIS_PASSWORD: "l83aa26"
6668
REDIS_TLS_ENABLED: "true"
6769
REDIS_TLS_PORT_NUMBER: 6443
@@ -71,13 +73,18 @@ services:
7173
REDIS_TLS_CA_FILE: "/opt/bitnami/redis/certs/ca.crt"
7274
REDIS_TLS_AUTH_CLIENTS: "yes"
7375
healthcheck:
74-
test: ["CMD-SHELL", "redis-cli -h 127.0.0.1 -p 6377 -a l83aa26 INFO | grep 'redis_version'"]
76+
test: ["CMD-SHELL", "redis-cli -h 127.0.0.1 -p $${REDIS_PORT_NUMBER:-6379} -a $${REDIS_PASSWORD} INFO | grep 'redis_version'"]
7577
interval: 3s
7678
timeout: 60s
7779
retries: 30
7880
ports:
79-
- "6377:6377"
81+
- "6379:6379"
8082
- "6443:6443"
83+
networks:
84+
proxies:
85+
aliases:
86+
- redis
87+
ipv4_address: 172.10.12.111
8188

8289
rabbitmq:
8390
container_name: rabbitmq
@@ -124,13 +131,13 @@ services:
124131
- shared-tmp
125132
- mysql
126133
- redis
127-
- redis-new
128134
- rabbitmq
129135
- kafka1
130136
- postgres
131137
environment:
132138
MYSQL_SERVER_HOST: mysql
133139
REDIS_SERVER_HOST: ${REDIS_SERVER_HOST}
140+
REDIS_SERVER_PASSWORD: ${REDIS_SERVER_HOST:-l83aa26}
134141
PGSQL_SERVER_HOST: postgres
135142
MYSQL_SERVER_PASSWORD: ""
136143
AMQP_SERVER_HOST: "rabbitmq"
@@ -140,7 +147,7 @@ services:
140147
REDIS_SERVER_CLUSTER_SEEDS: "172.10.12.2:6379,172.10.12.3:6379,172.10.12.4:6379,172.10.12.5:6379,172.10.12.6:6379,172.10.12.7:6379"
141148
REDIS_SERVER_TLS_CLUSTER_SEEDS: "172.10.12.2:6443,172.10.12.3:6443,172.10.12.4:6443,172.10.12.5:6443,172.10.12.6:6443,172.10.12.7:6443"
142149
REDIS_SERVER_UNIX_SOCK: "/run/shared/redis.sock"
143-
REDIS_SERVER_TLS_HOST: "redis-new"
150+
REDIS_SERVER_TLS_HOST: "redis"
144151
REDIS_SERVER_TLS_PORT: "6443"
145152
REDIS_SERVER_TLS_PASSWORD: "l83aa26"
146153
REDIS_SERVER_TLS_CA_FILE: "/imi/.github/service/redis-tls/certs/ca.crt"
@@ -162,13 +169,13 @@ services:
162169
- shared-tmp
163170
- mysql
164171
- redis
165-
- redis-new
166172
- rabbitmq
167173
- kafka1
168174
- postgres
169175
environment:
170176
MYSQL_SERVER_HOST: mysql
171177
REDIS_SERVER_HOST: ${REDIS_SERVER_HOST}
178+
REDIS_SERVER_PASSWORD: ${REDIS_SERVER_HOST:-l83aa26}
172179
PGSQL_SERVER_HOST: postgres
173180
MYSQL_SERVER_PASSWORD: ""
174181
AMQP_SERVER_HOST: "rabbitmq"
@@ -178,7 +185,7 @@ services:
178185
REDIS_SERVER_CLUSTER_SEEDS: "172.10.12.2:6379,172.10.12.3:6379,172.10.12.4:6379,172.10.12.5:6379,172.10.12.6:6379,172.10.12.7:6379"
179186
REDIS_SERVER_TLS_CLUSTER_SEEDS: "172.10.12.2:6443,172.10.12.3:6443,172.10.12.4:6443,172.10.12.5:6443,172.10.12.6:6443,172.10.12.7:6443"
180187
REDIS_SERVER_UNIX_SOCK: "/run/shared/redis.sock"
181-
REDIS_SERVER_TLS_HOST: "redis-new"
188+
REDIS_SERVER_TLS_HOST: "redis"
182189
REDIS_SERVER_TLS_PORT: "6443"
183190
REDIS_SERVER_TLS_PASSWORD: "l83aa26"
184191
REDIS_SERVER_TLS_CA_FILE: "/imi/.github/service/redis-tls/certs/ca.crt"

‎.github/service/redis-tls/redis-overrides.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
unixsocket /run/shared/redis.sock
2+
unixsocketperm 777

‎.github/workflows/ci.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ jobs:
6161
run: |
6262
docker ps
6363
docker logs shared-tmp || true
64-
docker logs redis-new || true
64+
docker logs redis || true
6565
docker exec ${ENV_SERVICE} bash -c "ls -lha /run/shared"
6666
echo ">>> redis-cluster-node-0"
6767
docker exec ${ENV_SERVICE} bash -c "echo -e 'auth l83aa26\r\ninfo server' | nc redis-cluster-node-0-1 6379 -w 1"
6868
docker exec ${ENV_SERVICE} bash -c "echo -e 'auth l83aa26\r\ncluster info\r\ncluster nodes' | nc redis-cluster-node-0-1 6379 -w 1"
69-
echo ">>> redis-new"
70-
docker exec ${ENV_SERVICE} bash -c "echo -e 'auth l83aa26\r\ninfo server' | nc redis-new 6377 -w 1"
69+
echo ">>> redis"
70+
docker exec ${ENV_SERVICE} bash -c "echo -e 'auth l83aa26\r\ninfo server' | nc redis 6379 -w 1"
7171
- name: Test
7272
if: ${{ env.test_prepared && always() }}
7373
run: docker exec ${ENV_SERVICE} composer test
@@ -152,7 +152,7 @@ jobs:
152152
sudo apt update && sudo apt install -y rsync netcat-openbsd tree
153153
docker network create imi-ci-service-network --subnet 172.10.12.0/24
154154
docker compose -f ./.github/service/redis-cluster/docker-compose.yml up -d
155-
docker compose -f ./.github/docker-compose.yml up -d mysql postgres redis redis-new rabbitmq kafka1
155+
docker compose -f ./.github/docker-compose.yml up -d mysql postgres redis rabbitmq kafka1
156156
echo "127.0.0.1 kafka1" | sudo tee -a /etc/hosts
157157
- name: Setup swoole-cli
158158
run: .github/script/install-swoole-cli.sh ${{ matrix.swoole-cli }}
@@ -199,10 +199,7 @@ jobs:
199199
find /run/shared -name *.sock
200200
tree -alfugh /run/shared
201201
echo ">>> redis"
202-
echo -e 'info server' | nc 127.0.0.1 6379 -w 1
203-
echo ">>> ====="
204-
echo ">>> redis-new"
205-
echo -e 'auth l83aa26\r\ninfo server' | nc 127.0.0.1 6377 -w 1
202+
echo -e 'auth l83aa26\r\ninfo server' | nc 127.0.0.1 6379 -w 1
206203
echo ">>> ====="
207204
docker compose -f ./.github/service/redis-cluster/docker-compose.yml logs
208205
echo ">>> redis-cluster"
@@ -212,6 +209,7 @@ jobs:
212209
- name: Test
213210
if: ${{ env.test_prepared && always() }}
214211
env:
212+
REDIS_SERVER_HOST: "l83aa26"
215213
REDIS_SERVER_CLUSTER_PASSWORD: "l83aa26"
216214
REDIS_SERVER_CLUSTER_SEEDS: "172.10.12.2:6379,172.10.12.3:6379,172.10.12.4:6379,172.10.12.5:6379,172.10.12.6:6379,172.10.12.7:6379"
217215
run: composer test

0 commit comments

Comments
 (0)