Merge pull request #22 from VMGWARE/General-Changes-or-Cleanup

General changes/cleanup
VMGWARE · Jul 27, 2023 · 639ce1d · 639ce1d
2 parents 2e75fa8 + 14b73a8
commit 639ce1d
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 5 deletions.
diff --git a/.woodpecker.yml b/.woodpecker.yml
@@ -1,8 +1,24 @@
 variables:
   - &buildx_image "woodpeckerci/plugin-docker-buildx"
-  - &platforms "linux/amd64"
+  - &platforms "linux/amd64,linux/arm64"
+
+services:
+  mysql:
+    image: mysql:8.0
+    environment:
+      MYSQL_ROOT_PASSWORD: root
+      MYSQL_DATABASE: vatc-suite
+    ports:
+      - 3306:3306
 
 pipeline:
+  - name: Install Dependencies
+    image: sineverba/php8xc:latest
+    commands:
+      - cd ./src
+      - composer install
+      - cd ../
+
   - name: Generate version file
     image: alpine/git
     commands:
@@ -11,6 +27,37 @@ pipeline:
       - cat version
       - cd ../
 
+  - name: Configure Site
+    image: sineverba/php8xc:latest
+    environment:
+      DB_HOST: mysql
+      DB_PORT: "3306"
+      DB_DATABASE: vatc-suite
+      DB_USERNAME: root
+      DB_PASSWORD: root
+    commands:
+      - cd ./src
+      - cp .env.example .env
+      - echo "Waiting for MySQL to start..."
+      - sleep 5
+      - php artisan key:generate
+      - php artisan migrate --force
+      - php artisan site:configure
+      - cd ../
+
+  - name: Testing
+    image: sineverba/php8xc:latest
+    environment:
+      DB_HOST: mysql
+      DB_PORT: "3306"
+      DB_DATABASE: vatc-suite
+      DB_USERNAME: root
+      DB_PASSWORD: root
+    commands:
+      - cd ./src
+      - php artisan test
+      - cd ../
+
   - name: Deploy to Docker Hub
     image: *buildx_image
     secrets: [docker_username, docker_password]

diff --git a/src/app/Console/Commands/ConfigureSite.php b/src/app/Console/Commands/ConfigureSite.php
@@ -6,7 +6,6 @@
 use Illuminate\Console\Command;
 use Spatie\Permission\Models\Role;
 use Spatie\Permission\Models\Permission;
-use Illuminate\Support\Facades\DB;
 
 class ConfigureSite extends Command
 {

diff --git a/src/app/Http/Controllers/API/HealthCheckController.php b/src/app/Http/Controllers/API/HealthCheckController.php
@@ -3,12 +3,9 @@
 namespace App\Http\Controllers\API;
 
 use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
 use Vyuldashev\LaravelOpenApi\Attributes as OpenApi;
 use Illuminate\Http\JsonResponse;
-use PDO;
 
 #[OpenApi\PathItem]
 class HealthCheckController extends Controller