Skip to content

Commit 5f1c241

Browse files
authored
Merge pull request #245 from ScanPlusGmbH/fix-configuration-inconsistencies
Fix configuration inconsistencies
2 parents 8806288 + 20c7461 commit 5f1c241

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

docker-compose.test.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ services:
55
depends_on:
66
- postgres
77
- redis
8+
- redis-cache
89
env_file: env/netbox.env
910
user: '101'
1011
volumes:
@@ -34,8 +35,15 @@ services:
3435
command:
3536
- sh
3637
- -c # this is to evaluate the $REDIS_PASSWORD from the env
37-
- redis-server --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
38+
- redis-server --appendonly yes --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
3839
env_file: env/redis.env
40+
redis-cache:
41+
image: redis:5-alpine
42+
command:
43+
- sh
44+
- -c # this is to evaluate the $REDIS_PASSWORD from the env
45+
- redis-server --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
46+
env_file: env/redis-cache.env
3947
volumes:
4048
netbox-static-files:
4149
driver: local

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ services:
5757
- sh
5858
- -c # this is to evaluate the $REDIS_PASSWORD from the env
5959
- redis-server --requirepass $$REDIS_PASSWORD ## $$ because of docker-compose
60-
env_file: env/redis.env
60+
env_file: env/redis-cache.env
6161
volumes:
6262
netbox-static-files:
6363
driver: local

env/netbox.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ REDIS_DATABASE=0
2020
REDIS_SSL=false
2121
REDIS_CACHE_HOST=redis-cache
2222
REDIS_CACHE_PASSWORD=t4Ph722qJ5QHeQ1qfu36
23-
REDIS_CACHE_DATABASE=0
23+
REDIS_CACHE_DATABASE=1
2424
REDIS_CACHE_SSL=false
2525
SECRET_KEY=r8OwDznj!!dci#P9ghmRfdu1Ysxm0AiPeDCQhKE+N_rClfWNj
2626
SKIP_STARTUP_SCRIPTS=false

0 commit comments

Comments
 (0)