version .1
Some checks failed
Build and Publish Docker Image / build-and-push (push) Has been cancelled
Some checks failed
Build and Publish Docker Image / build-and-push (push) Has been cancelled
This commit is contained in:
@@ -47,6 +47,7 @@ public class ComposeRenderService
|
||||
.Replace("{{MYSQL_PORT}}", ctx.MySqlPort)
|
||||
.Replace("{{MYSQL_DATABASE}}", ctx.MySqlDatabase)
|
||||
.Replace("{{MYSQL_USER}}", ctx.MySqlUser)
|
||||
.Replace("{{MYSQL_PASSWORD}}", ctx.MySqlPassword)
|
||||
.Replace("{{SMTP_SERVER}}", ctx.SmtpServer)
|
||||
.Replace("{{SMTP_USERNAME}}", ctx.SmtpUsername)
|
||||
.Replace("{{SMTP_PASSWORD}}", ctx.SmtpPassword)
|
||||
@@ -168,7 +169,7 @@ public class ComposeRenderService
|
||||
MYSQL_PORT: "{{MYSQL_PORT}}"
|
||||
MYSQL_DATABASE: {{MYSQL_DATABASE}}
|
||||
MYSQL_USER: {{MYSQL_USER}}
|
||||
MYSQL_PASSWORD_FILE: /run/secrets/{{ABBREV}}-cms-db-password
|
||||
MYSQL_PASSWORD: {{MYSQL_PASSWORD}}
|
||||
CMS_SERVER_NAME: {{CMS_SERVER_NAME}}
|
||||
CMS_SMTP_SERVER: {{SMTP_SERVER}}
|
||||
CMS_SMTP_USERNAME: {{SMTP_USERNAME}}
|
||||
@@ -182,7 +183,6 @@ public class ComposeRenderService
|
||||
CMS_PHP_UPLOAD_MAX_FILESIZE: {{PHP_UPLOAD_MAX_FILESIZE}}
|
||||
CMS_PHP_MAX_EXECUTION_TIME: "{{PHP_MAX_EXECUTION_TIME}}"
|
||||
secrets:
|
||||
- {{ABBREV}}-cms-db-password
|
||||
- {{ABBREV}}-cms-db-user
|
||||
- global_mysql_host
|
||||
- global_mysql_port
|
||||
@@ -280,8 +280,6 @@ public class ComposeRenderService
|
||||
o: "{{NFS_OPTS}}"
|
||||
|
||||
secrets:
|
||||
{{ABBREV}}-cms-db-password:
|
||||
external: true
|
||||
{{ABBREV}}-cms-db-user:
|
||||
external: true
|
||||
global_mysql_host:
|
||||
@@ -314,6 +312,7 @@ public class RenderContext
|
||||
public string MySqlPort { get; set; } = "3306";
|
||||
public string MySqlDatabase { get; set; } = "cms";
|
||||
public string MySqlUser { get; set; } = "cms";
|
||||
public string MySqlPassword { get; set; } = string.Empty;
|
||||
|
||||
// SMTP
|
||||
public string SmtpServer { get; set; } = string.Empty;
|
||||
|
||||
Reference in New Issue
Block a user