Merge branch 'laravel-buildpack' into develop

datakind · Dec 18, 2024 · 4944b92 · 4944b92
2 parents 0c7dc0c + 6baba28
commit 4944b92
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 13 deletions.
diff --git a/.gcloudignore b/.gcloudignore
@@ -0,0 +1,3 @@
+#!include:.gitignore
+.git
+!/public/build/manifest.json
diff --git a/Procfile b/Procfile
@@ -0,0 +1,3 @@
+web: pid1 --nginxBinaryPath nginx --nginxConfigPath /layers/google.php.webconfig/webconfig/nginx.conf --serverConfigPath /layers/google.php.webconfig/webconfig/nginxserver.conf --nginxErrLogFilePath /var/log/nginx.log --customAppCmd "php-fpm -R --nodaemonize --fpm-config /layers/google.php.webconfig/webconfig/php-fpm.conf" --pid1LogFilePath /var/log/pid1.log --mimeTypesPath /layers/google.utils.nginx/nginx/conf/mime.types --customAppSocket /layers/google.php.webconfig/webconfig/app.sock
+migrate: php artisan migrate
+static: npm run update-static
diff --git a/bootstrap/app.php b/bootstrap/app.php
@@ -41,6 +41,16 @@
     App\Exceptions\Handler::class
 );
 
+// [START cloudrun_laravel_secret_manager_mount]
+/* Load settings from a mounted volume, if available. */
+$settings_dir = $_ENV['APP_SETTINGS_DIR'] ?? '/config';
+
+if (file_exists($settings_dir . '/.env')) {
+    $dotenv = Dotenv\Dotenv::createImmutable($settings_dir);
+    $dotenv->load();
+}
+// [END cloudrun_laravel_secret_manager_mount]
+
 /*
 |--------------------------------------------------------------------------
 | Return The Application

diff --git a/composer.json b/composer.json
@@ -6,17 +6,21 @@
     "license": "MIT",
     "require": {
         "php": "^8.1",
-        "guzzlehttp/guzzle": "^7.2",
+        "google/auth": "^1.45",
+        "google/cloud-core": "^1.60",
+        "guzzlehttp/guzzle": "^7.9",
         "inertiajs/inertia-laravel": "^0.6.8",
         "laravel/framework": "^10.10",
         "laravel/jetstream": "^4.1",
         "laravel/sanctum": "^3.3",
         "laravel/socialite": "^5.16",
         "laravel/tinker": "^2.8",
         "laravel/ui": "^4.2",
+        "livewire/livewire": "^3.5",
         "socialiteproviders/manager": "^4.6",
         "socialiteproviders/microsoft-azure": "^5.2",
-        "tightenco/ziggy": "^1.0"
+        "tightenco/ziggy": "^2.4",
+        "vlucas/phpdotenv": "^5.6"
     },
     "require-dev": {
         "fakerphp/faker": "^1.9.1",

diff --git a/config/database.php b/config/database.php
@@ -129,7 +129,7 @@
 
         'options' => [
             'cluster' => env('REDIS_CLUSTER', 'redis'),
-            'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_database_'),
+            'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_') . '_database_'),
         ],
 
         'default' => [

diff --git a/config/filesystems.php b/config/filesystems.php
@@ -39,7 +39,7 @@
         'public' => [
             'driver' => 'local',
             'root' => storage_path('app/public'),
-            'url' => env('APP_URL').'/storage',
+            'url' => env('APP_URL') . '/storage',
             'visibility' => 'public',
             'throw' => false,
         ],

diff --git a/cors-config.json b/cors-config.json
@@ -0,0 +1,9 @@
+[
+    {
+      "origin": ["https://laravel-961954531666.us-central1.run.app"],
+      "method": ["GET", "HEAD", "OPTIONS"],
+      "responseHeader": ["Content-Type"],
+      "maxAgeSeconds": 3600
+    }
+  ]
+
diff --git a/index.php b/index.php
@@ -0,0 +1,4 @@
+<?php
+
+// Ensure the default Laravel index is found.
+require 'public/index.php';
diff --git a/package.json b/package.json
@@ -3,7 +3,8 @@
   "type": "module",
   "scripts": {
     "dev": "vite",
-    "build": "vite build"
+    "build": "vite build",
+    "update-static": "vite build && gsutil -o \"GSUtil:parallel_process_count=1\" -m cp -r public/* gs://${ASSET_BUCKET}"
   },
   "devDependencies": {
     "@popperjs/core": "^2.11.6",

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,27 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          colors="true"
 >
     <testsuites>
-        <testsuite name="Unit">
-            <directory>tests/Unit</directory>
-        </testsuite>
         <testsuite name="Feature">
             <directory>tests/Feature</directory>
         </testsuite>
     </testsuites>
-    <source>
+    <coverage processUncoveredFiles="true">
         <include>
-            <directory>app</directory>
+            <directory suffix=".php">./app</directory>
         </include>
-    </source>
+    </coverage>
+
     <php>
         <env name="APP_ENV" value="testing"/>
         <env name="BCRYPT_ROUNDS" value="4"/>
         <env name="CACHE_DRIVER" value="array"/>
-        <env name="DB_DATABASE" value="testing"/>
+        <!-- <env name="DB_CONNECTION" value="sqlite"/> -->
+        <!-- <env name="DB_DATABASE" value=":memory:"/> -->
         <env name="MAIL_MAILER" value="array"/>
         <env name="QUEUE_CONNECTION" value="sync"/>
         <env name="SESSION_DRIVER" value="array"/>