Remove remaining Redis references

master
Mark Veidemanis 2 months ago
parent b3df0bf249
commit 029afeb389
Signed by: m
GPG Key ID: 5ACFCEED46C0904F

@ -58,17 +58,17 @@ INSTALLED_APPS = [
]
# Performance optimisations
CACHES = {
"default": {
"BACKEND": "django_redis.cache.RedisCache",
"LOCATION": "unix:///var/run/socks/redis.sock",
"OPTIONS": {
"db": "10",
# "parser_class": "django_redis.cache.RedisCache",
"pool_class": "redis.BlockingConnectionPool",
},
}
}
# CACHES = {
# "default": {
# "BACKEND": "django_redis.cache.RedisCache",
# "LOCATION": "unix:///var/run/socks/redis.sock",
# "OPTIONS": {
# "db": "10",
# # "parser_class": "django_redis.cache.RedisCache",
# "pool_class": "redis.BlockingConnectionPool",
# },
# }
# }
# CACHE_MIDDLEWARE_ALIAS = 'default'
# CACHE_MIDDLEWARE_SECONDS = '600'
# CACHE_MIDDLEWARE_KEY_PREFIX = ''

@ -17,11 +17,11 @@ services:
# - "8000:8000" # uwsgi socket
env_file:
- stack.env
volumes_from:
- tmp
# volumes_from:
# - tmp
depends_on:
redis:
condition: service_healthy
# redis:
# condition: service_healthy
migration:
condition: service_started
collectstatic:
@ -43,8 +43,8 @@ services:
- ${REPO_DIR}/docker/uwsgi.ini:/conf/uwsgi.ini
- ${APP_DATABASE_FILE}:/conf/db.sqlite3
- app_static:${STATIC_ROOT}
volumes_from:
- tmp
# volumes_from:
# - tmp
env_file:
- stack.env
@ -60,8 +60,8 @@ services:
- ${REPO_DIR}:/code
- ${APP_DATABASE_FILE}:/conf/db.sqlite3
- app_static:${STATIC_ROOT}
volumes_from:
- tmp
# volumes_from:
# - tmp
env_file:
- stack.env
@ -79,8 +79,8 @@ services:
- ${REPO_DIR}:/code
- ${REPO_DIR}/docker/nginx/conf.d/${OPERATION}.conf:/etc/nginx/conf.d/default.conf
- app_static:${STATIC_ROOT}
volumes_from:
- tmp
# volumes_from:
# - tmp
networks:
- default
- xf
@ -88,31 +88,31 @@ services:
app:
condition: service_started
tmp:
image: busybox
container_name: tmp_drugs
command: chmod -R 777 /var/run/socks
volumes:
- /var/run/socks
# tmp:
# image: busybox
# container_name: tmp_drugs
# command: chmod -R 777 /var/run/socks
# volumes:
# - /var/run/socks
redis:
image: redis
command: redis-server /etc/redis.conf
ulimits:
nproc: 65535
nofile:
soft: 65535
hard: 65535
volumes:
- ${REPO_DIR}/docker/redis.conf:/etc/redis.conf
- redis_data:/data
volumes_from:
- tmp
healthcheck:
test: "redis-cli -s /var/run/socks/redis.sock ping"
interval: 2s
timeout: 2s
retries: 15
# redis:
# image: redis
# command: redis-server /etc/redis.conf
# ulimits:
# nproc: 65535
# nofile:
# soft: 65535
# hard: 65535
# volumes:
# - ${REPO_DIR}/docker/redis.conf:/etc/redis.conf
# - redis_data:/data
# volumes_from:
# - tmp
# healthcheck:
# test: "redis-cli -s /var/run/socks/redis.sock ping"
# interval: 2s
# timeout: 2s
# retries: 15
networks:
default:
@ -122,4 +122,4 @@ networks:
volumes:
app_static: {}
redis_data: {}
# redis_data: {}

Loading…
Cancel
Save