diff --git a/.env.example b/.env.example index c0660ea..c6540ef 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,4 @@ -APP_NAME=Laravel +APP_NAME=KooriERP APP_ENV=local APP_KEY= APP_DEBUG=true @@ -11,7 +11,7 @@ APP_FAKER_LOCALE=en_US APP_MAINTENANCE_DRIVER=file # APP_MAINTENANCE_STORE=database -# PHP_CLI_SERVER_WORKERS=4 +PHP_CLI_SERVER_WORKERS=4 BCRYPT_ROUNDS=12 @@ -20,16 +20,17 @@ LOG_STACK=single LOG_DEPRECATIONS_CHANNEL=null LOG_LEVEL=debug -DB_CONNECTION=sqlite -# DB_HOST=127.0.0.1 -# DB_PORT=3306 -# DB_DATABASE=laravel -# DB_USERNAME=root -# DB_PASSWORD= +DB_CONNECTION=mysql +DB_HOST=mysql +DB_PORT=3306 +DB_DATABASE=koori_erp +DB_USERNAME=sail +DB_PASSWORD=password +FORWARD_DB_PORT=3307 SESSION_DRIVER=database SESSION_LIFETIME=120 -SESSION_ENCRYPT=false +SESSION_ENCRYPT=false SESSION_PATH=/ SESSION_DOMAIN=null @@ -43,14 +44,15 @@ CACHE_STORE=database MEMCACHED_HOST=127.0.0.1 REDIS_CLIENT=phpredis -REDIS_HOST=127.0.0.1 +REDIS_HOST=redis REDIS_PASSWORD=null REDIS_PORT=6379 +# FORWARD_REDIS_PORT=6380 -MAIL_MAILER=log +MAIL_MAILER=smtp MAIL_SCHEME=null -MAIL_HOST=127.0.0.1 -MAIL_PORT=2525 +MAIL_HOST=mailpit +MAIL_PORT=1025 MAIL_USERNAME=null MAIL_PASSWORD=null MAIL_FROM_ADDRESS="hello@example.com" @@ -63,3 +65,7 @@ AWS_BUCKET= AWS_USE_PATH_STYLE_ENDPOINT=false VITE_APP_NAME="${APP_NAME}" +VITE_PORT=5174 + +WWWGROUP=1000 +WWWUSER=1000 diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 800ee37..0255dd9 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -1,64 +1,61 @@ -name: Koori-ERP-Deploy -on: - push: - branches: - - main +# name: Koori-ERP-Deploy +# on: +# push: +# branches: +# - main -jobs: - auto-deploy: - runs-on: ubuntu-latest - steps: - - name: 1. Checkout Code - uses: actions/checkout@v3 - with: - # --- 關鍵：直接指定 Gitea 的伺服器網址為 IP --- - github-server-url: http://192.168.0.103:3000 - repository: ${{ gitea.repository }} - # ------------------------------------------ +# jobs: +# auto-deploy: +# runs-on: ubuntu-latest +# steps: +# - name: 1. Checkout Code +# uses: actions/checkout@v3 +# with: +# # --- 關鍵：直接指定 Gitea 的伺服器網址為 IP --- +# github-server-url: http://192.168.0.103:3000 +# repository: ${{ gitea.repository }} +# # ------------------------------------------ - - name: 2. Create .env from Secrets - run: echo "${{ secrets.DOT2_ENV }}" > .env +# - name: 2. Create .env from Secrets +# run: echo "${{ secrets.DOT2_ENV }}" > .env - - name: 3. Build and Start Docker - run: | - # export $(grep -v '^#' .env | xargs) - # echo "Debug: APP_PORT=$APP_PORT" - - docker compose down --remove-orphans - docker compose up -d --build --force-recreate +# - name: 3. Build and Start Docker +# run: | +# docker compose down --remove-orphans +# docker compose up -d --build --force-recreate - # 【強制注入】不管是掛載失效還是路徑對不上，這招一定能把 web.php 送進去 - tar -cf - . | docker exec -i koori-erp-laravel.test-1 tar -xf - -C /var/www/html +# # 【強制注入】不管是掛載失效還是路徑對不上，這招一定能把 web.php 送進去 +# tar -cf - . | docker exec -i koori-erp-laravel.test-1 tar -xf - -C /var/www/html - # 修正權限（這步沒做，Laravel 後面也會噴錯） - docker exec koori-erp-laravel.test-1 chown -R www-data:www-data /var/www/html +# # 修正權限（這步沒做，Laravel 後面也會噴錯） +# docker exec koori-erp-laravel.test-1 chown -R www-data:www-data /var/www/html - - name: 4. Initialize Laravel - run: | - # 先進容器確認 composer.json 是否真的在那裡 - docker exec koori-erp-laravel.test-1 ls -F /var/www/html/ +# - name: 4. Initialize Laravel +# run: | +# # 先進容器確認 composer.json 是否真的在那裡 +# docker exec koori-erp-laravel.test-1 ls -F /var/www/html/ - # 執行安裝 - docker exec -w /var/www/html koori-erp-laravel.test-1 composer install --optimize-autoloader --no-dev +# # 執行安裝 +# docker exec -w /var/www/html koori-erp-laravel.test-1 composer install --optimize-autoloader --no-dev - # 其他初始化指令 - docker exec koori-erp-laravel.test-1 php artisan key:generate --force - docker exec koori-erp-laravel.test-1 php artisan storage:link - docker exec koori-erp-laravel.test-1 php artisan migrate --force +# # 其他初始化指令 +# docker exec koori-erp-laravel.test-1 php artisan key:generate --force +# docker exec koori-erp-laravel.test-1 php artisan storage:link +# docker exec koori-erp-laravel.test-1 php artisan migrate --force - - name: 5. Fix Permissions (Sail Mode) - run: | - # 同時照顧 www-data 和 sail - docker exec koori-erp-laravel.test-1 chmod -R 777 /var/www/html/storage - docker exec koori-erp-laravel.test-1 php artisan view:clear +# - name: 5. Fix Permissions (Sail Mode) +# run: | +# # 同時照顧 www-data 和 sail +# docker exec koori-erp-laravel.test-1 chmod -R 777 /var/www/html/storage +# docker exec koori-erp-laravel.test-1 php artisan view:clear - - name: 6. Build Frontend Assets (Vite) - run: | - # 1. 進入容器安裝 NPM 套件 - docker exec -w /var/www/html koori-erp-laravel.test-1 npm install +# - name: 6. Build Frontend Assets (Vite) +# run: | +# # 1. 進入容器安裝 NPM 套件 +# docker exec -w /var/www/html koori-erp-laravel.test-1 npm install - # 2. 執行 Vite 編譯 (這會產生 manifest.json) - docker exec -w /var/www/html koori-erp-laravel.test-1 npm run build +# # 2. 執行 Vite 編譯 (這會產生 manifest.json) +# docker exec -w /var/www/html koori-erp-laravel.test-1 npm run build - # 3. 再次確保編譯出來的 public/build 權限也是正確的 - docker exec koori-erp-laravel.test-1 chown -R www-data:www-data /var/www/html/public \ No newline at end of file +# # 3. 再次確保編譯出來的 public/build 權限也是正確的 +# docker exec koori-erp-laravel.test-1 chown -R www-data:www-data /var/www/html/public \ No newline at end of file