From c2dd8c097c7f4ad8b01625e6113e1e6276018856 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Tue, 4 Feb 2020 11:06:05 +0100
Subject: [PATCH] WIP: pipeline
---
.docker/Dockerfile | 4 ++--
.gitlab-ci.yml | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index ee4e868..9312497 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -1,3 +1,3 @@
-FROM debian:stretch
+FROM mariadb:10.4
RUN apt-get update && \
- apt-get install curl mariadb-server -y
+ apt-get install curl make unzip -y
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 59b7925..55df502 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,7 +45,7 @@ unittests:
stage: test
script:
- cp config.defaults .config
- - cat .config
+ - echo "MYSQL_USER_PASSWORD=caosdb1234" >> .config
- . .config || echo "failed"
- whereis mysql
- command -v mysql
@@ -64,7 +64,8 @@ build-testenv:
- docker login -u indiscale -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
# use here general latest or specific branch latest...
- docker pull $CI_REGISTRY_IMAGE || true
- - docker build
+ - docker build
+ -e MYSQL_ROOT_PASSWORD=caosdb1234
--pull
--cache-from $CI_REGISTRY_IMAGE
-t $CI_REGISTRY_IMAGE .
--
GitLab