[Feature] Refactored container startup process (BREAKING CHANGE) (alexjustesen#1445)

Author: alexjustesen

.env.production

@@ -11,7 +11,6 @@
     'force_https' => env('FORCE_HTTPS', false),
 
     'aliases' => Facade::defaultAliases()->merge([
-        // 'ExampleClass' => App\Example\ExampleClass::class,
         'TimeZoneHelper' => App\Helpers\TimeZoneHelper::class,
     ])->toArray(),
 

config/app.php

@@ -3,7 +3,7 @@
 return [
 
     'telegram-bot-api' => [
-        'token' => env('TELEGRAM_BOT_TOKEN', 'YOUR BOT TOKEN HERE'),
+        'token' => env('TELEGRAM_BOT_TOKEN'),
     ],
 
 ];

config/services.php

@@ -3,26 +3,25 @@
 use Carbon\Carbon;
 
 return [
-    /**
-     * Build information
-     */
+
     'build_date' => Carbon::parse('2024-04-16'),
 
     'build_version' => 'v0.19.0',
 
     /**
-     * General
+     * General settings.
      */
     'content_width' => env('CONTENT_WIDTH', '7xl'),
 
     'public_dashboard' => env('PUBLIC_DASHBOARD', false),
 
     /**
-     * Polling
+     * Polling settings.
      */
     'dashboard_polling' => env('DASHBOARD_POLLING', '60s'),
 
     'notification_polling' => env('NOTIFICATION_POLLING', '60s'),
 
     'results_polling' => env('RESULTS_POLLING', null),
+
 ];

config/speedtest.php

@@ -13,7 +13,7 @@ chmod -R 755 /config
 chown -R webuser:webgroup /config
 chmod -R 755 $WEBUSER_HOME/storage
 chown -R webuser:webgroup $WEBUSER_HOME/storage
-echo "✅  Permissions fixed."
+echo "✅  Done."
 echo ""
 
 if [ ${DB_CONNECTION:="sqlite"} = "sqlite" ]; then
@@ -33,69 +33,31 @@ if [ ${DB_CONNECTION:="sqlite"} = "sqlite" ]; then
         fi
     done
 
-    echo "✅  Database symlink created."
+    echo "✅  Done."
     echo ""
 fi
 
-# Check for env file
-if [ ! -f /config/.env ]; then
-    echo "🙄  Environment file not found, creating..."
-    s6-setuidgid webuser cp $WEBUSER_HOME/.env.production /config/.env
-    echo "✅  Environment file created."
-else
-    echo "✅  Environment file exists."
-fi
-
-echo ""
-
-# create symlinks
-echo "🔗  Creating symlinks for config and log files..."
-symlinks=( \
-/var/www/html/.env \
-)
-
-for i in "${symlinks[@]}"
-do
-    if [[ -e "$i" && ! -L "$i" ]]; then
-        rm -rf "$i"
-    fi
-    if [[ ! -L "$i" ]]; then
-        ln -s /config/"$(basename "$i")" "$i"
-    fi
-done
-
-echo "✅  Symlinks created."
-echo ""
-
 # Check for app key
 if [ ! ${APP_KEY} ]; then
-    if grep -E "APP_KEY=[0-9A-Za-z:+\/=]{1,}" $WEBUSER_HOME/.env > /dev/null; then
-        echo "✅  An application key exists."
-    else
-        echo "⏳  Generating an application key..."
-        export APP_KEY=$(s6-setuidgid webuser php $WEBUSER_HOME/artisan key:generate --show)
-        echo "⚠️  An application key was generated at start up, no environment variable was set."
-        echo "👀  To set an application key that persists, read the docs: https://docs.speedtest-tracker.dev/"
-    fi
-else
-    echo "✅  An application key environment variable exists."
+    echo "⚠️  An application key is missing!"
+    echo "👀  To set an application key, read the docs: https://docs.speedtest-tracker.dev/"
 fi
 
 echo ""
 
 # Refresh cache
-echo "💰  Building the cache..."
-s6-setuidgid webuser php $WEBUSER_HOME/artisan view:clear --no-ansi -q
+echo "💰  Refreshing the cache..."
+s6-setuidgid webuser php $WEBUSER_HOME/artisan filament:cache-components --no-ansi -q
 s6-setuidgid webuser php $WEBUSER_HOME/artisan optimize --no-ansi -q
-echo "✅  Cache set."
+echo "✅  Done."
 echo ""
 
 # Migrate database
 echo "🚛  Migrating the database..."
 s6-setuidgid webuser php $WEBUSER_HOME/artisan migrate --force --no-ansi -q
-echo "✅  Database migrated."
+echo "✅  Done."
 echo ""
 
 # App install done, show a message
-echo "✅  All set, Speedtest Tracker started."
+echo "✅  All set, Speedtest Tracker has started!"
 echo ""