Compare commits
No commits in common. "master" and "1.3.0+1.17.2-rootless" have entirely different histories.
master
...
1.3.0+1.17
21
.drone.yml
21
.drone.yml
|
@ -3,17 +3,14 @@ kind: pipeline
|
|||
name: deploy to swarm-test.autonomic.zone
|
||||
steps:
|
||||
- name: deployment
|
||||
image: thecoopcloud/stack-ssh-deploy:latest
|
||||
image: decentral1se/stack-ssh-deploy:latest
|
||||
settings:
|
||||
host: swarm-test.autonomic.zone
|
||||
stack: gitea
|
||||
networks:
|
||||
- proxy
|
||||
generate_secrets: true
|
||||
purge: true
|
||||
deploy_key:
|
||||
from_secret: drone_ssh_swarm_test
|
||||
compose: "compose.yml:compose.mariadb.yml"
|
||||
environment:
|
||||
APP_INI_VERSION: v1
|
||||
DOCKER_SETUP_SH_VERSION: v1
|
||||
|
@ -40,17 +37,11 @@ trigger:
|
|||
- master
|
||||
---
|
||||
kind: pipeline
|
||||
name: generate recipe catalogue
|
||||
name: recipe release
|
||||
steps:
|
||||
- name: release a new version
|
||||
image: plugins/downstream
|
||||
image: thecoopcloud/drone-abra:latest
|
||||
settings:
|
||||
server: https://build.coopcloud.tech
|
||||
token:
|
||||
from_secret: drone_abra-bot_token
|
||||
fork: true
|
||||
repositories:
|
||||
- coop-cloud/auto-recipes-catalogue-json
|
||||
|
||||
trigger:
|
||||
event: tag
|
||||
command: recipe gitea release
|
||||
deploy_key:
|
||||
from_secret: abra_bot_deploy_key
|
||||
|
|
38
.env.sample
38
.env.sample
|
@ -1,13 +1,7 @@
|
|||
TYPE=gitea
|
||||
|
||||
DOMAIN=gitea.example.com
|
||||
DOMAIN={{ .Domain }}
|
||||
LETS_ENCRYPT_ENV=production
|
||||
COMPOSE_FILE="compose.yml"
|
||||
COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml"
|
||||
# COMPOSE_FILE="$COMPOSE_FILE:compose.postgres.yml"
|
||||
|
||||
# Enable to use forgejo instead of gitea
|
||||
# COMPOSE_FILE="$COMPOSE_FILE:compose.forgejo.yml"
|
||||
|
||||
GITEA_DOMAIN=git.example.com
|
||||
GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION=true
|
||||
|
@ -19,21 +13,6 @@ 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
|
||||
|
@ -48,20 +27,7 @@ SECRET_JWT_SECRET_VERSION=v1 # length=43
|
|||
SECRET_SECRET_KEY_VERSION=v1 # length=64
|
||||
|
||||
# SMTP Mailer
|
||||
# COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml"
|
||||
# COMPOSE_FILE="compose.yml:compose.smtp.yml"
|
||||
# GITEA_SMTP_MAILER_ENABLED=1
|
||||
# GITEA_MAILER_HOST=mail.gandi.net:465
|
||||
# SECRET_SMTP_PASSWORD_VERSION=v1
|
||||
|
||||
# OATH2 Options
|
||||
# GITEA_REGISTER_EMAIL_CONFIRM=replace-me
|
||||
# GITEA_REGISTER_EMAIL_CONFIRM=replace-me
|
||||
# GITEA_OAUTH2_USERNAME=replace-me
|
||||
# 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**: 5
|
||||
* **Status**: 3, stable
|
||||
* **Image**: [`gitea/gitea`](https://hub.docker.com/gitea/gitea), 4, upstream
|
||||
* **Healthcheck**: Yes
|
||||
* **Backups**: Yes
|
||||
* **Email**: Yes
|
||||
* **Email**: ?
|
||||
* **Tests**: 2
|
||||
* **SSO**: 3 (OAuth)
|
||||
<!-- endmetadata -->
|
||||
|
@ -19,9 +19,9 @@
|
|||
2. Deploy [`coop-cloud/traefik`][cc-traefik]
|
||||
3. `abra app new gitea --secrets` (optionally with `--pass` if you'd like
|
||||
to save secrets in `pass`)
|
||||
4. `abra app config YOURAPPDOMAIN` - be sure to change `$DOMAIN` to something that resolves to
|
||||
4. `abra app YOURAPPDOMAIN config` - be sure to change `$DOMAIN` to something that resolves to
|
||||
your Docker swarm box
|
||||
5. `abra app deploy YOURAPPDOMAIN`
|
||||
5. `abra app YOURAPPDOMAIN deploy`
|
||||
|
||||
## Create first user
|
||||
|
||||
|
|
2
abra.sh
2
abra.sh
|
@ -1,4 +1,4 @@
|
|||
export APP_INI_VERSION=v18
|
||||
export APP_INI_VERSION=v8
|
||||
export DOCKER_SETUP_SH_VERSION=v1
|
||||
|
||||
abra_backup_app() {
|
||||
|
|
40
app.ini.tmpl
40
app.ini.tmpl
|
@ -16,13 +16,6 @@ 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" }}
|
||||
|
@ -31,23 +24,12 @@ 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]
|
||||
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" }}
|
||||
STARTUP_TIMEOUT = 0
|
||||
|
||||
[server]
|
||||
DOMAIN = {{ env "GITEA_DOMAIN" }}
|
||||
LANDING_PAGE = {{ env "GITEA_LANDING_PAGE" }}
|
||||
LANDING_PAGE = organizations
|
||||
ROOT_URL = https://%(DOMAIN)s/
|
||||
SSH_DOMAIN = {{ env "GITEA_DOMAIN" }}
|
||||
SSH_LISTEN_PORT = {{ env "GITEA_SSH_PORT" }}
|
||||
|
@ -61,9 +43,6 @@ 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" }}
|
||||
|
||||
|
@ -78,23 +57,8 @@ MAILER_TYPE = smtp
|
|||
IS_TLS_ENABLED = true
|
||||
{{ end }}
|
||||
|
||||
{{ if eq (env "GITEA_OAUTH2_CLIENT_ENABLED") "1" }}
|
||||
[oauth2_client]
|
||||
REGISTER_EMAIL_CONFIRM = {{ env "GITEA_REGISTER_EMAIL_CONFIRM" }}
|
||||
ENABLE_AUTO_REGISTRATION = {{ env "GITEA_ENABLE_AUTO_REGISTRATION" }}
|
||||
USERNAME = {{ env "GITEA_OAUTH2_USERNAME" }}
|
||||
UPDATE_AVATAR = {{ env "GITEA_UPDATE_AVATAR" }}
|
||||
ACCOUNT_LINKING = {{ env "GITEA_ACCOUNT_LINKING" }}
|
||||
{{ end }}
|
||||
|
||||
[markup.restructuredtext]
|
||||
ENABLED = true
|
||||
FILE_EXTENSIONS = .rst
|
||||
RENDER_COMMAND = rst2html
|
||||
IS_INPUT_FILE = false
|
||||
|
||||
[log]
|
||||
MODE=console
|
||||
LEVEL=WARN
|
||||
STACKTRACE_LEVEL=None
|
||||
ENABLE_XORM_LOG=false
|
||||
|
|
|
@ -1,5 +0,0 @@
|
|||
version: '3.8'
|
||||
|
||||
services:
|
||||
app:
|
||||
image: codeberg.org/forgejo/forgejo:1.21.11-1-rootless
|
|
@ -1,43 +0,0 @@
|
|||
version: '3.8'
|
||||
|
||||
services:
|
||||
app:
|
||||
environment:
|
||||
- GITEA_DB_TYPE=mysql
|
||||
- GITEA_DB_HOST="db:3306"
|
||||
- GITEA_DB_NAME=gitea
|
||||
- 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:
|
||||
- MYSQL_DATABASE=gitea
|
||||
- MYSQL_USER=gitea
|
||||
- MYSQL_PASSWORD_FILE=/run/secrets/db_password
|
||||
- MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
|
||||
secrets:
|
||||
- db_password
|
||||
- db_root_password
|
||||
volumes:
|
||||
- "mariadb:/var/lib/mysql"
|
||||
networks:
|
||||
- internal
|
||||
|
||||
secrets:
|
||||
db_password:
|
||||
name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
|
||||
external: true
|
||||
db_root_password:
|
||||
name: ${STACK_NAME}_db_root_password_${SECRET_DB_ROOT_PASSWORD_VERSION}
|
||||
external: true
|
||||
|
||||
volumes:
|
||||
mariadb:
|
||||
internal:
|
|
@ -1,36 +0,0 @@
|
|||
version: '3.8'
|
||||
|
||||
services:
|
||||
app:
|
||||
environment:
|
||||
- GITEA_DB_TYPE=postgres
|
||||
- GITEA_DB_HOST="db:5432"
|
||||
- GITEA_DB_NAME=gitea
|
||||
- GITEA_DB_USER=gitea
|
||||
db:
|
||||
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
|
||||
- POSTGRES_PASSWORD_FILE=/run/secrets/db_password
|
||||
secrets:
|
||||
- db_password
|
||||
volumes:
|
||||
- db:/var/lib/postgresql/data
|
||||
networks:
|
||||
- internal
|
||||
|
||||
secrets:
|
||||
db_password:
|
||||
name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
|
||||
external: true
|
||||
|
||||
volumes:
|
||||
db:
|
||||
internal:
|
67
compose.yml
67
compose.yml
|
@ -3,7 +3,7 @@ version: "3.8"
|
|||
|
||||
services:
|
||||
app:
|
||||
image: "gitea/gitea:1.22.1-rootless"
|
||||
image: "gitea/gitea:1.17.2-rootless"
|
||||
configs:
|
||||
- source: app_ini
|
||||
target: /etc/gitea/app.ini
|
||||
|
@ -19,6 +19,10 @@ services:
|
|||
- GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION
|
||||
- GITEA_APP_NAME
|
||||
- GITEA_AUTO_WATCH_NEW_REPOS
|
||||
- GITEA_DB_HOST="db:3306"
|
||||
- GITEA_DB_NAME=gitea
|
||||
- GITEA_DB_TYPE=mysql
|
||||
- GITEA_DB_USER=gitea
|
||||
- GITEA_DISABLE_REGISTRATION
|
||||
- GITEA_DOMAIN=${DOMAIN}
|
||||
- GITEA_ENABLE_NOTIFY_MAIL
|
||||
|
@ -28,30 +32,6 @@ services:
|
|||
- GITEA_SSH_PORT
|
||||
- GITEA_DISABLE_GRAVATAR
|
||||
- GITEA_ENABLE_FEDERATED_AVATAR
|
||||
- GITEA_REGISTER_EMAIL_CONFIRM
|
||||
- GITEA_ENABLE_AUTO_REGISTRATION
|
||||
- GITEA_OAUTH2_USERNAME
|
||||
- GITEA_UPDATE_AVATAR
|
||||
- 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
|
||||
|
@ -60,18 +40,11 @@ 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"
|
||||
|
@ -80,13 +53,24 @@ services:
|
|||
- "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)"
|
||||
- "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh"
|
||||
- "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}"
|
||||
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}_cors"
|
||||
- "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolallowmethods=GET,OPTIONS,PUT"
|
||||
- "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.10.0+1.22.1-rootless
|
||||
- coop-cloud.${STACK_NAME}.version=1.3.0+1.17.2-rootless
|
||||
|
||||
db:
|
||||
image: "mariadb:10.6"
|
||||
command: |
|
||||
mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
|
||||
environment:
|
||||
- MYSQL_DATABASE=gitea
|
||||
- MYSQL_USER=gitea
|
||||
- MYSQL_PASSWORD_FILE=/run/secrets/db_password
|
||||
- MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
|
||||
secrets:
|
||||
- db_password
|
||||
- db_root_password
|
||||
volumes:
|
||||
- "mariadb:/var/lib/mysql"
|
||||
networks:
|
||||
- internal
|
||||
|
||||
networks:
|
||||
internal:
|
||||
|
@ -104,6 +88,12 @@ configs:
|
|||
template_driver: golang
|
||||
|
||||
secrets:
|
||||
db_password:
|
||||
name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
|
||||
external: true
|
||||
db_root_password:
|
||||
name: ${STACK_NAME}_db_root_password_${SECRET_DB_ROOT_PASSWORD_VERSION}
|
||||
external: true
|
||||
internal_token:
|
||||
name: ${STACK_NAME}_internal_token_${SECRET_INTERNAL_TOKEN_VERSION}
|
||||
external: true
|
||||
|
@ -117,3 +107,4 @@ secrets:
|
|||
volumes:
|
||||
data:
|
||||
config:
|
||||
mariadb:
|
||||
|
|
|
@ -1,8 +0,0 @@
|
|||
This release adds the possibility to run gitea with postgres.
|
||||
Please add the following lines to your servers .env file!
|
||||
|
||||
```
|
||||
COMPOSE_FILE="compose.yml"
|
||||
COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml"
|
||||
# COMPOSE_FILE="$COMPOSE_FILE:compose.postgres.yml"
|
||||
```
|
|
@ -1,2 +0,0 @@
|
|||
Beware that you'll also be updating Postgres if you're running it. Usually with major updates it might involve pg_dumpall / pg_restore either side of the upgrade because the server app doesn't know how to upgrade data storage formats, won't launch if it detects an old data format, a pg_upgrade command is available. More info on https://git.coopcloud.tech/coop-cloud/gitea/pulls/31
|
||||
|
|
@ -1 +0,0 @@
|
|||
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