Skip to content

Commit 86e7768

Browse files
authored
chore(ci): migrate etcd, memcached, redis, and redis-cluster images to new sources (#6435)
* chore(ci): migrate etcd, memcached, redis, and redis-cluster images to new sources * ci: add etcd logs * ci: use bitnamilegacy * ci: add logs * ci * ci: memcached * ci: use ubuntu/memcached * ci: fix * ci: fix * ci: update * ci: remove log
1 parent 5846501 commit 86e7768

9 files changed

+63
-60
lines changed

fixtures/etcd/docker-compose-cluster.yml

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -17,50 +17,50 @@
1717

1818
services:
1919
etcd1:
20-
image: bitnami/etcd:latest
20+
image: gcr.io/etcd-development/etcd:v3.6.4
2121
ports:
2222
- "23790:2379"
2323
- "23800:2380"
24-
environment:
25-
ALLOW_NONE_AUTHENTICATION: "yes"
26-
ETCD_NAME: etcd1
27-
ETCD_INITIAL_ADVERTISE_PEER_URLS: http://etcd1:2380
28-
ETCD_LISTEN_PEER_URLS: http://0.0.0.0:2380
29-
ETCD_LISTEN_CLIENT_URLS: http://0.0.0.0:2379
30-
ETCD_ADVERTISE_CLIENT_URLS: http://etcd1:2379
31-
ETCD_INITIAL_CLUSTER_TOKEN: etcd-cluster
32-
ETCD_INITIAL_CLUSTER: etcd1=http://etcd1:2380,etcd2=http://etcd2:2380,etcd3=http://etcd3:2380
33-
ETCD_INITIAL_CLUSTER_STATE: new
34-
ETCD_MAX_REQUEST_BYTES: 10485760
24+
command:
25+
- /usr/local/bin/etcd
26+
- --name=etcd1
27+
- --listen-client-urls=http://0.0.0.0:2379
28+
- --advertise-client-urls=http://etcd1:2379
29+
- --listen-peer-urls=http://0.0.0.0:2380
30+
- --initial-advertise-peer-urls=http://etcd1:2380
31+
- --initial-cluster=etcd1=http://etcd1:2380,etcd2=http://etcd2:2380,etcd3=http://etcd3:2380
32+
- --initial-cluster-token=etcd-cluster
33+
- --initial-cluster-state=new
34+
- --max-request-bytes=10485760
3535
etcd2:
36-
image: bitnami/etcd:latest
36+
image: gcr.io/etcd-development/etcd:v3.6.4
3737
ports:
3838
- "23791:2379"
3939
- "23801:2380"
40-
environment:
41-
ALLOW_NONE_AUTHENTICATION: "yes"
42-
ETCD_NAME: etcd2
43-
ETCD_INITIAL_ADVERTISE_PEER_URLS: http://etcd2:2380
44-
ETCD_LISTEN_PEER_URLS: http://0.0.0.0:2380
45-
ETCD_LISTEN_CLIENT_URLS: http://0.0.0.0:2379
46-
ETCD_ADVERTISE_CLIENT_URLS: http://etcd2:2379
47-
ETCD_INITIAL_CLUSTER_TOKEN: etcd-cluster
48-
ETCD_INITIAL_CLUSTER: etcd1=http://etcd1:2380,etcd2=http://etcd2:2380,etcd3=http://etcd3:2380
49-
ETCD_INITIAL_CLUSTER_STATE: new
50-
ETCD_MAX_REQUEST_BYTES: 10485760
40+
command:
41+
- /usr/local/bin/etcd
42+
- --name=etcd2
43+
- --listen-client-urls=http://0.0.0.0:2379
44+
- --advertise-client-urls=http://etcd2:2379
45+
- --listen-peer-urls=http://0.0.0.0:2380
46+
- --initial-advertise-peer-urls=http://etcd2:2380
47+
- --initial-cluster=etcd1=http://etcd1:2380,etcd2=http://etcd2:2380,etcd3=http://etcd3:2380
48+
- --initial-cluster-token=etcd-cluster
49+
- --initial-cluster-state=new
50+
- --max-request-bytes=10485760
5151
etcd3:
52-
image: bitnami/etcd:latest
52+
image: gcr.io/etcd-development/etcd:v3.6.4
5353
ports:
5454
- "23792:2379"
5555
- "23802:2380"
56-
environment:
57-
ALLOW_NONE_AUTHENTICATION: "yes"
58-
ETCD_NAME: etcd3
59-
ETCD_INITIAL_ADVERTISE_PEER_URLS: http://etcd3:2380
60-
ETCD_LISTEN_PEER_URLS: http://0.0.0.0:2380
61-
ETCD_LISTEN_CLIENT_URLS: http://0.0.0.0:2379
62-
ETCD_ADVERTISE_CLIENT_URLS: http://etcd3:2379
63-
ETCD_INITIAL_CLUSTER_TOKEN: etcd-cluster
64-
ETCD_INITIAL_CLUSTER: etcd1=http://etcd1:2380,etcd2=http://etcd2:2380,etcd3=http://etcd3:2380
65-
ETCD_INITIAL_CLUSTER_STATE: new
66-
ETCD_MAX_REQUEST_BYTES: 10485760
56+
command:
57+
- /usr/local/bin/etcd
58+
- --name=etcd3
59+
- --listen-client-urls=http://0.0.0.0:2379
60+
- --advertise-client-urls=http://etcd3:2379
61+
- --listen-peer-urls=http://0.0.0.0:2380
62+
- --initial-advertise-peer-urls=http://etcd3:2380
63+
- --initial-cluster=etcd1=http://etcd1:2380,etcd2=http://etcd2:2380,etcd3=http://etcd3:2380
64+
- --initial-cluster-token=etcd-cluster
65+
- --initial-cluster-state=new
66+
- --max-request-bytes=10485760

fixtures/etcd/docker-compose-standalone-tls.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
services:
1919
etcd:
20-
image: bitnami/etcd:latest
20+
image: docker.io/bitnamilegacy/etcd:3.6.4-debian-12-r0
2121
ports:
2222
- "2379:2379"
2323
- "2380:2380"

fixtures/etcd/docker-compose-standalone.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,16 @@
1717

1818
services:
1919
etcd:
20-
image: bitnami/etcd:latest
20+
image: gcr.io/etcd-development/etcd:v3.6.4
2121
ports:
2222
- "2379:2379"
2323
- "2380:2380"
24-
environment:
25-
ALLOW_NONE_AUTHENTICATION: "yes"
26-
ETCD_NAME: etcd
27-
ETCD_LISTEN_CLIENT_URLS: http://0.0.0.0:2379
28-
ETCD_ADVERTISE_CLIENT_URLS: http://etcd:2379
29-
ETCD_MAX_REQUEST_BYTES: 10485760
24+
command:
25+
- /usr/local/bin/etcd
26+
- --name=etcd
27+
- --listen-client-urls=http://0.0.0.0:2379
28+
- --advertise-client-urls=http://etcd:2379
29+
- --log-level=info
30+
- --logger=zap
31+
- --log-outputs=stderr
32+
- --max-request-bytes=10485760

fixtures/memcached/docker-compose-memcached-with-auth.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
services:
1919
memcached:
20-
image: bitnami/memcached
20+
image: docker.io/bitnamilegacy/memcached:1.6.39-debian-12-r0
2121
environment:
2222
# memcache's max item size is 1MiB, But opendal's behavior tests
2323
# will produce larger file.

fixtures/memcached/docker-compose-memcached.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
services:
1919
memcached:
20-
image: bitnami/memcached
20+
image: bitnamisecure/memcached
2121
environment:
2222
# memcache's max item size is 1MiB, But opendal's behavior tests
2323
# will produce larger file.

fixtures/redis/docker-compose-redis-cluster-tls.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
services:
1919
redis-node-0:
20-
image: docker.io/bitnami/redis-cluster:7.0
20+
image: docker.io/bitnamilegacy/redis-cluster:7.4.3-debian-12-r0
2121
networks:
2222
redis_cluster:
2323
ipv4_address: 172.30.0.2
@@ -35,7 +35,7 @@ services:
3535
- ./ssl:/etc/redis/ssl/
3636

3737
redis-node-1:
38-
image: docker.io/bitnami/redis-cluster:7.0
38+
image: docker.io/bitnamilegacy/redis-cluster:7.4.3-debian-12-r0
3939
networks:
4040
redis_cluster:
4141
ipv4_address: 172.30.0.3
@@ -53,7 +53,7 @@ services:
5353
- ./ssl:/etc/redis/ssl/
5454

5555
redis-node-2:
56-
image: docker.io/bitnami/redis-cluster:7.0
56+
image: docker.io/bitnamilegacy/redis-cluster:7.4.3-debian-12-r0
5757
networks:
5858
redis_cluster:
5959
ipv4_address: 172.30.0.4
@@ -71,7 +71,7 @@ services:
7171
- ./ssl:/etc/redis/ssl/
7272

7373
redis-node-3:
74-
image: docker.io/bitnami/redis-cluster:7.0
74+
image: docker.io/bitnamilegacy/redis-cluster:7.4.3-debian-12-r0
7575
networks:
7676
redis_cluster:
7777
ipv4_address: 172.30.0.5
@@ -89,7 +89,7 @@ services:
8989
- ./ssl:/etc/redis/ssl/
9090

9191
redis-node-4:
92-
image: docker.io/bitnami/redis-cluster:7.0
92+
image: docker.io/bitnamilegacy/redis-cluster:7.4.3-debian-12-r0
9393
networks:
9494
redis_cluster:
9595
ipv4_address: 172.30.0.6
@@ -107,7 +107,7 @@ services:
107107
- ./ssl:/etc/redis/ssl/
108108

109109
redis-node-5:
110-
image: docker.io/bitnami/redis-cluster:7.0
110+
image: docker.io/bitnamilegacy/redis-cluster:7.4.3-debian-12-r0
111111
networks:
112112
redis_cluster:
113113
ipv4_address: 172.30.0.7

fixtures/redis/docker-compose-redis-cluster.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,47 +17,47 @@
1717

1818
services:
1919
redis-node-0:
20-
image: docker.io/bitnami/redis-cluster:7.0
20+
image: docker.io/bitnamilegacy/redis-cluster:7.4.3-debian-12-r0
2121
ports:
2222
- '6380:6379'
2323
environment:
2424
- 'ALLOW_EMPTY_PASSWORD=yes'
2525
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
2626

2727
redis-node-1:
28-
image: docker.io/bitnami/redis-cluster:7.0
28+
image: docker.io/bitnamilegacy/redis-cluster:7.4.3-debian-12-r0
2929
ports:
3030
- '6381:6379'
3131
environment:
3232
- 'ALLOW_EMPTY_PASSWORD=yes'
3333
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
3434

3535
redis-node-2:
36-
image: docker.io/bitnami/redis-cluster:7.0
36+
image: docker.io/bitnamilegacy/redis-cluster:7.4.3-debian-12-r0
3737
ports:
3838
- '6382:6379'
3939
environment:
4040
- 'ALLOW_EMPTY_PASSWORD=yes'
4141
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
4242

4343
redis-node-3:
44-
image: docker.io/bitnami/redis-cluster:7.0
44+
image: docker.io/bitnamilegacy/redis-cluster:7.4.3-debian-12-r0
4545
ports:
4646
- '6383:6379'
4747
environment:
4848
- 'ALLOW_EMPTY_PASSWORD=yes'
4949
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
5050

5151
redis-node-4:
52-
image: docker.io/bitnami/redis-cluster:7.0
52+
image: docker.io/bitnamilegacy/redis-cluster:7.4.3-debian-12-r0
5353
ports:
5454
- '6384:6379'
5555
environment:
5656
- 'ALLOW_EMPTY_PASSWORD=yes'
5757
- 'REDIS_NODES=redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5'
5858

5959
redis-node-5:
60-
image: docker.io/bitnami/redis-cluster:7.0
60+
image: docker.io/bitnamilegacy/redis-cluster:7.4.3-debian-12-r0
6161
ports:
6262
- '6385:6379'
6363
depends_on:

fixtures/redis/docker-compose-redis-tls.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
services:
1919
redis:
20-
image: docker.io/bitnami/redis:7.0
20+
image: docker.io/bitnamilegacy/redis:7.4.3-debian-12-r0
2121
ports:
2222
- '6379:6379'
2323
environment:

fixtures/redis/docker-compose-redis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
services:
1919
redis:
20-
image: docker.io/bitnami/redis:7.0
20+
image: docker.io/bitnamilegacy/redis:7.4.3-debian-12-r0
2121
ports:
2222
- '6379:6379'
2323
environment:

0 commit comments

Comments
 (0)