Skip to content

The Unified and Autonomous Development Platform

feat: Reject windows docker execution or provisioning

Robin Shen8468f90e666f
diff --git a/pom.xml b/pom.xml
index 645a24494f..66f082d791 100644
--- a/pom.xml
+++ b/pom.xml
@@ -682,7 +682,7 @@
</repositories>
<properties>
<commons.version>3.3.7</commons.version>
- <agent.version>3.0.8</agent.version>
+ <agent.version>3.0.9</agent.version>
<slf4j.version>2.0.9</slf4j.version>
<logback.version>1.4.14</logback.version>
<antlr.version>4.7.2</antlr.version>
diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerModule.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerModule.java
index 1b5e8291fd..e5685b3174 100644
--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerModule.java
+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerModule.java
@@ -2,6 +2,8 @@ package io.onedev.server.plugin.executor.serverdocker;
import java.util.Collection;
+import org.apache.commons.lang3.SystemUtils;
+
import com.google.common.collect.Sets;
import io.onedev.agent.AgentUtils;
@@ -25,7 +27,7 @@ public class ServerDockerModule extends AbstractPluginModule {
// put your guice bindings here
- if (OneDev.getK8sService() == null) {
+ if (OneDev.getK8sService() == null && !SystemUtils.IS_OS_WINDOWS) {
contribute(ImplementationProvider.class, new ImplementationProvider() {
@Override
diff --git a/server-plugin/server-plugin-provisioner-serverdocker/src/main/java/io/onedev/server/plugin/provisioner/serverdocker/ServerDockerModule.java b/server-plugin/server-plugin-provisioner-serverdocker/src/main/java/io/onedev/server/plugin/provisioner/serverdocker/ServerDockerModule.java
index 6428b8bd81..14b9b4bb49 100644
--- a/server-plugin/server-plugin-provisioner-serverdocker/src/main/java/io/onedev/server/plugin/provisioner/serverdocker/ServerDockerModule.java
+++ b/server-plugin/server-plugin-provisioner-serverdocker/src/main/java/io/onedev/server/plugin/provisioner/serverdocker/ServerDockerModule.java
@@ -2,6 +2,8 @@ package io.onedev.server.plugin.provisioner.serverdocker;
import java.util.Collection;
+import org.apache.commons.lang3.SystemUtils;
+
import com.google.common.collect.Sets;
import io.onedev.agent.AgentUtils;
@@ -23,7 +25,7 @@ public class ServerDockerModule extends AbstractPluginModule {
protected void configure() {
super.configure();
- if (OneDev.getK8sService() == null) {
+ if (OneDev.getK8sService() == null && !SystemUtils.IS_OS_WINDOWS) {
contribute(ImplementationProvider.class, new ImplementationProvider() {
@Override