Merge pull request #502 from timwhite/master

Fix docker bug when setting DB_PASSWORD
This commit is contained in:
Claude 2018-09-29 15:58:54 +02:00 committed by GitHub
commit dd3e481ba1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -34,7 +34,7 @@ STIKKED_DB_HOSTNAME="${STIKKED_DB_HOSTNAME:-db}"
# just guess.
STIKKED_DB_DATABASE="${STIKKED_DB_DATABASE:-${MYSQL_DATABASE:-stikked}}"
STIKKED_DB_USERNAME="${STIKKED_DB_USERNAME:-${MYSQL_USER:-stikked}}"
STIKKED_DB_PASS="${STIKKED_DB_PASSWORD:-${MYSQL_PASSWORD:-stikked}}"
STIKKED_DB_PASSWORD="${STIKKED_DB_PASSWORD:-${MYSQL_PASSWORD:-stikked}}"
# If there's not a cron key, set a random one.
if [ ! "$STIKKED_CRON_KEY" ]; then

View File

@ -15,7 +15,7 @@ STIKKED_DB_HOSTNAME=db
# if you are using a seperately managed database.
#STIKKED_DB_DATABASE=stikked
#STIKKED_DB_USERNAME=stikked
#STIKKED_DB_PASS=stikked
#STIKKED_DB_PASSWORD=stikked
# Other random examples
STIKKED_DISALLOW_SEARCH_ENGINES="true"