Add Docker ignore file, migration for test_entries table, and update job handling

HerrLevin · HerrLevin · commit 1d10629648ea · 2025-07-22T20:25:29.000+02:00
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,25 @@
+/.phpunit.cache
+/bootstrap/ssr
+/node_modules
+/public/build
+/public/hot
+/public/storage
+/storage/*.key
+/storage/pail
+/vendor
+.env
+.env.backup
+.env.production
+.phpactor.json
+.phpunit.result.cache
+Homestead.json
+Homestead.yaml
+npm-debug.log
+yarn-error.log
+/auth.json
+/.fleet
+/.idea
+/.nova
+/.vscode
+/.zed
+*.log
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -24,13 +24,13 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-      
+
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
         with:
           images: |
-            herrlevin/laravel-docker-text
+            herrlevin/laravel-docker-test
           tags: |
             type=ref,event=branch
             type=semver,pattern={{version}}
@@ -50,24 +50,15 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-            
+
       - name: Deploy via SSH
         uses: appleboy/ssh-action@v1.2.2
         with:
           host: ${{ secrets.SSH_HOST }}
           username: ${{ secrets.SSH_USER }}
-          key: <span class="math-inline">\{\{ secrets\.SSH\_KEY \}\}
+          port: ${{ secrets.SSH_PORT || 22 }}
+          key: ${{ secrets.SSH_KEY }}
           script: |
-           docker pull {IMAGE_REPOSITORY}/{IMAGE_NAME}\:</span>{{ github.event.inputs.tag || github.ref_name }}
-
-           docker stop {IMAGE_NAME} || true
-           docker rm {IMAGE_NAME} || true
-
-           docker run -d --name {IMAGE_NAME} \
-           -v /var/www/html/{FOLDER_NAME}/.env:/var/www/html/.env \
-           -v /var/www/html/{FOLDER_NAME}/database/database.sqlite:/var/www/html/database/database.sqlite \
-           -v /var/www/html/{FOLDER_NAME}/storage/logs:/var/www/html/storage/logs \
-           -p 80:80 \
-           --env-file /var/www/html/{FOLDER_NAME}/.env \
-           {IMAGE_REPOSITORY}/{IMAGE_NAME}:${{ github.event.inputs.tag || github.ref_name }}
-
+            cd ${{ secrets.PATH_TO_LARAVEL_PROJECT }}
+            docker compose -f docker-compose.production.yml pull
+            docker compose -f docker-compose.production.yml up -d
diff --git a/Dockerfile b/Dockerfile
@@ -12,26 +12,28 @@ ARG RUNTIME_GID=33
 
 # Install required system dependencies
 RUN apk add --no-cache \
-    nginx \
-    supervisor \
+    bash \
     icu-dev \
+    libpq-dev \
     libzip-dev \
-    zlib-dev \
+    nginx \
+    nodejs \
+    npm \
     oniguruma-dev \
     shadow \
-    bash \
     sqlite-dev \
-    nodejs \
-    npm
+    supervisor \
+    zlib-dev
 
 # Install required PHP extensions
 RUN docker-php-ext-install \
         bcmath \
+        intl \
+        opcache \
         pdo_mysql \
+        pdo_pgsql \
         pdo_sqlite \
-        zip \
-        intl \
-        opcache
+        zip
 
 RUN groupmod --gid ${RUNTIME_GID} www-data \
     && usermod --uid ${RUNTIME_UID} --gid ${RUNTIME_GID} www-data
diff --git a/app/Jobs/TestJob.php b/app/Jobs/TestJob.php
@@ -2,6 +2,7 @@
 
 namespace App\Jobs;
 
+use App\Models\TestEntry;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Queue\Queueable;
 use Illuminate\Support\Facades\Log;
@@ -14,7 +15,10 @@ public function handle(): void
     {
         Log::info("TestJob started");
         // Simulate some work
-        sleep(10); // Simulating a delay of 5 seconds
+        sleep(10); // Simulating a delay of 10 seconds
+        TestEntry::create([
+            'created_by' => 'TestJob',
+        ]);
         Log::info("TestJob completed");
     }
 }
diff --git a/app/Models/TestEntry.php b/app/Models/TestEntry.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Concerns\HasUuids;
+use Illuminate\Database\Eloquent\Model;
+
+class TestEntry extends Model
+{
+    use HasUuids;
+
+    protected $fillable = [
+        'created_by',
+    ];
+}
diff --git a/database/migrations/2025_07_22_173856_create_test_entries_table.php b/database/migrations/2025_07_22_173856_create_test_entries_table.php
@@ -0,0 +1,22 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::create('test_entries', function (Blueprint $table) {
+            $table->uuid('id')->primary();
+            $table->string('created_by')->nullable();
+            $table->timestamps();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('test_entries');
+    }
+};
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
@@ -12,9 +12,11 @@ if [ ! -f /var/www/html/database/database.sqlite ]; then
 fi
 
 if [ ! -f /var/www/html/.env ]; then
-  echo "Environment file not found. Copying example..."
-  cp /var/www/html/.env.example.prod /var/www/html/.env
-  php artisan key:generate
+  echo "Environment file not found. Creating a new one..."
+  touch /var/www/html/.env
+  echo "APP_ENV=production" >> /var/www/html/.env
+  echo "APP_DEBUG=false" >> /var/www/html/.env
+  echo "APP_KEY=base64:$(openssl rand -base64 32)" > /var/www/html/.env
 fi
 
 # Set correct permissions
diff --git a/docker/supervisor/supervisord.conf b/docker/supervisor/supervisord.conf
@@ -17,3 +17,16 @@ autostart=true
 autorestart=true
 stdout_logfile=/var/log/nginx/access.log
 stderr_logfile=/var/log/nginx/error.log
+
+[program:laravel-worker]
+process_name=%(program_name)s_%(process_num)02d
+command=php /var/www/html/artisan queue:work --sleep=3 --tries=3 --max-time=3600
+autostart=true
+autorestart=true
+stopasgroup=true
+killasgroup=true
+user=www-data
+numprocs=8
+redirect_stderr=true
+stdout_logfile=/var/www/html/storage/logs/worker.log
+stopwaitsecs=3600
diff --git a/resources/js/pages/Welcome.vue b/resources/js/pages/Welcome.vue
@@ -7,7 +7,8 @@ import { Head, Link } from '@inertiajs/vue3';
         <link rel="preconnect" href="https://rsms.me/" />
         <link rel="stylesheet" href="https://rsms.me/inter/inter.css" />
     </Head>
-    <div class="flex min-h-screen flex-col items-center bg-[#FDFDFC] p-6 text-[#1b1b18] lg:justify-center lg:p-8 dark:bg-[#0a0a0a]">
+    <div
+        class="flex min-h-screen flex-col items-center bg-[#FDFDFC] p-6 text-[#1b1b18] lg:justify-center lg:p-8 dark:bg-[#0a0a0a]">
         <header class="mb-6 w-full max-w-[335px] text-sm not-has-[nav]:hidden lg:max-w-4xl">
             <nav class="flex items-center justify-end gap-4">
                 <Link
@@ -33,16 +34,67 @@ import { Head, Link } from '@inertiajs/vue3';
                 </template>
             </nav>
         </header>
-        <div class="flex w-full items-center justify-center opacity-100 transition-opacity duration-750 lg:grow starting:opacity-0">
-            <main class="flex w-full max-w-[335px] flex-col-reverse overflow-hidden rounded-lg lg:max-w-4xl lg:flex-row">
+        <div
+            class="flex w-full items-center justify-center opacity-100 transition-opacity duration-750 lg:grow starting:opacity-0">
+            <main
+                class="flex w-full max-w-[335px] flex-col-reverse overflow-hidden rounded-lg lg:max-w-4xl lg:flex-row">
                 <div
                     class="flex-1 rounded-br-lg rounded-bl-lg bg-white p-6 pb-12 text-[13px] leading-[20px] shadow-[inset_0px_0px_0px_1px_rgba(26,26,0,0.16)] lg:rounded-tl-lg lg:rounded-br-none lg:p-20 dark:bg-[#161615] dark:text-[#EDEDEC] dark:shadow-[inset_0px_0px_0px_1px_#fffaed2d]"
                 >
                     <h1 class="mb-1 font-medium">Let's get started</h1>
                     <p class="mb-2 text-[#706f6c] dark:text-[#A1A09A]">
-                        Laravel has an incredibly rich ecosystem. <br />We suggest starting with the following.
+                        This is a demo project to showcase a containerized Laravel application using Inertia.js and Vue
+                        3. <br />
+                        This example project is built with redis and postgres in mind.
+
+                        More information at: <a href="https://github.com/HerrLevin/laravel-docker-test"
+                                                target="_blank"
+                                                class="ml-1 inline-flex items-center space-x-1 font-medium text-[#f53003] underline underline-offset-4 dark:text-[#FF4433]"
+                    >https://github.com/HerrLevin/laravel-docker-test</a>
                     </p>
                     <ul class="mb-4 flex flex-col lg:mb-6">
+                        <li
+                            class="relative flex items-center gap-4 py-2 before:absolute before:top-1/2 before:bottom-0 before:left-[0.4rem] before:border-l before:border-[#e3e3e0] dark:before:border-[#3E3E3A]"
+                        >
+                            <span class="relative bg-white py-1 dark:bg-[#161615]">
+                                <span
+                                    class="flex h-3.5 w-3.5 items-center justify-center rounded-full border border-[#e3e3e0] bg-[#FDFDFC] shadow-[0px_0px_1px_0px_rgba(0,0,0,0.03),0px_1px_2px_0px_rgba(0,0,0,0.06)] dark:border-[#3E3E3A] dark:bg-[#161615]"
+                                >
+                                    <span class="h-1.5 w-1.5 rounded-full bg-[#dbdbd7] dark:bg-[#3E3E3A]" />
+                                </span>
+                            </span>
+                            <span>
+                                Queue a job
+                                <a
+                                    href="/test-job"
+                                    target="_blank"
+                                    class="ml-1 inline-flex items-center space-x-1 font-medium text-[#f53003] underline underline-offset-4 dark:text-[#FF4433]"
+                                >
+                                    <span>Here</span>
+                                </a>
+                            </span>
+                        </li>
+                        <li
+                            class="relative flex items-center gap-4 py-2 before:absolute before:top-1/2 before:bottom-0 before:left-[0.4rem] before:border-l before:border-[#e3e3e0] dark:before:border-[#3E3E3A]"
+                        >
+                            <span class="relative bg-white py-1 dark:bg-[#161615]">
+                                <span
+                                    class="flex h-3.5 w-3.5 items-center justify-center rounded-full border border-[#e3e3e0] bg-[#FDFDFC] shadow-[0px_0px_1px_0px_rgba(0,0,0,0.03),0px_1px_2px_0px_rgba(0,0,0,0.06)] dark:border-[#3E3E3A] dark:bg-[#161615]"
+                                >
+                                    <span class="h-1.5 w-1.5 rounded-full bg-[#dbdbd7] dark:bg-[#3E3E3A]" />
+                                </span>
+                            </span>
+                            <span>
+                                Or look at the job-created sample data
+                                <a
+                                    href="/test-entries"
+                                    target="_blank"
+                                    class="ml-1 inline-flex items-center space-x-1 font-medium text-[#f53003] underline underline-offset-4 dark:text-[#FF4433]"
+                                >
+                                    <span>Here</span>
+                                </a>
+                            </span>
+                        </li>
                         <li
                             class="relative flex items-center gap-4 py-2 before:absolute before:top-1/2 before:bottom-0 before:left-[0.4rem] before:border-l before:border-[#e3e3e0] dark:before:border-[#3E3E3A]"
                         >
@@ -60,7 +112,7 @@ import { Head, Link } from '@inertiajs/vue3';
                                     target="_blank"
                                     class="ml-1 inline-flex items-center space-x-1 font-medium text-[#f53003] underline underline-offset-4 dark:text-[#FF4433]"
                                 >
-                                    <span>Documentation</span>
+                                    <span>Laravel Documentation</span>
                                     <svg
                                         width="{10}"
                                         height="{11}"
@@ -69,7 +121,8 @@ import { Head, Link } from '@inertiajs/vue3';
                                         xmlns="http://www.w3.org/2000/svg"
                                         class="h-2.5 w-2.5"
                                     >
-                                        <path d="M7.70833 6.95834V2.79167H3.54167M2.5 8L7.5 3.00001" stroke="currentColor" stroke-linecap="square" />
+                                        <path d="M7.70833 6.95834V2.79167H3.54167M2.5 8L7.5 3.00001"
+                                              stroke="currentColor" stroke-linecap="square" />
                                     </svg>
                                 </a>
                             </span>
@@ -100,7 +153,8 @@ import { Head, Link } from '@inertiajs/vue3';
                                         xmlns="http://www.w3.org/2000/svg"
                                         class="h-2.5 w-2.5"
                                     >
-                                        <path d="M7.70833 6.95834V2.79167H3.54167M2.5 8L7.5 3.00001" stroke="currentColor" stroke-linecap="square" />
+                                        <path d="M7.70833 6.95834V2.79167H3.54167M2.5 8L7.5 3.00001"
+                                              stroke="currentColor" stroke-linecap="square" />
                                     </svg>
                                 </a>
                             </span>
diff --git a/routes/web.php b/routes/web.php
@@ -1,6 +1,7 @@
 <?php
 
 use App\Jobs\TestJob;
+use App\Models\TestEntry;
 use Illuminate\Support\Facades\Route;
 use Inertia\Inertia;
 
@@ -12,9 +13,29 @@
     return Inertia::render('Dashboard');
 })->middleware(['auth', 'verified'])->name('dashboard');
 
-Route::get('test-tob', function () {
+Route::get('test-entries', function () {
+    $entries = TestEntry::all();
+
+    return response()->json([
+        'info' => 'This endpoint is used to test the persistence of the database and the job queue system. You can trigger a job at ' . route('test-job'),
+        'count' => $entries->count(),
+        'entries' => $entries->map(function ($entry) {
+            return [
+                'id' => $entry->id,
+                'created_by' => $entry->created_by,
+                'created_at' => $entry->created_at->toDateTimeString(),
+            ];
+        }),
+    ]);
+})->name('test-entries');
+
+Route::get('test-job', function () {
     TestJob::dispatch();
-});
 
-require __DIR__.'/settings.php';
-require __DIR__.'/auth.php';
+    return response()->json([
+        'success' => 'The job should have been dispatched! To test the results & persistence of the database, check ' . route('test-entries') . ' after a few seconds.',
+    ]);
+})->name('test-job');
+
+require __DIR__ . '/settings.php';
+require __DIR__ . '/auth.php';

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace App\Jobs;`
`4`	`4`
	`5`	`+use App\Models\TestEntry;`
`5`	`6`	`use Illuminate\Contracts\Queue\ShouldQueue;`
`6`	`7`	`use Illuminate\Foundation\Queue\Queueable;`
`7`	`8`	`use Illuminate\Support\Facades\Log;`
`@@ -14,7 +15,10 @@ public function handle(): void`
`14`	`15`	`{`
`15`	`16`	`Log::info("TestJob started");`
`16`	`17`	`// Simulate some work`
`17`		`- sleep(10); // Simulating a delay of 5 seconds`
	`18`	`+ sleep(10); // Simulating a delay of 10 seconds`
	`19`	`+ TestEntry::create([`
	`20`	`+ 'created_by' => 'TestJob',`
	`21`	`+ ]);`
`18`	`22`	`Log::info("TestJob completed");`
`19`	`23`	`}`
`20`	`24`	`}`