From b1a513a5a95140bb90cdd160b20ce134df3b1929 Mon Sep 17 00:00:00 2001 From: KsmoinO <99479-KsmoinO@users.noreply.framagit.org> Date: Sat, 19 Nov 2022 22:16:16 +0100 Subject: [PATCH] =?UTF-8?q?HedgeDoc=20-=20possibilit=C3=A9=20de=20passer?= =?UTF-8?q?=20de=20postgres=20=C3=A0=20mysql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- podman-hedgedoc/.gitlab-ci.yml | 1 - podman-hedgedoc/10_install.sh | 3 ++- podman-hedgedoc/vars.sh | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/podman-hedgedoc/.gitlab-ci.yml b/podman-hedgedoc/.gitlab-ci.yml index 47517a0..aa828a0 100644 --- a/podman-hedgedoc/.gitlab-ci.yml +++ b/podman-hedgedoc/.gitlab-ci.yml @@ -20,7 +20,6 @@ hedgedoc: - ./80_destroy.sh - podman volume rm podman-hedgedoc_data - podman volume rm podman-hedgedoc_database - - podman volume rm podman-hedgedoc_uploads tags: - garbaye - compute diff --git a/podman-hedgedoc/10_install.sh b/podman-hedgedoc/10_install.sh index 434d804..02ac4b1 100755 --- a/podman-hedgedoc/10_install.sh +++ b/podman-hedgedoc/10_install.sh @@ -37,7 +37,7 @@ CMD_DB_PASSWORD=${GARBAYE_HEDGEDOC_DATABASE_PASSWORD} CMD_DB_DATABASE=hedgedoc CMD_DB_HOST=database CMD_DB_PORT=5432 -CMD_DB_DIALECT=postgres +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 #CMD_DB_URL=CMD_DB_URL=mysql://hedgedoc:${GARBAYE_HEDGEDOC_DATABASE_PASSWORD}@database:3306/hedgedoc @@ -70,6 +70,7 @@ export hedgedoc_image export hedgedoc_version export database_image export database_version +export database_path export container_name export db_container_name diff --git a/podman-hedgedoc/vars.sh b/podman-hedgedoc/vars.sh index 5b878ed..e4f11c9 100644 --- a/podman-hedgedoc/vars.sh +++ b/podman-hedgedoc/vars.sh @@ -4,6 +4,10 @@ hedgedoc_image="quay.io/hedgedoc/hedgedoc" hedgedoc_version='1.9.6-alpine' database_image="docker.io/library/postgres" database_version='14.5-alpine' +database_path="/var/lib/postgresql/data" +database_dialect=postgres +#database_path="/var/lib/mysql" +#database_dialect=mysql ## mandatory ENV vars envvars='GARBAYE_HEDGEDOC_DATABASE_PASSWORD GARBAYE_HEDGEDOC_DOMAIN' ## internal vars : do not touch