From ffed88c04643b187150a9bf76bc885f83994ac6d Mon Sep 17 00:00:00 2001
From: Daniel <d.hornung@indiscale.com>
Date: Tue, 4 Feb 2025 17:37:37 +0100
Subject: [PATCH] WIP: Patch
---
.docker/docker-compose.yml | 2 +-
Makefile | 12 ++++++------
doc/Maintenance.rst | 7 ++-----
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 1a63292..8c6555e 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -1,7 +1,7 @@
version: '3.6'
services:
sqldb:
- image: mariadb:10.5
+ image: mariadb:11.4
volumes:
- type: volume
source: "caosdb-sqldata"
diff --git a/Makefile b/Makefile
index 4bfdc03..9bd45f7 100644
--- a/Makefile
+++ b/Makefile
@@ -62,10 +62,10 @@ test-dump-update:
# Run tests with a database which is started in a MariaDB Docker container
.PHONY: test-docker
test-docker:
- @docker kill caosdb-mysqlserver-test || true
- @docker container rm -v caosdb-mysqlserver-test || true
- @docker run --name caosdb-mysqlserver-test -p "3307:3306" \
- -e MYSQL_ROOT_PASSWORD="pass-for-test" -d mariadb:10.11
+ @docker kill linkahead-mysqlserver-test || true
+ @docker container rm -v linkahead-mysqlserver-test || true
+ @docker run --name linkahead-mysqlserver-test -p "3306:3306" \
+ -e MYSQL_ROOT_PASSWORD="pass-for-test" -d mariadb:11.4
@sleep 10
MAINPATH=$(realpath tests/docker_env) utils/make_db test --fresh
make test-docker-stop
@@ -73,8 +73,8 @@ test-docker:
# if automatic stopping failed
.PHONY: test-docker-stop
test-docker-stop:
- docker kill caosdb-mysqlserver-test
- docker container rm -v caosdb-mysqlserver-test
+ docker kill linkahead-mysqlserver-test
+ docker container rm -v linkahead-mysqlserver-test
# Compile the standalone documentation
.PHONY: doc
diff --git a/doc/Maintenance.rst b/doc/Maintenance.rst
index 39b2ad3..b8bedee 100644
--- a/doc/Maintenance.rst
+++ b/doc/Maintenance.rst
@@ -1,22 +1,19 @@
-
Maintenance
===========
-
Creating a Backup
-----------------
-
You can use the Python script ``utils/backup.py`` to create a backup (SQL dump)
of the SQL-Backend::
./utils/backup.py -d folder/where/the/backup/is/created
-You can do this while CaosDB is online.
+You can do this while LinkAhead is online.
Restoring a Backup
------------------
-CaosDB should be offline for restoring.
+LinkAhead should be offline for restoring.
You can use the Bash script ``utils/make_db`` to restore a backup (SQL dump)
of the SQL-Backend::
--
GitLab