Update docker image to use latest ubuntu version

Dockerfile

@@ -4,19 +4,20 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 # Environment variables
 ENV APP_ENV='prod'
-ENV PUID='1000'
-ENV PGID='1000'
+ENV PUID='1001'
+ENV PGID='1001'
 ENV USER='koillection'
 ENV COMPOSER_ALLOW_SUPERUSER=1
 
 COPY ./ /var/www/koillection
 
-# Add User and Group
-RUN addgroup --gid "$PGID" "$USER" && \
-    adduser --gecos '' --no-create-home --disabled-password --uid "$PUID" --gid "$PGID" "$USER" && \
+
 # Install some basics dependencies
-    apt-get update && \
+RUN apt-get update && \
     apt-get install -y curl lsb-release software-properties-common gnupg2 && \
+# Add User and Group
+    addgroup --gid "$PGID" "$USER" && \
+    adduser --gecos '' --no-create-home --disabled-password --uid "$PUID" --gid "$PGID" "$USER" && \
 # PHP
     add-apt-repository ppa:ondrej/php && \
 # Nodejs
@@ -73,7 +74,6 @@ RUN addgroup --gid "$PGID" "$USER" && \
     sed -i "s/group = www-data/group = $USER/g" /etc/php/8.3/fpm/pool.d/www.conf && \
     chown -R "$USER":"$USER" /var/www/koillection && \
     chmod +x /var/www/koillection/docker/entrypoint.sh && \
-    mkdir /run/php && \
 # Add nginx and PHP config files
     cp /var/www/koillection/docker/default.conf /etc/nginx/nginx.conf && \
     cp /var/www/koillection/docker/php.ini /etc/php/8.3/fpm/conf.d/php.ini

Dockerfile.dev

@@ -4,18 +4,18 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 # Environment variables
 ENV APP_ENV='prod'
-ENV PUID='1000'
-ENV PGID='1000'
+ENV PUID='1001'
+ENV PGID='1001'
 ENV USER='koillection'
 
 COPY ./docker/entrypoint-dev.sh /entrypoint.sh
 
-# Add User and Group
-RUN addgroup --gid "$PGID" "$USER" && \
-    adduser --gecos '' --no-create-home --disabled-password --uid "$PUID" --gid "$PGID" "$USER" && \
 # Install some basics dependencies
-    apt-get update && \
+RUN apt-get update && \
     apt-get install -y curl lsb-release software-properties-common gnupg2 vim && \
+# Add User and Groups
+    addgroup --gid "$PGID" "$USER" && \
+    adduser --gecos '' --no-create-home --disabled-password --uid "$PUID" --gid "$PGID" "$USER" && \
 # PHP
     add-apt-repository ppa:ondrej/php && \
 # Nodejs
@@ -47,8 +47,7 @@ RUN addgroup --gid "$PGID" "$USER" && \
 #Install composer dependencies
     curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer && \
 # Set permissions
-    chmod +x /entrypoint.sh && \
-    mkdir /run/php
+    chmod +x /entrypoint.sh
 
 # Add nginx and PHP config files
 COPY ./docker/default.conf /etc/nginx/nginx.conf

Dockerfile.frankenphp

@@ -2,8 +2,8 @@ FROM dunglas/frankenphp
 
 # Environment variables
 ENV APP_ENV=prod
-ENV PUID=1000
-ENV PGID=1000
+ENV PUID=1001
+ENV PGID=1001
 ENV USER=koillection
 ENV FRANKENPHP_CONFIG="worker /app/public/public/index.php"
 ENV FRANKENPHP_SERVER_NAME=":80"
@@ -12,12 +12,12 @@ ENV COMPOSER_ALLOW_SUPERUSER=1
 COPY ./ /app/public
 COPY ./docker/Caddyfile /etc/caddy/Caddyfile
 
-# Add User and Group
-RUN addgroup --gid "$PGID" "$USER" && \
-    adduser --gecos '' --no-create-home --disabled-password --uid "$PUID" --gid "$PGID" "$USER" && \
 # Install some basics dependencies
-    apt-get update && \
+RUN apt-get update && \
     apt-get install -y curl wget lsb-release gnupg2 && \
+# Add User and Group
+    addgroup --gid "$PGID" "$USER" && \
+    adduser --gecos '' --no-create-home --disabled-password --uid "$PUID" --gid "$PGID" "$USER" && \
 # Nodejs
     curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
     NODE_MAJOR=21 && \

src/Controller/Admin/AdminController.php

@@ -24,7 +24,7 @@
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 use Symfony\Component\HttpKernel\Kernel;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\Security\Http\Attribute\IsGranted;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use ZipStream\ZipStream;

src/Controller/Admin/ConfigurationController.php

@@ -10,7 +10,7 @@
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\Security\Http\Attribute\IsGranted;
 use Symfony\Contracts\Translation\TranslatorInterface;
 

src/Controller/Admin/UserController.php

@@ -21,7 +21,7 @@
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\Security\Http\Attribute\IsGranted;
 use Symfony\Contracts\Translation\TranslatorInterface;
 

src/Controller/AlbumController.php

@@ -13,7 +13,7 @@
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AlbumController extends AbstractController

src/Controller/ChoiceListController.php

@@ -10,7 +10,7 @@
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class ChoiceListController extends AbstractController

src/Controller/CollectionController.php

@@ -21,7 +21,7 @@
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class CollectionController extends AbstractController

src/Controller/DatumController.php

@@ -11,7 +11,7 @@
 use App\Enum\VisibilityEnum;
 use Symfony\Bridge\Doctrine\Attribute\MapEntity;
 use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 
 class DatumController extends AbstractController
 {

src/Controller/HistoryController.php

@@ -10,7 +10,7 @@
 use App\Service\PaginatorFactory;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 
 class HistoryController extends AbstractController
 {

src/Controller/InventoryController.php

@@ -12,7 +12,7 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class InventoryController extends AbstractController

src/Controller/ItemController.php

@@ -24,7 +24,7 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class ItemController extends AbstractController

src/Controller/LoanController.php

@@ -10,7 +10,7 @@
 use Symfony\Bridge\Doctrine\Attribute\MapEntity;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class LoanController extends AbstractController

src/Controller/PhotoController.php

@@ -10,7 +10,7 @@
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class PhotoController extends AbstractController

src/Controller/ProfileController.php

@@ -8,7 +8,7 @@
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class ProfileController extends AbstractController

src/Controller/Scraper/CollectionScraperController.php

@@ -20,7 +20,7 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\String\Slugger\SluggerInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;

src/Controller/Scraper/ItemScraperController.php

@@ -20,7 +20,7 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\String\Slugger\SluggerInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;

src/Controller/Scraper/WishScraperController.php

@@ -20,7 +20,7 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\String\Slugger\SluggerInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;

src/Controller/SearchController.php

@@ -15,7 +15,7 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 
 class SearchController extends AbstractController
 {

src/Controller/SecurityController.php

@@ -11,7 +11,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;

src/Controller/SettingsController.php

@@ -8,7 +8,7 @@
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class SettingsController extends AbstractController

src/Controller/SignController.php

@@ -6,7 +6,7 @@
 
 use App\Repository\ItemRepository;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 
 class SignController extends AbstractController
 {

src/Controller/StatisticsController.php

@@ -10,7 +10,7 @@
 use App\Service\Graph\ChartBuilder;
 use App\Service\Graph\TreeBuilder;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 
 class StatisticsController extends AbstractController
 {

src/Controller/TagCategoryController.php

@@ -12,7 +12,7 @@
 use Symfony\Bridge\Doctrine\Attribute\MapEntity;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class TagCategoryController extends AbstractController

src/Controller/TagController.php

@@ -18,7 +18,7 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class TagController extends AbstractController

src/Controller/TemplateController.php

@@ -13,7 +13,7 @@
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class TemplateController extends AbstractController

src/Controller/ToolsController.php

@@ -12,7 +12,7 @@
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\StreamedResponse;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use ZipStream\ZipStream;
 
 class ToolsController extends AbstractController

src/Controller/WishController.php

@@ -18,7 +18,7 @@
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class WishController extends AbstractController

src/Controller/WishlistController.php

@@ -13,7 +13,7 @@
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 class WishlistController extends AbstractController