Skip to content

Commit d16bcc9

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 f724f86 commit d16bcc9

7 files changed

Lines changed: 1221 additions & 1151 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
GRIMOIRELAB_SUPERUSER_USERNAME: admin
@@ -41,7 +43,7 @@ services:
4143
depends_on:
4244
mariadb:
4345
condition: service_healthy
44-
redis:
46+
valkey:
4547
condition: service_healthy
4648
command: grimoirelab run server
4749

@@ -54,13 +56,13 @@ services:
5456
GRIMOIRELAB_DB_DATABASE: core_db
5557
GRIMOIRELAB_DB_USER: root
5658
GRIMOIRELAB_DB_PASSWORD: ""
57-
GRIMOIRELAB_REDIS_HOST: redis
59+
GRIMOIRELAB_REDIS_HOST: valkey
5860
GRIMOIRELAB_REDIS_PORT: 6379
5961
GRIMOIRELAB_REDIS_PASSWORD: ""
6062
depends_on:
6163
mariadb:
6264
condition: service_healthy
63-
redis:
65+
valkey:
6466
condition: service_healthy
6567
command: grimoirelab run eventizers
6668

@@ -73,7 +75,7 @@ services:
7375
GRIMOIRELAB_DB_DATABASE: core_db
7476
GRIMOIRELAB_DB_USER: root
7577
GRIMOIRELAB_DB_PASSWORD: ""
76-
GRIMOIRELAB_REDIS_HOST: redis
78+
GRIMOIRELAB_REDIS_HOST: valkey
7779
GRIMOIRELAB_REDIS_PORT: 6379
7880
GRIMOIRELAB_REDIS_PASSWORD: ""
7981
GRIMOIRELAB_ARCHIVIST_STORAGE_URL: "https://opensearch-node1:9200"
@@ -82,7 +84,7 @@ services:
8284
depends_on:
8385
mariadb:
8486
condition: service_healthy
85-
redis:
87+
valkey:
8688
condition: service_healthy
8789
opensearch-node1:
8890
condition: service_started
@@ -97,13 +99,13 @@ services:
9799
GRIMOIRELAB_DB_DATABASE: core_db
98100
GRIMOIRELAB_DB_USER: root
99101
GRIMOIRELAB_DB_PASSWORD: ""
100-
GRIMOIRELAB_REDIS_HOST: redis
102+
GRIMOIRELAB_REDIS_HOST: valkey
101103
GRIMOIRELAB_REDIS_PORT: 6379
102104
GRIMOIRELAB_REDIS_PASSWORD: ""
103105
depends_on:
104106
mariadb:
105107
condition: service_healthy
106-
redis:
108+
valkey:
107109
condition: service_healthy
108110
command: grimoirelab run ushers
109111

@@ -116,13 +118,13 @@ services:
116118
SORTINGHAT_DB_DATABASE: core_db
117119
SORTINGHAT_DB_USER: root
118120
SORTINGHAT_DB_PASSWORD: ""
119-
SORTINGHAT_REDIS_HOST: redis
121+
SORTINGHAT_REDIS_HOST: valkey
120122
GRIMOIRELAB_REDIS_PORT: 6379
121123
SORTINGHAT_REDIS_PASSWORD: ""
122124
depends_on:
123125
mariadb:
124126
condition: service_healthy
125-
redis:
127+
valkey:
126128
condition: service_healthy
127129

128130
opensearch-node1:
@@ -176,4 +178,5 @@ services:
176178
volumes:
177179
mariadb_data:
178180
opensearch_data:
181+
valkey_data:
179182
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)