Remove remaining Redis references
This commit is contained in:
parent
b3df0bf249
commit
029afeb389
|
@ -58,17 +58,17 @@ INSTALLED_APPS = [
|
||||||
]
|
]
|
||||||
|
|
||||||
# Performance optimisations
|
# Performance optimisations
|
||||||
CACHES = {
|
# CACHES = {
|
||||||
"default": {
|
# "default": {
|
||||||
"BACKEND": "django_redis.cache.RedisCache",
|
# "BACKEND": "django_redis.cache.RedisCache",
|
||||||
"LOCATION": "unix:///var/run/socks/redis.sock",
|
# "LOCATION": "unix:///var/run/socks/redis.sock",
|
||||||
"OPTIONS": {
|
# "OPTIONS": {
|
||||||
"db": "10",
|
# "db": "10",
|
||||||
# "parser_class": "django_redis.cache.RedisCache",
|
# # "parser_class": "django_redis.cache.RedisCache",
|
||||||
"pool_class": "redis.BlockingConnectionPool",
|
# "pool_class": "redis.BlockingConnectionPool",
|
||||||
},
|
# },
|
||||||
}
|
# }
|
||||||
}
|
# }
|
||||||
# CACHE_MIDDLEWARE_ALIAS = 'default'
|
# CACHE_MIDDLEWARE_ALIAS = 'default'
|
||||||
# CACHE_MIDDLEWARE_SECONDS = '600'
|
# CACHE_MIDDLEWARE_SECONDS = '600'
|
||||||
# CACHE_MIDDLEWARE_KEY_PREFIX = ''
|
# CACHE_MIDDLEWARE_KEY_PREFIX = ''
|
||||||
|
|
|
@ -17,11 +17,11 @@ services:
|
||||||
# - "8000:8000" # uwsgi socket
|
# - "8000:8000" # uwsgi socket
|
||||||
env_file:
|
env_file:
|
||||||
- stack.env
|
- stack.env
|
||||||
volumes_from:
|
# volumes_from:
|
||||||
- tmp
|
# - tmp
|
||||||
depends_on:
|
depends_on:
|
||||||
redis:
|
# redis:
|
||||||
condition: service_healthy
|
# condition: service_healthy
|
||||||
migration:
|
migration:
|
||||||
condition: service_started
|
condition: service_started
|
||||||
collectstatic:
|
collectstatic:
|
||||||
|
@ -43,8 +43,8 @@ services:
|
||||||
- ${REPO_DIR}/docker/uwsgi.ini:/conf/uwsgi.ini
|
- ${REPO_DIR}/docker/uwsgi.ini:/conf/uwsgi.ini
|
||||||
- ${APP_DATABASE_FILE}:/conf/db.sqlite3
|
- ${APP_DATABASE_FILE}:/conf/db.sqlite3
|
||||||
- app_static:${STATIC_ROOT}
|
- app_static:${STATIC_ROOT}
|
||||||
volumes_from:
|
# volumes_from:
|
||||||
- tmp
|
# - tmp
|
||||||
env_file:
|
env_file:
|
||||||
- stack.env
|
- stack.env
|
||||||
|
|
||||||
|
@ -60,8 +60,8 @@ services:
|
||||||
- ${REPO_DIR}:/code
|
- ${REPO_DIR}:/code
|
||||||
- ${APP_DATABASE_FILE}:/conf/db.sqlite3
|
- ${APP_DATABASE_FILE}:/conf/db.sqlite3
|
||||||
- app_static:${STATIC_ROOT}
|
- app_static:${STATIC_ROOT}
|
||||||
volumes_from:
|
# volumes_from:
|
||||||
- tmp
|
# - tmp
|
||||||
env_file:
|
env_file:
|
||||||
- stack.env
|
- stack.env
|
||||||
|
|
||||||
|
@ -79,8 +79,8 @@ services:
|
||||||
- ${REPO_DIR}:/code
|
- ${REPO_DIR}:/code
|
||||||
- ${REPO_DIR}/docker/nginx/conf.d/${OPERATION}.conf:/etc/nginx/conf.d/default.conf
|
- ${REPO_DIR}/docker/nginx/conf.d/${OPERATION}.conf:/etc/nginx/conf.d/default.conf
|
||||||
- app_static:${STATIC_ROOT}
|
- app_static:${STATIC_ROOT}
|
||||||
volumes_from:
|
# volumes_from:
|
||||||
- tmp
|
# - tmp
|
||||||
networks:
|
networks:
|
||||||
- default
|
- default
|
||||||
- xf
|
- xf
|
||||||
|
@ -88,31 +88,31 @@ services:
|
||||||
app:
|
app:
|
||||||
condition: service_started
|
condition: service_started
|
||||||
|
|
||||||
tmp:
|
# tmp:
|
||||||
image: busybox
|
# image: busybox
|
||||||
container_name: tmp_drugs
|
# container_name: tmp_drugs
|
||||||
command: chmod -R 777 /var/run/socks
|
# command: chmod -R 777 /var/run/socks
|
||||||
volumes:
|
# volumes:
|
||||||
- /var/run/socks
|
# - /var/run/socks
|
||||||
|
|
||||||
redis:
|
# redis:
|
||||||
image: redis
|
# image: redis
|
||||||
command: redis-server /etc/redis.conf
|
# command: redis-server /etc/redis.conf
|
||||||
ulimits:
|
# ulimits:
|
||||||
nproc: 65535
|
# nproc: 65535
|
||||||
nofile:
|
# nofile:
|
||||||
soft: 65535
|
# soft: 65535
|
||||||
hard: 65535
|
# hard: 65535
|
||||||
volumes:
|
# volumes:
|
||||||
- ${REPO_DIR}/docker/redis.conf:/etc/redis.conf
|
# - ${REPO_DIR}/docker/redis.conf:/etc/redis.conf
|
||||||
- redis_data:/data
|
# - redis_data:/data
|
||||||
volumes_from:
|
# volumes_from:
|
||||||
- tmp
|
# - tmp
|
||||||
healthcheck:
|
# healthcheck:
|
||||||
test: "redis-cli -s /var/run/socks/redis.sock ping"
|
# test: "redis-cli -s /var/run/socks/redis.sock ping"
|
||||||
interval: 2s
|
# interval: 2s
|
||||||
timeout: 2s
|
# timeout: 2s
|
||||||
retries: 15
|
# retries: 15
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
default:
|
default:
|
||||||
|
@ -122,4 +122,4 @@ networks:
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
app_static: {}
|
app_static: {}
|
||||||
redis_data: {}
|
# redis_data: {}
|
||||||
|
|
Loading…
Reference in New Issue