diff --git a/app/Console/Commands/SeedMarketData.php b/app/Console/Commands/SeedMarketData.php deleted file mode 100644 index aa380bc..0000000 --- a/app/Console/Commands/SeedMarketData.php +++ /dev/null @@ -1,62 +0,0 @@ -count() === 0 - || $this->option('force', false) - ) { - - Artisan::call('db:seed', [ - '--class' => MarketDataSeeder::class, - ]); - - return; - } - - $this->line('Skipped seeding market data... Table already has data!'); - } -} - - diff --git a/database/migrations/2021_02_25_041221_create_market_data_table.php b/database/migrations/2021_02_25_041221_create_market_data_table.php index 5ffb270..297c3d0 100644 --- a/database/migrations/2021_02_25_041221_create_market_data_table.php +++ b/database/migrations/2021_02_25_041221_create_market_data_table.php @@ -31,6 +31,10 @@ class CreateMarketDataTable extends Migration $table->json('meta_data')->nullable(); $table->timestamps(); }); + + Artisan::call('db:seed', [ + '--class' => MarketDataSeeder::class, + ]); } /** diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 2c33331..f3fd8b7 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -2,6 +2,14 @@ cd /var/www/app +if [[ "$OSTYPE" == "darwin"* ]]; then + # macOS + OWNER=$(stat -f '%Su' storage) +else + # Linux + OWNER=$(stat -c '%U' storage) +fi + echo "====================== Running entrypoint script... ====================== " if [ ! -f ".env" ]; then echo " > Ope, gotta create an .env file!" @@ -16,6 +24,11 @@ echo "====================== Installing Composer dependencies... ============== /usr/local/bin/composer install echo "====================== Validating environment... ====================== " +if [ "$OWNER" != "www-data" ]; then + echo " > Setting correct permissions for storage directory..." + chown -R www-data:www-data storage +fi + if ( ! grep -q "^APP_KEY=" ".env" || grep -q "^APP_KEY=$" ".env"); then echo " > Ah, APP_KEY is missing in .env file. Generating a new key!" @@ -29,8 +42,5 @@ echo "====================== Installing NPM dependencies and building frontend.. echo "====================== Running migrations... ====================== " /usr/local/bin/php artisan migrate --force -echo "====================== Running seeders... ====================== " -/usr/local/bin/php artisan seed:market-data - echo "====================== Spinning up Supervisor daemon... ====================== " exec /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf