From bf68ccbb256390fa278f09a6f3a32ce83442c5a6 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sun, 20 Jun 2021 22:37:35 +0200 Subject: [PATCH] Don't use the mariadb root user in docker-compose examples --- docs/content/doc/setup/docker-start-to-finish.md | 6 ++++-- docs/content/doc/setup/full-docker-example.md | 16 ++++++++++------ docs/content/doc/setup/install-backend.md | 6 ++++-- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/docs/content/doc/setup/docker-start-to-finish.md b/docs/content/doc/setup/docker-start-to-finish.md index d56049db1..4e1920446 100644 --- a/docs/content/doc/setup/docker-start-to-finish.md +++ b/docs/content/doc/setup/docker-start-to-finish.md @@ -36,6 +36,8 @@ services: command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci environment: MYSQL_ROOT_PASSWORD: supersecret + MYSQL_USER: vikunja + MYSQL_PASSWORD: secret MYSQL_DATABASE: vikunja volumes: - ./db:/var/lib/mysql @@ -44,9 +46,9 @@ services: image: vikunja/api environment: VIKUNJA_DATABASE_HOST: db - VIKUNJA_DATABASE_PASSWORD: supersecret + VIKUNJA_DATABASE_PASSWORD: secret VIKUNJA_DATABASE_TYPE: mysql - VIKUNJA_DATABASE_USER: root + VIKUNJA_DATABASE_USER: vikunja VIKUNJA_DATABASE_DATABASE: vikunja volumes: - ./files:/app/vikunja/files diff --git a/docs/content/doc/setup/full-docker-example.md b/docs/content/doc/setup/full-docker-example.md index 9e67c321f..c043c0cce 100644 --- a/docs/content/doc/setup/full-docker-example.md +++ b/docs/content/doc/setup/full-docker-example.md @@ -203,7 +203,9 @@ services: command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci environment: MYSQL_ROOT_PASSWORD: supersecret - MYSQL_DATABASE: vikunja + MYSQL_USER: vikunja + MYSQL_PASSWORD: secret + MYSQL_DATABASE: vikunja volumes: - ./db:/var/lib/mysql restart: unless-stopped @@ -211,9 +213,9 @@ services: image: vikunja/api environment: VIKUNJA_DATABASE_HOST: db - VIKUNJA_DATABASE_PASSWORD: supersecret + VIKUNJA_DATABASE_PASSWORD: secret VIKUNJA_DATABASE_TYPE: mysql - VIKUNJA_DATABASE_USER: root + VIKUNJA_DATABASE_USER: vikunja VIKUNJA_DATABASE_DATABASE: vikunja volumes: - ./files:/app/vikunja/files @@ -259,7 +261,9 @@ services: command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci environment: MYSQL_ROOT_PASSWORD: supersecret - MYSQL_DATABASE: vikunja + MYSQL_USER: vikunja + MYSQL_PASSWORD: secret + MYSQL_DATABASE: vikunja volumes: - ./db:/var/lib/mysql restart: unless-stopped @@ -267,9 +271,9 @@ services: image: vikunja/api environment: VIKUNJA_DATABASE_HOST: db - VIKUNJA_DATABASE_PASSWORD: supersecret + VIKUNJA_DATABASE_PASSWORD: secret VIKUNJA_DATABASE_TYPE: mysql - VIKUNJA_DATABASE_USER: root + VIKUNJA_DATABASE_USER: vikunja VIKUNJA_DATABASE_DATABASE: vikunja volumes: - ./files:/app/vikunja/files diff --git a/docs/content/doc/setup/install-backend.md b/docs/content/doc/setup/install-backend.md index 31c1df9ed..db6a85a64 100644 --- a/docs/content/doc/setup/install-backend.md +++ b/docs/content/doc/setup/install-backend.md @@ -147,9 +147,9 @@ services: image: vikunja/api:latest environment: VIKUNJA_DATABASE_HOST: db - VIKUNJA_DATABASE_PASSWORD: supersecret + VIKUNJA_DATABASE_PASSWORD: secret VIKUNJA_DATABASE_TYPE: mysql - VIKUNJA_DATABASE_USER: root + VIKUNJA_DATABASE_USER: vikunja VIKUNJA_SERVICE_JWTSECRET: volumes: - ./files:/app/vikunja/files @@ -158,6 +158,8 @@ services: command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci environment: MYSQL_ROOT_PASSWORD: supersecret + MYSQL_USER: vikunja + MYSQL_PASSWORD: secret MYSQL_DATABASE: vikunja volumes: - ./db:/var/lib/mysql