From b7b4bc763ed9430caf3633ba909f993c6b32aeb7 Mon Sep 17 00:00:00 2001
From: "kai.t" <kai.t@apactech.io>
Date: Sat, 24 Feb 2024 01:55:21 +0000
Subject: [PATCH] update docker

---
 .env                                          |  1 +
 docker-compose.yml                            | 10 +++---
 src/app/Console/Commands/JobRun.php           | 33 +++++++++++++++++++
 .../{ProcessJob.php => ScreenshotJob.php}     |  9 +++--
 src/routes/web.php                            | 10 ------
 5 files changed, 45 insertions(+), 18 deletions(-)
 create mode 100644 .env
 create mode 100644 src/app/Console/Commands/JobRun.php
 rename src/app/Jobs/{ProcessJob.php => ScreenshotJob.php} (70%)

diff --git a/.env b/.env
new file mode 100644
index 0000000..fc2e475
--- /dev/null
+++ b/.env
@@ -0,0 +1 @@
+VERSION=1
diff --git a/docker-compose.yml b/docker-compose.yml
index 6becf30..24736ae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 version : '3'
 
-name: laravel-rabbitmq
+name: laravel-rabbitmq${VERSION}
 
 networks:
   laravel:
@@ -13,14 +13,14 @@ services:
       - ./src:/app
     command: "sh /app/laravel-entrypoint.sh"
     ports:
-      - 1000:8000
-      - 1001:8001
+      - 100${VERSION}:8000
     networks:
       - laravel
     depends_on:
       - redis
 
   puppeteer:
+    container_name: puppeteer
     build:
       context: ./.docker/puppeteer
       dockerfile: Dockerfile
@@ -29,6 +29,7 @@ services:
       - laravel
 
   socketio:
+    container_name: socketio
     build:
       context: ./.docker/socketio
       dockerfile: Dockerfile
@@ -39,9 +40,8 @@ services:
 
   redis:
     image: redis
-    container_name: redis
     ports:
-      - "6379:6379"
+      - ":6379"
     networks:
       - laravel
 
diff --git a/src/app/Console/Commands/JobRun.php b/src/app/Console/Commands/JobRun.php
new file mode 100644
index 0000000..ea1a830
--- /dev/null
+++ b/src/app/Console/Commands/JobRun.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Jobs\ScreenshotJob;
+use Illuminate\Console\Command;
+
+class JobRun extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'job:run';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '';
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        dispatch(new ScreenshotJob);
+    }
+}
diff --git a/src/app/Jobs/ProcessJob.php b/src/app/Jobs/ScreenshotJob.php
similarity index 70%
rename from src/app/Jobs/ProcessJob.php
rename to src/app/Jobs/ScreenshotJob.php
index b804cce..16410e3 100644
--- a/src/app/Jobs/ProcessJob.php
+++ b/src/app/Jobs/ScreenshotJob.php
@@ -9,7 +9,7 @@ use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Artisan;
 
-class ProcessJob implements ShouldQueue
+class ScreenshotJob implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
@@ -21,7 +21,7 @@ class ProcessJob implements ShouldQueue
      */
     public function __construct()
     {
-        $process = 'process' . rand(1, 3);
+        $process = 'process' . random_int(1, 3);
         $this->process = $process;
         $this->onQueue($process);
     }
@@ -33,6 +33,9 @@ class ProcessJob implements ShouldQueue
      */
     public function handle()
     {
-        var_dump('hello world');
+        file_put_contents(
+            public_path('pupeteer/' . time() . '.jpg'),
+            file_get_contents('http://puppeteer:4000?url=' . 'https://payment.nswteam.net/')
+        );
     }
 }
diff --git a/src/routes/web.php b/src/routes/web.php
index 272663e..ea03a1f 100644
--- a/src/routes/web.php
+++ b/src/routes/web.php
@@ -21,13 +21,3 @@ Route::get('/', function () {
 });
 
 Route::view('/queue', 'queue');
-Route::get('/pupeteer', function (Request $request) {
-    file_put_contents(
-        public_path('pupeteer/' . time() . '.jpg'),
-        file_get_contents('http://puppeteer:4000?url=' . $request->input('url'))
-    );
-
-    return dump(
-        glob(public_path('pupeteer/*'))
-    );
-});