diff --git a/.env.example b/.env.example index d1a4f8b..19ff22e 100644 --- a/.env.example +++ b/.env.example @@ -4,8 +4,3 @@ APP_DOMAIN=zqd.superstar.dnsnet.cc APP_URL=http://zqd.superstar.dnsnet.cc REPO_URL=http://47.251.18.130:3000/Leecheng/KTVCentral.git - -# Database -DB_DATABASE=KaraokeKingpin -DB_USERNAME=KaraokeKingpin -DB_PASSWORD=ESM7yTPMnavFmbBH diff --git a/docker-compose.yml b/docker-compose.yml index 8a3d42b..654cef1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,16 +13,6 @@ services: environment: REPO_URL: ${REPO_URL} BRANCH: ${REPO_BRANCH:-main} - DB_HOST: mariadb - DB_PORT: 3306 - DB_DATABASE: ${DB_DATABASE} - DB_USERNAME: ${DB_USERNAME} - DB_PASSWORD: ${DB_PASSWORD} - REDIS_HOST: redis - REDIS_PORT: 6379 - SESSION_DRIVER: redis - QUEUE_CONNECTION: redis - CACHE_STORE: redis APP_NAME: ${APP_NAME} APP_URL: ${APP_URL} NGINX_HOST: ${APP_DOMAIN} diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index b6acb3b..b0a70ac 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -24,16 +24,6 @@ fi update_env() { local k=$1 v=$2; grep -q "^$k=" .env && sed -i "s|^$k=.*|$k=$v|" .env || echo "$k=$v" >> .env; } update_env APP_NAME "$APP_NAME" update_env APP_URL "${APP_URL%/}" -update_env DB_HOST "$DB_HOST" -update_env DB_PORT "$DB_PORT" -update_env DB_DATABASE "$DB_DATABASE" -update_env DB_USERNAME "$DB_USERNAME" -update_env DB_PASSWORD "$DB_PASSWORD" -update_env REDIS_HOST "$REDIS_HOST" -update_env REDIS_PORT "$REDIS_PORT" -update_env SESSION_DRIVER "$SESSION_DRIVER" -update_env QUEUE_CONNECTION "$QUEUE_CONNECTION" -update_env CACHE_STORE "$CACHE_STORE" php artisan key:generate --force php artisan migrate --force