fix: upgrade mariadb and fully disable by default

This commit is contained in:
Mac Chaffee
2025-09-09 18:42:45 -04:00
parent af92bb1f7a
commit 57dd7df172
2 changed files with 7 additions and 6 deletions

View File

@ -19,7 +19,8 @@ CHORUS=false
FOREST=false FOREST=false
SINGLE_USER=false SINGLE_USER=false
MAX_BLOGS="10" MAX_BLOGS="10"
DISABLE_PASSWORD_AUTH=true # Set to true if using keycloak
DISABLE_PASSWORD_AUTH=false
#This is here so later lines can extend it; you likely don't wanna edit #This is here so later lines can extend it; you likely don't wanna edit
COMPOSE_FILE="compose.yml" COMPOSE_FILE="compose.yml"
@ -28,13 +29,13 @@ COMPOSE_FILE="compose.yml"
#EXTRA_DOMAINS=', `www.writefreely.example.com`' #EXTRA_DOMAINS=', `www.writefreely.example.com`'
LETS_ENCRYPT_ENV=production LETS_ENCRYPT_ENV=production
## Uncomment to use mariadb instead of sqlite ## Uncomment to use MariaDB instead of sqlite
#COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml" #COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml"
#USE_MARIADB=true #USE_MARIADB=true
SECRET_DB_ROOT_PASSWORD_VERSION=v1 #SECRET_DB_ROOT_PASSWORD_VERSION=v1
SECRET_DB_PASSWORD_VERSION=v1 #SECRET_DB_PASSWORD_VERSION=v1
## Set both for keycloak. See README.md for explanation ## Uncomment to use Keycloak. See README.md for explanation
#KEYCLOAK_ENABLED=1 #KEYCLOAK_ENABLED=1
#COMPOSE_FILE="$COMPOSE_FILE:compose.keycloak.yml" #COMPOSE_FILE="$COMPOSE_FILE:compose.keycloak.yml"
#OAUTH_CLIENT_ID=writefreely #OAUTH_CLIENT_ID=writefreely

View File

@ -9,7 +9,7 @@ services:
- db_password - db_password
db: db:
image: "mariadb:10.11" image: "mariadb:12.1"
environment: environment:
- MYSQL_DATABASE=writefreely - MYSQL_DATABASE=writefreely
- MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password