Compare commits
21 Commits
3.1.0+1.23
...
master
Author | SHA1 | Date | |
---|---|---|---|
4cfc2ac2e0 | |||
ca4733a0b0 | |||
5a65ef04c5 | |||
270ed7bb93 | |||
b2c9d95e60 | |||
88b226f713 | |||
94af9cea9e | |||
85dcf3a0b1 | |||
3840e87f2f | |||
777aad5da4 | |||
5350ce207f | |||
2bfec14654 | |||
b44e18f063 | |||
77624221b4 | |||
ce632c8e5f | |||
cac5c8d694 | |||
cf2298162d | |||
0bbac9ed9c | |||
8ffd4d33be | |||
7364f0b87c | |||
1619c333c3 |
@ -51,7 +51,7 @@ steps:
|
|||||||
from_secret: drone_abra-bot_token
|
from_secret: drone_abra-bot_token
|
||||||
fork: true
|
fork: true
|
||||||
repositories:
|
repositories:
|
||||||
- coop-cloud/auto-recipes-catalogue-json
|
- toolshed/auto-recipes-catalogue-json
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
event: tag
|
event: tag
|
||||||
|
@ -10,6 +10,7 @@ COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml"
|
|||||||
|
|
||||||
# Enable to use forgejo instead of gitea
|
# Enable to use forgejo instead of gitea
|
||||||
# COMPOSE_FILE="$COMPOSE_FILE:compose.forgejo.yml"
|
# COMPOSE_FILE="$COMPOSE_FILE:compose.forgejo.yml"
|
||||||
|
# SECRET_LFS_JWT_SECRET_VERSION=v1 # length=43
|
||||||
|
|
||||||
GITEA_DOMAIN=git.example.com
|
GITEA_DOMAIN=git.example.com
|
||||||
GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION=true
|
GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION=true
|
||||||
@ -33,6 +34,7 @@ GITEA_DEFAULT_ORG_VISIBILITY=limited
|
|||||||
GITEA_REQUIRE_SIGNIN_VIEW=true
|
GITEA_REQUIRE_SIGNIN_VIEW=true
|
||||||
GITEA_ENABLE_PUSH_CREATE_USER=false
|
GITEA_ENABLE_PUSH_CREATE_USER=false
|
||||||
GITEA_ENABLE_PUSH_CREATE_ORG=false
|
GITEA_ENABLE_PUSH_CREATE_ORG=false
|
||||||
|
GITEA_LFS_START_SERVER=false
|
||||||
|
|
||||||
GITEA_REPO_UPLOAD_ENABLED=true
|
GITEA_REPO_UPLOAD_ENABLED=true
|
||||||
GITEA_REPO_UPLOAD_ALLOWED_TYPES=*/*
|
GITEA_REPO_UPLOAD_ALLOWED_TYPES=*/*
|
||||||
@ -67,6 +69,11 @@ SECRET_SECRET_KEY_VERSION=v1 # length=64
|
|||||||
# GITEA_ACCOUNT_LINKING=replace-me
|
# GITEA_ACCOUNT_LINKING=replace-me
|
||||||
# GITEA_OAUTH2_CLIENT_ENABLED=replace-me
|
# GITEA_OAUTH2_CLIENT_ENABLED=replace-me
|
||||||
|
|
||||||
|
# Lifetime of an OAuth2 refresh token in hours, prolly no need to edit. We
|
||||||
|
# were hitting issues with infrequently pushed to repos that were not picked
|
||||||
|
# up by drone after a month of inactivity, hence the option.
|
||||||
|
# GITEA__oauth2__REFRESH_TOKEN_EXPIRATION_TIME=730
|
||||||
|
|
||||||
# Indexer (for issue search)
|
# Indexer (for issue search)
|
||||||
# GITEA_REPO_INDEXER_ENABLED=false
|
# GITEA_REPO_INDEXER_ENABLED=false
|
||||||
# GITEA_ISSUE_INDEXER_TYPE=db
|
# GITEA_ISSUE_INDEXER_TYPE=db
|
||||||
|
2
abra.sh
2
abra.sh
@ -1,4 +1,4 @@
|
|||||||
export APP_INI_VERSION=v20
|
export APP_INI_VERSION=v21
|
||||||
export DOCKER_SETUP_SH_VERSION=v1
|
export DOCKER_SETUP_SH_VERSION=v1
|
||||||
export PG_BACKUP_VERSION=v1
|
export PG_BACKUP_VERSION=v1
|
||||||
|
|
||||||
|
@ -60,6 +60,10 @@ SSH_DOMAIN = {{ env "GITEA_DOMAIN" }}
|
|||||||
SSH_LISTEN_PORT = {{ env "GITEA_SSH_PORT" }}
|
SSH_LISTEN_PORT = {{ env "GITEA_SSH_PORT" }}
|
||||||
SSH_PORT = {{ env "GITEA_SSH_PORT" }}
|
SSH_PORT = {{ env "GITEA_SSH_PORT" }}
|
||||||
START_SSH_SERVER = true
|
START_SSH_SERVER = true
|
||||||
|
LFS_START_SERVER = {{ env "GITEA_LFS_START_SERVER" }}
|
||||||
|
{{ if eq (env "FORGE") "forgejo" }}
|
||||||
|
LFS_JWT_SECRET = {{ secret "lfs_jwt_secret" }}
|
||||||
|
{{ end }}
|
||||||
|
|
||||||
[security]
|
[security]
|
||||||
INSTALL_LOCK = true
|
INSTALL_LOCK = true
|
||||||
|
@ -2,4 +2,12 @@ version: '3.8'
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: codeberg.org/forgejo/forgejo:9.0.3-rootless
|
image: codeberg.org/forgejo/forgejo:11.0.2-rootless
|
||||||
|
environment:
|
||||||
|
- FORGE=forgejo
|
||||||
|
secrets:
|
||||||
|
- lfs_jwt_secret
|
||||||
|
secrets:
|
||||||
|
lfs_jwt_secret:
|
||||||
|
name: ${STACK_NAME}_lfs_jwt_secret_${SECRET_LFS_JWT_SECRET_VERSION}
|
||||||
|
external: true
|
||||||
|
@ -10,7 +10,7 @@ services:
|
|||||||
secrets:
|
secrets:
|
||||||
- db_password
|
- db_password
|
||||||
db:
|
db:
|
||||||
image: postgres:15.10
|
image: postgres:15.13
|
||||||
deploy:
|
deploy:
|
||||||
labels:
|
labels:
|
||||||
backupbot.backup.pre-hook: "/pg_backup.sh backup"
|
backupbot.backup.pre-hook: "/pg_backup.sh backup"
|
||||||
|
@ -3,7 +3,7 @@ version: "3.8"
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: "gitea/gitea:1.23.0-rootless"
|
image: "gitea/gitea:1.24.2-rootless"
|
||||||
configs:
|
configs:
|
||||||
- source: app_ini
|
- source: app_ini
|
||||||
target: /etc/gitea/app.ini
|
target: /etc/gitea/app.ini
|
||||||
@ -15,6 +15,7 @@ services:
|
|||||||
- jwt_secret
|
- jwt_secret
|
||||||
- secret_key
|
- secret_key
|
||||||
environment:
|
environment:
|
||||||
|
- FORGE=gitea
|
||||||
- GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION
|
- GITEA_ALLOW_ONLY_EXTERNAL_REGISTRATION
|
||||||
- GITEA_APP_NAME
|
- GITEA_APP_NAME
|
||||||
- GITEA_AUTO_WATCH_NEW_REPOS
|
- GITEA_AUTO_WATCH_NEW_REPOS
|
||||||
@ -51,6 +52,8 @@ services:
|
|||||||
- GITEA_ALLOWED_USER_VISIBILITY_MODES
|
- GITEA_ALLOWED_USER_VISIBILITY_MODES
|
||||||
- GITEA_DEFAULT_ORG_VISIBILITY
|
- GITEA_DEFAULT_ORG_VISIBILITY
|
||||||
- GITEA_REQUIRE_SIGNIN_VIEW
|
- GITEA_REQUIRE_SIGNIN_VIEW
|
||||||
|
- GITEA__oauth2__REFRESH_TOKEN_EXPIRATION_TIME
|
||||||
|
- GITEA_LFS_START_SERVER=${GITEA_LFS_START_SERVER:-false}
|
||||||
volumes:
|
volumes:
|
||||||
- data:/var/lib/gitea
|
- data:/var/lib/gitea
|
||||||
- config:/etc/gitea
|
- config:/etc/gitea
|
||||||
@ -84,7 +87,7 @@ services:
|
|||||||
- "traefik.http.middlewares.${STACK_NAME}_cors.headers.accesscontrolalloworiginlist=https://${GITEA_CORS_ALLOW_DOMAIN}"
|
- "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.accesscontrolmaxage=100"
|
||||||
- "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true"
|
- "traefik.http.middlewares.${STACK_NAME}_cors.headers.addvaryheader=true"
|
||||||
- coop-cloud.${STACK_NAME}.version=3.1.0+1.23.0-rootless
|
- coop-cloud.${STACK_NAME}.version=3.4.0+1.24.2-rootless
|
||||||
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
|
Reference in New Issue
Block a user