From d0016c1ef9f6892ad9846ea3b9f071bee76ceb8d Mon Sep 17 00:00:00 2001
From: Daniel Hornung <d.hornung@indiscale.com>
Date: Mon, 5 Jul 2021 09:44:55 +0200
Subject: [PATCH] WIP: docker-compose with override for mysql.
---
.docker/docker-compose.mysql.yml | 3 +++
.gitlab-ci.yml | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
create mode 100644 .docker/docker-compose.mysql.yml
diff --git a/.docker/docker-compose.mysql.yml b/.docker/docker-compose.mysql.yml
new file mode 100644
index 0000000..7e5513d
--- /dev/null
+++ b/.docker/docker-compose.mysql.yml
@@ -0,0 +1,3 @@
+services:
+ sqldb:
+ image: mysql:8.0
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4d4b4d7..f3b0201 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -185,8 +185,8 @@ test:
- time docker load < /image-cache/mariadb.tar || true
- docker pull $CI_REGISTRY_IMAGE
- cd .docker
- # here the server and the mysql backend docker are being started
- - CAOSDB_TAG=$CAOSDB_TAG docker-compose up -d
+ # here the server and the mysql backend docker are being started
+ - CAOSDB_TAG=$CAOSDB_TAG docker-compose -f docker-compose.yml -f docker-compose.mysql.yml up -d
# store versions of CaosDB parts
- docker exec -u 0 -t docker_caosdb-server_1 cat /opt/caosdb/git/caosdb_pylib_commit > hash_pylib
- docker exec -u 0 -t docker_caosdb-server_1 cat /opt/caosdb/git/caosdb_webui_commit > hash_webui
--
GitLab