Compare commits
15
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d0243cf724 | ||
|
|
97fe2bf213 | ||
|
|
fe536b276b | ||
|
|
852717d212 | ||
|
|
1f987b4ab3 | ||
|
|
a8d2231e74 | ||
|
|
096cc70fd9 | ||
|
|
37ebd22ba4 | ||
|
|
4c330eb4a4 | ||
|
|
57e224c5b0 | ||
|
|
0ab323d24a | ||
|
|
2f7f1b6bfe | ||
|
|
6a0339d3f2 | ||
|
|
ce4de9e645 | ||
|
|
357926f26e |
+3
-2
@@ -8,8 +8,9 @@ COMPOSE_FILE="$COMPOSE_FILE:compose.mariadb.yml"
|
|||||||
# COMPOSE_FILE="$COMPOSE_FILE:compose.sqlite3.yml"
|
# COMPOSE_FILE="$COMPOSE_FILE:compose.sqlite3.yml"
|
||||||
# COMPOSE_FILE="$COMPOSE_FILE:compose.postgres.yml"
|
# COMPOSE_FILE="$COMPOSE_FILE:compose.postgres.yml"
|
||||||
|
|
||||||
# Enable to use forgejo instead of gitea
|
# Enable Git LFS on plain gitea (not needed with forgejo, which bundles it).
|
||||||
# COMPOSE_FILE="$COMPOSE_FILE:compose.forgejo.yml"
|
# Mounts the lfs_jwt_secret secret and sets GITEA_LFS_START_SERVER=true.
|
||||||
|
# COMPOSE_FILE="$COMPOSE_FILE:compose.lfs.yml"
|
||||||
# SECRET_LFS_JWT_SECRET_VERSION=v1 # length=43
|
# SECRET_LFS_JWT_SECRET_VERSION=v1 # length=43
|
||||||
|
|
||||||
GITEA_DOMAIN=git.example.com
|
GITEA_DOMAIN=git.example.com
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
export APP_INI_VERSION=v21
|
export APP_INI_VERSION=v23
|
||||||
export DOCKER_SETUP_SH_VERSION=v1
|
export DOCKER_SETUP_SH_VERSION=v3
|
||||||
export PG_BACKUP_VERSION=v1
|
export PG_BACKUP_VERSION=v1
|
||||||
|
|
||||||
abra_backup_app() {
|
abra_backup_app() {
|
||||||
|
|||||||
+1
-1
@@ -61,7 +61,7 @@ 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" }}
|
LFS_START_SERVER = {{ env "GITEA_LFS_START_SERVER" }}
|
||||||
{{ if eq (env "FORGE") "forgejo" }}
|
{{ if (eq (env "GITEA_LFS_START_SERVER") "true") }}
|
||||||
LFS_JWT_SECRET = {{ secret "lfs_jwt_secret" }}
|
LFS_JWT_SECRET = {{ secret "lfs_jwt_secret" }}
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
version: '3.8'
|
version: "3.8"
|
||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: codeberg.org/forgejo/forgejo:12.0.2-rootless
|
|
||||||
environment:
|
environment:
|
||||||
- FORGE=forgejo
|
- GITEA_LFS_START_SERVER=true
|
||||||
secrets:
|
secrets:
|
||||||
- lfs_jwt_secret
|
- lfs_jwt_secret
|
||||||
|
|
||||||
secrets:
|
secrets:
|
||||||
lfs_jwt_secret:
|
lfs_jwt_secret:
|
||||||
name: ${STACK_NAME}_lfs_jwt_secret_${SECRET_LFS_JWT_SECRET_VERSION}
|
name: ${STACK_NAME}_lfs_jwt_secret_${SECRET_LFS_JWT_SECRET_VERSION}
|
||||||
@@ -10,7 +10,7 @@ services:
|
|||||||
secrets:
|
secrets:
|
||||||
- db_password
|
- db_password
|
||||||
db:
|
db:
|
||||||
image: postgres:15.13
|
image: postgres:15.18
|
||||||
deploy:
|
deploy:
|
||||||
labels:
|
labels:
|
||||||
backupbot.backup.pre-hook: "/pg_backup.sh backup"
|
backupbot.backup.pre-hook: "/pg_backup.sh backup"
|
||||||
|
|||||||
+3
-4
@@ -3,10 +3,10 @@ version: "3.8"
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: "gitea/gitea:1.24.2-rootless"
|
image: "gitea/gitea:1.27.1-rootless"
|
||||||
configs:
|
configs:
|
||||||
- source: app_ini
|
- source: app_ini
|
||||||
target: /etc/gitea/app.ini
|
target: /etc/gitea/app.ini.init
|
||||||
- source: docker_setup_sh
|
- source: docker_setup_sh
|
||||||
target: /usr/local/bin/docker-setup.sh
|
target: /usr/local/bin/docker-setup.sh
|
||||||
mode: 0555
|
mode: 0555
|
||||||
@@ -15,7 +15,6 @@ 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
|
||||||
@@ -88,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.5.3+1.24.2-rootless
|
- coop-cloud.${STACK_NAME}.version=3.6.3+1.27.1-rootless
|
||||||
|
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
|
|||||||
@@ -13,3 +13,11 @@ mkdir -p ${GITEA_CUSTOM} && chmod 0500 ${GITEA_CUSTOM}
|
|||||||
# Prepare temp folder
|
# Prepare temp folder
|
||||||
mkdir -p ${GITEA_TEMP} && chmod 0700 ${GITEA_TEMP}
|
mkdir -p ${GITEA_TEMP} && chmod 0700 ${GITEA_TEMP}
|
||||||
if [ ! -w ${GITEA_TEMP} ]; then echo "${GITEA_TEMP} is not writable"; exit 1; fi
|
if [ ! -w ${GITEA_TEMP} ]; then echo "${GITEA_TEMP} is not writable"; exit 1; fi
|
||||||
|
|
||||||
|
# Gitea 1.24+ writes settings back to app.ini on boot (e.g. WORK_PATH), which fails when app.ini is
|
||||||
|
# mounted directly as a read-only swarm config. So mount the rendered config as app.ini.init and seed
|
||||||
|
# a writable copy. Use `! -s` (empty), not `! -f`: old direct-mount upgrades leave a 0-byte app.ini.
|
||||||
|
if [ ! -s /etc/gitea/app.ini ]; then
|
||||||
|
cp /etc/gitea/app.ini.init /etc/gitea/app.ini
|
||||||
|
fi
|
||||||
|
chmod 0600 /etc/gitea/app.ini 2>/dev/null || true
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
Forgejo support has been moved to its own recipe. Make the move by:
|
||||||
|
|
||||||
|
* Getting the recipe locally with `abra recipe fetch forgejo`
|
||||||
|
* Changing the recipe's TYPE with `abra application config FORGEJO_DOMAIN`
|
||||||
|
* Redeploy the app with `abra application undeploy` and `abra
|
||||||
|
application deploy`
|
||||||
Reference in New Issue
Block a user