Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions apps/casdoor/1.927.0/data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ additionalProperties:
value: mysql
- label: MariaDB
value: mariadb
- label: PostgreSQL
value: postgres
- default: casdoor
envKey: PANEL_DB_NAME
labelEn: Database
Expand Down
4 changes: 2 additions & 2 deletions apps/casdoor/1.927.0/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ services:
- ${PANEL_APP_PORT_HTTP}:8000
environment:
RUNNING_IN_DOCKER: "true"
driverName: "mysql"
dataSourceName: ${PANEL_DB_USER}:${PANEL_DB_USER_PASSWORD}@tcp(${PANEL_DB_HOST}:${PANEL_DB_PORT})/
driverName: ${CASDOOR_DRIVER_NAME}
dataSourceName: ${CASDOOR_DATASOURCE_NAME}
dbName: ${PANEL_DB_NAME}
volumes:
- ./conf:/conf
Expand Down
28 changes: 28 additions & 0 deletions apps/casdoor/1.927.0/scripts/init.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#!/bin/bash

[ -f ./.env ] && source ./.env

# Default configuration
CASDOOR_DRIVER_NAME=${PANEL_DB_TYPE}
CASDOOR_DATASOURCE_NAME="${PANEL_DB_USER}:${PANEL_DB_USER_PASSWORD}@tcp(${PANEL_DB_HOST}:${PANEL_DB_PORT})/"

# Reset mariadb driver
if [ "$PANEL_DB_TYPE" = "mariadb" ]; then
CASDOOR_DRIVER_NAME="mysql"
fi

# Reset postgresql datasource
if [ "$PANEL_DB_TYPE" = "postgres" ]; then
CASDOOR_DATASOURCE_NAME="user=${PANEL_DB_USER} password=${PANEL_DB_USER_PASSWORD} host=${PANEL_DB_HOST} port=${PANEL_DB_PORT} dbname=${PANEL_DB_NAME} sslmode=disable"
fi

{
# Retain the original environment variables
grep -vE '^(CASDOOR_DRIVER_NAME|CASDOOR_DATASOURCE_NAME)' ./.env 2>/dev/null

# Add CASDOOR_xx environment variables
echo "CASDOOR_DRIVER_NAME=${CASDOOR_DRIVER_NAME}"
echo "CASDOOR_DATASOURCE_NAME=\"${CASDOOR_DATASOURCE_NAME}\""
echo ""
} > ./.env.tmp && mv ./.env.tmp ./.env

Loading