Compare commits
29 Commits
2.3.0+1.20
...
master
Author | SHA1 | Date |
---|---|---|
Javielico | 8e8809fd07 | |
Moritz | 24e4b09b07 | |
Moritz | 43d43fb2b7 | |
3wc | c5dada903e | |
Moritz | 9687f7f738 | |
Moritz | 92073fbba5 | |
Moritz | f26296ba5c | |
Javielico | baacc575c2 | |
javielico | 53ffe86350 | |
Javielico | dbde635976 | |
Javielico | 2b15ff9c28 | |
Javielico | 94de0096fc | |
Javielico | e0d73083e2 | |
decentral1se | ced3ea7978 | |
decentral1se | 43abfe0483 | |
decentral1se | 4683a81eeb | |
decentral1se | ea7e26698a | |
3wc | 3815417c2c | |
3wc | 4421f81a35 | |
3wc | a0e8ba4839 | |
3wc | ca9d0b4a6c | |
Cassowary | 9d44d9e61c | |
Cassowary | 464c890afb | |
knoflook | c8ea2ddf0c | |
3wc | b0ce473627 | |
3wc | 73970dd79c | |
3wc | 9153c4db2a | |
3wc | b95eae3b57 | |
3wc | d18379a364 |
20
.env.sample
20
.env.sample
|
@ -19,6 +19,21 @@ GITEA_ENABLE_OPENID_SIGNIN=true
|
|||
GITEA_ENABLE_OPENID_SIGNUP=true
|
||||
GITEA_DISABLE_GRAVATAR=false
|
||||
GITEA_ENABLE_FEDERATED_AVATAR=true
|
||||
GITEA_LANDING_PAGE=organizations
|
||||
GITEA_SHOW_USER_EMAIL=false
|
||||
GITEA_DISABLE_REGULAR_ORG_CREATION=true
|
||||
GITEA_DEFAULT_KEEP_EMAIL_PRIVATE=true
|
||||
GITEA_DEFAULT_ALLOW_CREATE_ORGANIZATION=false
|
||||
GITEA_ENABLE_USER_HEATMAP=false
|
||||
GITEA_DEFAULT_USER_VISIBILITY=limited
|
||||
GITEA_ALLOWED_USER_VISIBILITY_MODES=limited,private
|
||||
GITEA_DEFAULT_ORG_VISIBILITY=limited
|
||||
GITEA_REQUIRE_SIGNIN_VIEW=true
|
||||
|
||||
GITEA_REPO_UPLOAD_ENABLED=true
|
||||
GITEA_REPO_UPLOAD_ALLOWED_TYPES=*/*
|
||||
GITEA_REPO_UPLOAD_MAX_SIZE=50
|
||||
GITEA_REPO_UPLOAD_MAX_FILES=5
|
||||
|
||||
GITEA_MAILER_FROM=noreply@example.com
|
||||
GITEA_MAILER_USER=noreply@example.com
|
||||
|
@ -45,3 +60,8 @@ SECRET_SECRET_KEY_VERSION=v1 # length=64
|
|||
# GITEA_UPDATE_AVATAR=replace-me
|
||||
# GITEA_ACCOUNT_LINKING=replace-me
|
||||
# GITEA_OAUTH2_CLIENT_ENABLED=replace-me
|
||||
|
||||
# Indexer (for issue search)
|
||||
# GITEA_REPO_INDEXER_ENABLED=false
|
||||
# GITEA_ISSUE_INDEXER_TYPE=db
|
||||
# GITEA_STARTUP_TIMEOUT=-1
|
||||
|
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
<!-- metadata -->
|
||||
* **Category**: Development
|
||||
* **Status**: 3, stable
|
||||
* **Status**: 5
|
||||
* **Image**: [`gitea/gitea`](https://hub.docker.com/gitea/gitea), 4, upstream
|
||||
* **Healthcheck**: Yes
|
||||
* **Backups**: Yes
|
||||
* **Email**: ?
|
||||
* **Email**: Yes
|
||||
* **Tests**: 2
|
||||
* **SSO**: 3 (OAuth)
|
||||
<!-- endmetadata -->
|
||||
|
|
2
abra.sh
2
abra.sh
|
@ -1,4 +1,4 @@
|
|||
export APP_INI_VERSION=v9
|
||||
export APP_INI_VERSION=v18
|
||||
export DOCKER_SETUP_SH_VERSION=v1
|
||||
|
||||
abra_backup_app() {
|
||||
|
|
26
app.ini.tmpl
26
app.ini.tmpl
|
@ -16,6 +16,13 @@ ALLOW_ONLY_EXTERNAL_REGISTRATION = {{ env "GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATIO
|
|||
AUTO_WATCH_NEW_REPOS = {{ env "GITEA_AUTO_WATCH_NEW_REPOS" }}
|
||||
DISABLE_REGISTRATION = {{ env "GITEA_DISABLE_REGISTRATION" }}
|
||||
ENABLE_NOTIFY_MAIL = {{ env "GITEA_ENABLE_NOTIFY_MAIL" }}
|
||||
DEFAULT_KEEP_EMAIL_PRIVATE = {{ env "GITEA_DEFAULT_KEEP_EMAIL_PRIVATE" }}
|
||||
DEFAULT_ALLOW_CREATE_ORGANIZATION = {{ env "GITEA_DEFAULT_ALLOW_CREATE_ORGANIZATION" }}
|
||||
ENABLE_USER_HEATMAP = {{ env "GITEA_ENABLE_USER_HEATMAP" }}
|
||||
DEFAULT_USER_VISIBILITY = {{ env "GITEA_DEFAULT_USER_VISIBILITY" }}
|
||||
ALLOWED_USER_VISIBILITY_MODES = {{ env "GITEA_ALLOWED_USER_VISIBILITY_MODES" }}
|
||||
DEFAULT_ORG_VISIBILITY = {{ env "GITEA_DEFAULT_ORG_VISIBILITY" }}
|
||||
REQUIRE_SIGNIN_VIEW = {{ env "GITEA_REQUIRE_SIGNIN_VIEW" }}
|
||||
|
||||
[openid]
|
||||
ENABLE_OPENID_SIGNIN = {{ env "GITEA_ENABLE_OPENID_SIGNIN" }}
|
||||
|
@ -24,12 +31,23 @@ ENABLE_OPENID_SIGNUP = {{ env "GITEA_ENABLE_OPENID_SIGNUP" }}
|
|||
[repository]
|
||||
DEFAULT_BRANCH = main
|
||||
|
||||
[repository.upload]
|
||||
ENABLED = {{ env "GITEA_REPO_UPLOAD_ENABLED" }}
|
||||
ALLOWED_TYPES = {{ env "GITEA_REPO_UPLOAD_ALLOWED_TYPES" }}
|
||||
FILE_MAX_SIZE = {{ env "GITEA_REPO_UPLOAD_MAX_SIZE" }}
|
||||
MAX_FILES = {{ env "GITEA_REPO_UPLOAD_MAX_FILES" }}
|
||||
|
||||
[ui]
|
||||
SHOW_USER_EMAIL = {{ env "GITEA_SHOW_USER_EMAIL" }}
|
||||
|
||||
[indexer]
|
||||
STARTUP_TIMEOUT = 0
|
||||
REPO_INDEXER_ENABLED = {{ or (env "GITEA_REPO_INDEXER_ENABLED") "false" }}
|
||||
ISSUE_INDEXER_TYPE= {{ or (env "GITEA_ISSUE_INDEXER_TYPE") "db" }}
|
||||
STARTUP_TIMEOUT = {{ or (env "GITEA_STARTUP_TIMEOUT") "-1" }}
|
||||
|
||||
[server]
|
||||
DOMAIN = {{ env "GITEA_DOMAIN" }}
|
||||
LANDING_PAGE = organizations
|
||||
LANDING_PAGE = {{ env "GITEA_LANDING_PAGE" }}
|
||||
ROOT_URL = https://%(DOMAIN)s/
|
||||
SSH_DOMAIN = {{ env "GITEA_DOMAIN" }}
|
||||
SSH_LISTEN_PORT = {{ env "GITEA_SSH_PORT" }}
|
||||
|
@ -43,6 +61,9 @@ REVERSE_PROXY_LIMIT = 1
|
|||
REVERSE_PROXY_TRUSTED_PROXIES = *
|
||||
SECRET_KEY = {{ secret "secret_key" }}
|
||||
|
||||
[admin]
|
||||
DISABLE_REGULAR_ORG_CREATION = {{ env "GITEA_DISABLE_REGULAR_ORG_CREATION" }}
|
||||
|
||||
[oauth2]
|
||||
JWT_SECRET = {{ secret "jwt_secret" }}
|
||||
|
||||
|
@ -76,5 +97,4 @@ IS_INPUT_FILE = false
|
|||
MODE=console
|
||||
LEVEL=WARN
|
||||
STACKTRACE_LEVEL=None
|
||||
ENABLE_ACCESS_LOG=false
|
||||
ENABLE_XORM_LOG=false
|
||||
|
|
|
@ -2,4 +2,4 @@ version: '3.8'
|
|||
|
||||
services:
|
||||
app:
|
||||
image: codeberg.org/forgejo/forgejo:1.19.3-0-rootless
|
||||
image: codeberg.org/forgejo/forgejo:1.21.11-1-rootless
|
||||
|
|
|
@ -9,6 +9,12 @@ services:
|
|||
- GITEA_DB_USER=gitea
|
||||
db:
|
||||
image: "mariadb:10.11.2"
|
||||
deploy:
|
||||
labels:
|
||||
backupbot.backup: "true"
|
||||
backupbot.backup.pre-hook: 'mysqldump --single-transaction -u root -p"$$(cat /run/secrets/db_root_password)" gitea > /var/lib/mysql/backup.sql'
|
||||
backupbot.backup.post-hook: "rm -rf /var/lib/mysql/backup.sql"
|
||||
backupbot.backup.path: "/var/lib/mysql/backup.sql"
|
||||
command: |
|
||||
mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
|
||||
environment:
|
||||
|
|
|
@ -8,7 +8,13 @@ services:
|
|||
- GITEA_DB_NAME=gitea
|
||||
- GITEA_DB_USER=gitea
|
||||
db:
|
||||
image: postgres:15.3
|
||||
image: postgres:15.7
|
||||
deploy:
|
||||
labels:
|
||||
backupbot.backup: "true"
|
||||
backupbot.backup.pre-hook: "PGPASSWORD=$$(cat $${POSTGRES_PASSWORD_FILE}) pg_dump -U $${POSTGRES_USER} $${POSTGRES_DB} > /var/lib/postgresql/data/backup.sql"
|
||||
backupbot.backup.post-hook: "rm -r /var/lib/postgresql/data/backup.sql"
|
||||
backupbot.backup.path: "/var/lib/postgresql/data"
|
||||
environment:
|
||||
- POSTGRES_DB=gitea
|
||||
- POSTGRES_USER=gitea
|
||||
|
|
28
compose.yml
28
compose.yml
|
@ -3,7 +3,7 @@ version: "3.8"
|
|||
|
||||
services:
|
||||
app:
|
||||
image: "gitea/gitea:1.20.1-rootless"
|
||||
image: "gitea/gitea:1.22.1-rootless"
|
||||
configs:
|
||||
- source: app_ini
|
||||
target: /etc/gitea/app.ini
|
||||
|
@ -35,6 +35,23 @@ services:
|
|||
- GITEA_ACCOUNT_LINKING
|
||||
- GITEA_OAUTH2_CLIENT_ENABLED
|
||||
- GITEA_CORS_ALLOW_DOMAIN
|
||||
- GITEA_LANDING_PAGE
|
||||
- GITEA_REPO_UPLOAD_ENABLED
|
||||
- GITEA_REPO_UPLOAD_ALLOWED_TYPES
|
||||
- GITEA_REPO_UPLOAD_MAX_SIZE
|
||||
- GITEA_REPO_UPLOAD_MAX_FILES
|
||||
- GITEA_REPO_INDEXER_ENABLED
|
||||
- GITEA_ISSUE_INDEXER_TYPE
|
||||
- GITEA_STARTUP_TIMEOUT
|
||||
- GITEA_SHOW_USER_EMAIL
|
||||
- GITEA_DISABLE_REGULAR_ORG_CREATION
|
||||
- GITEA_DEFAULT_KEEP_EMAIL_PRIVATE
|
||||
- GITEA_DEFAULT_ALLOW_CREATE_ORGANIZATION
|
||||
- GITEA_ENABLE_USER_HEATMAP
|
||||
- GITEA_DEFAULT_USER_VISIBILITY
|
||||
- GITEA_ALLOWED_USER_VISIBILITY_MODES
|
||||
- GITEA_DEFAULT_ORG_VISIBILITY
|
||||
- GITEA_REQUIRE_SIGNIN_VIEW
|
||||
volumes:
|
||||
- data:/var/lib/gitea
|
||||
- config:/etc/gitea
|
||||
|
@ -43,11 +60,18 @@ services:
|
|||
networks:
|
||||
- proxy
|
||||
- internal
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-f", "http://localhost:3000/api/healthz"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 10
|
||||
start_period: 1m
|
||||
deploy:
|
||||
update_config:
|
||||
failure_action: rollback
|
||||
order: start-first
|
||||
labels:
|
||||
- "backupbot.backup=true"
|
||||
- "traefik.enable=true"
|
||||
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`)"
|
||||
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
|
||||
|
@ -61,7 +85,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=2.3.0+1.20.1-rootless
|
||||
- coop-cloud.${STACK_NAME}.version=2.10.0+1.22.1-rootless
|
||||
|
||||
|
||||
networks:
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
This release adds a docker healthcheck for the main Gitea service -- please pay careful attention when updating apps, and as always feel free to ask in Matrix if you run into any bugs 🐛
|
Loading…
Reference in New Issue