diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 9312497e64c2234e81c1e873086d9fab1aaa2848..291dc18e07009215742729a000e6fa990e0dab7f 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -1,3 +1,3 @@ -FROM mariadb:10.4 +FROM debian:stretch RUN apt-get update && \ apt-get install curl make unzip -y diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 984886b205fb7bc800ee48744dfaef9a5884bfe9..64be0b4424746ab483b29a077400718e2cf77853 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,11 +50,7 @@ unittests: - cp config.defaults .config - echo "MYSQL_USER_PASSWORD=caosdb1234" >> .config - echo "MYSQL_HOST=mariadb" >> .config - - . .config || echo "failed" - - whereis mysql - command -v mysql - - ls - - ./make_db bla || echo "failed" - ./make_db test-connection - ./make_db test --fresh