Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🎨Redis: add optional Redis username #6381

Merged
merged 5 commits into from
Sep 17, 2024
+10 −0
Merged

🎨Redis: add optional Redis username #6381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b8021b2
missing envs
sanderegg Sep 17, 2024
9822a7a
Merge branch 'master' into add-redis-user
YuryHrytsuk Sep 17, 2024
317492c
Merge branch 'master' into add-redis-user
YuryHrytsuk Sep 17, 2024
2c53837
Add `REDIS_USER` to .env-devel
YuryHrytsuk Sep 17, 2024
cfece4f
Merge branch 'master' into add-redis-user
YuryHrytsuk Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env-devel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ REDIS_HOST=redis
REDIS_PORT=6379
REDIS_PASSWORD=adminadmin
REDIS_SECURE=false
REDIS_USER=null

REGISTRY_AUTH=True
REGISTRY_PW=adminadminadmin
Expand Down
9 changes: 9 additions & 0 deletions services/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ services:
REDIS_PASSWORD: ${REDIS_PASSWORD}
REDIS_PORT: ${REDIS_PORT}
REDIS_SECURE: ${REDIS_SECURE}
REDIS_USER: ${REDIS_USER}
REGISTRY_USER: ${REGISTRY_USER}
REGISTRY_PW: ${REGISTRY_PW}
REGISTRY_URL: ${REGISTRY_URL}
Expand Down Expand Up @@ -211,6 +212,7 @@ services:
REDIS_HOST: ${REDIS_HOST}
REDIS_PORT: ${REDIS_PORT}
REDIS_SECURE: ${REDIS_SECURE}
REDIS_USER: ${REDIS_USER}
REDIS_PASSWORD: ${REDIS_PASSWORD}
SWARM_STACK_NAME: ${SWARM_STACK_NAME}
CLUSTERS_KEEPER_WORKERS_EC2_INSTANCES: ${CLUSTERS_KEEPER_WORKERS_EC2_INSTANCES}
Expand Down Expand Up @@ -341,6 +343,7 @@ services:
REDIS_HOST: ${REDIS_HOST}
REDIS_PORT: ${REDIS_PORT}
REDIS_SECURE: ${REDIS_SECURE}
REDIS_USER: ${REDIS_USER}
REDIS_PASSWORD: ${REDIS_PASSWORD}

REGISTRY_AUTH: ${REGISTRY_AUTH}
Expand Down Expand Up @@ -492,6 +495,7 @@ services:
REDIS_HOST: ${REDIS_HOST}
REDIS_PORT: ${REDIS_PORT}
REDIS_SECURE: ${REDIS_SECURE}
REDIS_USER: ${REDIS_USER}
REDIS_PASSWORD: ${REDIS_PASSWORD}
RESOURCE_USAGE_TRACKER_LOGLEVEL: ${RESOURCE_USAGE_TRACKER_LOGLEVEL}
RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_CHECK_ENABLED: ${RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_CHECK_ENABLED}
Expand All @@ -518,6 +522,7 @@ services:
REDIS_HOST: ${REDIS_HOST}
REDIS_PORT: ${REDIS_PORT}
REDIS_SECURE: ${REDIS_SECURE}
REDIS_USER: ${REDIS_USER}
REDIS_PASSWORD: ${REDIS_PASSWORD}
DIRECTOR_V2_HOST: ${DIRECTOR_V2_HOST}
DIRECTOR_V2_PORT: ${DIRECTOR_V2_PORT}
Expand Down Expand Up @@ -681,6 +686,7 @@ services:
REDIS_HOST: ${REDIS_HOST}
REDIS_PORT: ${REDIS_PORT}
REDIS_SECURE: ${REDIS_SECURE}
REDIS_USER: ${REDIS_USER}
REDIS_PASSWORD: ${REDIS_PASSWORD}

# WEBSERVER_REST
Expand Down Expand Up @@ -870,6 +876,7 @@ services:
REDIS_HOST: ${REDIS_HOST}
REDIS_PORT: ${REDIS_PORT}
REDIS_SECURE: ${REDIS_SECURE}
REDIS_USER: ${REDIS_USER}
REDIS_PASSWORD: ${REDIS_PASSWORD}

RESOURCE_MANAGER_RESOURCE_TTL_S: ${RESOURCE_MANAGER_RESOURCE_TTL_S}
Expand Down Expand Up @@ -919,6 +926,7 @@ services:
REDIS_HOST: ${REDIS_HOST}
REDIS_PORT: ${REDIS_PORT}
REDIS_SECURE: ${REDIS_SECURE}
REDIS_USER: ${REDIS_USER}
REDIS_PASSWORD: ${REDIS_PASSWORD}

SWARM_STACK_NAME: ${SWARM_STACK_NAME}
Expand Down Expand Up @@ -1059,6 +1067,7 @@ services:
REDIS_HOST: ${REDIS_HOST}
REDIS_PORT: ${REDIS_PORT}
REDIS_SECURE: ${REDIS_SECURE}
REDIS_USER: ${REDIS_USER}
REDIS_PASSWORD: ${REDIS_PASSWORD}
S3_ACCESS_KEY: ${S3_ACCESS_KEY}
S3_BUCKET_NAME: ${S3_BUCKET_NAME}
Expand Down
Loading