Compare commits

...

9 Commits

Author SHA1 Message Date
f35689989c Merge pull request 'Adding Oauth2 options and up on versions' (#29) from javielico/gitea:master into master
Some checks failed
continuous-integration/drone/tag Build is failing
Reviewed-on: #29
2022-11-13 21:54:01 +00:00
1d4dc8e8bb Bump version up on compose.yml 2022-11-13 00:45:23 +00:00
f85eaed26e Adding GITEA_OAUTH2_CLIENT_ENABLED to compose.yml and .env.sample 2022-11-11 16:47:52 +00:00
fbb36d5598 Up versions of gitea and mariadb 2022-11-11 16:15:34 +00:00
13c8af2356 Version bump 2022-11-11 16:11:33 +00:00
a4cddb7b09 Adding vars to compose.yml 2022-11-11 16:10:38 +00:00
daf24d521f Adding variables to .env.sample 2022-11-11 16:09:27 +00:00
b92ad0d45c Add oauth2_client options 2022-11-11 16:04:33 +00:00
af97db8082 chore: publish 1.3.0+1.17.2-rootless release 2022-09-07 14:45:39 +02:00
4 changed files with 27 additions and 4 deletions

View File

@ -31,3 +31,11 @@ SECRET_SECRET_KEY_VERSION=v1 # length=64
# GITEA_SMTP_MAILER_ENABLED=1
# GITEA_MAILER_HOST=mail.gandi.net:465
# SECRET_SMTP_PASSWORD_VERSION=v1
# OATH2 Options
# GITEA_REGISTER_EMAIL_CONFIRM=replace-me
# GITEA_REGISTER_EMAIL_CONFIRM=replace-me
# GITEA_OAUTH2_USERNAME=replace-me
# GITEA_UPDATE_AVATAR=replace-me
# GITEA_ACCOUNT_LINKING=replace-me
# GITEA_OAUTH2_CLIENT_ENABLED=replace-me

View File

@ -1,4 +1,4 @@
export APP_INI_VERSION=v8
export APP_INI_VERSION=v9
export DOCKER_SETUP_SH_VERSION=v1
abra_backup_app() {

View File

@ -57,6 +57,15 @@ MAILER_TYPE = smtp
IS_TLS_ENABLED = true
{{ end }}
{{ if eq (env "GITEA_OAUTH2_CLIENT_ENABLED") "1" }}
[oauth2_client]
REGISTER_EMAIL_CONFIRM = {{ env "GITEA_REGISTER_EMAIL_CONFIRM" }}
ENABLE_AUTO_REGISTRATION = {{ env "GITEA_ENABLE_AUTO_REGISTRATION" }}
USERNAME = {{ env "GITEA_OAUTH2_USERNAME" }}
UPDATE_AVATAR = {{ env "GITEA_UPDATE_AVATAR" }}
ACCOUNT_LINKING = {{ env "GITEA_ACCOUNT_LINKING" }}
{{ end }}
[markup.restructuredtext]
ENABLED = true
FILE_EXTENSIONS = .rst

View File

@ -3,7 +3,7 @@ version: "3.8"
services:
app:
image: "gitea/gitea:1.16.8-rootless"
image: "gitea/gitea:1.17.3-rootless"
configs:
- source: app_ini
target: /etc/gitea/app.ini
@ -32,6 +32,12 @@ services:
- GITEA_SSH_PORT
- GITEA_DISABLE_GRAVATAR
- GITEA_ENABLE_FEDERATED_AVATAR
- GITEA_REGISTER_EMAIL_CONFIRM
- GITEA_ENABLE_AUTO_REGISTRATION
- GITEA_OAUTH2_USERNAME
- GITEA_UPDATE_AVATAR
- GITEA_ACCOUNT_LINKING
- GITEA_OAUTH2_CLIENT_ENABLED
volumes:
- data:/var/lib/gitea
- config:/etc/gitea
@ -53,10 +59,10 @@ services:
- "traefik.tcp.routers.${STACK_NAME}-ssh.rule=HostSNI(`*`)"
- "traefik.tcp.routers.${STACK_NAME}-ssh.entrypoints=gitea-ssh"
- "traefik.tcp.services.${STACK_NAME}-ssh.loadbalancer.server.port=${GITEA_SSH_PORT}"
- coop-cloud.${STACK_NAME}.version=1.2.1+1.16.8-rootless
- coop-cloud.${STACK_NAME}.version=1.3.1+1.17.3-rootless
db:
image: "mariadb:10.6"
image: "mariadb:10.9"
command: |
mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
environment: