From e154d6e1a40bdd26c0680546c073728bb773270a Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Thu, 24 Jun 2021 12:21:18 +0200
Subject: [PATCH] WIP: mysql8 pipeline
---
.docker/Dockerfile | 2 +-
.gitlab-ci.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 8f1fd34..5c49eb7 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 bd2016e..5d6198c 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
--
GitLab