Skip to content
This repository was archived by the owner on Jan 17, 2024. It is now read-only.

Commit 39b0ecb

Browse files
committed
FIX Fixes several bugs
1 parent 092bfbf commit 39b0ecb

File tree

8 files changed

+17
-7
lines changed

8 files changed

+17
-7
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<groupId>com.gpuopenanalytics.jenkins</groupId>
1414
<artifactId>remote-docker-plugin</artifactId>
15-
<version>0.0.1-SNAPSHOT</version>
15+
<version>0.0.2-SNAPSHOT</version>
1616
<packaging>hpi</packaging>
1717

1818
<name>Remote Docker Build</name>

src/main/java/com/gpuopenanalytics/jenkins/remotedocker/DockerLauncher.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ private ArgumentListBuilder getlaunchArgs(DockerConfiguration config,
159159
//TODO Set name? Maybe with build.toString().replaceAll("^\\w", "_")
160160
ArgumentListBuilder args = new ArgumentListBuilder()
161161
.add("run", "-t", "-d")
162-
.add("--env", "TMPDIR=" + workspacePath + ".tmp")
163162
.add("--workdir", workspacePath)
164163
//Add bridge network for internet access
165164
.add("--network", "bridge");

src/main/java/com/gpuopenanalytics/jenkins/remotedocker/config/EnvironmentVariableConfigItem.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ public void validate() throws Descriptor.FormException {
5151
//no-op
5252
}
5353

54+
public String getEnvironment() {
55+
return environment;
56+
}
57+
5458
@Override
5559
public void addCreateArgs(DockerLauncher launcher,
5660
ArgumentListBuilder args,

src/main/java/com/gpuopenanalytics/jenkins/remotedocker/config/ExtraDockerArgsConfigItem.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ public ExtraDockerArgsConfigItem(String extraArgs) {
4949
this.extraArgs = extraArgs;
5050
}
5151

52+
public String getExtraArgs() {
53+
return extraArgs;
54+
}
55+
5256
@Override
5357
public void validate() throws Descriptor.FormException {
5458

src/main/java/com/gpuopenanalytics/jenkins/remotedocker/config/MemoryConfigItem.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ public MemoryConfigItem(String memory) {
5050
this.memory = memory;
5151
}
5252

53+
public String getMemory() {
54+
return memory;
55+
}
56+
5357
@Override
5458
public void validate() throws Descriptor.FormException {
5559
if (!Utils.hasVariablesToResolve(memory)) {

src/main/resources/com/gpuopenanalytics/jenkins/remotedocker/RemoteDockerBuildWrapper/config.jelly

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,8 @@
3737
<f:repeatableDeleteButton/>
3838
</f:repeatableProperty>
3939
</f:entry>
40+
<f:entry title="Debug" field="debug">
41+
<f:checkbox/>
42+
</f:entry>
4043

4144
</j:jelly>

src/main/resources/com/gpuopenanalytics/jenkins/remotedocker/config/DockerRuntimeConfigItem/config.jelly

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
2727

28-
<f:radioBlock name="dockerRuntime" value="runc" title="runc - Standard Docker runtime (default)" inline="true" checked="${instance.getValue()=='runc'}" />
28+
<f:radioBlock name="dockerRuntime" value="runc" title="runc - Standard Docker runtime (default)" inline="true" checked="${instance.getValue()=='runc' or empty(instance.getValue())}" />
2929
<f:radioBlock name="dockerRuntime" value="nvidia" title="nvidia - Enable NVIDIA GPU support with nvidia-docker" inline="true" checked="${instance.getValue()=='nvidia'}" />
3030
<f:radioBlock name="dockerRuntime" value="custom" title="custom - Define which runtime to use" inline="true" checked="${instance.isCustom()}">
3131
<f:entry title="Custom runtime to use" field="dockerRuntimeCustom">

src/main/resources/com/gpuopenanalytics/jenkins/remotedocker/job/AbstractDockerConfiguration/config.jelly

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@
3232
<f:advanced>
3333
<f:section title="Advanced Settings">
3434

35-
<f:entry title="Debug" field="debug">
36-
<f:checkbox/>
37-
</f:entry>
38-
3935
<st:include page="advanced-config.jelly" class="${descriptor.clazz}" optional="true"/>
4036

4137
<f:entry title="Additional Settings">

0 commit comments

Comments
 (0)