Fix permission issues

docker-compose.yml.dist

@@ -16,7 +16,6 @@ services:
 
   php:
     image: mklocke/liga-manager-api:latest
-    user: 1000:1000
     volumes:
       - .:/var/www/api
       - logos:/mnt/logos

docker/php/Dockerfile

@@ -33,6 +33,10 @@ RUN chmod +x /usr/local/bin/install-phar.sh \
 COPY docker/php/docker.conf /usr/local/etc/php-fpm.d/docker.conf
 COPY docker/php/php.ini /usr/local/etc/php/php.ini
 
+# Add entrypoint
+COPY docker/php/entrypoint.sh /usr/local/bin/docker-php-entrypoint
+RUN chmod +x /usr/local/bin/docker-php-entrypoint
+
 # Prepare application source directory
 ENV APP_HOME="/var/www/api"
 RUN mkdir ${APP_HOME}
@@ -53,7 +57,6 @@ COPY bin bin/
 
 # Configure ownership and permissions
 RUN chown -R www-data:www-data ${APP_HOME} && chmod +x bin/*
-USER www-data
 ENV PATH="${PATH}:${APP_HOME}/bin:${APP_HOME}/vendor/bin"
 
 CMD lima migrations:migrate -n && php-fpm

docker/php/entrypoint.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+# first arg is `-f` or `--some-option`
+if [ "${1#-}" != "$1" ]; then
+	set -- php-fpm "$@"
+fi
+
+if [ -e /mnt/logos ]; then
+    chown www-data:www-data /mnt/logos
+fi
+
+exec "$@"

src/Infrastructure/API/Logos/UploadAction.php

@@ -28,8 +28,8 @@ public function __construct(LoggerInterface $logger)
     public function __invoke(ServerRequestInterface $request, ResponseInterface $response, array $args): ResponseInterface
     {
         $file = $this->getUploadedFile($request);
+
         $this->checkForUploadError($file);
-        $fileId = $this->generateFileId();
 
         $fileSize = (int)$file->getSize();
         if ($fileSize === 0) {
@@ -41,6 +41,8 @@ public function __invoke(ServerRequestInterface $request, ResponseInterface $res
             throw new InvalidInputException("Invalid media type. Expected: image/webp. Got: $mediaType");
         }
 
+        $fileId = $this->generateFileId();
+
         $file->moveTo($this->buildStoragePath($fileId));
 
         return $response->withHeader('Location', $this->buildPublicPath($fileId));
@@ -61,35 +63,6 @@ private function generateFileId(): string
         return Uuid::create();
     }
 
-    private function getMaxFileSize(): int
-    {
-        $value = ini_get('upload_max_filesize');
-        $value = trim($value);
-
-        if (is_numeric($value)) {
-            return (int)$value;
-        }
-
-        $unit = substr($value, -1);
-        $value = substr($value, 0, -1);
-
-        switch (strtolower($unit)) {
-            case 'g':
-                $value *= 2**30;
-                break;
-            case 'm':
-                $value *= 2**20;
-                break;
-            case 'k':
-                $value *= 2**10;
-                break;
-            default:
-                throw new InternalException('Invalid unit suffix in "upload_max_filesize"');
-        }
-
-        return (int)$value;
-    }
-
     private function getUploadedFile(ServerRequestInterface $request): UploadedFileInterface
     {
         $files = $request->getUploadedFiles();