archive-gh-me/onedev
1
0
Fork 0
mirror of https://github.com/theonedev/onedev.git synced 2025-12-08 18:26:30 +00:00
Code Issues Projects Releases Wiki Activity

feat: able to specify docker sock path

Browse Source
This commit is contained in:
Robin Shen 2023-05-27 10:05:32 +08:00
parent 8c83037506
commit d8c984d471
39 changed files with 57 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -9,7 +9,7 @@
<version>1.2.0</version>
</parent>
<artifactId>server</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
<packaging>pom</packaging>
<build>
<finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
@ -615,7 +615,7 @@
</repositories>
<properties>
<commons.version>2.7.15</commons.version>
<agent.version>1.8.9</agent.version>
<agent.version>1.8.10</agent.version>
<slf4j.version>1.7.36</slf4j.version>
<logback.version>1.2.11</logback.version>
<antlr.version>4.7.2</antlr.version>

2
server-core/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<build>
<plugins>

2
server-plugin/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-archetype/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<build>
<resources>

2
server-plugin/server-plugin-authenticator-ldap/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.authenticator.ldap.LdapModule</moduleClass>

2
server-plugin/server-plugin-buildspec-gradle/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.buildspec.gradle.GradleModule</moduleClass>

2
server-plugin/server-plugin-buildspec-maven/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.buildspec.maven.MavenModule</moduleClass>

2
server-plugin/server-plugin-buildspec-node/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.buildspec.node.NodePluginModule</moduleClass>

2
server-plugin/server-plugin-executor-kubernetes/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.executor.kubernetes.KubernetesModule</moduleClass>

2
server-plugin/server-plugin-executor-remotedocker/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<dependencies>
<dependency>

3
server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java
View File

@ -195,7 +195,8 @@ public class RemoteDockerExecutor extends ServerDockerExecutor {
}
TestDockerJobData jobData = new TestDockerJobData(getName(), jobToken,
testData.getDockerImage(), registryLogins, getRunOptions());
testData.getDockerImage(), getDockerSockPath(), registryLogins,
getRunOptions());
long timeout = 300*1000L;
if (getLogManager().getJobLogger(jobToken) == null) {

2
server-plugin/server-plugin-executor-remoteshell/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-executor-serverdocker/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.executor.serverdocker.ServerDockerModule</moduleClass>

37
server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
View File

@ -102,7 +102,17 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
this.concurrency = concurrency;
}
@Editable(order=500, group="More Settings", description="Whether or not to mount docker sock into job container to "
@Editable(order=510, group="More Settings", placeholder="Default", description="Optionally specify docker sock to use. "
+ "Defaults to <i>/var/run/docker.sock</i> on Linux, and <i>//./pipe/docker_engine</i> on Windows")
public String getDockerSockPath() {
return dockerSockPath;
}
public void setDockerSockPath(String dockerSockPath) {
this.dockerSockPath = dockerSockPath;
}
@Editable(order=520, group="More Settings", description="Whether or not to mount docker sock into job container to "
+ "support docker operations in job commands, for instance to build docker image.<br>"
+ "<b class='text-danger'>WARNING</b>: Malicious jobs can take control of whole OneDev "
+ "by operating the mounted docker sock. You should configure job requirement above to make sure the " +
@ -114,22 +124,6 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
public void setMountDockerSock(boolean mountDockerSock) {
this.mountDockerSock = mountDockerSock;
}
@SuppressWarnings("unused")
private static boolean isMountDockerSockEnabled() {
return (Boolean)EditContext.get().getInputValue("mountDockerSock");
}
@Editable(order=510, group="More Settings", placeholder="Default", description="Optionally specify docker sock path to mount from. "
+ "Defaults to <i>/var/run/docker.sock</i> on Linux, and <i>//./pipe/docker_engine</i> on Windows")
@ShowCondition("isMountDockerSockEnabled")
public String getDockerSockPath() {
return dockerSockPath;
}
public void setDockerSockPath(String dockerSockPath) {
this.dockerSockPath = dockerSockPath;
}
@Editable(order=50010, group="More Settings", placeholder = "No limit", description = "" +
"Optionally specify cpu limit of jobs/services using this executor. This will be " +
@ -176,12 +170,15 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
}
private Commandline newDocker() {
Commandline docker;
if (getDockerExecutable() != null)
return new Commandline(getDockerExecutable());
docker = new Commandline(getDockerExecutable());
else if (SystemUtils.IS_OS_MAC_OSX && new File("/usr/local/bin/docker").exists())
return new Commandline("/usr/local/bin/docker");
docker = new Commandline("/usr/local/bin/docker");
else
return new Commandline("docker");
docker = new Commandline("docker");
useDockerSock(docker, getDockerSockPath());
return docker;
}
private File getCacheHome(JobExecutor jobExecutor) {

2
server-plugin/server-plugin-executor-servershell/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.executor.servershell.ServerShellModule</moduleClass>

2
server-plugin/server-plugin-import-bitbucketcloud/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.bitbucketcloud.BitbucketModule</moduleClass>

2
server-plugin/server-plugin-import-gitea/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.gitea.GiteaModule</moduleClass>

2
server-plugin/server-plugin-import-github/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.github.GitHubModule</moduleClass>

2
server-plugin/server-plugin-import-gitlab/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.gitlab.GitLabModule</moduleClass>

2
server-plugin/server-plugin-import-jiracloud/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.jiracloud.JiraModule</moduleClass>

2
server-plugin/server-plugin-import-url/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.url.UrlModule</moduleClass>

2
server-plugin/server-plugin-import-youtrack/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.youtrack.YouTrackModule</moduleClass>

2
server-plugin/server-plugin-notification-discord/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.notification.discord.DiscordModule</moduleClass>

2
server-plugin/server-plugin-notification-slack/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.notification.slack.SlackModule</moduleClass>

2
server-plugin/server-plugin-report-checkstyle/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-report-clover/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-report-coverage/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.coverage.CoverageModule</moduleClass>

2
server-plugin/server-plugin-report-cpd/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-report-jacoco/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-report-jest/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-report-junit/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-report-markdown/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.markdown.MarkdownModule</moduleClass>

2
server-plugin/server-plugin-report-pmd/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-report-problem/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.problem.ProblemModule</moduleClass>

2
server-plugin/server-plugin-report-spotbugs/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<dependencies>
<dependency>

2
server-plugin/server-plugin-report-unittest/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.unittest.UnitTestModule</moduleClass>

2
server-plugin/server-plugin-sso-discord/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.sso.discord.DiscordModule</moduleClass>

2
server-plugin/server-plugin-sso-openid/pom.xml
View File

@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.sso.openid.OpenIdModule</moduleClass>

2
server-product/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
<version>8.2.7</version>
<version>8.2.8</version>
</parent>
<dependencies>
<dependency>