From b4273a95e34602988d986ca00a92f62c0d64b594 Mon Sep 17 00:00:00 2001 From: f Date: Tue, 7 Jan 2025 10:15:46 -0300 Subject: [PATCH] feat: sqlite3 support --- .env.sample | 1 + abra.sh | 2 +- app.ini.tmpl | 5 +++++ compose.mariadb.yml | 2 ++ compose.postgres.yml | 2 ++ compose.sqlite3.yml | 8 ++++++++ compose.yml | 1 - 7 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 compose.sqlite3.yml diff --git a/.env.sample b/.env.sample index 06f0355..489a6c4 100644 --- a/.env.sample +++ b/.env.sample @@ -5,6 +5,7 @@ LETS_ENCRYPT_ENV=production COMPOSE_FILE="compose.yml" ENABLE_BACKUPS=true COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml" +# COMPOSE_FILE="$COMPOSE_FILE:compose.sqlite3.yml" # COMPOSE_FILE="$COMPOSE_FILE:compose.postgres.yml" # Enable to use forgejo instead of gitea diff --git a/abra.sh b/abra.sh index 75ba4f2..72c6ada 100644 --- a/abra.sh +++ b/abra.sh @@ -1,4 +1,4 @@ -export APP_INI_VERSION=v19 +export APP_INI_VERSION=v20 export DOCKER_SETUP_SH_VERSION=v1 export PG_BACKUP_VERSION=v1 diff --git a/app.ini.tmpl b/app.ini.tmpl index 3934684..fd24780 100644 --- a/app.ini.tmpl +++ b/app.ini.tmpl @@ -2,10 +2,15 @@ APP_NAME = {{ env "GITEA_APP_NAME" }} [database] DB_TYPE = {{ env "GITEA_DB_TYPE" }} +{{ if ne (env "GITEA_DB_TYPE") "sqlite3" }} HOST = {{ env "GITEA_DB_HOST" }} NAME = {{ env "GITEA_DB_NAME" }} PASSWD = {{ secret "db_password" }} USER = {{ env "GITEA_DB_USER" }} +{{ else }} +SQLITE_JOURNAL_MODE = {{ env "GITEA_SQLITE_JOURNAL_MODE" }} +PATH = {{ env "GITEA_PATH" }} +{{ end }} [picture] DISABLE_GRAVATAR = {{ env "GITEA_DISABLE_GRAVATAR" }} diff --git a/compose.mariadb.yml b/compose.mariadb.yml index 301da3b..b4cc117 100644 --- a/compose.mariadb.yml +++ b/compose.mariadb.yml @@ -7,6 +7,8 @@ services: - GITEA_DB_HOST="db:3306" - GITEA_DB_NAME=gitea - GITEA_DB_USER=gitea + secrets: + - db_password db: image: "mariadb:10.11.2" deploy: diff --git a/compose.postgres.yml b/compose.postgres.yml index 24571b0..e7ebc06 100644 --- a/compose.postgres.yml +++ b/compose.postgres.yml @@ -7,6 +7,8 @@ services: - GITEA_DB_HOST="db:5432" - GITEA_DB_NAME=gitea - GITEA_DB_USER=gitea + secrets: + - db_password db: image: postgres:15.8 deploy: diff --git a/compose.sqlite3.yml b/compose.sqlite3.yml new file mode 100644 index 0000000..42013d9 --- /dev/null +++ b/compose.sqlite3.yml @@ -0,0 +1,8 @@ +version: '3.8' + +services: + app: + environment: + - GITEA_DB_TYPE=sqlite3 + - GITEA_SQLITE_JOURNAL_MODE=wal + - GITEA_PATH=/var/lib/gitea/gitea.db diff --git a/compose.yml b/compose.yml index cf517c0..497bd83 100644 --- a/compose.yml +++ b/compose.yml @@ -11,7 +11,6 @@ services: target: /usr/local/bin/docker-setup.sh mode: 0555 secrets: - - db_password - internal_token - jwt_secret - secret_key