From 7d803baef9272b4624a10847497ffc1d52dd9079 Mon Sep 17 00:00:00 2001 From: Xbird Date: Fri, 23 Sep 2022 21:05:31 +0200 Subject: [PATCH 1/7] Work on docker file --- .dockerignore | 34 +++++++++++++++++++++++++++++++++- Dockerfile | 4 +--- docker/docker.sh | 1 + visionversion.json | 2 +- 4 files changed, 36 insertions(+), 5 deletions(-) diff --git a/.dockerignore b/.dockerignore index a37b360..20d8770 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1 +1,33 @@ -**/.env.local \ No newline at end of file +**/*.log +**/*.md +**/*.php~ +**/*.dist.php +**/*.dist +**/*.cache +**/._* +**/.dockerignore +**/.DS_Store +**/.git/ +**/.gitattributes +**/.gitignore +**/.gitmodules +**/docker-compose.*.yaml +**/docker-compose.*.yml +**/docker-compose.yaml +**/docker-compose.yml +**/Dockerfile +**/Thumbs.db +.github/ +.gitlab/ +docs/ +public/bundles/ +public/build/ +tests/ +var/ +vendor/ +.editorconfig +.env.*.local +.env.local +.env.local.php +.env.test +node_modules/ \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index cfd1f45..4ec7493 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,9 +23,7 @@ RUN chown -R www-data:www-data /var/www USER www-data -RUN cd /var/www && \ - composer install - +RUN cd /var/www WORKDIR /var/www/ ENTRYPOINT ["bash", "./docker/docker.sh"] diff --git a/docker/docker.sh b/docker/docker.sh index 1fc7e12..3b4279d 100644 --- a/docker/docker.sh +++ b/docker/docker.sh @@ -1,3 +1,4 @@ +composer install php bin/console d:m:m --no-interaction php bin/console cache:clear exec apache2-foreground \ No newline at end of file diff --git a/visionversion.json b/visionversion.json index c56effc..a7d4f79 100644 --- a/visionversion.json +++ b/visionversion.json @@ -1,3 +1,3 @@ { - "version": "0.2.10" + "version": "0.2.11" } From 12c6bd043ace57155f6d63fca3a2ff239efd8d6e Mon Sep 17 00:00:00 2001 From: Xbird Date: Fri, 23 Sep 2022 21:06:48 +0200 Subject: [PATCH 2/7] remove failed cache --- .gitlab-ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2283ee3..14e6f89 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,10 +6,6 @@ include: before_script: - composer install --no-scripts -cache: - paths: - - vendor/ - stages: - SecurityChecker - CodingStandards From 2303f4a5859c4a2e19a3c9a38704cc5f45a46d4c Mon Sep 17 00:00:00 2001 From: Xbird Date: Fri, 23 Sep 2022 21:29:55 +0200 Subject: [PATCH 3/7] php bin/console doctrine:database:create --- docker/docker.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/docker.sh b/docker/docker.sh index 3b4279d..80f4c13 100644 --- a/docker/docker.sh +++ b/docker/docker.sh @@ -1,4 +1,5 @@ composer install +php bin/console doctrine:database:create php bin/console d:m:m --no-interaction php bin/console cache:clear exec apache2-foreground \ No newline at end of file From ce6a82d33e3cf111caa8d8804e1cf2f587c16160 Mon Sep 17 00:00:00 2001 From: Xbird Date: Sat, 24 Sep 2022 19:29:07 +0200 Subject: [PATCH 4/7] fix addrank and add user group error --- src/Command/AddRankCommand.php | 4 ++-- src/Command/AddUserCommand.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Command/AddRankCommand.php b/src/Command/AddRankCommand.php index 5146ff0..4bfeadb 100644 --- a/src/Command/AddRankCommand.php +++ b/src/Command/AddRankCommand.php @@ -44,7 +44,7 @@ class AddRankCommand extends Command /** * @var GroupRepository $groupRepository */ - $groupRepository = $this->entityManager->getRepository("App:Group"); + $groupRepository = $this->entityManager->getRepository(Group::class); if ($groupid && null === $groupRepository->find($groupid)) { $groupid = ''; @@ -64,7 +64,7 @@ class AddRankCommand extends Command ); } global $groupRepository; - if (null === $this->entityManager->getRepository("App:Group")->find($answer)) { + if (null === $this->entityManager->getRepository(Group::class)->find($answer)) { throw new \RuntimeException( 'No group find for this id' ); diff --git a/src/Command/AddUserCommand.php b/src/Command/AddUserCommand.php index 86f2c0a..893e32c 100644 --- a/src/Command/AddUserCommand.php +++ b/src/Command/AddUserCommand.php @@ -103,7 +103,7 @@ class AddUserCommand extends Command /** * @var GroupRepository $groupRepository */ - $groupRepository = $this->entityManager->getRepository("App:Group"); + $groupRepository = $this->entityManager->getRepository(Group::class); if ($groupid && null === $groupRepository->find($groupid)) { $groupid = ''; @@ -123,7 +123,7 @@ class AddUserCommand extends Command ); } global $groupRepository; - if (null === $this->entityManager->getRepository("App:Group")->find($answer)) { + if (null === $this->entityManager->getRepository(Group::class)->find($answer)) { throw new \RuntimeException( 'No group find for this id' ); From 40042c41f57c9d3f71c1c0d7a4e15bd56c15f643 Mon Sep 17 00:00:00 2001 From: Xbird Date: Sat, 24 Sep 2022 19:30:27 +0200 Subject: [PATCH 5/7] upgrade vision version --- visionversion.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/visionversion.json b/visionversion.json index a7d4f79..4f8c0f3 100644 --- a/visionversion.json +++ b/visionversion.json @@ -1,3 +1,3 @@ { - "version": "0.2.11" + "version": "0.2.12" } From 90c4ada7d13ad25728da1a43923a6a7b14eb2607 Mon Sep 17 00:00:00 2001 From: Xbird Date: Sat, 24 Sep 2022 19:31:32 +0200 Subject: [PATCH 6/7] re-add composer install on dockerBuild --- Dockerfile | 3 ++- docker/docker.sh | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4ec7493..55d4576 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,8 @@ RUN chown -R www-data:www-data /var/www USER www-data -RUN cd /var/www +RUN cd /var/www && \ + composer install WORKDIR /var/www/ ENTRYPOINT ["bash", "./docker/docker.sh"] diff --git a/docker/docker.sh b/docker/docker.sh index 80f4c13..98d1d34 100644 --- a/docker/docker.sh +++ b/docker/docker.sh @@ -1,4 +1,3 @@ -composer install php bin/console doctrine:database:create php bin/console d:m:m --no-interaction php bin/console cache:clear From 7a21e38646ef396e190f276f71bfd2666ffd9354 Mon Sep 17 00:00:00 2001 From: Xbird Date: Sat, 24 Sep 2022 19:32:36 +0200 Subject: [PATCH 7/7] fix missing use --- src/Command/AddUserCommand.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Command/AddUserCommand.php b/src/Command/AddUserCommand.php index 893e32c..2c2c72f 100644 --- a/src/Command/AddUserCommand.php +++ b/src/Command/AddUserCommand.php @@ -3,6 +3,7 @@ namespace App\Command; use App\Entity\User; +use App\Entity\Group; use Doctrine\ORM\Query; use App\Repository\GroupRepository; use Doctrine\ORM\EntityManagerInterface;