Skip to content

Commit 320959b

Browse files
committed
Update Redis service to use Valkey image
Changed the docker-compose configuration to replace the redis service with valkey. Valkey is the community-driven, fully open-source fork of Redis, providing the same API compatibility with long-term support. Signed-off-by: Jose Javier Merchante <jjmerchante@bitergia.com>
1 parent f262800 commit 320959b

7 files changed

Lines changed: 1498 additions & 1118 deletions

File tree

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ or visiting the [GrimoireLab website](https://chaoss.github.io/grimoirelab).
2323
- Linux/MacOS (Windows not supported yet)
2424
- Python >= 3.11
2525
- MySQL >= 8.0/ MariaDB >= 11.4
26-
- Redis database >= 7.4
26+
- Redis / Valkey database
2727
- OpenSearch >= 2.0
2828

2929
To simplify the setup of the development environment, you can use the provided
@@ -104,7 +104,7 @@ Some environment variables you might need to change are:
104104

105105
- **GrimoireLab common settings**:
106106
- `GRIMOIRELAB_DEBUG`: to activate the debug mode (`true` or `false` values)
107-
- **Redis configuration**
107+
- **Redis/Valkey configuration**
108108
- `GRIMOIRELAB_REDIS_HOST`: ip address of the server
109109
- `GRIMOIRELAB_REDIS_PORT`: port of the server
110110
- `GRIMOIRELAB_REDIS_PASSWORD`: password for the server

docker-compose/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ for running GrimoireLab in development mode.
8383
By default, it includes:
8484

8585
- MariaDB running on port 3306
86-
- Redis running on port 6379
86+
- Valkey running on port 6379
8787
- OpenSearch running on port 9200
8888
- OpenSearch Dashboards running on port 5601
8989

docker-compose/docker-compose-development.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ services:
44
file: ./docker-compose.yml
55
service: mariadb
66

7-
redis:
7+
valkey:
88
extends:
99
file: ./docker-compose.yml
10-
service: redis
10+
service: valkey
1111

1212
opensearch-node1:
1313
extends:

docker-compose/docker-compose.yml

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@ services:
1212
volumes:
1313
- mariadb_data:/var/lib/mysql
1414

15-
redis:
16-
image: redis:7.4
15+
valkey:
16+
image: valkey/valkey:8
1717
expose:
1818
- "6379"
1919
healthcheck:
20-
test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ]
20+
test: [ "CMD", "valkey-cli", "--raw", "incr", "ping" ]
2121
retries: 5
22+
volumes:
23+
- valkey_data:/data
2224

2325
grimoirelab_core:
2426
restart: on-failure:3
@@ -29,7 +31,7 @@ services:
2931
GRIMOIRELAB_DB_DATABASE: core_db
3032
GRIMOIRELAB_DB_USER: root
3133
GRIMOIRELAB_DB_PASSWORD: ""
32-
GRIMOIRELAB_REDIS_HOST: redis
34+
GRIMOIRELAB_REDIS_HOST: valkey
3335
GRIMOIRELAB_REDIS_PORT: 6379
3436
GRIMOIRELAB_REDIS_PASSWORD: ""
3537
expose:
@@ -39,7 +41,7 @@ services:
3941
depends_on:
4042
mariadb:
4143
condition: service_healthy
42-
redis:
44+
valkey:
4345
condition: service_healthy
4446
command: grimoirelab run server
4547

@@ -52,13 +54,13 @@ services:
5254
GRIMOIRELAB_DB_DATABASE: core_db
5355
GRIMOIRELAB_DB_USER: root
5456
GRIMOIRELAB_DB_PASSWORD: ""
55-
GRIMOIRELAB_REDIS_HOST: redis
57+
GRIMOIRELAB_REDIS_HOST: valkey
5658
GRIMOIRELAB_REDIS_PORT: 6379
5759
GRIMOIRELAB_REDIS_PASSWORD: ""
5860
depends_on:
5961
mariadb:
6062
condition: service_healthy
61-
redis:
63+
valkey:
6264
condition: service_healthy
6365
command: grimoirelab run eventizers
6466

@@ -71,7 +73,7 @@ services:
7173
GRIMOIRELAB_DB_DATABASE: core_db
7274
GRIMOIRELAB_DB_USER: root
7375
GRIMOIRELAB_DB_PASSWORD: ""
74-
GRIMOIRELAB_REDIS_HOST: redis
76+
GRIMOIRELAB_REDIS_HOST: valkey
7577
GRIMOIRELAB_REDIS_PORT: 6379
7678
GRIMOIRELAB_REDIS_PASSWORD: ""
7779
GRIMOIRELAB_ARCHIVIST_STORAGE_URL: "https://opensearch-node1:9200"
@@ -80,7 +82,7 @@ services:
8082
depends_on:
8183
mariadb:
8284
condition: service_healthy
83-
redis:
85+
valkey:
8486
condition: service_healthy
8587
opensearch-node1:
8688
condition: service_started
@@ -95,13 +97,13 @@ services:
9597
GRIMOIRELAB_DB_DATABASE: core_db
9698
GRIMOIRELAB_DB_USER: root
9799
GRIMOIRELAB_DB_PASSWORD: ""
98-
GRIMOIRELAB_REDIS_HOST: redis
100+
GRIMOIRELAB_REDIS_HOST: valkey
99101
GRIMOIRELAB_REDIS_PORT: 6379
100102
GRIMOIRELAB_REDIS_PASSWORD: ""
101103
depends_on:
102104
mariadb:
103105
condition: service_healthy
104-
redis:
106+
valkey:
105107
condition: service_healthy
106108
command: grimoirelab run ushers
107109

@@ -114,13 +116,13 @@ services:
114116
SORTINGHAT_DB_DATABASE: core_db
115117
SORTINGHAT_DB_USER: root
116118
SORTINGHAT_DB_PASSWORD: ""
117-
SORTINGHAT_REDIS_HOST: redis
119+
SORTINGHAT_REDIS_HOST: valkey
118120
GRIMOIRELAB_REDIS_PORT: 6379
119121
SORTINGHAT_REDIS_PASSWORD: ""
120122
depends_on:
121123
mariadb:
122124
condition: service_healthy
123-
redis:
125+
valkey:
124126
condition: service_healthy
125127

126128
opensearch-node1:
@@ -174,4 +176,5 @@ services:
174176
volumes:
175177
mariadb_data:
176178
opensearch_data:
179+
valkey_data:
177180
core-static:

docker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ The easier way to start using the image is to use the provided
2525
[docker-compose file](../docker-compose/).
2626

2727
It provides a simple way to run the GrimoireLab components, including the
28-
MariaDB database, a Redis server, and the GrimoireLab core.
28+
MariaDB database, a Valkey server, and the GrimoireLab core.
2929

3030
Please, refer to that documentation for more information.
3131

0 commit comments

Comments
 (0)