ResiLien
/
services
2
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity

Merge pull request 'feat(Gitea): Upgrade to 1.19 and update configuration' (#53) from gitea into main 

Reviewed-on: https://git.weko.io/resilien/services/pulls/53
This commit is contained in:
Simon 2023-02-21 11:58:40 +01:00
parent c8c945ad64 e8a022e7e3
commit 0798bab099
3 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gitea/docker-compose.smtp.yml
View File

@ -4,9 +4,12 @@ services:
gitea: gitea:
environment: environment:
- GITEA__mailer__ENABLED=true - GITEA__mailer__ENABLED=true
- GITEA__mailer__FROM=${GITEA__mailer__FROM:?GITEA__mailer__FROM not set} - GITEA__mailer__PROTOCOL=${GITEA__mailer__PROTOCOL:-smtp}
- GITEA__mailer__MAILER_TYPE=smtp - GITEA__mailer__SMTP_ADDR=${GITEA__mailer__SMTP_ADDR:?GITEA__mailer__SMTP_ADDR not set}
- GITEA__mailer__HOST=${GITEA__mailer__HOST:?GITEA__mailer__HOST not set} - GITEA__mailer__SMTP_PORT=${GITEA__mailer__SMTP_PORT:?GITEA__mailer__SMTP_PORT not set}
- GITEA__mailer__IS_TLS_ENABLED=true
- GITEA__mailer__USER=${GITEA__mailer__USER:?GITEA__mailer__USER not set} - GITEA__mailer__USER=${GITEA__mailer__USER:?GITEA__mailer__USER not set}
- GITEA__mailer__PASSWD="""${GITEA__mailer__PASSWD:?GITEA__mailer__PASSWD not set}""" - GITEA__mailer__PASSWD="""${GITEA__mailer__PASSWD:?GITEA__mailer__PASSWD not set}"""
- GITEA__mailer__FROM=${GITEA__mailer__FROM:?GITEA__mailer__FROM not set}
- GITEA__mailer__HOST=${GITEA__mailer__HOST:?GITEA__mailer__HOST not set}

12
gitea/docker-compose.traefik.yml
View File

@ -7,10 +7,8 @@ networks:
services: services:
gitea: gitea:
labels: labels:
traefik.enable: 'true' - traefik.enable=true
traefik.docker.network: ${TRAEFIK_NETWORK_NAME:-traefik} - traefik.docker.network=${TRAEFIK_NETWORK_NAME:-traefik}
- traefik.http.routers.${TRAEFIK_ROUTER_NAME:-gitea}.rule=Host(`${GITEA_DOMAIN:?err}`)
traefik.http.routers.gitea.rule: 'Host(`${GITEA_DOMAIN:?err}`)' - traefik.http.routers.${TRAEFIK_ROUTER_NAME:-gitea}.entrypoints=${TRAEFIK_ENTRYPOINTS:-web}
traefik.http.routers.gitea.entrypoints: 'web' - traefik.http.services.${TRAEFIK_ROUTER_NAME:-gitea}.loadbalancer.server.port=3000
traefik.http.services.gitea.loadbalancer.server.port: '3000'

20
gitea/docker-compose.yml
View File

@ -7,16 +7,20 @@ volumes:
services: services:
gitea: gitea:
container_name: ${GITEA_CONTAINER_NAME:-gitea} container_name: ${GITEA_CONTAINER_NAME:-gitea}
image: ${GITEA_IMAGE:-gitea/gitea:1.16.5} image: ${GITEA_IMAGE:-gitea/gitea:1.18.4}
restart: always restart: always
environment: environment:
# - USER_UID=1000 - USER_UID=${GITEA_UID:-1000}
# - USER_GID=1000 - USER_GID=${GITEA_GID:-1000}
DB_TYPE: postgres # Database
DB_HOST: ${POSTGRES_CONTAINER_NAME:-postgres}:5432 # Default name is same as ../postgres/docker-compose.yml:8 - GITEA__database__DB_TYPE=postgres
DB_NAME: ${POSTGRES_DB} - GITEA__database__HOST=${POSTGRES_CONTAINER_NAME:-postgres}:5432
DB_USER: ${POSTGRES_USER} - GITEA__database__NAME=${POSTGRES_DB}
DB_PASSWD: ${POSTGRES_PASSWORD} - GITEA__database__USER=${POSTGRES_USER}
- GITEA__database__PASSWD=${POSTGRES_PASSWORD}
# Security
- GITEA__security__SECRET_KEY=${GITEA_SECRET_KEY:-}
- GITEA__security__INTERNAL_TOKEN=${GITEA_INTERNAL_TOKEN:-}
volumes: volumes:
- gitea:/data - gitea:/data
- /etc/timezone:/etc/timezone:ro - /etc/timezone:/etc/timezone:ro