theonedev/onedev
1
0
Fork 0
mirror of https://github.com/theonedev/onedev.git synced 2025-12-10 10:12:19 -06:00
Code Issues Packages Projects Releases 429 Wiki Activity

fix: Docker container can not start with preset initial user/password (OD-2624)

Browse Source
This commit is contained in:
Robin Shen 2025-12-09 22:49:31 +08:00
parent afb984e5de
commit b2f39efe95
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server-core/src/main/java/io/onedev/server/data/DefaultDataService.java
View File

@ -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();

12
server-product/docker/docker-compose.yaml
View File

@ -18,15 +18,21 @@ services:
hibernate_connection_username: postgres
tty: true
depends_on:
- "postgres"
postgres:
condition: service_healthy
postgres:
image: postgres:14-alpine3.15
image: postgres:14
restart: always
healthcheck:
test: ["CMD-SHELL", "pg_isready -U postgres"]
interval: 5s
timeout: 5s
retries: 5
start_period: 30s
environment:
### Change this
POSTGRES_PASSWORD: "changeit"
POSTGRES_USER: "postgres"
POSTGRES_DB: "onedev"
expose: