Use mysql to match our installation

This commit is contained in:
Luke Murphy 2020-06-23 11:10:33 +02:00
parent 8ada7f238c
commit 875a0efa1e
2 changed files with 15 additions and 13 deletions

View File

@ -1,14 +1,14 @@
export APP_INI_VERSION=v1 export APP_INI_VERSION=v1
export APP_NAME=gitea export APP_NAME=gitea
export DB_HOST=postgres:5432 export DB_HOST=mariadb:3306
export DB_NAME=gitea export DB_NAME=gitea
export DB_PASSWD_VERSION=v1 export DB_PASSWD_VERSION=v1
export DB_TYPE=postgres export DB_TYPE=mysql
export DB_USER=gitea export DB_USER=gitea
export DOMAIN=gitea.swarm.autonomic.zone export DOMAIN=gitea.swarm.autonomic.zone
export INTERNAL_TOKEN_VERSION=v1 export INTERNAL_TOKEN_VERSION=v1
export JWT_SECRET_VERSION=v1 export JWT_SECRET_VERSION=v1
export LETS_ENCRYPT_ENV=staging export LETS_ENCRYPT_ENV=production
export SECRET_KEY_VERSION=v1 export SECRET_KEY_VERSION=v1
export SSH_HOST_PORT=2222 export SSH_HOST_PORT=2222
export STACK_NAME=gitea export STACK_NAME=gitea

View File

@ -3,7 +3,7 @@ version: "3.8"
services: services:
gitea: gitea:
image: "gitea/gitea:1.11.5" image: "gitea/gitea:1.12.1"
configs: configs:
- source: app_ini - source: app_ini
target: /data/gitea/conf/app.ini target: /data/gitea/conf/app.ini
@ -47,18 +47,20 @@ services:
- "traefik.tcp.routers.gitea-ssh.entrypoints=gitea-ssh" - "traefik.tcp.routers.gitea-ssh.entrypoints=gitea-ssh"
- "traefik.tcp.services.gitea-ssh.loadbalancer.server.port=2222" - "traefik.tcp.services.gitea-ssh.loadbalancer.server.port=2222"
postgres: mariadb:
image: "postgres:12" image: "mariadb:10.5"
environment:
- MYSQL_DATABASE=gitea
- MYSQL_USER=gitea
- MYSQL_PASSWORD_FILE=/run/secrets/db_passwd
- MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_passwd
secrets: secrets:
- db_passwd - db_passwd
environment: - db_root_passwd
- POSTGRES_USER=gitea volumes:
- POSTGRES_DB=gitea - "mariadb:/var/lib/mysql"
- POSTGRES_PASSWORD_FILE=/run/secrets/db_passwd
networks: networks:
- internal - internal
volumes:
- "db:/var/lib/postgresql/data"
networks: networks:
internal: internal:
@ -87,4 +89,4 @@ secrets:
volumes: volumes:
git: git:
db: mariadb: