diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index 1a63292b080f182821935cb5b20b7500bfcf8f63..8c6555eb457a992f69625c55bfced34d9b1c51fd 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 4bfdc0302602c85f229ab6025f1950f8edca1456..9bd45f71d56435c68eb953158d0af6d7a8ec8bca 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 39b2ad35996cd14acad3178f4eada24b1e2c1d21..b8bedee1146009a90a281398fe62d49e1da0351b 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::