From 3c68332ede5aab9788e29107b48fd3fce180c934 Mon Sep 17 00:00:00 2001 From: KsmoinO <99479-KsmoinO@users.noreply.framagit.org> Date: Sat, 19 Nov 2022 22:33:54 +0100 Subject: [PATCH] =?UTF-8?q?HedgeDoc=20-=20possibilit=C3=A9=20de=20passer?= =?UTF-8?q?=20de=20postgres=20=C3=A0=20mysql=20Fix=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- podman-hedgedoc/10_install.sh | 3 ++- podman-hedgedoc/vars.sh | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/podman-hedgedoc/10_install.sh b/podman-hedgedoc/10_install.sh index 02ac4b1..764fa6a 100755 --- a/podman-hedgedoc/10_install.sh +++ b/podman-hedgedoc/10_install.sh @@ -36,7 +36,7 @@ CMD_DB_USERNAME=hedgedoc CMD_DB_PASSWORD=${GARBAYE_HEDGEDOC_DATABASE_PASSWORD} CMD_DB_DATABASE=hedgedoc CMD_DB_HOST=database -CMD_DB_PORT=5432 +CMD_DB_PORT=${database_port} CMD_DB_DIALECT=${database_dialect} #CMD_DB_URL=sqlite:///data/sqlite.db #CMD_DB_URL=CMD_DB_URL=postgres://hedgedoc:${GARBAYE_HEDGEDOC_DATABASE_PASSWORD}@database:5432/hedgedoc @@ -64,6 +64,7 @@ POSTGRES_USER=hedgedoc MYSQL_USER=hedgedoc MYSQL_PASSWORD=${GARBAYE_HEDGEDOC_DATABASE_PASSWORD} MYSQL_DATABASE=hedgedoc +MYSQL_RANDOM_ROOT_PASSWORD=true EOT export hedgedoc_image diff --git a/podman-hedgedoc/vars.sh b/podman-hedgedoc/vars.sh index e4f11c9..1e51a02 100644 --- a/podman-hedgedoc/vars.sh +++ b/podman-hedgedoc/vars.sh @@ -6,8 +6,12 @@ database_image="docker.io/library/postgres" database_version='14.5-alpine' database_path="/var/lib/postgresql/data" database_dialect=postgres +database_port=5432 +#database_image="docker.io/library/mariadb" +#database_version='10' #database_path="/var/lib/mysql" #database_dialect=mysql +#database_port=3306 ## mandatory ENV vars envvars='GARBAYE_HEDGEDOC_DATABASE_PASSWORD GARBAYE_HEDGEDOC_DOMAIN' ## internal vars : do not touch