Merge pull request 'install fresh laravel 13' (#1) from develop into main

Reviewed-on: #1

backend/Dockerfile

@@ -1,36 +1,28 @@
-FROM php:8.5.3-fpm-alpine3.23
+FROM docker.arvancloud.ir/dunglas/frankenphp:1.11.2-php8.5-trixie
 
-# Install common PHP extension dependencies
-RUN apk update && apk add --no-cache \
-    bash \
-    curl \
-    libpng \
-    libpng-dev \
-    libjpeg-turbo-dev \
-    freetype-dev \
-    libwebp-dev \
-    libxml2-dev \
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends libpq-dev \
     unzip \
-    libzip-dev \
-    libpq-dev \
-    && docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp \
-    && docker-php-ext-install pdo_pgsql gd zip
+    zip \
+    && install-php-extensions pdo_pgsql pgsql \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 
-# Set the working directory
 WORKDIR /var/www/payment
 
+#ENV SERVER_NAME=your-domain-name.example.com
+
+# Copy Laravel application
 COPY . .
 
-RUN chmod -R 665 /var/www/payment/storage /var/www/payment/bootstrap/cache
+# Give permissions to storage and bootstrap/cache
+RUN chmod -R 777 storage bootstrap/cache
 
 # Install Composer
-COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
-ENV COMPOSER_ALLOW_SUPERUSER=1
+COPY --from=docker.arvancloud.ir/composer:latest /usr/bin/composer /usr/bin/composer
 
-# Default command
-CMD composer install ;\
-    composer dump-autoload --optimize --classmap-authoritative ;\
-    php artisan key:generate ;\
-    php artisan migrate ;\
-    php artisan db:seed ;\
-    php-fpm
+CMD composer install;\
+    php artisan key:generate;\
+    php artisan migrate;\
+    php artisan db:seed;\
+    frankenphp php-server -r public/

backend/Dockerfile.production

@@ -14,28 +14,19 @@ COPY . .
 
 RUN composer dump-autoload --optimize --classmap-authoritative
 
-FROM php:8.5.3-fpm-alpine3.23 AS application
+FROM docker.arvancloud.ir/dunglas/frankenphp:1.11.2-php8.5-trixie AS application
 
-RUN apk update && apk add --no-cache \
-    bash \
-    curl \
-    libpng \
-    libpng-dev \
-    libjpeg-turbo-dev \
-    freetype-dev \
-    libwebp-dev \
-    libxml2-dev \
-    unzip \
-    libzip-dev \
-    libpq-dev \
-    && docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp \
-    && docker-php-ext-install pdo_pgsql gd zip
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends libpq-dev unzip zip \
+    && install-php-extensions pdo_pgsql pgsql \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /var/www/payment
 
 COPY --from=builder /app /var/www/payment
 
 RUN chown -R www-data:www-data /var/www/payment \
-    && chmod -R 665 storage bootstrap/cache
+    && chmod -R 775 storage bootstrap/cache
 
-CMD ["php-fpm"]
+CMD ["frankenphp", "php-server", "-r", "public/"]

backend/app/Models/User.php

@@ -9,14 +9,13 @@ use Illuminate\Database\Eloquent\Attributes\Hidden;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
-use Laravel\Passport\HasApiTokens;
 
 #[Fillable(['name', 'email', 'password'])]
 #[Hidden(['password', 'remember_token'])]
 class User extends Authenticatable
 {
     /** @use HasFactory<UserFactory> */
-    use HasFactory, Notifiable, HasApiTokens;
+    use HasFactory, Notifiable;
 
     /**
      * Get the attributes that should be cast.

backend/app/Providers/AppServiceProvider.php

@@ -3,7 +3,6 @@
 namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
-use Laravel\Passport\Passport;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -20,6 +19,6 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot(): void
     {
-        Passport::enablePasswordGrant();
+        //
     }
 }

backend/bootstrap/app.php

@@ -7,7 +7,6 @@ use Illuminate\Foundation\Configuration\Middleware;
 return Application::configure(basePath: dirname(__DIR__))
     ->withRouting(
         web: __DIR__.'/../routes/web.php',
-        api: __DIR__.'/../routes/api.php',
         commands: __DIR__.'/../routes/console.php',
         health: '/up',
     )

backend/composer.json

@@ -11,7 +11,6 @@
     "require": {
         "php": "^8.3",
         "laravel/framework": "^13.0",
-        "laravel/passport": "^13.0",
         "laravel/tinker": "^3.0"
     },
     "require-dev": {
@@ -87,4 +86,4 @@
     },
     "minimum-stability": "stable",
     "prefer-stable": true
-}
+}

backend/config/auth.php

@@ -42,10 +42,6 @@ return [
             'driver' => 'session',
             'provider' => 'users',
         ],
-        'api' => [
-            'driver' => 'passport',
-            'provider' => 'users',
-        ],
     ],
 
     /*

backend/config/passport.php

@@ -1,48 +0,0 @@
-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Passport Guard
-    |--------------------------------------------------------------------------
-    |
-    | Here you may specify which authentication guard Passport will use when
-    | authenticating users. This value should correspond with one of your
-    | guards that is already present in your "auth" configuration file.
-    |
-    */
-
-    'guard' => 'web',
-
-    'middleware' => [],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Encryption Keys
-    |--------------------------------------------------------------------------
-    |
-    | Passport uses encryption keys while generating secure access tokens for
-    | your application. By default, the keys are stored as local files but
-    | can be set via environment variables when that is more convenient.
-    |
-    */
-
-    'private_key' => env('PASSPORT_PRIVATE_KEY'),
-
-    'public_key' => env('PASSPORT_PUBLIC_KEY'),
-
-    /*
-    |--------------------------------------------------------------------------
-    | Passport Database Connection
-    |--------------------------------------------------------------------------
-    |
-    | By default, Passport's models will utilize your application's default
-    | database connection. If you wish to use a different connection you
-    | may specify the configured name of the database connection here.
-    |
-    */
-
-    'connection' => env('PASSPORT_CONNECTION'),
-
-];

backend/database/migrations/2026_04_27_122415_create_oauth_auth_codes_table.php

@@ -1,39 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::create('oauth_auth_codes', function (Blueprint $table) {
-            $table->char('id', 80)->primary();
-            $table->foreignId('user_id')->index();
-            $table->foreignUuid('client_id');
-            $table->text('scopes')->nullable();
-            $table->boolean('revoked');
-            $table->dateTime('expires_at')->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('oauth_auth_codes');
-    }
-
-    /**
-     * Get the migration connection name.
-     */
-    public function getConnection(): ?string
-    {
-        return $this->connection ?? config('passport.connection');
-    }
-};

backend/database/migrations/2026_04_27_122416_create_oauth_access_tokens_table.php

@@ -1,41 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::create('oauth_access_tokens', function (Blueprint $table) {
-            $table->char('id', 80)->primary();
-            $table->foreignId('user_id')->nullable()->index();
-            $table->foreignUuid('client_id');
-            $table->string('name')->nullable();
-            $table->text('scopes')->nullable();
-            $table->boolean('revoked');
-            $table->timestamps();
-            $table->dateTime('expires_at')->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('oauth_access_tokens');
-    }
-
-    /**
-     * Get the migration connection name.
-     */
-    public function getConnection(): ?string
-    {
-        return $this->connection ?? config('passport.connection');
-    }
-};

backend/database/migrations/2026_04_27_122417_create_oauth_refresh_tokens_table.php

@@ -1,37 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::create('oauth_refresh_tokens', function (Blueprint $table) {
-            $table->char('id', 80)->primary();
-            $table->char('access_token_id', 80)->index();
-            $table->boolean('revoked');
-            $table->dateTime('expires_at')->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('oauth_refresh_tokens');
-    }
-
-    /**
-     * Get the migration connection name.
-     */
-    public function getConnection(): ?string
-    {
-        return $this->connection ?? config('passport.connection');
-    }
-};

backend/database/migrations/2026_04_27_122418_create_oauth_clients_table.php

@@ -1,42 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::create('oauth_clients', function (Blueprint $table) {
-            $table->uuid('id')->primary();
-            $table->nullableMorphs('owner');
-            $table->string('name');
-            $table->string('secret')->nullable();
-            $table->string('provider')->nullable();
-            $table->text('redirect_uris');
-            $table->text('grant_types');
-            $table->boolean('revoked');
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('oauth_clients');
-    }
-
-    /**
-     * Get the migration connection name.
-     */
-    public function getConnection(): ?string
-    {
-        return $this->connection ?? config('passport.connection');
-    }
-};

backend/database/migrations/2026_04_27_122419_create_oauth_device_codes_table.php

@@ -1,42 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::create('oauth_device_codes', function (Blueprint $table) {
-            $table->char('id', 80)->primary();
-            $table->foreignId('user_id')->nullable()->index();
-            $table->foreignUuid('client_id')->index();
-            $table->char('user_code', 8)->unique();
-            $table->text('scopes');
-            $table->boolean('revoked');
-            $table->dateTime('user_approved_at')->nullable();
-            $table->dateTime('last_polled_at')->nullable();
-            $table->dateTime('expires_at')->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('oauth_device_codes');
-    }
-
-    /**
-     * Get the migration connection name.
-     */
-    public function getConnection(): ?string
-    {
-        return $this->connection ?? config('passport.connection');
-    }
-};

backend/routes/api.php

@@ -1,8 +0,0 @@
-<?php
-
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Route;
-
-Route::get('/user', function (Request $request) {
-    return $request->user();
-})->middleware('auth:api');

docker-compose.production.yml

@@ -0,0 +1,60 @@
+services:
+  postgres:
+    image: docker.arvancloud.ir/postgres:17.8-alpine3.23
+    container_name: pgsql
+    restart: unless-stopped
+    ports:
+      - "8091:5432"
+    environment:
+      POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+    volumes:
+      - payment-db:/var/lib/postgresql/data
+    networks:
+      - payment
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+
+  backend:
+    build:
+      context: ${BACKEND_PATH}
+      dockerfile: Dockerfile.production
+    container_name: laravel
+    tty: true
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:80"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+    ports:
+      - "8003:80"
+      - "443:443"
+      - "443:443/udp"
+    volumes:
+      - ${BACKEND_PATH}:/var/www/${PROJECT_NAME}
+    depends_on:
+      - postgres
+    networks:
+      - payment
+    logging:
+      driver: "syslog"
+      options:
+        syslog-address: "tcp://host.docker.internal:514"
+        tag: "laravel-backend"
+        syslog-facility: "daemon"
+        max-size: "10m"
+    mem_limit: 512M
+    cpus: 1
+
+volumes:
+  payment-db:
+    driver: local
+
+networks:
+  payment:
+    driver: bridge

docker-compose.yml

@@ -1,39 +1,14 @@
 services:
-  nginx:
-    image: nginx:stable-alpine3.23-perl
-    container_name: nginx
-    restart: unless-stopped
-    ports:
-      - "8000:80"
-    volumes:
-      - ./nginx/payment.conf:/etc/nginx/conf.d/default.conf
-      - ${BACKEND_PATH}:/var/www/${PROJECT_NAME}
-    networks:
-      - payment
-
-  redis:
-    image: redis:8.6.0-alpine3.23
-    container_name: redis
-    restart: unless-stopped
-    tty: true
-    networks:
-      - payment
-
   postgres:
-    image: postgres:18.2-alpine3.23
-    container_name: payment-db
+    image: docker.arvancloud.ir/postgres:17.8-alpine3.23
+    container_name: pgsql
     restart: unless-stopped
     ports:
-      - "8092:5432"
+      - "8091:5432"
     environment:
       POSTGRES_DB: ${POSTGRES_DB}
       POSTGRES_USER: ${POSTGRES_USER}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-    healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}" ]
-      interval: 30s
-      timeout: 10s
-      retries: 3
     volumes:
       - payment-db:/var/lib/postgresql/data
     networks:
@@ -47,22 +22,17 @@ services:
     tty: true
     restart: unless-stopped
     ports:
-      - "9000:9000"
+      - "8003:80"
+      - "443:443"
+      - "443:443/udp"
     volumes:
       - ${BACKEND_PATH}:/var/www/${PROJECT_NAME}
+#      - caddy_data:/data
+#      - caddy_config:/config
     depends_on:
       - postgres
     networks:
       - payment
-#    logging:
-#      driver: "syslog"
-#      options:
-#        syslog-address: "tcp://host.docker.internal:514"
-#        tag: "laravel-backend"
-#        syslog-facility: "daemon"
-#        max-size: "10m"
-#    mem_limit: 512M
-#    cpus: 1
 
 volumes:
   payment-db:

nginx/payment.conf

@@ -1,21 +0,0 @@
-server {
-    listen 80;
-    listen [::]:80;
-    charset utf-8;
-
-    location / {
-            try_files $uri $uri/ /index.php?$query_string;
-        }
-
-    location ~ ^/index\.php(/|$) {
-        include fastcgi_params;
-        fastcgi_pass laravel:9000;
-        fastcgi_index index.php;
-        fastcgi_hide_header X-Powered-By;
-        fastcgi_param SCRIPT_FILENAME /var/www/payment/backend/public/index.php;
-    }
-
-    location ~ /\.(?!well-known).* {
-            deny all;
-        }
-}