ewandor/vision
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Xbird/FixDocker' into 'main'

Browse Source 
Fix commands + return composer install in docker build

See merge request gamexperience/vision!45
This commit is contained in:
Xbird
2022-09-24 17:37:04 +00:00
parent e5c2fffdd7 200bd58458
commit 5db8dbe163
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@@ -23,7 +23,8 @@ RUN chown -R www-data:www-data /var/www
USER www-data USER www-data
RUN cd /var/www RUN cd /var/www && \
composer install
WORKDIR /var/www/ WORKDIR /var/www/
ENTRYPOINT ["bash", "./docker/docker.sh"] ENTRYPOINT ["bash", "./docker/docker.sh"]

1
docker/docker.sh
View File

@@ -1,4 +1,3 @@
composer install
php bin/console doctrine:database:create php bin/console doctrine:database:create
php bin/console d:m:m --no-interaction php bin/console d:m:m --no-interaction
php bin/console cache:clear php bin/console cache:clear

4
src/Command/AddRankCommand.php
View File

@@ -44,7 +44,7 @@ class AddRankCommand extends Command
/** /**
* @var GroupRepository $groupRepository * @var GroupRepository $groupRepository
*/ */
$groupRepository = $this->entityManager->getRepository("App:Group"); $groupRepository = $this->entityManager->getRepository(Group::class);
if ($groupid && null === $groupRepository->find($groupid)) { if ($groupid && null === $groupRepository->find($groupid)) {
$groupid = ''; $groupid = '';
@@ -64,7 +64,7 @@ class AddRankCommand extends Command
); );
} }
global $groupRepository; global $groupRepository;
if (null === $this->entityManager->getRepository("App:Group")->find($answer)) { if (null === $this->entityManager->getRepository(Group::class)->find($answer)) {
throw new \RuntimeException( throw new \RuntimeException(
'No group find for this id' 'No group find for this id'
); );

5
src/Command/AddUserCommand.php
View File

@@ -3,6 +3,7 @@
namespace App\Command; namespace App\Command;
use App\Entity\User; use App\Entity\User;
use App\Entity\Group;
use Doctrine\ORM\Query; use Doctrine\ORM\Query;
use App\Repository\GroupRepository; use App\Repository\GroupRepository;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManagerInterface;
@@ -103,7 +104,7 @@ class AddUserCommand extends Command
/** /**
* @var GroupRepository $groupRepository * @var GroupRepository $groupRepository
*/ */
$groupRepository = $this->entityManager->getRepository("App:Group"); $groupRepository = $this->entityManager->getRepository(Group::class);
if ($groupid && null === $groupRepository->find($groupid)) { if ($groupid && null === $groupRepository->find($groupid)) {
$groupid = ''; $groupid = '';
@@ -123,7 +124,7 @@ class AddUserCommand extends Command
); );
} }
global $groupRepository; global $groupRepository;
if (null === $this->entityManager->getRepository("App:Group")->find($answer)) { if (null === $this->entityManager->getRepository(Group::class)->find($answer)) {
throw new \RuntimeException( throw new \RuntimeException(
'No group find for this id' 'No group find for this id'
); );

2
visionversion.json
View File

@@ -1,3 +1,3 @@
{ {
"version": "0.2.11" "version": "0.2.12"
} }