DEV-65163 php compatibility for 8.1 - 8.2

ClarkSource · Aug 31, 2023 · 5c06637 · 5c06637
1 parent 55547e6
commit 5c06637
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -29,8 +29,6 @@ test:
     # prepare tests
     - composer install --no-interaction --prefer-source
     - cp ./tests/TestConfiguration.gitlab.php ./tests/TestConfiguration.php
-    - echo "waiting for database is up and running ..."
-    - until echo "SELECT 'OK';" | mysql -h mysql --user=root; do sleep 1; done;
   script:
     - composer test
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -19,7 +19,7 @@ services:
     #    stdin_open: true
     user: "${DOCKER_COMPOSE_RUN_AS_USER:?You must export DOCKER_COMPOSE_RUN_AS_USER for permissions handling, look at README.md}"
   mariadb:
-    image: mariadb:10.6
+    image: "mariadb:10.6"
     hostname: mysql
     environment:
       MYSQL_ROOT_PASSWORD: ''