Skip to content

Commit 35f54ed

Browse files
authored
Merge pull request #206 from PROCOLLAB-github/feature/redis-cache
Add redis cache to docker compose & project settings
2 parents 59f071f + b079d73 commit 35f54ed

4 files changed

Lines changed: 38 additions & 20 deletions

File tree

docker-compose.dev-ci.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,19 @@ services:
5656
- web
5757
ports:
5858
- 8000:80
59+
60+
redis:
61+
container_name: redis
62+
image: redis:latest
63+
expose:
64+
- 6379
65+
volumes:
66+
- redis-data:/data
67+
5968
volumes:
6069
grafana-data:
6170
grafana-configs:
6271
prom-data:
6372
prom-configs:
6473
log:
74+
redis-data:

docker-compose.prod-ci.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,17 @@ services:
5353
- web
5454
ports:
5555
- 8000:80
56+
redis:
57+
container_name: redis
58+
image: redis:latest
59+
expose:
60+
- 6379
61+
volumes:
62+
- redis-data:/data
5663
volumes:
5764
grafana-data:
5865
grafana-configs:
5966
prom-data:
6067
prom-configs:
61-
log:
68+
log:
69+
redis_data:

docker-compose.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,17 @@ services:
5656
- web
5757
ports:
5858
- 8000:80
59+
redis:
60+
container_name: redis
61+
image: redis:latest
62+
expose:
63+
- 6379
64+
volumes:
65+
- redis-data:/data
5966
volumes:
6067
grafana-data:
6168
grafana-configs:
6269
prom-data:
6370
prom-configs:
64-
log:
71+
log:
72+
redis_data:

procollab/settings.py

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -197,27 +197,19 @@
197197
# fixme
198198
CACHES = {
199199
"default": {
200-
"BACKEND": "django.core.cache.backends.locmem.LocMemCache",
200+
"BACKEND": "django.core.cache.backends.redis.RedisCache",
201+
"LOCATION": "redis://redis:6379",
201202
}
202203
}
203204

204-
CHANNEL_LAYERS = {"default": {"BACKEND": "channels.layers.InMemoryChannelLayer"}}
205-
# CHANNEL_LAYERS = {
206-
# "default": {
207-
# "BACKEND": "channels_redis.core.RedisChannelLayer",
208-
# "CONFIG": {
209-
# "hosts": [("127.0.0.1", 6379)],
210-
# },
211-
# },
212-
# }
213-
#
214-
# REDIS_HOST = config("REDIS_HOST", cast=str, default="127.0.0.1")
215-
# CACHES = {
216-
# "default": {
217-
# "BACKEND": "django.core.cache.backends.redis.RedisCache",
218-
# "LOCATION": f"redis://{REDIS_HOST}:6379",
219-
# }
220-
# }
205+
CHANNEL_LAYERS = {
206+
"default": {
207+
"BACKEND": "channels_redis.core.RedisChannelLayer",
208+
"CONFIG": {
209+
"hosts": [("redis", 6379)],
210+
},
211+
},
212+
}
221213

222214
REST_FRAMEWORK["DEFAULT_RENDERER_CLASSES"] = [
223215
"rest_framework.renderers.JSONRenderer",

0 commit comments

Comments
 (0)