From 0776b06592ba1872ba99a913e38b8dad673d77db Mon Sep 17 00:00:00 2001 From: Khadim Fall Date: Mon, 21 Aug 2023 13:18:31 +0200 Subject: [PATCH 1/3] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c32a96118..4d1560690 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,8 @@ docker run --detach \ mariadb:latest --init-file /init.sql ``` - Alternatively, install mariadb on its own. - - Create the database `tumlive` using [this](https://github.com/joschahenningsen/TUM-Live/files/8505487/tum-live-starter.zip) script. + - Create the database `tumlive` using [this](https://github.com/joschahenningsen/TUM-Live/files/12395380/tum-live-starter.zip) +) script. - Or: Use [JetBrains DataGrip](https://www.jetbrains.com/datagrip/) to open the database and then run the script there to automatically set up a demo database. - The database contains the users `admin`, `prof1`, `prof2`, `studi1`, `studi2` and `studi3` with the password `password`. From 4d95c0afe5b532f4cf2a090e1409be7756e25203 Mon Sep 17 00:00:00 2001 From: Khadim Fall Date: Mon, 21 Aug 2023 13:21:14 +0200 Subject: [PATCH 2/3] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 4d1560690..2affaa143 100644 --- a/README.md +++ b/README.md @@ -77,8 +77,7 @@ docker run --detach \ mariadb:latest --init-file /init.sql ``` - Alternatively, install mariadb on its own. - - Create the database `tumlive` using [this](https://github.com/joschahenningsen/TUM-Live/files/12395380/tum-live-starter.zip) -) script. + - Create the database `tumlive` using [this](https://github.com/joschahenningsen/TUM-Live/files/12395380/tum-live-starter.zip) script. - Or: Use [JetBrains DataGrip](https://www.jetbrains.com/datagrip/) to open the database and then run the script there to automatically set up a demo database. - The database contains the users `admin`, `prof1`, `prof2`, `studi1`, `studi2` and `studi3` with the password `password`. From ec3b61d5f76fc361374d54f1cec45c2443207110 Mon Sep 17 00:00:00 2001 From: Khadim Fall Date: Mon, 21 Aug 2023 13:56:57 +0200 Subject: [PATCH 3/3] Add docker-compose --- README.md | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2affaa143..3e85ba747 100644 --- a/README.md +++ b/README.md @@ -71,13 +71,33 @@ docker run --detach \ --name mariadb-tumlive \ --env MARIADB_USER=root \ --env MARIADB_ROOT_PASSWORD=example \ + --env MARIADB_DATABASE=tumlive \ --restart always \ -p 3306:3306 \ --volume "$(pwd)"/docs/static/tum-live-starter.sql:/init.sql \ mariadb:latest --init-file /init.sql ``` -- Alternatively, install mariadb on its own. - - Create the database `tumlive` using [this](https://github.com/joschahenningsen/TUM-Live/files/12395380/tum-live-starter.zip) script. +- Alternative 1, use `docker-compose up` with the following docker-compose.yml file. Make sure you have [tum-live-starter.sql](https://github.com/joschahenningsen/TUM-Live/files/8505487/tum-live-starter.zip) inside the same folder. +```yaml +version: "3.8" + +services: + mariadb-tumlive: + image: mariadb:latest + container_name: mariadb-tumlive + environment: + MARIADB_USER: root + MARIADB_ROOT_PASSWORD: example + MARIADB_DATABASE: tumlive + ports: + - 3306:3306 + expose: + - 3306 + volumes: + - ./tum-live-starter.sql:/docker-entrypoint-initdb.d/init.sql +``` +- Alternative 2, install mariadb on its own. + - Create the database `tumlive` using [this](https://github.com/joschahenningsen/TUM-Live/files/8505487/tum-live-starter.zip) script. - Or: Use [JetBrains DataGrip](https://www.jetbrains.com/datagrip/) to open the database and then run the script there to automatically set up a demo database. - The database contains the users `admin`, `prof1`, `prof2`, `studi1`, `studi2` and `studi3` with the password `password`.