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

Jump to bottom

fix(docker-compose): command format incorrect, postgres not fixed #161

Merged
merged 2 commits into from
Jul 15, 2023
Merged

fix(docker-compose): command format incorrect, postgres not fixed #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88a4c88
fix(docker-compose): command format incorrect, postgres not fixed
nekomeowww Jul 15, 2023
ba15cc9
fix(docker-compose): support empty password
nekomeowww Jul 15, 2023
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
2 changes: 1 addition & 1 deletion .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
# # Redis username, default is `""`
# REDIS_USERNAME=
# # Redis password, default is `""`
# REDIS_PASSWORD=
# REDIS_PASSWORD=123456
# # Redis database, default is `0`
# REDIS_DB=0
# # Redis client cache enabled, default is `false`, read more about client cache at
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ services:
volumes:
- ./.postgres/data:/var/lib/postgresql/data
healthcheck:
test: [ "CMD-SHELL", "pg_isready -d $POSTGRES_DB -U $POSTGRES_USER" ]
test: [ "CMD-SHELL", "pg_isready -d $$POSTGRES_DB -U $$POSTGRES_USER" ]
interval: 10s
timeout: 5s
retries: 5
Expand All @@ -119,9 +119,9 @@ services:
environment:
- REDIS_PASSWORD=123456
command: >
${REDIS_PASSWORD:+--requirepass \"$REDIS_PASSWORD}\"}
/bin/sh -c "redis-server $${REDIS_PASSWORD:+--requirepass \"$$REDIS_PASSWORD\"}"
healthcheck:
test: [ "CMD-SHELL", "redis-cli -e ${REDIS_PASSWORD:+-a \"$REDIS_PASSWORD\"} --no-auth-warning ping" ]
test: [ "CMD-SHELL", "redis-cli -e $${REDIS_PASSWORD:+-a \"$$REDIS_PASSWORD\"} --no-auth-warning ping" ]
interval: 10s
timeout: 5s
retries: 5
Expand Down