improve more

CONTRIBUTION.md

@@ -22,11 +22,6 @@ ## 3) Start & setup Coolify
 - Run `spin up` - You can notice that errors will be thrown. Don't worry.
   - If you see weird permission errors, especially on Mac, run `sudo spin up` instead. 
 
-If you are running Coolify for the first time:
-- Run `./scripts/run dev:init` - This will delete any existing database layouts, migrate database to the new layout, and seed your database.
-
-> If you see the login page with a 404 error, you forgot to run `./scripts/run dev:init`.
-
 ### 4) Start development
 You can login your Coolify instance at `localhost:8000` with `test@example.com` and `password`.
 

app/Console/Commands/Dev.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\InstanceSettings;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Process;
+
+class Dev extends Command
+{
+    protected $signature = 'dev:init';
+    protected $description = 'Init the app in dev mode';
+
+    public function handle()
+    {
+        // Generate APP_KEY if not exists
+        if (empty(env('APP_KEY'))) {
+            echo "Generating APP_KEY.\n";
+            Artisan::call('key:generate');
+        }
+        // Seed database if it's empty
+        $settings = InstanceSettings::find(0);
+        if (!$settings) {
+            echo "Initializing instance, seeding database.\n";
+            Artisan::call('migrate --seed');
+        } else {
+            echo "Instance already initialized.\n";
+        }
+        // Set permissions
+        Process::run(['chmod', '-R', 'o+rwx', '.']);
+    }
+}

app/Http/Middleware/NOTUSEDIsBoardingFlow.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Http\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Illuminate\Support\Str;
-
-class IsBoardingFlow
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
-     */
-    public function handle(Request $request, Closure $next): Response
-    {
-        // ray()->showQueries()->color('orange');
-        if (showBoarding() && !in_array($request->path(), allowedPathsForBoardingAccounts())) {
-            if (Str::startsWith($request->path(), 'invitations')) {
-                return $next($request);
-            }
-            return redirect('boarding');
-        }
-        return $next($request);
-    }
-}

app/Http/Middleware/NOTUSEDIsSubscriptionValid.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Closure;
-use Illuminate\Http\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Illuminate\Support\Str;
-
-class IsSubscriptionValid
-{
-    public function handle(Request $request, Closure $next): Response
-    {
-        if (isInstanceAdmin()) {
-            return $next($request);
-        }
-        if (!auth()->user() || !isCloud()) {
-            if ($request->path() === 'subscription') {
-                return redirect('/');
-            } else {
-                return $next($request);
-            }
-        }
-        if (isSubscriptionActive() && $request->path() === 'subscription') {
-            // ray('active subscription Middleware');
-            return redirect('/');
-        }
-        if (isSubscriptionOnGracePeriod()) {
-            // ray('is_subscription_in_grace_period Middleware');
-            return $next($request);
-        }
-        if (!isSubscriptionActive() && !isSubscriptionOnGracePeriod()) {
-            // ray('SubscriptionValid Middleware');
-            if (!in_array($request->path(), allowedPathsForUnsubscribedAccounts())) {
-                if (Str::startsWith($request->path(), 'invitations')) {
-                    return $next($request);
-                }
-                return redirect('subscription');
-            } else {
-                return $next($request);
-            }
-        }
-        return $next($request);
-    }
-}

database/factories/StandaloneMongoDBFactory.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace Database\Factories;
-
-use Illuminate\Database\Eloquent\Factories\Factory;
-
-/**
- * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\StandaloneMongodb>
- */
-class StandaloneMongodbFactory extends Factory
-{
-    /**
-     * Define the model's default state.
-     *
-     * @return array<string, mixed>
-     */
-    public function definition(): array
-    {
-        return [
-            //
-        ];
-    }
-}

docker-compose.dev.yml

@@ -70,6 +70,8 @@ services:
     volumes:
       - .:/var/www/html:cached
     command: sh -c "npm install && npm run dev"
+    networks:
+      - coolify
   testing-host:
     <<: *testing-host-base
     container_name: coolify-testing-host
@@ -77,15 +79,8 @@ services:
       - /:/host
       - /var/run/docker.sock:/var/run/docker.sock
       - /data/coolify/:/data/coolify
-      # - coolify-data-dev:/data/coolify
+    networks:
-      # remote-host:
+      - coolify
-      #   <<: *testing-host-base
-      #   container_name: coolify-remote-host
-      #   volumes:
-      #     - /:/host
-      #     - /var/run/docker.sock:/var/run/docker.sock
-      #     - /data/coolify/:/data/coolify
-      #     # - coolify-data-dev:/data/coolify
   mailpit:
     image: "axllent/mailpit:latest"
     container_name: coolify-mail
@@ -116,8 +111,8 @@ volumes:
   coolify-redis-data-dev:
   coolify-minio-data-dev:
 
+
 networks:
-    coolify:
+  coolify:
-        name: coolify
+    name: coolify
-        driver: bridge  
+    external: false
-        external: false

docker/dev-ssu/etc/s6-overlay/s6-rc.d/init-setup/up

@@ -1,4 +1,5 @@
 #!/command/execlineb -P
 foreground { composer -d /var/www/html/ install }
-foreground { php /var/www/html/artisan key:generate }
 foreground { php /var/www/html/artisan migrate --step }
+foreground { php /var/www/html/artisan dev:init }
+

scripts/run

@@ -20,50 +20,50 @@ function help {
     compgen -A function | cat -n
 }
 
-function dev:init {
+# function dev:init {
-    docker exec coolify bash -c "php artisan migrate --seed"
+#     docker exec coolify bash -c "php artisan migrate --seed"
-    echo "Need to update privileges on a few files. I need your password for that."
+#     echo "Need to update privileges on a few files. I need your password for that."
-    sudo chmod -R o+rwx .
+#     sudo chmod -R o+rwx .
-}
+# }
 
-function sync:v3 {
+# function sync:v3 {
-    if [ -z "$1" ]; then
+#     if [ -z "$1" ]; then
-        echo -e "Please provide a version.\n\nExample: run sync:v3 3.12.32"
+#         echo -e "Please provide a version.\n\nExample: run sync:v3 3.12.32"
-        exit 1
+#         exit 1
-    fi
+#     fi
-    skopeo copy --all docker://ghcr.io/coollabsio/coolify:$1 docker://coollabsio/coolify:$1
+#     skopeo copy --all docker://ghcr.io/coollabsio/coolify:$1 docker://coollabsio/coolify:$1
-}
+# }
 function sync:bunny {
     php artisan sync:bunny --env=secrets
 }
 
-function queue {
+# function queue {
-    bash spin exec -u webuser coolify php artisan queue:listen
+#     bash spin exec -u webuser coolify php artisan queue:listen
-}
+# }
 
-function horizon {
+# function horizon {
-    bash spin exec -u webuser coolify php artisan horizon -vvv
+#     bash spin exec -u webuser coolify php artisan horizon -vvv
-}
+# }
 
-function schedule {
+# function schedule {
-    bash spin exec -u webuser coolify php artisan schedule:work
+#     bash spin exec -u webuser coolify php artisan schedule:work
-}
+# }
 
-function schedule:run {
+# function schedule:run {
-    bash spin exec -u webuser coolify php artisan schedule:run
+#     bash spin exec -u webuser coolify php artisan schedule:run
-}
+# }
 
 
-function db {
+# function db {
-    bash spin exec -u webuser coolify php artisan db
+#     bash spin exec -u webuser coolify php artisan db
-}
+# }
-function db:seed {
+# function db:seed {
-    bash spin exec -u webuser coolify php artisan migrate --seed
+#     bash spin exec -u webuser coolify php artisan migrate --seed
-}
+# }
 
-function db:migrate {
+# function db:migrate {
-    bash spin exec -u webuser coolify php artisan migrate --step
+#     bash spin exec -u webuser coolify php artisan migrate --step
-}
+# }
 
 function db:reset {
     bash spin exec -u webuser coolify php artisan migrate:fresh --seed
@@ -101,9 +101,9 @@ function tinker {
 }
 
 
-function build:helper {
+# function build:helper {
-    act -W .github/workflows/coolify-helper.yml --secret-file .env.secrets
+#     act -W .github/workflows/coolify-helper.yml --secret-file .env.secrets
-}
+# }
 function default {
     help
 }