From 5a7e6048d91457e1db9f70a8311b24f2618996cd Mon Sep 17 00:00:00 2001 From: Alex Tavarez Date: Wed, 12 Aug 2026 11:39:37 -0400 Subject: [PATCH] re-included environment variables for forge container service --- dependent/compose.yml | 104 +++++++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/dependent/compose.yml b/dependent/compose.yml index 1ba8319..657e18e 100644 --- a/dependent/compose.yml +++ b/dependent/compose.yml @@ -224,59 +224,59 @@ services: FORGEJO__RUN_USER: ${FORGEJO_MODE:-dev} FORGEJO__APP_NAME: ${FORGEJO_NAME} FORGEJO__APP_SLOGAN: ${FORGEJO_SLOGAN} - # FORGEJO__ui.meta_AUTHOR: ${SERVER_FQDN%.*} - # FORGEJO__ui.meta_DESCRIPTION: ${FORGEJO_DESC} - # FORGEJO__server_PROTOCOL: ${FORGEJO_PROTOCOL} - # FORGEJO__server_DOMAIN: ${FORGEJO_SUBDOMAIN}.${SERVER_FQDN} - # # @NOTE https://gist.github.com/erik-toth/087262f19941da9bf4c2ce449fe98a47 - # FORGEJO__server_SSH_PORT: ${FORGEJO_SSH_PORT:-2323} - # FORGEJO__server_SSH_EXPOSE_ANONYMOUS: false - # FORGEJO__server_START_SSH_SERVER: false - # FORGEJO__server_SSH_AUTHORIZED_KEYS_BACKUP: true - # FORGEJO__server_LANDING_PAGE: ${FORGEJO_LANDING:-explore} - # FORGEJO__admin_DEFAULT_EMAIL_NOTIFICATIONS: onmention - # FORGEJO__security_REVERSE_PROXY_TRUSTED_PROXIES: ${FORGEJO_TRUSTED_PROXIES} - # FORGEJO__security_PASSWORD_COMPLEXITY: lower,upper,digit,spec - # FORGEJO__security_PASSWORD_CHECK_PWN: true - # FORGEJO__security_GLOBAL_TWO_FACTOR_REQUIREMENT: true - # FORGEJO__service_REGISTER_EMAIL_CONFIRM: true - # FORGEJO__service_DEFAULT_KEEP_EMAIL_PRIVATE: true - # FORGEJO__service_DISABLE_REGISTRATION: ${FORGEJO_PROHIBIT_REGISTRATION:-true} - # FORGEJO__service_ENABLE_NOTIFY_MAIL: true - # FORGEJO__security_ENABLE_CAPTCHA: true - # FORGEJO__picture_REPOSITORY_AVATAR_FALLBACK: image + FORGEJO__ui.meta_AUTHOR: ${SERVER_FQDN%.*} + FORGEJO__ui.meta_DESCRIPTION: ${FORGEJO_DESC} + FORGEJO__server_PROTOCOL: ${FORGEJO_PROTOCOL} + FORGEJO__server_DOMAIN: ${FORGEJO_SUBDOMAIN}.${SERVER_FQDN} + # @NOTE https://gist.github.com/erik-toth/087262f19941da9bf4c2ce449fe98a47 + FORGEJO__server_SSH_PORT: ${FORGEJO_SSH_PORT:-2323} + FORGEJO__server_SSH_EXPOSE_ANONYMOUS: false + FORGEJO__server_START_SSH_SERVER: false + FORGEJO__server_SSH_AUTHORIZED_KEYS_BACKUP: true + FORGEJO__server_LANDING_PAGE: ${FORGEJO_LANDING:-explore} + FORGEJO__admin_DEFAULT_EMAIL_NOTIFICATIONS: onmention + FORGEJO__security_REVERSE_PROXY_TRUSTED_PROXIES: ${FORGEJO_TRUSTED_PROXIES} + FORGEJO__security_PASSWORD_COMPLEXITY: lower,upper,digit,spec + FORGEJO__security_PASSWORD_CHECK_PWN: true + FORGEJO__security_GLOBAL_TWO_FACTOR_REQUIREMENT: true + FORGEJO__service_REGISTER_EMAIL_CONFIRM: true + FORGEJO__service_DEFAULT_KEEP_EMAIL_PRIVATE: true + FORGEJO__service_DISABLE_REGISTRATION: ${FORGEJO_PROHIBIT_REGISTRATION:-true} + FORGEJO__service_ENABLE_NOTIFY_MAIL: true + FORGEJO__security_ENABLE_CAPTCHA: true + FORGEJO__picture_REPOSITORY_AVATAR_FALLBACK: image # FORGEJO__picture_REPOSITORY_AVATAR_FALLBACK_IMAGE: img/repo_default.svg - # FORGEJO__picture_ENABLE_FEDERATED_AVATAR: true - # FORGEJO__log_MODE: file - # FORGEJO__mailer_ENABLED: true - # FORGEJO__mailer_PROTOCOL: ${EMAIL_SEND_PROTOCOL:-smtp}s - # FORGEJO__mailer_SMTP_ADDR: ${EMAIL_SMTP_HOST} - # FORGEJO__mailer_SMTP_PORT: ${EMAIL_SMTP_PORT:-465} - # FORGEJO__mailer_USER: ${EMAIL_SMTP_USERNAME} - # FORGEJO__mailer_PASSWD_URI: file:/run/secrets/email.pass - # FORGEJO__mailer_FROM: "\"${SERVER_FQDN%.*} Administrator\" <${EMAIL_SMTP_USER_ALIAS:-admin}@${EMAIL_SMTP_EMAIL_ALIAS}>" - # FORGEJO__database_DB_TYPE: ${FORGEJO_DB_TYPE:-mysql} - # FORGEJO__database_HOST: "${MYSQL_DB_HOST}:3306" - # FORGEJO__database_NAME: ${FORGEJO_DB_NAME:-forgejo} - # FORGEJO__database_USER: ${MYSQL_DB_USER:-admin} - # FORGEJO__database_PASSWD_URI: file:/run/secrets/user-mysql.pass - # FORGEJO__repository_DEFAULT_BRANCH: main - # FORGEJO__repository_DEFAULT_PRIVATE: private - # FORGEJO__repository_ENABLE_PUSH_CREATE_USER: true - # FORGEJO__repository_DEFAULT_CLOSE_ISSUES_VIA_COMMITS_IN_ANY_BRANCH: true - # FORGEJO__repository.issue_MAX_PINNED: 6 - # FORGEJO__repository.issue_LOCK_REASON: ${FORGEJO_LOCK_REASONS} - # FORGEJO__federation_ENABLED: true - # FORGEJO__cors_ENABLED: true - # FORGEJO__cors_ALLOW_DOMAIN: "${FORGEJO_PROTOCOL}://${SERVER_FQDN} ${FORGEJO_PROTOCOL}://${OG_SUBDOMAIN}.${SERVER_FQDN}" - # FORGEJO__cors_ALLOW_CREDENTIALS: true - # FORGEJO__ui_SHOW_USER_EMAIL: false - # FORGEJO__ui_ONLY_SHOW_RELEVANT_REPOS: true - # FORGEJO__project_PROJECT_BOARD_BASIC_KANBAN_TYPE: ${FORGEJO_KANBAN_COLUMNS} - # FORGEJO__project_PROJECT_BOARD_BUG_TRIAGE_TYPE: ${FORGEJO_TRIAGE_CATEGORIES} - # FORGEJO__migrations_ALLOW_DOMAINS: "*.${SERVER_FQDN},*.bebopfederation.org,github.com,*.github.com,gitlab.com,*.gitlab.com,codeberg.org,*.codeberg.org,sr.ht,*.sr.ht" - # FORGEJO__moderation_ENABLED: true - # FORGEJO__repository.editor_LINE_WRAP_EXTENSIONS: .txt,.md,.markdown,.mdown,.mkd,.livemd + FORGEJO__picture_ENABLE_FEDERATED_AVATAR: true + FORGEJO__log_MODE: file + FORGEJO__mailer_ENABLED: true + FORGEJO__mailer_PROTOCOL: ${EMAIL_SEND_PROTOCOL:-smtp}s + FORGEJO__mailer_SMTP_ADDR: ${EMAIL_SMTP_HOST} + FORGEJO__mailer_SMTP_PORT: ${EMAIL_SMTP_PORT:-465} + FORGEJO__mailer_USER: ${EMAIL_SMTP_USERNAME} + FORGEJO__mailer_PASSWD_URI: file:/run/secrets/email.pass + FORGEJO__mailer_FROM: "\"${SERVER_FQDN%.*} Administrator\" <${EMAIL_SMTP_USER_ALIAS:-admin}@${EMAIL_SMTP_EMAIL_ALIAS}>" + FORGEJO__database_DB_TYPE: ${FORGEJO_DB_TYPE:-mysql} + FORGEJO__database_HOST: "${MYSQL_DB_HOST}:3306" + FORGEJO__database_NAME: ${FORGEJO_DB_NAME:-forgejo} + FORGEJO__database_USER: ${MYSQL_DB_USER:-admin} + FORGEJO__database_PASSWD_URI: file:/run/secrets/user-mysql.pass + FORGEJO__repository_DEFAULT_BRANCH: main + FORGEJO__repository_DEFAULT_PRIVATE: private + FORGEJO__repository_ENABLE_PUSH_CREATE_USER: true + FORGEJO__repository_DEFAULT_CLOSE_ISSUES_VIA_COMMITS_IN_ANY_BRANCH: true + FORGEJO__repository.issue_MAX_PINNED: 6 + FORGEJO__repository.issue_LOCK_REASON: ${FORGEJO_LOCK_REASONS} + FORGEJO__federation_ENABLED: true + FORGEJO__cors_ENABLED: true + FORGEJO__cors_ALLOW_DOMAIN: "${FORGEJO_PROTOCOL}://${SERVER_FQDN} ${FORGEJO_PROTOCOL}://${OG_SUBDOMAIN}.${SERVER_FQDN}" + FORGEJO__cors_ALLOW_CREDENTIALS: true + FORGEJO__ui_SHOW_USER_EMAIL: false + FORGEJO__ui_ONLY_SHOW_RELEVANT_REPOS: true + FORGEJO__project_PROJECT_BOARD_BASIC_KANBAN_TYPE: ${FORGEJO_KANBAN_COLUMNS} + FORGEJO__project_PROJECT_BOARD_BUG_TRIAGE_TYPE: ${FORGEJO_TRIAGE_CATEGORIES} + FORGEJO__migrations_ALLOW_DOMAINS: "*.${SERVER_FQDN},*.bebopfederation.org,github.com,*.github.com,gitlab.com,*.gitlab.com,codeberg.org,*.codeberg.org,sr.ht,*.sr.ht" + FORGEJO__moderation_ENABLED: true + FORGEJO__repository.editor_LINE_WRAP_EXTENSIONS: .txt,.md,.markdown,.mdown,.mkd,.livemd secrets: - "user-mysql.pass" - email.pass