Merge pull request 'feat(Gitea): Update configuration' (#54) from gitea into main

Reviewed-on: #54
This commit is contained in:
Simon 2023-02-21 12:44:50 +01:00
commit d5e61d35a5
3 changed files with 26 additions and 17 deletions

View File

@ -1,26 +1,34 @@
COMPOSE_FILE=../postgres/docker-compose.yml:./docker-compose.yml:./docker-compose.override.yml ########
# DOCKER
# APP SERVICES_DIR=".."
COMPOSE_FILE=${SERVICES_DIR}/gitea/docker-compose.yml:${SERVICES_DIR}/gitea/docker-compose.traefik.yml:${SERVICES_DIR}/gitea/docker-compose.smtp.yml:${SERVICES_DIR}/gitea/docker-compose.metrics.yml:${SERVICES_DIR}/postgres/docker-compose.yml
COMPOSE_PROJECT_NAME=$GITEA_DOMAIN
GITEA_VOLUME_NAME=gitea #######
GITEA_PROTOCOL=http # GITEA
GITEA_DOMAIN=gitea.lan
# APP CONFIG
# https://docs.gitea.io/en-us/install-with-docker/#environments-variables # https://docs.gitea.io/en-us/install-with-docker/#environments-variables
DISABLE_SSH=true GITEA_DOMAIN=gitea.lan
RUN_MODE=prod GITEA_VOLUME_NAME=gitea
ROOT_URL=${GITEA_PROTOCOL}://${GITEA_DOMAIN} GITEA_IMAGE=gitea/gitea:1.18.4
DISABLE_REGISTRATION=true GITEA_PROTOCOL=http
DISABLE_GRAVATAR=true GITEA_SECRET_KEY=kt5UdK0m9lI9MDyhVOFEB5jk7VwFynDyaxcUjEJUpWJBrC6FyH4dkUDKLYEa7hGn
#INSTALL_LOCK=true GITEA_INTERNAL_TOKEN=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYmYiOjE2NzY5NzkxMzZ9.Iopu6DBUhglmNPzEyYylfmTmEUpYLHYEsNrm50GoBkU
# SMTP
GITEA__mailer__FROM='"Name" <email@example.com>'
GITEA__mailer__SMTP_ADDR=smtp.gitea.lan
GITEA__mailer__SMTP_PORT=465
GITEA__mailer__USER=gitea.lan
GITEA__mailer__PASSWD=gitea.lan
# DATABASE # DATABASE
# Voir la description ../postgres/README.md
POSTGRES_USER=user-example POSTGRES_USER=user-example
POSTGRES_PASSWORD=password-example POSTGRES_PASSWORD=password-example
POSTGRES_DB=postgres-database-name-example POSTGRES_DB=postgres-database-name-example
POSTGRES_CONTAINER_NAME=gitea-postgres POSTGRES_CONTAINER_NAME=gitea-postgres
POSTGRES_VOLUME_NAME=gitea-postgres POSTGRES_VOLUME_NAME=gitea-postgres
POSTGRES_IMAGE=postgres:15.2-alpine

View File

@ -12,4 +12,3 @@ services:
- 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__FROM=${GITEA__mailer__FROM:?GITEA__mailer__FROM not set}
- GITEA__mailer__HOST=${GITEA__mailer__HOST:?GITEA__mailer__HOST not set}

View File

@ -19,8 +19,10 @@ services:
- GITEA__database__USER=${POSTGRES_USER} - GITEA__database__USER=${POSTGRES_USER}
- GITEA__database__PASSWD=${POSTGRES_PASSWORD} - GITEA__database__PASSWD=${POSTGRES_PASSWORD}
# Security # Security
- GITEA__security__SECRET_KEY=${GITEA_SECRET_KEY:-} # docker run -it --rm gitea/gitea:1 gitea generate secret SECRET_KEY
- GITEA__security__INTERNAL_TOKEN=${GITEA_INTERNAL_TOKEN:-} - GITEA__security__SECRET_KEY=${GITEA_SECRET_KEY}
# docker run -it --rm gitea/gitea:1 gitea generate secret INTERNAL_TOKEN
- GITEA__security__INTERNAL_TOKEN=${GITEA_INTERNAL_TOKEN}
volumes: volumes:
- gitea:/data - gitea:/data
- /etc/timezone:/etc/timezone:ro - /etc/timezone:/etc/timezone:ro