Final hold out on passwd -> password migration
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/push Build is failing
Details
See https://git.autonomic.zone/coop-cloud/gitea/issues/10.
This commit is contained in:
parent
0f558acef9
commit
a099e702fa
|
@ -6,10 +6,8 @@ services:
|
|||
- GITEA_MAILER_HOST
|
||||
- GITEA_MAILER_USER
|
||||
secrets:
|
||||
- smtp_passwd
|
||||
# Note(decentral1se): migrate from passwd -> password
|
||||
# See https://git.autonomic.zone/coop-cloud/abra/pulls/33
|
||||
- smtp_password
|
||||
secrets:
|
||||
smtp_passwd:
|
||||
name: ${STACK_NAME}_smtp_passwd_${SECRET_SMTP_PASSWORD_VERSION}
|
||||
smtp_passord:
|
||||
name: ${STACK_NAME}_smtp_password_${SECRET_SMTP_PASSWORD_VERSION}
|
||||
external: true
|
||||
|
|
20
compose.yml
20
compose.yml
|
@ -6,7 +6,7 @@ services:
|
|||
- source: app_ini
|
||||
target: /data/gitea/conf/app.ini
|
||||
secrets:
|
||||
- db_passwd
|
||||
- db_password
|
||||
- internal_token
|
||||
- jwt_secret
|
||||
- secret_key
|
||||
|
@ -58,11 +58,11 @@ services:
|
|||
environment:
|
||||
- MYSQL_DATABASE=gitea
|
||||
- MYSQL_USER=gitea
|
||||
- MYSQL_PASSWORD_FILE=/run/secrets/db_passwd
|
||||
- MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_passwd
|
||||
- MYSQL_PASSWORD_FILE=/run/secrets/db_password
|
||||
- MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
|
||||
secrets:
|
||||
- db_passwd
|
||||
- db_root_passwd
|
||||
- db_password
|
||||
- db_root_password
|
||||
volumes:
|
||||
- "mariadb:/var/lib/mysql"
|
||||
networks:
|
||||
|
@ -78,14 +78,12 @@ configs:
|
|||
name: ${STACK_NAME}_app_ini_${APP_INI_VERSION}
|
||||
file: app.ini.tmpl
|
||||
template_driver: golang
|
||||
# Note(decentral1se): migrate from passwd -> password
|
||||
# See https://git.autonomic.zone/coop-cloud/abra/pulls/33
|
||||
secrets:
|
||||
db_passwd:
|
||||
name: ${STACK_NAME}_db_passwd_${SECRET_DB_PASSWORD_VERSION}
|
||||
db_password:
|
||||
name: ${STACK_NAME}_db_password_${SECRET_DB_PASSWORD_VERSION}
|
||||
external: true
|
||||
db_root_passwd:
|
||||
name: ${STACK_NAME}_db_root_passwd_${SECRET_DB_ROOT_PASSWORD_VERSION}
|
||||
db_root_password:
|
||||
name: ${STACK_NAME}_db_root_password_${SECRET_DB_ROOT_PASSWORD_VERSION}
|
||||
external: true
|
||||
internal_token:
|
||||
name: ${STACK_NAME}_internal_token_${SECRET_INTERNAL_TOKEN_VERSION}
|
||||
|
|
Loading…
Reference in New Issue