Skip to content

The Unified and Autonomous Development Platform

Reduce size of docker image used in build/publish docker image step

Robin Shen210daf114d54
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.java
index adde3f7f4c..8c43107b75 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageStep.java
@@ -191,7 +191,7 @@ public class BuildImageStep extends Step {
List<OsExecution> executions = new ArrayList<>();
String imageVersion = KubernetesHelper.getVersion();
- String image = KubernetesHelper.IMAGE_REPO_PREFIX + "-linux:" + imageVersion;
+ String image = "1dev/docker-cli-alpine:1.0.0";
executions.add(new OsExecution(OsMatcher.NON_WINDOWS, image, getNonWindowsCommands()));
List<String> commands = getWindowsCommands();
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/BashInterpreter.java b/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/BashInterpreter.java
index b0eca9a768..cdafd9e9eb 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/BashInterpreter.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/commandinterpreter/BashInterpreter.java
@@ -10,7 +10,7 @@ import io.onedev.server.util.validation.annotation.Code;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
-@Editable(order=200, name="bash")
+@Editable(order=200, name="Bash")
public class BashInterpreter extends Interpreter {
private static final long serialVersionUID = 1L;
diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
index d0790fd50d..2647b4474b 100644
--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
@@ -3445,6 +3445,32 @@ public class DataMigrator {
}
}
dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("Agents.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ Element osElement = element.element("os");
+ String osName;
+
+ switch (osElement.getTextTrim()) {
+ case "WINDOWS":
+ osName = "Windows";
+ break;
+ case "LINUX":
+ osName = "Linux";
+ break;
+ case "FREEBSD":
+ osName = "FreeBSD";
+ break;
+ case "MACOSX":
+ osName = "Mac OS X";
+ break;
+ default:
+ osName = "Other";
+ }
+ element.addElement("osName").setText(osName);
+ osElement.detach();
+ }
+ dom.writeToFile(file, false);
}
}
}