diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 8f1fd3480f4273aae10cc307454ab245a9860468..5c49eb7e9c88346b8423a611dc14aca2e85cf346 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -1,4 +1,4 @@ -FROM mysql:8 +FROM debian:buster RUN apt-get update \ && \ apt-get install -y \ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bd2016ee4a7426ab193febbdd40363604631f452..5d6198c4652c8e4c233842673ce8bd57ca367669 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ # services: - - mariadb:10.4 + - mysql:8 variables: DEPLOY_REF: dev CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/src/caosdb-mysqlbackend/testenv:latest @@ -52,7 +52,7 @@ unittests: - cp config.defaults .config - echo 'DATABASE_USER_HOST_LIST="%,"' >> .config - echo "MYSQL_USER_PASSWORD=$MYSQL_ROOT_PASSWORD" >> .config - - echo "MYSQL_HOST=mariadb" >> .config + - echo "MYSQL_HOST=mysql" >> .config - sleep 10 - make install - ./utils/make_db restore_db tests/example.dump.sql