The Unified and Autonomous Development Platform
Fix issue #959 - Automatic setup
Robin Shenedd03b24dae6
diff --git a/pom.xml b/pom.xmlindex 62a6ca98c4..0c98caf0b9 100644--- a/pom.xml+++ b/pom.xml@@ -7,7 +7,7 @@<version>1.1.0</version></parent><artifactId>server</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version><packaging>pom</packaging><build><finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>diff --git a/server-core/pom.xml b/server-core/pom.xmlindex f63d74d087..c3be1a62a0 100644--- a/server-core/pom.xml+++ b/server-core/pom.xml@@ -7,7 +7,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><build><plugins>diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultEmailAddressManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultEmailAddressManager.javaindex 16e28de2b3..138d16bbfb 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultEmailAddressManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultEmailAddressManager.java@@ -155,7 +155,7 @@ public class DefaultEmailAddressManager extends BaseEntityManager<EmailAddress>user.getEmailAddresses().add(emailAddress);- if (isNew && settingManager.getMailSetting() != null && !emailAddress.isVerified()) {+ if (isNew && !emailAddress.isVerified() && settingManager.getMailSetting() != null) {Long addressId = emailAddress.getId();sessionManager.runAsyncAfterCommit(new Runnable() {diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.javaindex b80253e449..4c4fe33cee 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java@@ -28,6 +28,7 @@ import io.onedev.commons.loader.Listen;import io.onedev.commons.loader.ManagedSerializedForm;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.FileUtils;+import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.EmailAddressManager;import io.onedev.server.entitymanager.LinkSpecManager;@@ -70,6 +71,16 @@ import io.onedev.server.web.util.editablebean.NewUserBean;@Singletonpublic class DefaultDataManager implements DataManager, Serializable {+ private static final String ENV_INITIAL_USER = "initial_user";++ private static final String ENV_INITIAL_PASSWORD = "initial_password";++ private static final String ENV_INITIAL_EMAIL = "initial_email";++ private static final String ENV_INITIAL_SERVER_URL = "initial_server_url";++ private static final String ENV_INITIAL_SSH_ROOT_URL = "initial_ssh_root_url";+private final UserManager userManager;private final SettingManager settingManager;@@ -109,6 +120,33 @@ public class DefaultDataManager implements DataManager, Serializable {this.linkSpecManager = linkSpecManager;this.emailAddressManager = emailAddressManager;}++ private void createRoot(NewUserBean bean) {+ User user = new User();+ user.setId(User.ROOT_ID);+ user.setName(bean.getName());+ user.setFullName(bean.getFullName());+ user.setPassword(passwordService.encryptPassword(bean.getPassword()));+ userManager.replicate(user);++ EmailAddress primaryEmailAddress = null;+ for (EmailAddress emailAddress: emailAddressManager.query()) {+ if (emailAddress.getOwner().equals(user) && emailAddress.isPrimary()) {+ primaryEmailAddress = emailAddress;+ break;+ }+ }++ if (primaryEmailAddress == null) {+ primaryEmailAddress = new EmailAddress();+ primaryEmailAddress.setPrimary(true);+ primaryEmailAddress.setGit(true);+ primaryEmailAddress.setVerificationCode(null);+ primaryEmailAddress.setOwner(user);+ }+ primaryEmailAddress.setValue(bean.getEmailAddress());+ emailAddressManager.save(primaryEmailAddress);+ }@SuppressWarnings({"serial"})@Transactional@@ -134,38 +172,23 @@ public class DefaultDataManager implements DataManager, Serializable {userManager.replicate(unknown);}if (userManager.get(User.ROOT_ID) == null) {- manualConfigs.add(new ManualConfig("Create Administrator Account", null, new NewUserBean()) {-- @Override- public void complete() {- NewUserBean newUserBean = (NewUserBean) getSetting();- User user = new User();- user.setId(User.ROOT_ID);- user.setName(newUserBean.getName());- user.setFullName(newUserBean.getFullName());- user.setPassword(passwordService.encryptPassword(newUserBean.getPassword()));- userManager.replicate(user);-- EmailAddress primaryEmailAddress = null;- for (EmailAddress emailAddress: emailAddressManager.query()) {- if (emailAddress.getOwner().equals(user) && emailAddress.isPrimary()) {- primaryEmailAddress = emailAddress;- break;- }- }-- if (primaryEmailAddress == null) {- primaryEmailAddress = new EmailAddress();- primaryEmailAddress.setPrimary(true);- primaryEmailAddress.setGit(true);- primaryEmailAddress.setVerificationCode(null);- primaryEmailAddress.setOwner(user);- }- primaryEmailAddress.setValue(newUserBean.getEmailAddress());- emailAddressManager.save(primaryEmailAddress);- }-- });+ NewUserBean bean = new NewUserBean();+ bean.setName(System.getenv(ENV_INITIAL_USER));+ bean.setPassword(System.getenv(ENV_INITIAL_PASSWORD));+ bean.setEmailAddress(System.getenv(ENV_INITIAL_EMAIL));++ if (validator.validate(bean).isEmpty()) {+ createRoot(bean);+ } else {+ manualConfigs.add(new ManualConfig("Create Administrator Account", null, bean) {++ @Override+ public void complete() {+ createRoot((NewUserBean) getSetting());+ }++ });+ }}Setting setting = settingManager.getSetting(Key.SYSTEM);@@ -175,10 +198,16 @@ public class DefaultDataManager implements DataManager, Serializable {if (setting == null || setting.getValue() == null) {systemSetting = new SystemSetting();- if (ingressUrl != null) {+ systemSetting.setSshRootUrl(System.getenv(ENV_INITIAL_SSH_ROOT_URL));+ String serverUrl = System.getenv(ENV_INITIAL_SERVER_URL);+ if (ingressUrl != null) {systemSetting.setServerUrl(ingressUrl);settingManager.saveSystemSetting(systemSetting);systemSetting = null;+ } else if (serverUrl != null) {+ systemSetting.setServerUrl(StringUtils.stripEnd(serverUrl, "/\\"));+ settingManager.saveSystemSetting(systemSetting);+ systemSetting = null;} else {systemSetting.setServerUrl(OneDev.getInstance().guessServerUrl());}diff --git a/server-plugin/pom.xml b/server-plugin/pom.xmlindex 15f529a753..4aca90ddb0 100644--- a/server-plugin/pom.xml+++ b/server-plugin/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-archetype/pom.xml b/server-plugin/server-plugin-archetype/pom.xmlindex 76976176f5..9fe204a786 100644--- a/server-plugin/server-plugin-archetype/pom.xml+++ b/server-plugin/server-plugin-archetype/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><build><resources>diff --git a/server-plugin/server-plugin-authenticator-ldap/pom.xml b/server-plugin/server-plugin-authenticator-ldap/pom.xmlindex 1466d2cf9f..014ea90851 100644--- a/server-plugin/server-plugin-authenticator-ldap/pom.xml+++ b/server-plugin/server-plugin-authenticator-ldap/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><properties><moduleClass>io.onedev.server.plugin.authenticator.ldap.LdapModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-gradle/pom.xml b/server-plugin/server-plugin-buildspec-gradle/pom.xmlindex 818fedc3f8..46e4918801 100644--- a/server-plugin/server-plugin-buildspec-gradle/pom.xml+++ b/server-plugin/server-plugin-buildspec-gradle/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.gradle.GradleModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-maven/pom.xml b/server-plugin/server-plugin-buildspec-maven/pom.xmlindex bbd9d58c40..2b77079804 100644--- a/server-plugin/server-plugin-buildspec-maven/pom.xml+++ b/server-plugin/server-plugin-buildspec-maven/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.maven.MavenModule</moduleClass>diff --git a/server-plugin/server-plugin-buildspec-node/pom.xml b/server-plugin/server-plugin-buildspec-node/pom.xmlindex 929a4f5de3..4d03c0f034 100644--- a/server-plugin/server-plugin-buildspec-node/pom.xml+++ b/server-plugin/server-plugin-buildspec-node/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><properties><moduleClass>io.onedev.server.plugin.buildspec.node.NodePluginModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-kubernetes/pom.xml b/server-plugin/server-plugin-executor-kubernetes/pom.xmlindex 33b831850c..c9544fad8b 100644--- a/server-plugin/server-plugin-executor-kubernetes/pom.xml+++ b/server-plugin/server-plugin-executor-kubernetes/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.kubernetes.KubernetesModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-remotedocker/pom.xml b/server-plugin/server-plugin-executor-remotedocker/pom.xmlindex d5a1fb76b2..97c9799894 100644--- a/server-plugin/server-plugin-executor-remotedocker/pom.xml+++ b/server-plugin/server-plugin-executor-remotedocker/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-executor-remoteshell/pom.xml b/server-plugin/server-plugin-executor-remoteshell/pom.xmlindex 30601b1676..5667e57e6d 100644--- a/server-plugin/server-plugin-executor-remoteshell/pom.xml+++ b/server-plugin/server-plugin-executor-remoteshell/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-executor-serverdocker/pom.xml b/server-plugin/server-plugin-executor-serverdocker/pom.xmlindex 0991ffbcdf..f19fbed9c5 100644--- a/server-plugin/server-plugin-executor-serverdocker/pom.xml+++ b/server-plugin/server-plugin-executor-serverdocker/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.serverdocker.ServerDockerModule</moduleClass>diff --git a/server-plugin/server-plugin-executor-servershell/pom.xml b/server-plugin/server-plugin-executor-servershell/pom.xmlindex a12b762545..6230ca7111 100644--- a/server-plugin/server-plugin-executor-servershell/pom.xml+++ b/server-plugin/server-plugin-executor-servershell/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><properties><moduleClass>io.onedev.server.plugin.executor.servershell.ServerShellModule</moduleClass>diff --git a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml b/server-plugin/server-plugin-import-bitbucketcloud/pom.xmlindex effd4de241..695b154411 100644--- a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml+++ b/server-plugin/server-plugin-import-bitbucketcloud/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.bitbucketcloud.BitbucketPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-gitea/pom.xml b/server-plugin/server-plugin-import-gitea/pom.xmlindex bcf88b5464..2a668f310b 100644--- a/server-plugin/server-plugin-import-gitea/pom.xml+++ b/server-plugin/server-plugin-import-gitea/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.gitea.GiteaPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-github/pom.xml b/server-plugin/server-plugin-import-github/pom.xmlindex b30d555f9a..75aa37be4f 100644--- a/server-plugin/server-plugin-import-github/pom.xml+++ b/server-plugin/server-plugin-import-github/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.github.GitHubPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-gitlab/pom.xml b/server-plugin/server-plugin-import-gitlab/pom.xmlindex 39b14877da..7138913ef3 100644--- a/server-plugin/server-plugin-import-gitlab/pom.xml+++ b/server-plugin/server-plugin-import-gitlab/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.gitlab.GitLabPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-jiracloud/pom.xml b/server-plugin/server-plugin-import-jiracloud/pom.xmlindex 7f06835253..1c4085f7b1 100644--- a/server-plugin/server-plugin-import-jiracloud/pom.xml+++ b/server-plugin/server-plugin-import-jiracloud/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.jiracloud.JiraPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-url/pom.xml b/server-plugin/server-plugin-import-url/pom.xmlindex 3c53b4c6d2..d95a4ba5c8 100644--- a/server-plugin/server-plugin-import-url/pom.xml+++ b/server-plugin/server-plugin-import-url/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.url.UrlPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-import-youtrack/pom.xml b/server-plugin/server-plugin-import-youtrack/pom.xmlindex 5790ef0d4e..be9a0d7d8b 100644--- a/server-plugin/server-plugin-import-youtrack/pom.xml+++ b/server-plugin/server-plugin-import-youtrack/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><properties><moduleClass>io.onedev.server.plugin.imports.youtrack.YouTrackPluginModule</moduleClass>diff --git a/server-plugin/server-plugin-notification-discord/pom.xml b/server-plugin/server-plugin-notification-discord/pom.xmlindex 3be6bc37b0..25afc7b6ea 100644--- a/server-plugin/server-plugin-notification-discord/pom.xml+++ b/server-plugin/server-plugin-notification-discord/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><properties><moduleClass>io.onedev.server.plugin.notification.discord.DiscordModule</moduleClass>diff --git a/server-plugin/server-plugin-notification-slack/pom.xml b/server-plugin/server-plugin-notification-slack/pom.xmlindex 45f6f3ba54..6b5c6ff069 100644--- a/server-plugin/server-plugin-notification-slack/pom.xml+++ b/server-plugin/server-plugin-notification-slack/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><properties><moduleClass>io.onedev.server.plugin.notification.slack.SlackModule</moduleClass>diff --git a/server-plugin/server-plugin-report-checkstyle/pom.xml b/server-plugin/server-plugin-report-checkstyle/pom.xmlindex 8174749ec1..41679fad26 100644--- a/server-plugin/server-plugin-report-checkstyle/pom.xml+++ b/server-plugin/server-plugin-report-checkstyle/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-clover/pom.xml b/server-plugin/server-plugin-report-clover/pom.xmlindex d1414219c0..815fedcc4d 100644--- a/server-plugin/server-plugin-report-clover/pom.xml+++ b/server-plugin/server-plugin-report-clover/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-coverage/pom.xml b/server-plugin/server-plugin-report-coverage/pom.xmlindex 3f0e9978e3..8c88fbf229 100644--- a/server-plugin/server-plugin-report-coverage/pom.xml+++ b/server-plugin/server-plugin-report-coverage/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><properties><moduleClass>io.onedev.server.plugin.report.coverage.CoverageReportModule</moduleClass>diff --git a/server-plugin/server-plugin-report-cpd/pom.xml b/server-plugin/server-plugin-report-cpd/pom.xmlindex 1623d29c3c..0066cc4ede 100644--- a/server-plugin/server-plugin-report-cpd/pom.xml+++ b/server-plugin/server-plugin-report-cpd/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-jacoco/pom.xml b/server-plugin/server-plugin-report-jacoco/pom.xmlindex 1c3c6e29d5..9640fad9b7 100644--- a/server-plugin/server-plugin-report-jacoco/pom.xml+++ b/server-plugin/server-plugin-report-jacoco/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-jest/pom.xml b/server-plugin/server-plugin-report-jest/pom.xmlindex 1639ea72a4..cb7f2a4084 100644--- a/server-plugin/server-plugin-report-jest/pom.xml+++ b/server-plugin/server-plugin-report-jest/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-junit/pom.xml b/server-plugin/server-plugin-report-junit/pom.xmlindex 057a56eb6a..3b5e500c00 100644--- a/server-plugin/server-plugin-report-junit/pom.xml+++ b/server-plugin/server-plugin-report-junit/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-markdown/pom.xml b/server-plugin/server-plugin-report-markdown/pom.xmlindex 1d1737210c..bb9ff16725 100644--- a/server-plugin/server-plugin-report-markdown/pom.xml+++ b/server-plugin/server-plugin-report-markdown/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><properties><moduleClass>io.onedev.server.plugin.report.markdown.MarkdownReportModule</moduleClass>diff --git a/server-plugin/server-plugin-report-pmd/pom.xml b/server-plugin/server-plugin-report-pmd/pom.xmlindex 8bb1e998de..a6d2083c84 100644--- a/server-plugin/server-plugin-report-pmd/pom.xml+++ b/server-plugin/server-plugin-report-pmd/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-problem/pom.xml b/server-plugin/server-plugin-report-problem/pom.xmlindex 8a91cd805e..9e46064f56 100644--- a/server-plugin/server-plugin-report-problem/pom.xml+++ b/server-plugin/server-plugin-report-problem/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><properties><moduleClass>io.onedev.server.plugin.report.problem.ProblemReportModule</moduleClass>diff --git a/server-plugin/server-plugin-report-spotbugs/pom.xml b/server-plugin/server-plugin-report-spotbugs/pom.xmlindex 139030227c..f4f2126445 100644--- a/server-plugin/server-plugin-report-spotbugs/pom.xml+++ b/server-plugin/server-plugin-report-spotbugs/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><dependencies><dependency>diff --git a/server-plugin/server-plugin-report-unittest/pom.xml b/server-plugin/server-plugin-report-unittest/pom.xmlindex 531ad683d7..aa811dc7df 100644--- a/server-plugin/server-plugin-report-unittest/pom.xml+++ b/server-plugin/server-plugin-report-unittest/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><properties><moduleClass>io.onedev.server.plugin.report.unittest.UnitTestReportModule</moduleClass>diff --git a/server-plugin/server-plugin-sso-discord/pom.xml b/server-plugin/server-plugin-sso-discord/pom.xmlindex a9d92d57c4..af8ed52bd8 100644--- a/server-plugin/server-plugin-sso-discord/pom.xml+++ b/server-plugin/server-plugin-sso-discord/pom.xml@@ -5,7 +5,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><properties><moduleClass>io.onedev.server.plugin.sso.discord.DiscordModule</moduleClass>diff --git a/server-plugin/server-plugin-sso-openid/pom.xml b/server-plugin/server-plugin-sso-openid/pom.xmlindex c6c93fa85c..cd13e0b1da 100644--- a/server-plugin/server-plugin-sso-openid/pom.xml+++ b/server-plugin/server-plugin-sso-openid/pom.xml@@ -6,7 +6,7 @@<parent><groupId>io.onedev</groupId><artifactId>server-plugin</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><properties><moduleClass>io.onedev.server.plugin.sso.openid.OpenIdModule</moduleClass>diff --git a/server-product/helm/templates/deployment.yaml b/server-product/helm/templates/deployment.yamlindex 4aeac3c5dc..3e903d07ad 100644--- a/server-product/helm/templates/deployment.yaml+++ b/server-product/helm/templates/deployment.yaml@@ -46,6 +46,26 @@ spec:- name: ingress_hostvalue: {{ .Values.ingress.host }}{{- end }}+ {{- if .Values.initial.user }}+ - name: initial_user+ value: {{ .Values.initial.user }}+ {{- end }}+ {{- if .Values.initial.password }}+ - name: initial_password+ value: {{ .Values.initial.password }}+ {{- end }}+ {{- if .Values.initial.email }}+ - name: initial_email+ value: {{ .Values.initial.email }}+ {{- end }}+ {{- if .Values.initial.serverUrl }}+ - name: initial_server_url+ value: {{ .Values.initial.serverUrl }}+ {{- end }}+ {{- if .Values.initial.sshRootUrl }}+ - name: initial_ssh_root_url+ value: {{ .Values.initial.sshRootUrl }}+ {{- end }}- name: ingress_tlsvalue: "{{ .Values.ingress.tls }}"- name: hibernate_dialectdiff --git a/server-product/helm/values.yaml b/server-product/helm/values.yamlindex 450520a2c3..884cadeec3 100644--- a/server-product/helm/values.yaml+++ b/server-product/helm/values.yaml@@ -79,3 +79,15 @@ secrets:mysql:## change mysql root password if desiredpassword: changeit++## Specify OneDev initial settings to avoid manual setup+initial:+ ## Login name of administrator+ user: ""+ ## Password of administrator+ password: ""+ ## Email address of adminsitrator+ email: ""+ ## Server url will be ignored if ingress.host is specified above+ serverUrl: ""+ sshRootUrl: ""\ No newline at end of filediff --git a/server-product/pom.xml b/server-product/pom.xmlindex 9b51d9ecfd..88d5a54352 100644--- a/server-product/pom.xml+++ b/server-product/pom.xml@@ -7,7 +7,7 @@<parent><groupId>io.onedev</groupId><artifactId>server</artifactId>- <version>7.7.6</version>+ <version>7.7.7</version></parent><dependencies><dependency>