From 75102b5a9d15a69b6f8576d0afc7b6f73cc437f6 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Tue, 4 Feb 2020 11:49:46 +0100
Subject: [PATCH] WIP: pipeline
---
.docker/Dockerfile | 2 +-
.gitlab-ci.yml | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 9312497..291dc18 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 984886b..64be0b4 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
--
GitLab