Laravel 10 follow-up (#650)

* Add missing `unzip`

* Fix `does not comply with psr-4 autoloading standard`

* Update `composer.locl`

* More `psr-4` autoload

* Add health check to fix race-condition between local containers

* Fix `yamllint`

Author: dmohns

docker-compose-dockerhub.yml

@@ -15,6 +15,12 @@ services:
     ports:
       - 8000:80
       - 8443:443
+    healthcheck:
+      test: [CMD, curl, -f, http://localhost/up]
+      start_period: 60s
+      interval: 30s
+      timeout: 10s
+      retries: 100
 
   frontend:
     container_name: frontend
@@ -35,12 +41,11 @@ services:
         condition: service_healthy
       redis:
         condition: service_started
+      backend:
+        condition: service_healthy
     links:
       - mysql:db
       - redis:redis
-    volumes:
-      - ./docker/config/php/php.ini:/usr/local/etc/php/php.ini
-      - ./src/backend:/var/www/html
 
   worker:
     container_name: worker

docker-compose-prod.yml

@@ -16,6 +16,12 @@ services:
     ports:
       - 8000:80
       - 8443:443
+    healthcheck:
+      test: [CMD, curl, -f, http://localhost/up]
+      start_period: 60s
+      interval: 30s
+      timeout: 10s
+      retries: 100
 
   frontend-prod:
     container_name: frontend-prod
@@ -38,6 +44,8 @@ services:
         condition: service_healthy
       redis:
         condition: service_started
+      backend-prod:
+        condition: service_healthy
     links:
       - mysql:db
       - redis:redis

docker-compose.yml

@@ -18,6 +18,12 @@ services:
       - 8443:443
     volumes:
       - ./src/backend:/var/www/html
+    healthcheck:
+      test: [CMD, curl, -f, http://localhost/up]
+      start_period: 60s
+      interval: 30s
+      timeout: 10s
+      retries: 100
 
   frontend-dev:
     container_name: frontend-dev
@@ -41,6 +47,8 @@ services:
         condition: service_healthy
       redis:
         condition: service_started
+      backend-dev:
+        condition: service_healthy
     links:
       - mysql:db
       - redis:redis

docker/DockerfileBackendDev

@@ -8,6 +8,7 @@ RUN apt-get update && apt-get install -y \
     libssl-dev \
     libxml2-dev \
     libzip-dev \
+    unzip \
     zlib1g-dev
 
 # remove apt lists

docker/DockerfileBackendProd

@@ -8,6 +8,7 @@ RUN apt-get update && apt-get install -y \
     libssl-dev \
     libxml2-dev \
     libzip-dev \
+    unzip \
     zlib1g-dev
 
 # remove apt lists

docker/DockerfileSchedulerDev

@@ -8,6 +8,7 @@ RUN apt-get update && apt-get install -y \
     libssl-dev \
     libxml2-dev \
     libzip-dev \
+    unzip \
     zlib1g-dev
 
 # install container specific apt packages

docker/DockerfileSchedulerProd

@@ -8,6 +8,7 @@ RUN apt-get update && apt-get install -y \
     libssl-dev \
     libxml2-dev \
     libzip-dev \
+    unzip \
     zlib1g-dev
 
 # install container specific apt packages

src/backend/app/Exceptions/Meters/MeterNotFound.php

@@ -1,5 +1,5 @@
 <?php
 
-namespace App\Exceptions\Meter;
+namespace App\Exceptions\Meters;
 
 class MeterNotFound extends \Exception {}

src/backend/app/Misc/LoanDataContainer.php

@@ -2,9 +2,9 @@
 
 namespace App\Misc;
 
-use App\Exceptions\Meter\MeterNotFound;
 use App\Exceptions\Meters\MeterIsNotAssignedToCustomer;
 use App\Exceptions\Meters\MeterIsNotInUse;
+use App\Exceptions\Meters\MeterNotFound;
 use App\Models\AssetPerson;
 use App\Models\AssetRate;
 use App\Models\Meter\Meter;