From 8bddb565c243fc089cbf5d71c666f7d92608b442 Mon Sep 17 00:00:00 2001 From: ImmortaL Date: Sun, 31 Mar 2024 22:04:23 +0300 Subject: [PATCH] one line start up now --- README.md | 4 ---- app/src/Form/Type/UserAnswerType.php | 1 + docker/fpm/Dockerfile | 8 +++++++- docker/fpm/bootstrap.sh | 11 +++++++++++ 4 files changed, 19 insertions(+), 5 deletions(-) create mode 100755 docker/fpm/bootstrap.sh diff --git a/README.md b/README.md index a623dbd..d3f4d74 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,4 @@ To access the test you will need to write the server name in your `/etc/hosts` f Run `docker compose up -d` -Run `docker compose exec --workdir=/var/www/trial php /usr/local/bin/php ./bin/console cache:clear` -Run `docker compose exec --workdir=/var/www/trial php /usr/local/bin/php ./bin/console doctrine:migrations:migrate --no-interaction` -Run `docker compose exec --workdir=/var/www/trial php /usr/bin/yarn encore prod` - To access the test then just simply visit `https://trial:8443` (you need to agree with self-signed cert). diff --git a/app/src/Form/Type/UserAnswerType.php b/app/src/Form/Type/UserAnswerType.php index 49f1433..21c3fce 100644 --- a/app/src/Form/Type/UserAnswerType.php +++ b/app/src/Form/Type/UserAnswerType.php @@ -34,6 +34,7 @@ class UserAnswerType extends AbstractType $builder ->add('answer', ChoiceType::class, [ 'choices' => $answers, + 'choice_value' => 'name', 'choice_label' => function (?AnswerModel $answerModel): string { return $answerModel->getName(); }, diff --git a/docker/fpm/Dockerfile b/docker/fpm/Dockerfile index 618fe37..7dfe4a0 100644 --- a/docker/fpm/Dockerfile +++ b/docker/fpm/Dockerfile @@ -20,4 +20,10 @@ RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \ WORKDIR /var/www/trial COPY ./app/composer.json ./app/composer.lock ./app/package.json ./app/yarn.lock ./app/symfony.lock ./ -RUN composer install && npm install -g yarn -y && yarn install \ No newline at end of file +RUN composer install && npm install -g yarn -y + +COPY ./docker/fpm/bootstrap.sh /usr/local/bin/ + +ENTRYPOINT ["/usr/local/bin/bootstrap.sh"] + + diff --git a/docker/fpm/bootstrap.sh b/docker/fpm/bootstrap.sh new file mode 100755 index 0000000..54ee088 --- /dev/null +++ b/docker/fpm/bootstrap.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +cd /var/www/trial && \ +php bin/console cache:clear --env=$APP_ENV && \ +php bin/console cache:warmup --env=$APP_ENV && \ +php bin/console doctrine:migrations:migrate --no-interaction --env=$APP_ENV && \ +yarn install && \ +yarn encore $APP_ENV && \ + +# Start the server +/usr/local/bin/docker-php-entrypoint php-fpm \ No newline at end of file