Skip to content

The Unified and Autonomous Development Platform

Only show maintenance image of server docker executor on non-winddows platforms

Robin Shen44af7b3e343b
diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/ServerDockerExecutor.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/ServerDockerExecutor.java
index c5c824c195..519afc8179 100644
--- a/core/src/main/java/io/onedev/server/model/support/jobexecutor/ServerDockerExecutor.java
+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/ServerDockerExecutor.java
@@ -150,6 +150,7 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
@Editable(order=22000, group="More Settings", description="A maintenance docker image is used by OneDev to do things requiring root "
+ "privilege. For instance, job execution in container may generate files owned by root user in cache "
+ "directory on host, and OneDev will run this maintenance image to remove outdated cache files as root if necessary")
+ @ShowCondition("isMaintenanceImageVisible")
@NotEmpty
public String getMaintenanceImage() {
return maintenanceImage;
@@ -158,6 +159,10 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
public void setMaintenanceImage(String maintenanceImage) {
this.maintenanceImage = maintenanceImage;
}
+
+ public static boolean isMaintenanceImageVisible() {
+ return !SystemUtils.IS_OS_WINDOWS;
+ }
private Commandline getDockerCmd() {
if (getDockerExecutable() != null)
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java
index c64c12e1b4..f85a7a2e18 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java
@@ -3,13 +3,10 @@ package io.onedev.server.web.page.admin.jobexecutor;
import java.io.Serializable;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import javax.annotation.Nullable;
-import org.apache.commons.lang.SystemUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
@@ -72,11 +69,7 @@ abstract class JobExecutorEditPanel extends Panel {
if (executorIndex != -1)
bean.setExecutor(executors.get(executorIndex));
- Set<String> excludedProperties = new HashSet<>();
- if (SystemUtils.IS_OS_WINDOWS)
- excludedProperties.add("maintenanceImage");
-
- BeanEditor editor = BeanContext.editBean("editor", bean, excludedProperties, true);
+ BeanEditor editor = BeanContext.editBean("editor", bean);
editor.setOutputMarkupId(true);
AjaxButton saveButton = new AjaxButton("save") {
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java
index b747025267..36516d821a 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java
@@ -1,10 +1,7 @@
package io.onedev.server.web.page.admin.jobexecutor;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
-import org.apache.commons.lang.SystemUtils;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
@@ -103,11 +100,7 @@ abstract class JobExecutorPanel extends Panel {
});
- Set<String> excludedProperties = new HashSet<>();
- if (SystemUtils.IS_OS_WINDOWS)
- excludedProperties.add("maintenanceImage");
-
- add(BeanContext.viewBean("executor", getExecutor(), excludedProperties, true).setOutputMarkupId(true));
+ add(BeanContext.viewBean("executor", getExecutor()).setOutputMarkupId(true));
add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {