Skip to content

The Unified and Autonomous Development Platform

refactor: Rename image build settings to reflect buildx usage in Docker executors

Robin Shen2d1fcdd87d38
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 c54434d0c1..6ac1cfa2b9 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
@@ -26,7 +26,7 @@ import io.onedev.server.model.support.administration.DockerAware;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
import io.onedev.server.model.support.administration.jobexecutor.KubernetesAware;
-@Editable(order=160, name="Build Image", group = DOCKER_IMAGE, description="Build docker image with buildx. " +
+@Editable(order=160, name="Build Image (Buildx)", group = DOCKER_IMAGE, description="Build docker image with buildx. " +
"This step can only be executed by server docker executor or remote docker executor, and it uses the buildx " +
"builder specified in these executors to do the job. To build image with Kubernetes executor, please use kaniko " +
"step instead")
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
index 573c30d704..c9cd7f1210 100644
--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
@@ -9540,7 +9540,7 @@ public class DataMigrator {
for (Element executorElement : valueElement.elements()) {
if (executorElement.getName().endsWith(".ServerDockerExecutor")
|| executorElement.getName().endsWith(".RemoteDockerExecutor")) {
- executorElement.addElement("imageBuildEnabled").setText("false");
+ executorElement.addElement("buildxImageBuildEnabled").setText("false");
executorElement.addElement("builderCachePruneEnabled").setText("false");
executorElement.addElement("imagetoolsEnabled").setText("false");
}
diff --git a/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java b/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java
index 9475e899b0..f51fd5f6a3 100644
--- a/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java
+++ b/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java
@@ -110,7 +110,7 @@ public class RemoteDockerExecutor extends ServerDockerExecutor {
var dockerSettings = new JobDockerSettings(isMountDockerSock(), getDockerSockPath(),
getCpuLimit(), getMemoryLimit(), getRunOptions(), registryLogins,
isAlwaysPullImage(), getDockerBuilder(), getNetworkOptions(),
- isImageBuildEnabled(), isBuilderCachePruneEnabled(), isImagetoolsEnabled());
+ isBuildxImageBuildEnabled(), isBuilderCachePruneEnabled(), isImagetoolsEnabled());
DockerJobData jobData = new DockerJobData(jobToken, getName(), jobContext.getProjectPath(),
jobContext.getProjectId(), jobContext.getRefName(), jobContext.getCommitId().name(),
jobContext.getBuildNumber(), jobContext.getSubmitSequence(), jobContext.getActions(),
diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
index 2fb88eae18..32f0f1472f 100644
--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
@@ -103,7 +103,7 @@ public class ServerDockerExecutor extends JobExecutor implements DockerAware, Te
private boolean mountDockerSock;
- private boolean imageBuildEnabled;
+ private boolean buildxImageBuildEnabled;
private boolean builderCachePruneEnabled;
@@ -220,12 +220,12 @@ public class ServerDockerExecutor extends JobExecutor implements DockerAware, Te
The image build step using kaniko can still be used even this option is disabled.
To avoid malicious jobs reading arbitrary host files by running this step,
make sure executor with this option enabled can only be used by trusted jobs""")
- public boolean isImageBuildEnabled() {
- return imageBuildEnabled;
+ public boolean isBuildxImageBuildEnabled() {
+ return buildxImageBuildEnabled;
}
- public void setImageBuildEnabled(boolean imageBuildEnabled) {
- this.imageBuildEnabled = imageBuildEnabled;
+ public void setBuildxImageBuildEnabled(boolean buildxImageBuildEnabled) {
+ this.buildxImageBuildEnabled = buildxImageBuildEnabled;
}
@Editable(order=550, name="Enable Buildx Image Tools", group="Security Settings", description="""
@@ -474,7 +474,7 @@ public class ServerDockerExecutor extends JobExecutor implements DockerAware, Te
var registryLogins = merge(buildImageFacade.getRegistryLogins(), getRegistryLogins(jobToken));
callWithRegistryLogins(docker, registryLogins, () -> {
JobUtils.buildImage(docker, getDockerBuilder(), buildImageFacade, buildDir,
- isAlwaysPullImage(), isImageBuildEnabled(), getName(), jobLogger);
+ isAlwaysPullImage(), isBuildxImageBuildEnabled(), getName(), jobLogger);
return null;
});
} else if (facade instanceof RunImagetoolsFacade) {