Compare commits

...

12 Commits

9 changed files with 30 additions and 7 deletions

@ -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
@ -30,6 +31,8 @@ GITEA_DEFAULT_USER_VISIBILITY=limited
GITEA_ALLOWED_USER_VISIBILITY_MODES=limited,private
GITEA_DEFAULT_ORG_VISIBILITY=limited
GITEA_REQUIRE_SIGNIN_VIEW=true
GITEA_ENABLE_PUSH_CREATE_USER=false
GITEA_ENABLE_PUSH_CREATE_ORG=false
GITEA_REPO_UPLOAD_ENABLED=true
GITEA_REPO_UPLOAD_ALLOWED_TYPES=*/*
@ -54,6 +57,7 @@ SECRET_SECRET_KEY_VERSION=v1 # length=64
# GITEA_MAILER_ADDR=mail.gandi.net
# GITEA_MAILER_PORT=465
# SECRET_SMTP_PASSWORD_VERSION=v1
# GITEA_MAILER_PROTOCOL=smtps
# OATH2 Options
# GITEA_REGISTER_EMAIL_CONFIRM=replace-me

@ -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

@ -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" }}
@ -30,6 +35,8 @@ ENABLE_OPENID_SIGNUP = {{ env "GITEA_ENABLE_OPENID_SIGNUP" }}
[repository]
DEFAULT_BRANCH = main
ENABLE_PUSH_CREATE_USER = {{ env "GITEA_ENABLE_PUSH_CREATE_USER" }}
ENABLE_PUSH_CREATE_ORG = {{ env "GITEA_ENABLE_PUSH_CREATE_ORG" }}
[repository.upload]
ENABLED = {{ env "GITEA_REPO_UPLOAD_ENABLED" }}
@ -71,7 +78,7 @@ JWT_SECRET = {{ secret "jwt_secret" }}
[mailer]
ENABLED = true
FROM = {{ env "GITEA_MAILER_FROM" }}
PROTOCOL = smtps
PROTOCOL = {{ env "GITEA_MAILER_PROTOCOL" }}
SMTP_ADDR = {{ env "GITEA_MAILER_ADDR" }}
SMTP_PORT = {{ env "GITEA_MAILER_PORT" }}
USER = {{ env "GITEA_MAILER_USER" }}

@ -2,4 +2,4 @@ version: '3.8'
services:
app:
image: codeberg.org/forgejo/forgejo:9.0.1-rootless
image: codeberg.org/forgejo/forgejo:9.0.3-rootless

@ -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:

@ -7,8 +7,10 @@ services:
- GITEA_DB_HOST="db:5432"
- GITEA_DB_NAME=gitea
- GITEA_DB_USER=gitea
secrets:
- db_password
db:
image: postgres:15.8
image: postgres:15.10
deploy:
labels:
backupbot.backup.pre-hook: "/pg_backup.sh backup"

@ -8,6 +8,7 @@ services:
- GITEA_MAILER_ADDR
- GITEA_MAILER_PORT
- GITEA_MAILER_USER
- "GITEA_MAILER_PROTOCOL=${GITEA_MAILER_PROTOCOL:-smtps}"
secrets:
- smtp_password

8
compose.sqlite3.yml Normal file

@ -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

@ -3,7 +3,7 @@ version: "3.8"
services:
app:
image: "gitea/gitea:1.22.3-rootless"
image: "gitea/gitea:1.22.6-rootless"
configs:
- source: app_ini
target: /etc/gitea/app.ini
@ -11,7 +11,6 @@ services:
target: /usr/local/bin/docker-setup.sh
mode: 0555
secrets:
- db_password
- internal_token
- jwt_secret
- secret_key
@ -85,7 +84,7 @@ services:
- "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}"
- "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolmaxage=100"
- "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true"
- coop-cloud.${STACK_NAME}.version=3.0.1+1.22.3-rootless
- coop-cloud.${STACK_NAME}.version=3.0.3+1.22.6-rootless
networks: