The Unified and Autonomous Development Platform
midwork
Robin Shenba68f12998ff
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.javaindex ab4c33d4a9..39fe67317e 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@@ -14,6 +14,8 @@ import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.util.UrlUtils;import javax.validation.constraints.NotEmpty;+import javax.validation.constraints.NotNull;+import java.io.Serializable;import java.util.List;import static io.onedev.server.buildspec.step.StepGroup.DOCKER_IMAGE;@@ -29,10 +31,8 @@ public class BuildImageStep extends Step {private String buildPath;private String dockerfile;-- private String tags;- private boolean publish = true;+ private Output output = new RegistryOutput();private String builtInRegistryAccessTokenSecret;@@ -64,26 +64,14 @@ public class BuildImageStep extends Step {this.dockerfile = dockerfile;}- @Editable(order=300, description="Specify full tag of the image, for instance <tt>myorg/myrepo:latest</tt>, "- + "<tt>myorg/myrepo:1.0.0</tt>, or <tt>onedev.example.com/myproject/myrepo:1.0.0</tt>. "- + "Multiple tags should be separated with space.<br>")- @Interpolative(variableSuggester="suggestVariables")- @NotEmpty- public String getTags() {- return tags;- }-- public void setTags(String tags) {- this.tags = tags;- }-- @Editable(order=330, name="Publish After Build", description="Whether or not to publish built image to docker registry")- public boolean isPublish() {- return publish;+ @Editable(order=300)+ @NotNull+ public Output getOutput() {+ return output;}- public void setPublish(boolean publish) {- this.publish = publish;+ public void setOutput(Output output) {+ this.output = output;}@Editable(order=1000, name="Built-in Registry Access Token Secret", group = "More Settings", descriptionProvider = "getBuiltInRegistryAccessTokenSecretDescription")@@ -141,8 +129,71 @@ public class BuildImageStep extends Step {accessToken = build.getJobAuthorizationContext().getSecretValue(getBuiltInRegistryAccessTokenSecret());elseaccessToken = null;- return new BuildImageFacade(getBuildPath(), getDockerfile(), getTags(), isPublish(),+ return new BuildImageFacade(getBuildPath(), getDockerfile(), getOutput().getFacade(),isRemoveDanglingImages(), accessToken, getMoreOptions());}+ @Editable+ public static interface Output extends Serializable {++ BuildImageFacade.Output getFacade();++ }++ @Editable(order=100, name="Push to Container registry")+ public static class RegistryOutput implements Output {++ private static final long serialVersionUID = 1L;++ private String tags;++ @Editable(description="Specify full tag of the image, for instance <tt>myorg/myrepo:latest</tt>, "+ + "<tt>myorg/myrepo:1.0.0</tt>, or <tt>onedev.example.com/myproject/myrepo:1.0.0</tt>. "+ + "Multiple tags should be separated with space.<br>")+ @Interpolative(variableSuggester="suggestVariables")+ @NotEmpty+ public String getTags() {+ return tags;+ }++ public void setTags(String tags) {+ this.tags = tags;+ }++ static List<InputSuggestion> suggestVariables(String matchWith) {+ return BuildSpec.suggestVariables(matchWith, true, true, false);+ }++ @Override+ public BuildImageFacade.Output getFacade() {+ return new BuildImageFacade.RegistryOutput(getTags());+ }+ }++ @Editable(order=200, name="Export to OCI layout")+ public static class OCIOutput implements Output {++ private static final long serialVersionUID = 1L;++ private String destPath;++ @Editable(name="OCI Layout Directory", description = "Specify path relative to <a href='https://docs.onedev.io/concepts#job-workspace' target='_blank'>job workspace</a> to store OCI layout")+ @SubPath+ @Interpolative(variableSuggester="suggestVariables")+ @NotEmpty+ public String getDestPath() {+ return destPath;+ }++ public void setDestPath(String destPath) {+ this.destPath = destPath;+ }++ @Override+ public BuildImageFacade.Output getFacade() {+ return new BuildImageFacade.OCIOutput(destPath);+ }++ }+}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.javaindex e1b0b712cf..430fb1c1ce 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/BuildImageWithKanikoStep.java@@ -7,6 +7,7 @@ import io.onedev.k8shelper.CommandFacade;import io.onedev.server.OneDev;import io.onedev.server.annotation.*;import io.onedev.server.buildspec.BuildSpec;+import io.onedev.server.buildspec.step.CommandStep;import io.onedev.server.buildspec.step.commandinterpreter.DefaultInterpreter;import io.onedev.server.buildspec.step.commandinterpreter.Interpreter;import io.onedev.server.entitymanager.SettingManager;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/RunImagetoolsStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/RunImagetoolsStep.javaindex 70658cd6b1..96c95736d2 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/RunImagetoolsStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/RunImagetoolsStep.java@@ -9,6 +9,7 @@ import io.onedev.server.annotation.Editable;import io.onedev.server.annotation.Interpolative;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.param.ParamCombination;+import io.onedev.server.buildspec.step.Step;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SetupCacheStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SetupCacheStep.javaindex 45ec0cb05c..1bf103ea53 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/SetupCacheStep.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SetupCacheStep.java@@ -23,7 +23,7 @@ import static java.util.stream.Collectors.toList;@Editable(order=55, name="Set Up Cache", description = "Set up job cache to speed up job execution. " +"Check <a href='https://docs.onedev.io/tutorials/cicd/job-cache' target='_blank'>this tutorial</a> " +- "to get familiar with job cache")+ "on how to use job cache")public class SetupCacheStep extends Step {private static final long serialVersionUID = 1L;@@ -99,7 +99,8 @@ public class SetupCacheStep extends Step {}@Editable(order=425, description = "Optionally specify files relative to cache path to ignore when " +- "detect cache changes")+ "detect cache changes. Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>. " ++ "Multiple files should be separated by space, and single file containing space should be quoted")@Interpolative(variableSuggester="suggestStaticVariables")@ShowCondition("isUploadIfChanged")public String getChangeDetectionExcludes() {diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.javaindex c869e54baf..5c2140bc51 100644--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java@@ -742,7 +742,8 @@ public class KubernetesExecutor extends JobExecutor implements RegistryLoginAwarMap<String, Object> podSpec = new LinkedHashMap<>();Map<Object, Object> containerSpec = newLinkedHashMap("name", "default",- "image", mapImage(jobService.getImage()));+ "image", mapImage(jobService.getImage()),+ "imagePullPolicy", "always");Map<Object, Object> resourcesSpec = newLinkedHashMap("requests", newLinkedHashMap("cpu", getCpuRequest(),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.javaindex 92aeb53eb3..5e5071d61d 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@@ -111,8 +111,8 @@ public class RemoteDockerExecutor extends ServerDockerExecutor {jobContext.getProjectId(), jobContext.getRefName(), jobContext.getCommitId().name(),jobContext.getBuildNumber(), jobContext.getActions(), jobContext.getRetried(),jobContext.getServices(), registryLogins, builtInRegistryUrl, imageMappings,- isMountDockerSock(), getDockerSockPath(), getCpuLimit(), getMemoryLimit(),- getRunOptions(), getNetworkOptions());+ isMountDockerSock(), getDockerSockPath(), getDockerBuilder(), getCpuLimit(),+ getMemoryLimit(), getRunOptions(), getNetworkOptions());try {return call(agentSession, jobData, jobContext.getTimeout()*1000L);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.javaindex 855a16ea39..826c54be92 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@@ -67,6 +67,8 @@ public class ServerDockerExecutor extends JobExecutor implements RegistryLoginAwprivate String dockerSockPath;+ private String dockerBuilder = "onedev";+private String networkOptions;private String cpuLimit;@@ -119,6 +121,17 @@ public class ServerDockerExecutor extends JobExecutor implements RegistryLoginAwthis.dockerSockPath = dockerSockPath;}+ @Editable(order=515, group="More Settings", name="Buildx Builder", description = "Specify dockerx builder used to " ++ "build docker image")+ @NotEmpty+ public String getDockerBuilder() {+ return dockerBuilder;+ }++ public void setDockerBuilder(String dockerBuilder) {+ this.dockerBuilder = dockerBuilder;+ }+@Editable(order=520, group="Privilege Settings", description="Whether or not to mount docker sock into job container to "+ "support docker operations in job commands<br>"+ "<b class='text-danger'>WARNING</b>: Malicious jobs can take control of whole OneDev "@@ -318,7 +331,7 @@ public class ServerDockerExecutor extends JobExecutor implements RegistryLoginAwvar useProcessIsolation = isUseProcessIsolation(docker, image, osInfo, jobLogger);docker.clearArgs();- docker.addArgs("run", "--name=" + containerName, "--network=" + network);+ docker.addArgs("run", "--pull=always", "--name=" + containerName, "--network=" + network);if (runAs != null)docker.addArgs("--user", runAs);else if (!SystemUtils.IS_OS_WINDOWS)@@ -437,7 +450,7 @@ public class ServerDockerExecutor extends JobExecutor implements RegistryLoginAwvar builtInRegistryLogin = new BuiltInRegistryLogin(serverUrl,jobContext.getJobToken(), buildImageFacade.getBuiltInRegistryAccessToken());callWithDockerAuth(docker, getRegistryLoginFacades(), builtInRegistryLogin, () -> {- buildImage(docker, buildImageFacade, hostBuildHome, jobLogger);+ buildImage(docker, getDockerBuilder(), buildImageFacade, hostBuildHome, jobLogger);return null;});} else if (facade instanceof RunImagetoolsFacade) {