Fix CI/CD

Author: Sigri44

.github/workflows/branch.yml

@@ -163,8 +163,11 @@ jobs:
                     docker compose --file docker-compose-branch.yml pull && \
                     docker login -u ${{ secrets.DOCKER_LOGIN }} -p ${{ secrets.DOCKER_PASSWD }} ${DOCKER_REGISTRY} && \
                     docker compose --project-name ${DOCKER_BRANCH}-api_php --file docker-compose-branch.yml up -d --remove-orphans && \
-                    echo 'Waiting for container to be ready...' && \
+                    echo 'Waiting for Symfony container to be ready...' && \
                     until docker exec ${DOCKER_BRANCH}-api_php-sf true 2>/dev/null; do sleep 2; done && \
+                    echo 'Waiting for MySQL to be ready...' && \
+                    until docker exec ${DOCKER_BRANCH}-api_php-db mysqladmin ping -h localhost --silent 2>/dev/null; do sleep 2; done && \
+                    sleep 5 && \
                     echo 'Running migrations...' && \
                     docker compose --project-name ${DOCKER_BRANCH}-api_php --file docker-compose-branch.yml exec -T symfony php bin/console doctrine:migrations:migrate --no-interaction --allow-no-migration && \
                     echo 'Clearing cache...' && \

docker-compose-branch.yml

@@ -13,6 +13,9 @@ services:
 #        volumes:
 #              - ./logs/symfony:/var/www/html/var/log:cached
 #              - ./logs/nginx:/var/log/nginx:cached
+        depends_on:
+            db:
+                condition: service_healthy
         labels:
             - "traefik.enable=true"
             - "traefik.http.routers.api-${DOCKER_BRANCH}.rule=Host(`${HOSTNAME}`)"
@@ -29,6 +32,12 @@ services:
             - "MYSQL_USER=${MYSQL_USER}"
             - "MYSQL_PASSWORD=${MYSQL_PASSWORD}"
             - "MYSQL_DATABASE=${MYSQL_DATABASE}"
+        healthcheck:
+            test: [ "CMD", "mysqladmin", "ping", "-h", "localhost", "--silent" ]
+            interval: 5s
+            timeout: 3s
+            retries: 10
+            start_period: 30s
         restart: always
 
     redis:
@@ -47,6 +56,9 @@ services:
         networks:
             - api-php
             - traefik-realt
+        depends_on:
+            db:
+                condition: service_healthy
         labels:
             - "traefik.enable=true"
             - "traefik.http.routers.adminer-api-${DOCKER_BRANCH}.rule=Host(`adminer.${HOSTNAME}`)"