The Unified and Autonomous Development Platform
fix: Docker container can not start with preset initial user/password (OD-2624)
Robin Shenb2f39efe95e0
diff --git a/server-core/src/main/java/io/onedev/server/data/DefaultDataService.java b/server-core/src/main/java/io/onedev/server/data/DefaultDataService.javaindex 98df5d6fd7..cd7e8fbb29 100644--- a/server-core/src/main/java/io/onedev/server/data/DefaultDataService.java+++ b/server-core/src/main/java/io/onedev/server/data/DefaultDataService.java@@ -655,6 +655,12 @@ public class DefaultDataService implements DataService, Serializable {userService.replicate(unknown);}+ // Initialize security setting first as initial password validation below relies on password policy+ var setting = settingService.findSetting(Key.SECURITY);+ if (setting == null) {+ settingService.saveSecuritySetting(new SecuritySetting());+ }+if (userService.get(User.ROOT_ID) == null) {NewUserBean bean = new NewUserBean();bean.setName(System.getenv(ENV_INITIAL_USER));@@ -685,7 +691,7 @@ public class DefaultDataService implements DataService, Serializable {}}- Setting setting = settingService.findSetting(Key.SYSTEM);+ setting = settingService.findSetting(Key.SYSTEM);SystemSetting systemSetting;String ingressUrl = OneDev.getInstance().getIngressUrl();@@ -753,10 +759,6 @@ public class DefaultDataService implements DataService, Serializable {settingService.saveGpgSetting(gpgSetting);}- setting = settingService.findSetting(Key.SECURITY);- if (setting == null) {- settingService.saveSecuritySetting(new SecuritySetting());- }setting = settingService.findSetting(Key.ISSUE);if (setting == null) {LinkSpec link = new LinkSpec();diff --git a/server-product/docker/docker-compose.yaml b/server-product/docker/docker-compose.yamlindex 3f21769de5..f5a5a0d863 100644--- a/server-product/docker/docker-compose.yaml+++ b/server-product/docker/docker-compose.yaml@@ -18,15 +18,21 @@ services:hibernate_connection_username: postgrestty: truedepends_on:- - "postgres"+ postgres:+ condition: service_healthypostgres:- image: postgres:14-alpine3.15+ image: postgres:14restart: always+ healthcheck:+ test: ["CMD-SHELL", "pg_isready -U postgres"]+ interval: 5s+ timeout: 5s+ retries: 5+ start_period: 30senvironment:### Change thisPOSTGRES_PASSWORD: "changeit"-POSTGRES_USER: "postgres"POSTGRES_DB: "onedev"expose: