Merge branch 'staging' into deployment

Author: BertalanD

.devcontainer/devcontainer.json

@@ -1,11 +1,11 @@
 // https://aka.ms/devcontainer.json
 {
-	"name": "Existing Docker Compose (Extend)",
+	"name": "Mars development",
 	"dockerComposeFile": [
 		"../docker-compose.yml"
 	],
-	"service": "laravel.test",
-	"workspaceFolder": "/var/www/html",
+	"service": "mars_dev",
+	"workspaceFolder": "/workspace/mars",
 	"settings": {},
 	"extensions": [
 		// "mikestead.dotenv",
@@ -14,9 +14,9 @@
 		// "onecentlin.laravel5-snippets",
 		// "onecentlin.laravel-blade"
 	],
-	"remoteUser": "sail",
-	"postCreateCommand": "chown -R 1000:1000 /var/www/html"
+	"remoteUser": "ubuntu",
+	"postCreateCommand": "make build"
 	// "forwardPorts": [],
 	// "runServices": [],
 	// "shutdownAction": "none",
-}
+}

Makefile

@@ -0,0 +1,13 @@
+build:
+	npm install
+	composer install
+	npm run dev
+	cp .env.example .env
+	php artisan key:generate
+	php artisan migrate
+
+seed:
+	php artisan db:seed
+
+serve:
+	php artisan serve --host=0.0.0.0

app/Http/Controllers/Dormitory/Printing/PrintJobController.php

@@ -121,7 +121,11 @@ public function store(Request $request)
             Log::error("Error while creating print job: " . $e->getMessage());
             return back()->with('error', __('print.error_printing'));
         } finally {
-            Storage::disk('printing')->delete($path);
+            /*
+             * Let's keep around the documents for easier troubleshooting
+             * TODO: clean up after an interval (e.g. 7 days)
+             */
+            // Storage::disk('printing')->delete($path);
         }
 
         DB::commit();

app/Models/Printer.php

@@ -87,9 +87,9 @@ public function print(bool $twoSided, int $copies, string $path)
                 'lp',
                 '-h', "$this->ip:$this->port",
                 '-d', $this->name,
-                ($twoSided ? '-o sides=two-sided-long-edge' : ''),
-                 '-n', $copies,
-                 $path
+                '-o', ($twoSided ? 'sides=two-sided-long-edge' : 'sides=one-sided'),
+                '-n', $copies,
+                $path
             ]);
             $process->run();
             if (!$process->isSuccessful()) {

docker-compose.gitpod.yml

@@ -1,56 +1,32 @@
-# For more information: https://laravel.com/docs/sail
 version: '3'
+
 services:
-    laravel.test:
-        build:
-            context: ./vendor/laravel/sail/runtimes/8.2
-            dockerfile: Dockerfile
-            args:
-                WWWGROUP: '${WWWGROUP}'
-        image: sail-8.2/app
-        extra_hosts:
-            - 'host.docker.internal:host-gateway'
-        ports:
-            - '${APP_PORT:-80}:80'
-            - '${VITE_PORT:-5173}:${VITE_PORT:-5173}'
-        environment:
-            WWWUSER: '${WWWUSER}'
-            LARAVEL_SAIL: 1
-            XDEBUG_MODE: '${SAIL_XDEBUG_MODE:-off}'
-            XDEBUG_CONFIG: '${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}'
-        volumes:
-            - '.:/var/www/html'
-        networks:
-            - sail
-        depends_on:
-            - mysql
-    mysql:
-        image: 'mysql/mysql-server:8.0'
-        ports:
-            - '${FORWARD_DB_PORT:-3306}:3306'
-        environment:
-            MYSQL_ROOT_PASSWORD: '${DB_PASSWORD}'
-            MYSQL_ROOT_HOST: '%'
-            MYSQL_DATABASE: '${DB_DATABASE}'
-            MYSQL_USER: '${DB_USERNAME}'
-            MYSQL_PASSWORD: '${DB_PASSWORD}'
-            MYSQL_ALLOW_EMPTY_PASSWORD: 1
-        volumes:
-            - 'sail-mysql:/var/lib/mysql'
-            - './vendor/laravel/sail/database/mysql/create-testing-database.sh:/docker-entrypoint-initdb.d/10-create-testing-database.sh'
-        networks:
-            - sail
-        healthcheck:
-            test:
-                - CMD
-                - mysqladmin
-                - ping
-                - '-p${DB_PASSWORD}'
-            retries: 3
-            timeout: 5s
-networks:
-    sail:
-        driver: bridge
+  mysql:
+    container_name: mysql
+    image: mysql:8.3
+    environment:
+      MYSQL_DATABASE: 'mars'
+      MYSQL_USER: 'mars'
+      MYSQL_PASSWORD: 'secret'
+      MYSQL_ROOT_PASSWORD: 'secret'
+    ports:
+      - '127.0.0.1:3307:3306'
+    expose:
+      - '3306'
+    volumes:
+      - mars_db:/var/lib/mysql
+  mars_dev:
+    container_name: mars_dev
+    image: mars_image:latest
+    pull_policy: never
+    build:
+      context: ./docker-dev-setup
+    depends_on:
+      - mysql
+    volumes:
+      - ".:/workspace/mars"
+    ports:
+      - '127.0.0.1:8000:8000'
+
 volumes:
-    sail-mysql:
-        driver: local
+  mars_db:

docker-compose.yml

@@ -9,6 +9,7 @@ RUN apt-get update \
                           libzip-dev libpng-dev libonig-dev libcurl4-openssl-dev libxml2-dev \
                           php8.3-cli php8.3-mysql php8.3-zip php8.3-gd php8.3-mbstring php8.3-curl php8.3-xml php8.3-bcmath \
                           texlive-latex-base texlive-latex-extra texlive-lang-european \
+                          make \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Install Node.js