Rework dockerfile to final form

Rework install script to create .env and run symfony and composer commands
Add symfony/debug-bundle because I get an error otherwise
2024-05-24 00:54:38 -04:00 · 2024-05-24 00:54:11 -04:00 · 2024-05-24 00:50:29 -04:00 · 2024-05-24 00:49:56 -04:00
6 changed files with 146 additions and 124 deletions
--- a/22
+++ b/22
@ -1,7 +1,5 @@
 FROM php:8.2-apache

-WORKDIR /var/www/html
-
 RUN apt update && \
    apt upgrade -y && \
    apt install -y \
@ -37,16 +35,20 @@ RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" &&
 RUN curl -sS https://get.symfony.com/cli/installer | bash && \
    mv /root/.symfony5/bin/symfony /usr/local/bin/symfony

-COPY 000-default.conf /etc/apache2/sites-available/
-
-COPY composer.lock composer.json /var/www/html/
-
-RUN composer install --no-scripts --no-dev --optimize-autoloader
-
 COPY . /var/www/html/
-RUN rm /var/www/html/.env*

-RUN cp /var/www/html/data/data.db /var/www/html/var/
+RUN mv 000-default.conf /etc/apache2/sites-available/
+RUN rm /var/www/html/.env*
+RUN rm -rf /var/www/html/var/*
+RUN rm -rf /var/www/html/vendor
+RUN rm -rf /var/www/html/tests
+RUN rm -rf /var/www/html/translations
+
+RUN COMPOSER_ALLOW_SUPERUSER=1 composer install --no-scripts --no-dev --optimize-autoloader
+RUN mv /var/www/html/data/data.db /var/www/html/var/
+
+RUN mkdir /var/www/html/var/cache
+RUN mkdir /var/www/html/var/log

 RUN chown -R www-data:www-data /var/www/html
 RUN chmod -R 755 /var/www/html
--- a/composer.json
+++ b/composer.json
@ -45,7 +45,8 @@
        "symfony/web-link": "7.0.*",
        "symfony/yaml": "7.0.*",
        "twig/extra-bundle": "^2.12|^3.0",
-        "twig/twig": "^2.12|^3.0"
+        "twig/twig": "^2.12|^3.0",
+        "symfony/debug-bundle": "7.0.*"
    },
    "config": {
        "allow-plugins": {
@ -101,7 +102,6 @@
        "phpunit/phpunit": "^9.5",
        "symfony/browser-kit": "7.0.*",
        "symfony/css-selector": "7.0.*",
-        "symfony/debug-bundle": "7.0.*",
        "symfony/maker-bundle": "^1.0",
        "symfony/phpunit-bridge": "^7.0",
        "symfony/stopwatch": "7.0.*",
--- a/composer.lock
+++ b/composer.lock
@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "361fd73241c9895cbec28ddf0158d96c",
+    "content-hash": "7f57aa7d9b15ae1237c769af447ea233",
    "packages": [
        {
            "name": "composer/semver",
@ -640,16 +640,16 @@
        },
        {
            "name": "doctrine/event-manager",
-            "version": "2.0.0",
+            "version": "2.0.1",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/event-manager.git",
-                "reference": "750671534e0241a7c50ea5b43f67e23eb5c96f32"
+                "reference": "b680156fa328f1dfd874fd48c7026c41570b9c6e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/event-manager/zipball/750671534e0241a7c50ea5b43f67e23eb5c96f32",
-                "reference": "750671534e0241a7c50ea5b43f67e23eb5c96f32",
+                "url": "https://api.github.com/repos/doctrine/event-manager/zipball/b680156fa328f1dfd874fd48c7026c41570b9c6e",
+                "reference": "b680156fa328f1dfd874fd48c7026c41570b9c6e",
                "shasum": ""
            },
            "require": {
@ -659,10 +659,10 @@
                "doctrine/common": "<2.9"
            },
            "require-dev": {
-                "doctrine/coding-standard": "^10",
+                "doctrine/coding-standard": "^12",
                "phpstan/phpstan": "^1.8.8",
-                "phpunit/phpunit": "^9.5",
-                "vimeo/psalm": "^4.28"
+                "phpunit/phpunit": "^10.5",
+                "vimeo/psalm": "^5.24"
            },
            "type": "library",
            "autoload": {
@ -711,7 +711,7 @@
            ],
            "support": {
                "issues": "https://github.com/doctrine/event-manager/issues",
-                "source": "https://github.com/doctrine/event-manager/tree/2.0.0"
+                "source": "https://github.com/doctrine/event-manager/tree/2.0.1"
            },
            "funding": [
                {
@ -727,7 +727,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-10-12T20:59:15+00:00"
+            "time": "2024-05-22T20:47:39+00:00"
        },
        {
            "name": "doctrine/inflector",
@ -1071,16 +1071,16 @@
        },
        {
            "name": "doctrine/orm",
-            "version": "3.1.3",
+            "version": "3.2.0",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/orm.git",
-                "reference": "8ca99fdfdca3dc129ed93124e95e7f88b791a354"
+                "reference": "37946d3a21ddf837c0d84f8156ee60a92102e332"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/orm/zipball/8ca99fdfdca3dc129ed93124e95e7f88b791a354",
-                "reference": "8ca99fdfdca3dc129ed93124e95e7f88b791a354",
+                "url": "https://api.github.com/repos/doctrine/orm/zipball/37946d3a21ddf837c0d84f8156ee60a92102e332",
+                "reference": "37946d3a21ddf837c0d84f8156ee60a92102e332",
                "shasum": ""
            },
            "require": {
@ -1102,12 +1102,12 @@
            "require-dev": {
                "doctrine/coding-standard": "^12.0",
                "phpbench/phpbench": "^1.0",
-                "phpstan/phpstan": "1.10.59",
+                "phpstan/phpstan": "1.11.1",
                "phpunit/phpunit": "^10.4.0",
                "psr/log": "^1 || ^2 || ^3",
                "squizlabs/php_codesniffer": "3.7.2",
                "symfony/cache": "^5.4 || ^6.2 || ^7.0",
-                "vimeo/psalm": "5.22.2"
+                "vimeo/psalm": "5.24.0"
            },
            "suggest": {
                "ext-dom": "Provides support for XSD validation for XML mapping files",
@ -1153,9 +1153,9 @@
            ],
            "support": {
                "issues": "https://github.com/doctrine/orm/issues",
-                "source": "https://github.com/doctrine/orm/tree/3.1.3"
+                "source": "https://github.com/doctrine/orm/tree/3.2.0"
            },
-            "time": "2024-04-30T07:14:13+00:00"
+            "time": "2024-05-23T14:27:52+00:00"
        },
        {
            "name": "doctrine/persistence",
@ -1533,16 +1533,16 @@
        },
        {
            "name": "phpdocumentor/reflection-docblock",
-            "version": "5.4.0",
+            "version": "5.4.1",
            "source": {
                "type": "git",
                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "298d2febfe79d03fe714eb871d5538da55205b1a"
+                "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/298d2febfe79d03fe714eb871d5538da55205b1a",
-                "reference": "298d2febfe79d03fe714eb871d5538da55205b1a",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c",
+                "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c",
                "shasum": ""
            },
            "require": {
@ -1591,9 +1591,9 @@
            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
            "support": {
                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.0"
+                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.1"
            },
-            "time": "2024-04-09T21:13:58+00:00"
+            "time": "2024-05-21T05:55:05+00:00"
        },
        {
            "name": "phpdocumentor/type-resolver",
@ -2567,6 +2567,80 @@
            ],
            "time": "2024-04-18T09:29:19+00:00"
        },
+        {
+            "name": "symfony/debug-bundle",
+            "version": "v7.0.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/debug-bundle.git",
+                "reference": "4b013a2c886cfd0292d90a9a9cebfa29ec7b578c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/debug-bundle/zipball/4b013a2c886cfd0292d90a9a9cebfa29ec7b578c",
+                "reference": "4b013a2c886cfd0292d90a9a9cebfa29ec7b578c",
+                "shasum": ""
+            },
+            "require": {
+                "ext-xml": "*",
+                "php": ">=8.2",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/twig-bridge": "^6.4|^7.0",
+                "symfony/var-dumper": "^6.4|^7.0"
+            },
+            "conflict": {
+                "symfony/config": "<6.4",
+                "symfony/dependency-injection": "<6.4"
+            },
+            "require-dev": {
+                "symfony/config": "^6.4|^7.0",
+                "symfony/web-profiler-bundle": "^6.4|^7.0"
+            },
+            "type": "symfony-bundle",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Bundle\\DebugBundle\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides a tight integration of the Symfony VarDumper component and the ServerLogCommand from MonologBridge into the Symfony full-stack framework",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/debug-bundle/tree/v7.0.7"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-04-18T09:29:19+00:00"
+        },
        {
            "name": "symfony/dependency-injection",
            "version": "v7.0.7",
@ -7469,16 +7543,16 @@
        },
        {
            "name": "twig/twig",
-            "version": "v3.10.2",
+            "version": "v3.10.3",
            "source": {
                "type": "git",
                "url": "https://github.com/twigphp/Twig.git",
-                "reference": "7aaed0b8311a557cc8c4047a71fd03153a00e755"
+                "reference": "67f29781ffafa520b0bbfbd8384674b42db04572"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/7aaed0b8311a557cc8c4047a71fd03153a00e755",
-                "reference": "7aaed0b8311a557cc8c4047a71fd03153a00e755",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/67f29781ffafa520b0bbfbd8384674b42db04572",
+                "reference": "67f29781ffafa520b0bbfbd8384674b42db04572",
                "shasum": ""
            },
            "require": {
@ -7532,7 +7606,7 @@
            ],
            "support": {
                "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.10.2"
+                "source": "https://github.com/twigphp/Twig/tree/v3.10.3"
            },
            "funding": [
                {
@ -7544,7 +7618,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-05-14T06:04:16+00:00"
+            "time": "2024-05-16T10:04:27+00:00"
        },
        {
            "name": "webmozart/assert",
@ -9426,80 +9500,6 @@
            ],
            "time": "2024-04-18T09:29:19+00:00"
        },
-        {
-            "name": "symfony/debug-bundle",
-            "version": "v7.0.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/debug-bundle.git",
-                "reference": "4b013a2c886cfd0292d90a9a9cebfa29ec7b578c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug-bundle/zipball/4b013a2c886cfd0292d90a9a9cebfa29ec7b578c",
-                "reference": "4b013a2c886cfd0292d90a9a9cebfa29ec7b578c",
-                "shasum": ""
-            },
-            "require": {
-                "ext-xml": "*",
-                "php": ">=8.2",
-                "symfony/dependency-injection": "^6.4|^7.0",
-                "symfony/http-kernel": "^6.4|^7.0",
-                "symfony/twig-bridge": "^6.4|^7.0",
-                "symfony/var-dumper": "^6.4|^7.0"
-            },
-            "conflict": {
-                "symfony/config": "<6.4",
-                "symfony/dependency-injection": "<6.4"
-            },
-            "require-dev": {
-                "symfony/config": "^6.4|^7.0",
-                "symfony/web-profiler-bundle": "^6.4|^7.0"
-            },
-            "type": "symfony-bundle",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Bundle\\DebugBundle\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Provides a tight integration of the Symfony VarDumper component and the ServerLogCommand from MonologBridge into the Symfony full-stack framework",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/debug-bundle/tree/v7.0.7"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-04-18T09:29:19+00:00"
-        },
        {
            "name": "symfony/dom-crawler",
            "version": "v7.0.7",
--- a/install.sh
+++ b/install.sh
@ -1,11 +1,17 @@
 #!/bin/bash

+rm -rf .env*
+
+echo "APP_ENV=prod" > .env
+echo "APP_DEBUG=0" >> .env
+
 LENGTH=32

 SECRET_KEY=$(openssl rand -base64 $LENGTH | tr -d '=' | tr -d '+' | tr -d '/' | tr -d ' ')
 TRIMMED_KEY=$(cut -c1-32 <<< $SECRET_KEY)
-echo "APP_SECRET=$TRIMMED_KEY" > .env.local
-echo "APP_ENV=prod" >> .env.local
-echo "APP_DEBUG=0" >> .env.local
-echo "DATABASE_URL=\"sqlite:///%kernel.project_dir%/var/data.db\"" >> .env.local
-echo "MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0" >> .env.local
+echo "APP_SECRET=$TRIMMED_KEY" >> .env
+echo "DATABASE_URL=\"sqlite:///%kernel.project_dir%/var/data.db\"" >> .env
+echo "MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0" >> .env
+
+symfony console doctrine:migrations:migrate --no-interaction
+COMPOSER_ALLOW_SUPERUSER=1 composer update
--- a/src/Controller/RegistrationController.php
+++ b/src/Controller/RegistrationController.php
@ -20,6 +20,11 @@ class RegistrationController extends AbstractController

        $form = $this->createForm(RegistrationFormType::class, $user);
        $form->handleRequest($request);
+        $role = ['ROLE_USER'];
+
+        if ($entityManager->getRepository(User::class)->getUserCount() == 0) {
+            $role = ['ROLE_ADMIN'];
+        }

        if ($form->isSubmitted() && $form->isValid()) {
            // encode the plain password
@ -28,8 +33,8 @@ class RegistrationController extends AbstractController
                    $user,
                    $form->get('plainPassword')->getData()
                )
-            )
-            ->setRoles(['ROLE_USER']);
+            );
+            $user->setRoles($role);

            $entityManager->persist($user);
            $entityManager->flush();
--- a/src/Repository/UserRepository.php
+++ b/src/Repository/UserRepository.php
@ -33,6 +33,15 @@ class UserRepository extends ServiceEntityRepository implements PasswordUpgrader
        $this->getEntityManager()->flush();
    }

+    public function getUserCount(): int
+    {
+        return $this->createQueryBuilder('u')
+            ->select('COUNT(u.id)')
+            ->getQuery()
+            ->getSingleScalarResult()
+        ;
+    }
+
    //    /**
    //     * @return User[] Returns an array of User objects
    //     */
Author	SHA1	Message	Date
Ryan Prather	4a81718818	Rework dockerfile to final form	2024-05-24 00:54:38 -04:00
Ryan Prather	a624faa728	Rework install script to create .env and run symfony and composer commands	2024-05-24 00:54:11 -04:00
Ryan Prather	2b2b3c8dc4	Add symfony/debug-bundle because I get an error otherwise	2024-05-24 00:50:29 -04:00
Ryan Prather	e0309874d4	Change code to make first user an admin so they have access to reference editor	2024-05-24 00:49:56 -04:00